WMSPrjInstance/HH-0126_HeNanPingGao.git

			@@ -41,6 +41,9 @@
			using System.Data;
			using System.Runtime.ConstrainedExecution;
			using HH.WCS.Mobox3.pinggao.core;
			using static HH.WCS.Mobox3.pinggao.api.OtherModel.Putaway_Order_In;
			using System.Web.Http.Results;
			using System.Runtime.Caching;

			namespace HH.WCS.Mobox3.pinggao.api
			{
			@@ -1007,7 +1010,7 @@
			{
			var result = new SimpleResult();
			//判断冲销凭证编号是否为空如果为空则为冲销(审核前才能冲销，非待执行状态提示执行中不可冲销) 不为空则为外采入库
			if ((itemwlpz.HEAD.YDLX != "351" \|\| itemwlpz.HEAD.YDLX != "Z89") && itemwlpz.ITEM[0].FHGC == "3040")
			if (itemwlpz.ITEM[0].JDBS=="H" && itemwlpz.ITEM[0].GC == "3040")
			{
			var po = db.Queryable<TN_Ll_Order>().Includes(a => a.Details).Where(s => s.S_NO == itemwlpz.HEAD.WLPZH).First();
			//创建出库单主子表
			@@ -1243,7 +1246,7 @@
			}
			#endregion
			}
			else if ((itemwlpz.HEAD.YDLX == "351" \|\| itemwlpz.HEAD.YDLX == "Z89") && itemwlpz.ITEM[0].GC == "3040")
			else if (itemwlpz.ITEM[0].JDBS == "S" && itemwlpz.ITEM[0].GC == "3040")
			{
			//创建入库单主子表
			var po = WMSHelper.GetInboundOrder(itemwlpz.HEAD.WLPZH);
			@@ -1731,6 +1734,8 @@
			/// <returns></returns>
			internal static SimpleResult InboundOrderSorting(MPSorting model)
			{


			var result = new SimpleResult();
			foreach (var a in model.MaterList)
			{
			@@ -1745,6 +1750,27 @@
			// var db = new SqlHelper<object>().GetInstance();
			using (var db = new SqlHelper<object>().GetInstance())
			{
			Location endloc = new Location();
			var hwbd = db.Queryable<TN_Container_Code>().Where(a => a.S_CNTR_CODE.Trim() == model.cntr_code).First();
			if (hwbd!=null)
			{
			endloc = db.Queryable<Location>().Where(a => a.S_CODE == hwbd.S_LOC_CODE.Trim()).First();
			if (endloc?.N_LOCK_STATE != 0)
			{
			result.resultCode = 3;
			result.resultMsg = $"终点库位已锁/不存在";
			return result;
			}
			}
			else
			{
			result.resultCode = 3;
			result.resultMsg = $"{model.cntr_code}托盘找不到货位";
			return result;
			}



			var locinfo = db.Queryable<Location>().Where(a => a.S_CODE == model.start).First();

			if (locinfo?.N_LOCK_STATE != 0)
			@@ -1817,7 +1843,9 @@
			S_START_LOC = model.start,
			S_START_AREA = locinfo.S_AREA_CODE,
			S_START_WH = locinfo.S_WH_CODE,
			S_END_LOC = model.start,
			S_END_LOC = endloc.S_CODE,
			S_END_AREA = endloc.S_AREA_CODE,
			S_END_WH = endloc.S_WH_CODE,
			S_BS_NO = model.MaterList[0].arrival_no,
			N_TYPE = 1,
			S_TYPE = WMSTask.GetTypeStr(1),
			@@ -1895,30 +1923,59 @@
			}
			else if (!string.IsNullOrEmpty(model.item_code))
			{
			var starts = db.Queryable<CntrItemRel>().Where(cir => cir.S_CNTR_TYPE == "半托" && cir.S_ITEM_CODE == model.item_code).OrderBy(cir => cir.T_CREATE).ToList().FirstOrDefault();
			if (starts!=null)
			{
			LogHelper.Info($"starts{starts}");
			var starts12 = db.Queryable<LocCntrRel>().Where(lcr => lcr.S_CNTR_CODE == starts.S_CNTR_CODE).ToList().FirstOrDefault();
			LogHelper.Info($"starts1{starts12}");
			start = db.Queryable<Location>().Where(loc => loc.S_AREA_CODE == "HJQ" && loc.S_CODE == starts12.S_LOC_CODE).ToList().FirstOrDefault();
			LogHelper.Info($"starts2{start}");
			LogHelper.Info($"进来了");
			var khsta= db.Queryable<CGRels>().Where(cir => cir.S_CNTR_TYPE == "半托" && cir.S_ITEM_CODE == model.item_code).OrderBy(cir => cir.T_CREATE).ToList().FirstOrDefault();

			model.cntr_code = starts12?.S_CNTR_CODE;


			if (khsta != null)
			{
			LogHelper.Info($"starts{khsta?.S_CNTR_CODE}");
			var starts12 = db.Queryable<LocCntrRel>().Where(lcr => lcr.S_CNTR_CODE == khsta.S_CNTR_CODE).First();
			if (starts12==null)
			{
			LogHelper.Info($"{khsta.S_CNTR_CODE}容器货位不存在");
			result.resultMsg = $"{khsta.S_CNTR_CODE}容器货位不存在";
			result.resultCode = 1;
			return result;
			}
			else
			{

			LogHelper.Info($"starts1{starts12.S_LOC_CODE}");
			start = db.Queryable<Location>().Where(loc => loc.S_AREA_CODE == "HJQ" && loc.S_CODE == starts12.S_LOC_CODE).ToList().FirstOrDefault();
			LogHelper.Info($"starts2{start?.S_CODE}");

			model.cntr_code = starts12?.S_CNTR_CODE;
			}
			}
			else
			{
			var list = db.Queryable<CntrItemRel>().Select(s => s.S_CNTR_CODE).ToArray();
			var S_LOC_CODElist = db.Queryable<LocCntrRel>().Where(s => !list.Contains(s.S_CNTR_CODE)).Select(s => s.S_LOC_CODE).ToArray();
			start = db.Queryable<Location>().Where(it => S_LOC_CODElist.Contains(it.S_CODE)).ToList().FirstOrDefault();
			var starts = db.Queryable<CntrItemRel>().Where(cir => cir.S_CNTR_TYPE == "半托" && cir.S_ITEM_CODE == model.item_code).OrderBy(cir => cir.T_CREATE).ToList().FirstOrDefault();

			if (starts!=null)
			{
			LogHelper.Info($"{model.cntr_code}容器货品存在该物料，请配置物料容器");
			result.resultMsg = $"容器货品存在该物料，请配置物料容器";
			result.resultCode = 1;
			return result;

			}
			else
			{
			var list = db.Queryable<CntrItemRel>().Select(s => s.S_CNTR_CODE).ToArray();
			var S_LOC_CODElist = db.Queryable<LocCntrRel>().Where(s => !list.Contains(s.S_CNTR_CODE)).Select(s => s.S_LOC_CODE).ToArray();
			start = db.Queryable<Location>().Where(it => S_LOC_CODElist.Contains(it.S_CODE)).ToList().FirstOrDefault();
			if (start!=null)
			{
			var starts12 = db.Queryable<LocCntrRel>().Where(lcr => lcr.S_CNTR_CODE == start.S_CODE).ToList().FirstOrDefault();




			var starts12 = db.Queryable<LocCntrRel>().Where(lcr => lcr.S_CNTR_CODE == start.S_CODE).ToList().FirstOrDefault();


			model.cntr_code = starts12?.S_CNTR_CODE;
			model.cntr_code = starts12?.S_CNTR_CODE;
			}

			}

			}

			}
			@@ -1930,8 +1987,8 @@
			}
			if (start == null)
			{
			LogHelper.Info($"{model.cntr_code}未找到可用货位");
			result.resultMsg = $"{model.cntr_code}未找到可用货位";
			LogHelper.Info($"{model.item_code}未找到可用货位");
			result.resultMsg = $"{model.item_code}未找到可用货位";
			result.resultCode = 1;
			return result;
			}
			@@ -1948,7 +2005,7 @@
			S_END_LOC = endinfo.S_CODE,
			S_END_AREA = endinfo.S_AREA_CODE,
			S_END_WH = endinfo.S_WH_CODE,

			N_PRIORITY=1,
			N_TYPE = 2,
			// S_TYPE = WMSTask.GetTypeStr(1),
			S_TYPE = "出库空托盘",
			@@ -1969,26 +2026,42 @@
			if (!string.IsNullOrEmpty(model.cntr_code))
			{

			#region MyRegion
			//var list = db.Queryable<CntrItemRel>().Select(s => s.S_CNTR_CODE).ToArray();
			//var S_LOC_CODElist = db.Queryable<LocCntrRel>().Where(s=>!list.Contains(s.S_CNTR_CODE)).Select(s=>s.S_LOC_CODE).ToArray();
			//start = db.Queryable<Location>().Where(it => S_LOC_CODElist.Contains(it.S_CODE)).First();
			var hwbd = db.Queryable<TN_Container_Code>().Where(a => a.S_CNTR_CODE.Trim() == model.cntr_code).First();
			if (hwbd!=null)
			{
			end = db.Queryable<Location>().Where(s => s.S_CODE == hwbd.S_LOC_CODE.Trim()).First();
			}
			else
			{

			//// 获取所有被占用的容器编码
			//var usedContainerCodes = db.Queryable<CntrItemRel>().Select(s => s.S_CNTR_CODE).ToList();
			#region MyRegion
			//var list = db.Queryable<CntrItemRel>().Select(s => s.S_CNTR_CODE).ToArray();
			//var S_LOC_CODElist = db.Queryable<LocCntrRel>().Where(s=>!list.Contains(s.S_CNTR_CODE)).Select(s=>s.S_LOC_CODE).ToArray();
			//start = db.Queryable<Location>().Where(it => S_LOC_CODElist.Contains(it.S_CODE)).First();

			// 获取未被占用的容器对应的货位编码
			var availableLocationCodes = db.Queryable<LocCntrRel>()
			.Select(s => s.S_LOC_CODE)
			.ToList();
			//// 获取所有被占用的容器编码
			//var usedContainerCodes = db.Queryable<CntrItemRel>().Select(s => s.S_CNTR_CODE).ToList();
			#endregion
			// 获取未被占用的容器对应的货位编码
			var availableLocationCodes = db.Queryable<LocCntrRel>()
			.Select(s => s.S_LOC_CODE)
			.ToList();

			// 获取第一个可用货位（如果没有则返回null）
			end = db.Queryable<Location>()
			.Where(it => !availableLocationCodes.Contains(it.S_CODE) && it.S_AREA_CODE == "HJQ")
			.ToList().FirstOrDefault();

			if (end!=null)
			{
			TN_Container_Code tN_Container_Code = new TN_Container_Code();
			tN_Container_Code.S_CNTR_CODE= model.cntr_code;
			tN_Container_Code.S_LOC_CODE = end.S_CODE;
			var sss = db.Insertable<TN_Container_Code>(tN_Container_Code).ExecuteCommand();
			}

			#endregion
			}

			}
			else
			{
			@@ -2038,6 +2111,7 @@
			catch (Exception e)
			{
			result.resultMsg = e.Message;
			result.resultCode = 1;
			db.RollbackTran();
			return result;
			throw;
			@@ -2045,24 +2119,232 @@
			}

			}
			private static readonly ObjectCache Cache = MemoryCache.Default;
			private const string CachePrefix = "ClickProtection_";
			private const int CacheDurationInSeconds = 5;

			public static bool IsClickAllowed(string parameter)
			{
			string cacheKey = CachePrefix + parameter;

			// 检查缓存中是否已存在该参数
			if (Cache.Contains(cacheKey))
			{
			// 缓存中存在，说明5秒内已点击过
			return false;
			}
			else
			{
			// 缓存中不存在，添加到缓存并设置5秒后过期
			CacheItemPolicy policy = new CacheItemPolicy { AbsoluteExpiration = DateTimeOffset.Now.AddSeconds(CacheDurationInSeconds) };
			Cache.Set(cacheKey, parameter, policy);
			return true;
			}
			}
			public static async Task<SimpleResult> AllTYAddOutboundOrder(SqlSugarClient db, List<Mater> MaterList, string arrival_no, string cntr_code, string start, string S_OUT_TYPE, string cntr_type)
			{
			// var db = new SqlHelper<object>().GetInstance();
			//using (var db = new SqlHelper<object>().GetInstance())
			//{
			var result = new SimpleResult();

			try
			{
			//库位信息
			var startinfo = db.Queryable<Location>().Where(it => it.S_CODE == start).First();
			//出库单详情
			var po = db.Queryable<TN_Outbound_Order>().Includes(s => s.Details).Where(a => a.S_NO == arrival_no).First();
			//分拣单
			//var popp = db.Queryable<TN_Distribution_CNTR>().Where(a => a.S_BS_NO == arrival_no&&a.S_SORT_TYPE=="未分类" && a.N_B_STATE == 2).First();

			//回参物料信息
			List<OutboundRecord> records = new List<OutboundRecord>();
			var pzlist = db.Queryable<MaterialVoucher>().Where(a => a.S_NO == arrival_no).ToList();
			foreach (var item in MaterList)
			{
			var pz = pzlist.Where(s => s.S_WLBM == item.item_code).FirstOrDefault();
			// 插入到托盘明细表
			var cntr = db.Queryable<CntrItemRel>().Where(a => a.S_CNTR_CODE == cntr_code).ToList();
			if (cntr.Count() > 0)
			{
			db.BeginTran();
			//1.查看是否有相同物料批次的信息，如果有要累减少，不同批次的可以分开&& a.N_BS_ROW_NO == item.N_ROW_NO
			var cir = db.Queryable<CntrItemRel>().Where(a => a.S_CNTR_CODE == cntr_code && a.S_ITEM_CODE == item.item_code).First();//&& a.S_BATCH_NO == item.S_BATCH_NO
			if (cir != null)
			{
			cir.F_QTY -= item.qty;
			cir.S_CNTR_TYPE = cntr_type;
			cir.F_ALLOC_QTY -= item.qty;
			cir.T_MODIFY = DateTime.Now;
			if (cir.F_QTY == 0)
			{
			db.Deleteable(cir).ExecuteCommand();
			}
			else
			{
			db.Updateable(cir).UpdateColumns(it => new { it.F_QTY, it.S_CNTR_TYPE, it.F_ALLOC_QTY, it.T_MODIFY }).ExecuteCommand();

			}
			}
			else
			{
			db.RollbackTran();
			result.resultCode = 1;
			result.resultMsg = $"物料不存在{item.item_code}";
			LogHelper.Info($"物料不存在{item.item_code}");
			return result;
			}

			OutboundRecord outboundRecord = new OutboundRecord();
			outboundRecord.S_WLPZBH = pz?.S_WLPZBH;
			outboundRecord.S_WLPZND = pz?.S_WLPZND;
			outboundRecord.S_TYPE = S_OUT_TYPE;

			outboundRecord.S_NO = arrival_no;
			outboundRecord.S_WLBM = item.item_code;
			outboundRecord.S_SL = item.qty;
			outboundRecord.S_CNTR_CODE = cntr_code;
			records.Add(outboundRecord);
			}
			else
			{
			result.resultCode = 1;
			result.resultMsg = $"获取托盘信息失败{cntr_code}";
			LogHelper.Info($"获取托盘信息失败{cntr_code}");
			return result;
			}
			}
			//if (isHK)
			//{
			var locs = db.Queryable<WCSTask>().Where(a => a.S_TYPE.Contains("出库") && a.S_CNTR_CODE == cntr_code && a.N_B_STATE == 3).OrderByDescending(s => s.T_END_TIME).First();
			if (locs != null)
			{
			var cntr = db.Queryable<TN_Distribution_CNTR>().Where(a => a.S_DC_NO == locs.S_BS_NO).First();
			if (cntr != null)
			{
			cntr.S_SORT_TYPE = "已分拣";
			db.Updateable(cntr).UpdateColumns(it => new { it.S_SORT_TYPE }).ExecuteCommand();
			}
			else
			{
			result.resultCode = 1;
			result.resultMsg += $"任务{locs.S_CODE}来源号{locs.S_BS_NO}找不到配盘信息";
			return result;
			}
			Location endloc = new Location();

			LogHelper.Info($"获取托盘信息{cntr_code}容器");
			var hwbd = db.Queryable<TN_Container_Code>().Where(a => a.S_CNTR_CODE.Trim() == cntr_code).First();
			if (hwbd != null)
			{
			endloc = db.Queryable<Location>().Where(a => a.S_CODE == hwbd.S_LOC_CODE.Trim()).First();
			if (endloc?.N_LOCK_STATE != 0)
			{
			result.resultCode = 3;
			result.resultMsg = $"终点库位已锁/不存在";
			return result;
			}

			}
			else
			{
			result.resultCode = 3;
			result.resultMsg = $"{cntr_code}托盘找不到货位";
			return result;
			}

			//var location = db.Queryable<Location>().Where(a => a.S_CODE == locs.S_LOC_CODE).First();
			var wmsTask = new WMSTask
			{
			S_CNTR_CODE = cntr_code,
			S_CODE = WMSHelper.GenerateTaskNo(),
			S_START_LOC = start,
			S_START_AREA = startinfo.S_AREA_CODE,
			S_START_WH = startinfo.S_WH_CODE,

			//S_END_LOC = start,
			//S_END_AREA = startinfo.S_AREA_CODE,
			//S_END_WH = startinfo.S_AREA_CODE,
			S_END_LOC = endloc?.S_CODE,
			S_END_AREA = endloc?.S_AREA_CODE,
			S_END_WH = endloc?.S_WH_CODE,

			N_TYPE = 1,
			// S_TYPE = WMSTask.GetTypeStr(1),
			S_TYPE = "回库",
			S_OP_DEF_CODE = "",
			S_OP_DEF_NAME = "pda入库"
			};
			if (WMSHelper.CreateWmsTask(wmsTask))
			{
			LocationHelper.LockLoc(start, 2);
			result.resultMsg = $"创建作业成功，作业号{wmsTask.S_CODE}";
			}
			}
			else
			{
			result.resultCode = 1;
			result.resultMsg += $"找不到容器对应任务信息{cntr_code}";
			return result;
			}

			//}
			var sss = db.Insertable<OutboundRecord>(records).ExecuteCommand();

			//db.CommitTran();
			}
			catch (Exception ex)
			{
			//db.RollbackTran();
			LogHelper.Info("物料信息绑定到满容器上" + ex.Message);
			result.resultCode = 1;
			result.resultMsg += ex.Message;
			Console.WriteLine(ex.Message);

			throw;
			}
			return result;
			}

			/// <summary>
			/// 分拣
			/// </summary>
			/// <param name="model"></param>
			/// <returns></returns>
			internal static async Task<SimpleResult> OutboundOrderSorting(FJSorting model)
			internal static async Task<SimpleResult> ALLOutboundOrderSorting(FJSorting model)
			{


			var result = new SimpleResult();
			if (!IsClickAllowed("1"))
			{
			// 提示用户5秒内已点击过
			result.resultMsg = "您已点击过，请5秒后再试。";
			result.resultCode = 1;
			return result;
			}
			else
			{

			}
			// var db = new SqlHelper<object>().GetInstance();

			using (var db = new SqlHelper<object>().GetInstance())
			{
			try
			{


			var start = "";
			var startloc = db.Queryable<LocCntrRel>().Where(a => a.S_CNTR_CODE == model.cntr_code).First();
			if (startloc != null)
			{
			start = startloc.S_LOC_CODE;
			}
			else
			{
			result.resultMsg = $"{model.cntr_code}容器未找到货位信息";
			result.resultCode = 1;
			return result;
			}
			result.resultMsg = "成功";
			result.resultCode = 0;
			if (string.IsNullOrEmpty(model.arrival_no))
			@@ -2083,28 +2365,37 @@

			}
			LogHelper.Info($"S_OUT_TYPE{po.S_OUT_TYPE}");
			var gzra = db.Queryable<TN_GZ_SZ>().Where(a => a.C_ENABLE == "Y").First();
			var GZRQ = DateTime.Now.ToString("yyyyMMdd");
			if (gzra != null)
			{
			GZRQ = gzra.S_GZRQ.ToString("yyyyMMdd");
			}
			//根据不同出库类型回调sap
			if (po.S_OUT_TYPE == "冲销出库")
			{
			result = await CXAddOutboundOrder(db, model.MaterList, model.arrival_no, model.cntr_code, model.start);
			result = await CXAddOutboundOrder(GZRQ, db, model.MaterList, model.arrival_no, model.cntr_code, start);
			}
			else
			if (po.S_OUT_TYPE == "出库")//普通出库
			{
			LogHelper.Info($"S_OUT_TYPE{po.S_OUT_TYPE}");
			result = await AddOutboundOrder(db, model.MaterList, model.arrival_no, model.cntr_code, model.start);
			result = await AddOutboundOrder(GZRQ, db, model.MaterList, model.arrival_no, model.cntr_code, start);
			}
			else if (po.S_OUT_TYPE == "计划外发料出库")
			{
			result = await jhwtlAddOutboundOrder(db, model.MaterList, model.arrival_no, model.cntr_code, model.start);
			result = await jhwtlAddOutboundOrder(GZRQ, db, model.MaterList, model.arrival_no, model.cntr_code, start);
			}
			else if (po.S_OUT_TYPE == "成本中心出库")
			{
			result = await CBAddOutboundOrder(db, model.MaterList, model.arrival_no, model.cntr_code, model.start);
			result = await CBAddOutboundOrder(GZRQ, db, model.MaterList, model.arrival_no, model.cntr_code, start);
			}

			//if (result.resultCode == 1)
			//{
			// return result;
			//}
			//通用接口对容器货品的删减和生成回库单都要用的接口
			result = await TYAddOutboundOrder(db, model.MaterList, model.arrival_no, model.cntr_code, model.IsHK, model.start, po.S_OUT_TYPE, model.cntr_type);
			result = await AllTYAddOutboundOrder(db, model.MaterList, model.arrival_no, model.cntr_code, start, po.S_OUT_TYPE, model.cntr_type);
			if (result.resultCode == 1)
			{
			return result;
			@@ -2225,7 +2516,221 @@
			}

			}
			public static async Task<SimpleResult> TYAddOutboundOrder(SqlSugarClient db, List<Mater> MaterList, string arrival_no, string cntr_code, bool isHK, string start, string S_OUT_TYPE, string cntr_type)
			/// <summary>
			/// 分拣
			/// </summary>
			/// <param name="model"></param>
			/// <returns></returns>
			internal static async Task<SimpleResult> OutboundOrderSorting(FJSorting model)
			{

			var result = new SimpleResult();
			if (!IsClickAllowed("1"))
			{
			// 提示用户5秒内已点击过
			result.resultMsg = "您已点击过，请5秒后再试。";
			result.resultCode = 1;
			return result;
			}
			else
			{

			}
			// var db = new SqlHelper<object>().GetInstance();

			using (var db = new SqlHelper<object>().GetInstance())
			{
			try
			{
			var start = "";
			var startloc = db.Queryable<LocCntrRel>().Where(a => a.S_CNTR_CODE == model.cntr_code).First();
			if (startloc!=null)
			{
			start = startloc.S_LOC_CODE;
			}
			else
			{
			result.resultMsg = $"{model.cntr_code}容器未找到货位信息";
			result.resultCode = 1;
			return result;
			}
			result.resultMsg = "成功";
			result.resultCode = 0;
			if (string.IsNullOrEmpty(model.arrival_no))
			{
			result.resultMsg = "出库单号不能为空";
			result.resultCode = 1;
			return result;
			}

			//人工分拣容器货品表数量、分配量升降
			//出库单详情
			var po = db.Queryable<TN_Outbound_Order>().Includes(s => s.Details).Where(a => a.S_NO == model.arrival_no).First();
			if (po == null)
			{
			result.resultMsg = "未找到此出库单";
			result.resultCode = 1;
			return result;

			}
			LogHelper.Info($"S_OUT_TYPE{po.S_OUT_TYPE}");
			var gzra = db.Queryable<TN_GZ_SZ>().Where(a => a.C_ENABLE == "Y").First();
			var GZRQ = DateTime.Now.ToString("yyyyMMdd");
			if (gzra != null)
			{
			GZRQ = gzra.S_GZRQ.ToString("yyyyMMdd");
			}
			#region 注释sap 因效率过慢人工回到
			//根据不同出库类型回调sap
			if (po.S_OUT_TYPE == "冲销出库")
			{
			result = await CXAddOutboundOrder(GZRQ, db, model.MaterList, model.arrival_no, model.cntr_code, start);
			}
			else
			if (po.S_OUT_TYPE == "出库")//普通出库
			{
			LogHelper.Info($"S_OUT_TYPE{po.S_OUT_TYPE}");
			result = await AddOutboundOrder(GZRQ, db, model.MaterList, model.arrival_no, model.cntr_code, start);
			}
			else if (po.S_OUT_TYPE == "计划外发料出库")
			{
			result = await jhwtlAddOutboundOrder(GZRQ, db, model.MaterList, model.arrival_no, model.cntr_code, start);
			}
			else if (po.S_OUT_TYPE == "成本中心出库")
			{
			result = await CBAddOutboundOrder(GZRQ, db, model.MaterList, model.arrival_no, model.cntr_code, start);
			}
			#endregion



			//if (result.resultCode == 1)
			//{
			// return result;
			//}
			//通用接口对容器货品的删减和生成回库单都要用的接口
			result = await TYAddOutboundOrder(db, model.MaterList, model.arrival_no, model.cntr_code, start, po.S_OUT_TYPE, model.cntr_type);
			if (result.resultCode == 1)
			{
			return result;
			}
			#region 升降量

			bool adds = true;

			//var itemlist = db.Queryable<CntrItemRel>().Where(a => a.S_CNTR_CODE == model.cntr_code).ToList();
			if (model.MaterList.Count > 0)
			{
			var url = Settings.MoboxSeverUrl + "inventory/AddChange";
			//仓库量表升量
			var req = new AddChangeModel { op_type = 4 };
			//库区量表升量
			var req2 = new AddChangeModel { op_type = 7 };
			var S_WH_CODE = "";
			var S_AREA_CODE = "";
			if (string.IsNullOrEmpty(po.S_WH_CODE))
			{
			S_WH_CODE = util.Settings.WHCode;
			}
			else
			{
			S_WH_CODE = po.S_WH_CODE;
			}
			if (string.IsNullOrEmpty(po.S_AREA_CODE))
			{
			S_AREA_CODE = util.Settings.AREACode;
			}
			else
			{
			S_AREA_CODE = po.S_AREA_CODE;
			}
			model.MaterList.ForEach(a =>
			{
			LogHelper.Info($"填充数据{util.Settings.WHCode}");
			LogHelper.Info($"减仓库量{util.Settings.AREACode}表数据仓库{po.S_WH_CODE} 物料编码{a.item_code} 物料名称数量{a.qty}");
			req.item_info.Add(new AddChangeModel.itemModel
			{
			wh_code = S_WH_CODE,
			item_code = a.item_code,
			item_name = "",
			qty = a.qty
			});
			LogHelper.Info($"减库区量表数据库区{po.S_AREA_CODE} 物料编码{a.item_code} 物料名称数量{a.qty}");
			req2.item_info.Add(new AddChangeModel.itemModel
			{
			wh_code = S_WH_CODE,
			area_code = S_AREA_CODE,
			item_code = a.item_code,
			item_name = "",
			qty = a.qty
			});
			});
			var reqData = JsonConvert.SerializeObject(req);
			var AppKey = Settings.AppKey;
			var AppSecret = Settings.AppSecret;
			var ReqTime = DateTimeOffset.UtcNow.ToUnixTimeSeconds().ToString();
			//var ReqTime = GetTimeStamp(DateTime.Now.AddHours(-8), 1, 2);
			LogHelper.Info($"加密前 AppKey={AppKey} AppSecret={AppSecret} ReqTime={ReqTime}");
			var ReqVerify = GetMd5FromString(AppKey + AppSecret + ReqTime);
			LogHelper.Info($"加密后 AppKey={AppKey} AppSecret={AppSecret} ReqTime={ReqTime} ReqVerify={ReqVerify} url={url} req={reqData}");
			var res = new HttpHelper().WebPost(url, reqData, "application/json", AppKey, ReqTime, ReqVerify);
			if (!string.IsNullOrEmpty(res))
			{
			LogHelper.Info($"mobox 仓库降量接口返回 {res}");
			var moboxres = JsonConvert.DeserializeObject<moboxres>(res);
			if (moboxres.err_code != 0)
			{
			adds = false;
			}
			}
			else
			{
			LogHelper.Info($"mobox 仓库降量接口返回为空");

			}
			var reqData2 = JsonConvert.SerializeObject(req2);
			var ReqTime2 = DateTimeOffset.UtcNow.ToUnixTimeSeconds().ToString();
			//var ReqTime2 = GetTimeStamp(DateTime.Now.AddHours(-8), 1, 2);
			LogHelper.Info($"加密前 AppKey={AppKey} AppSecret={AppSecret} ReqTime={ReqTime2}");
			var ReqVerify2 = GetMd5FromString(AppKey + AppSecret + ReqTime2);
			LogHelper.Info($"加密后 AppKey={AppKey} AppSecret={AppSecret} ReqTime={ReqTime2} ReqVerify={ReqVerify2} url={url} req={reqData2}");
			var res2 = new HttpHelper().WebPost(url, reqData2, "application/json", AppKey, ReqTime2, ReqVerify2);
			if (!string.IsNullOrEmpty(res2))
			{
			LogHelper.Info($"mobox 库区降量接口返回 {res2}");
			var moboxres = JsonConvert.DeserializeObject<moboxres>(res);
			if (moboxres.err_code != 0)

			{
			adds = false;
			}
			}
			else
			{
			LogHelper.Info($"mobox 库区降量接口返回为空");

			}
			//if (adds) addOnShelves(po, model.cntr_code, 2);

			}
			else LogHelper.Info($"托盘{model.cntr_code}无需要升降量的物料");
			db.CommitTran();
			#endregion
			return result;

			}
			catch (Exception e)
			{
			LogHelper.Info($"报错{e.Message}");
			result.resultMsg = e.Message;
			db.RollbackTran();
			return result;
			throw;
			}
			}

			}
			public static async Task<SimpleResult> TYAddOutboundOrder(SqlSugarClient db, List<Mater> MaterList, string arrival_no, string cntr_code, string start, string S_OUT_TYPE, string cntr_type)
			{
			// var db = new SqlHelper<object>().GetInstance();
			//using (var db = new SqlHelper<object>().GetInstance())
			@@ -2243,9 +2748,10 @@

			//回参物料信息
			List<OutboundRecord> records = new List<OutboundRecord>();
			var pz = db.Queryable<MaterialVoucher>().Where(a => a.S_NO == arrival_no).First();
			var pzlist = db.Queryable<MaterialVoucher>().Where(a => a.S_NO == arrival_no).ToList();
			foreach (var item in MaterList)
			{
			var pz=pzlist.Where(s=>s.S_WLBM== item.item_code).FirstOrDefault();
			// 插入到托盘明细表
			var cntr = db.Queryable<CntrItemRel>().Where(a => a.S_CNTR_CODE == cntr_code).ToList();
			if (cntr.Count() > 0)
			@@ -2266,7 +2772,7 @@
			else
			{
			db.Updateable(cir).UpdateColumns(it => new { it.F_QTY, it.S_CNTR_TYPE, it.F_ALLOC_QTY, it.T_MODIFY }).ExecuteCommand();
			//添加回库作业

			}
			}
			else
			@@ -2297,56 +2803,28 @@
			return result;
			}
			}
			if (isHK)
			LogHelper.Info($"分拣接口{cntr_code}");
			//if (isHK)
			//{
			var locs = db.Queryable<WCSTask>().Where(a => a.S_TYPE.Contains("出库") && a.S_CNTR_CODE == cntr_code && a.N_B_STATE == 3).OrderByDescending(s => s.T_END_TIME).First();
			if (locs != null)
			{
			var locs = db.Queryable<WCSTask>().Where(a => a.S_TYPE.Contains("出库") && a.S_CNTR_CODE == cntr_code && a.N_B_STATE == 3).OrderByDescending(s => s.T_END_TIME).First();
			if (locs != null)
			LogHelper.Info($"分拣接口进来了{cntr_code}");
			var cntr = db.Queryable<TN_Distribution_CNTR>().Where(a => a.S_DC_NO == locs.S_BS_NO).First();
			if (cntr != null)
			{
			var cntr = db.Queryable<TN_Distribution_CNTR>().Where(a => a.S_DC_NO == locs.S_BS_NO).First();
			if (cntr != null)
			{
			cntr.S_SORT_TYPE = "已分拣";
			db.Updateable(cntr).UpdateColumns(it => new { it.S_SORT_TYPE }).ExecuteCommand();
			}
			else
			{
			result.resultCode = 1;
			result.resultMsg += $"任务{locs.S_CODE}来源号{locs.S_BS_NO}找不到配盘信息";
			return result;
			}
			//var location = db.Queryable<Location>().Where(a => a.S_CODE == locs.S_LOC_CODE).First();
			var wmsTask = new WMSTask
			{
			S_CNTR_CODE = cntr_code,
			S_CODE = WMSHelper.GenerateTaskNo(),
			S_START_LOC = start,
			S_START_AREA = startinfo.S_AREA_CODE,
			S_START_WH = startinfo.S_WH_CODE,
			S_END_LOC = locs?.S_START_LOC,
			S_END_AREA = locs?.S_START_AREA,
			S_END_WH = locs?.S_START_WH,

			N_TYPE = 1,
			// S_TYPE = WMSTask.GetTypeStr(1),
			S_TYPE = "回库",
			S_OP_DEF_CODE = "",
			S_OP_DEF_NAME = "pda入库"
			};
			if (WMSHelper.CreateWmsTask(wmsTask))
			{
			LocationHelper.LockLoc(start, 1);
			result.resultMsg = $"创建作业成功，作业号{wmsTask.S_CODE}";
			}
			cntr.S_SORT_TYPE = "已分拣";
			db.Updateable(cntr).UpdateColumns(it => new { it.S_SORT_TYPE }).ExecuteCommand();
			}
			else
			{
			result.resultCode = 1;
			result.resultMsg += $"找不到容器对应任务信息{cntr_code}";
			result.resultMsg += $"任务{locs.S_CODE}来源号{locs.S_BS_NO}找不到配盘信息";
			return result;
			}

			}
			var sss = db.Insertable<OutboundRecord>(records).ExecuteCommand();

			var sss = db.Insertable<OutboundRecord>(records).ExecuteCommand();

			//db.CommitTran();
			}
			@@ -2364,7 +2842,97 @@
			}

			//}
			public static async Task<SimpleResult> HkGets(HuiK model) {

			var db = new SqlHelper<object>().GetInstance();

			SimpleResult result = new SimpleResult();
			//var locs = db.Queryable<WCSTask>().Where(a => a.S_TYPE.Contains("出库") && a.S_CNTR_CODE == model.cntr_code && a.N_B_STATE == 3).OrderByDescending(s => s.T_END_TIME).First();
			//if (locs != null)
			//{
			//var cntr = db.Queryable<TN_Distribution_CNTR>().Where(a => a.S_DC_NO == locs.S_BS_NO).First();
			//if (cntr != null)
			//{
			// cntr.S_SORT_TYPE = "已分拣";
			// db.Updateable(cntr).UpdateColumns(it => new { it.S_SORT_TYPE }).ExecuteCommand();
			//}
			//else
			//{
			// result.resultCode = 1;
			// result.resultMsg += $"任务{locs.S_CODE}来源号{locs.S_BS_NO}找不到配盘信息";
			// return result;
			//}
			Location endloc = new Location();

			LogHelper.Info($"获取托盘信息{model.cntr_code}容器");
			var hwbd = db.Queryable<TN_Container_Code>().Where(a => a.S_CNTR_CODE.Trim() == model.cntr_code).First();
			if (hwbd != null)
			{
			endloc = db.Queryable<Location>().Where(a => a.S_CODE == hwbd.S_LOC_CODE.Trim()).First();
			if (endloc?.N_LOCK_STATE != 0)
			{
			result.resultCode = 3;
			result.resultMsg = $"终点库位已锁/不存在";
			return result;
			}

			}
			else
			{
			result.resultCode = 3;
			result.resultMsg = $"{model.cntr_code}托盘找不到货位";
			return result;
			}
			var start = "";
			var startloc1 = db.Queryable<LocCntrRel>().Where(a => a.S_CNTR_CODE == model.cntr_code).First();
			if (startloc1 != null)
			{
			start = startloc1.S_LOC_CODE;
			}
			else
			{
			result.resultMsg = $"{model.cntr_code}容器未找到货位信息";
			result.resultCode = 1;
			return result;
			}
			var startloc = db.Queryable<Location>().Where(a => a.S_CODE ==start).First();
			//var location = db.Queryable<Location>().Where(a => a.S_CODE == locs.S_LOC_CODE).First();
			var wmsTask = new WMSTask
			{
			S_CNTR_CODE = model.cntr_code,
			S_CODE = WMSHelper.GenerateTaskNo(),
			S_START_LOC = startloc.S_CODE,
			S_START_AREA = startloc.S_AREA_CODE,
			S_START_WH = startloc.S_WH_CODE,

			//S_END_LOC = start,
			//S_END_AREA = startinfo.S_AREA_CODE,
			//S_END_WH = startinfo.S_AREA_CODE,
			S_END_LOC = endloc?.S_CODE,
			S_END_AREA = endloc?.S_AREA_CODE,
			S_END_WH = endloc?.S_WH_CODE,

			N_TYPE = 1,
			// S_TYPE = WMSTask.GetTypeStr(1),
			S_TYPE = "回库",
			S_OP_DEF_CODE = "",
			S_OP_DEF_NAME = "pda入库"
			};
			if (WMSHelper.CreateWmsTask(wmsTask))
			{
			LocationHelper.LockLoc(startloc.S_CODE, 2);
			result.resultMsg = $"创建作业成功，作业号{wmsTask.S_CODE}";
			}
			//}
			//else
			//{
			// result.resultCode = 1;
			// result.resultMsg += $"找不到容器对应任务信息{model.cntr_code}";
			// return result;
			//}
			return result;

			}


			/// <summary>
			@@ -2375,7 +2943,7 @@
			/// <param name="cntr_code"></param>
			/// <param name="start"></param>
			/// <returns></returns>
			public static async Task<SimpleResult> CBAddOutboundOrder(SqlSugarClient db, List<Mater> MaterList, string arrival_no, string cntr_code, string start)
			public static async Task<SimpleResult> CBAddOutboundOrder(string GZRQ,SqlSugarClient db, List<Mater> MaterList, string arrival_no, string cntr_code, string start)
			{
			//using (var db = new SqlHelper<object>().GetInstance())
			//{
			@@ -2403,12 +2971,12 @@
			//回参物料信息
			List<CBcenterBackDto.HEADItem> iTEMs = new List<CBcenterBackDto.HEADItem>();
			List<OutboundRecord> records = new List<OutboundRecord>();
			string GZRQ = "";
			//string GZRQ = "";
			string PZZDRQ = "";
			if (po.BUDAT != null)
			{
			GZRQ = DateTime.Parse(po.BUDAT.ToString()).ToString("yyyyMMdd");
			}
			//if (po.BUDAT != null)
			//{
			// GZRQ = DateTime.Parse(po.BUDAT.ToString()).ToString("yyyyMMdd");
			//}
			if (po.BLDAT != null)
			{
			PZZDRQ = DateTime.Parse(po.BLDAT.ToString()).ToString("yyyyMMdd");
			@@ -2423,7 +2991,7 @@
			ckbitem.CBZX = po.S_CBZX;
			ckbitem.WLBH = item.item_code;
			ckbitem.SL = item.qty;
			ckbitem.KCDD = podetail?.S_KCDD;
			ckbitem.KCDD = podetail?.S_ERP_WH_CODE;
			ckbitem.LRZX = po.S_LRZX;
			ckbitem.ZZKM = po.S_ZZKM;
			ckbitem.GC = po.S_FACTORY;
			@@ -2463,17 +3031,7 @@
			string xml = JsonConvert.DeserializeXmlNode(json, "ROOT").OuterXml;

			LogHelper.Info($"成本中心出库xml数据{xml}");
			//// 创建 StringContent 并指定媒体类型为 "text/xml"
			//HttpContent content = new StringContent(xml, Encoding.UTF8, "application/xml");
			//string url = Settings.WCSSeverUrl + "/api/WmsSap/cesReceiveXmlData";
			//string responseXml = "";
			//using (HttpClient client = new HttpClient())
			//{
			// // 发送 POST 请求并接收响应
			// HttpResponseMessage responsess = await client.PostAsync(url, content);
			// responseXml = await responsess.Content.ReadAsStringAsync();

			//}


			#region sap回调
			// 创建Web Service代理类实例
			@@ -2497,12 +3055,13 @@
			XmlDocument xmlDoc = new XmlDocument();
			xmlDoc.LoadXml(responses.Output.ToString());
			JObject jsonObject = JsonConvert.DeserializeObject<JObject>(JsonConvert.SerializeXmlNode(xmlDoc));
			var data = JsonConvert.DeserializeObject<ReturnWcBcak.Root>(jsonObject.ToString());
			EnsureArrayFormat(jsonObject, "ITEM", "");
			var data = JsonConvert.DeserializeObject<CbbReturnWcBcak.Root>(jsonObject.ToString());

			//添加凭证记录表
			result.resultMsg = data.ROOT.ITEM.MSGDESP;
			result.resultCode = data.ROOT.ITEM.MSGCODE;
			if (data.ROOT.ITEM.MSGCODE == 0)
			result.resultMsg = data.ROOT.ITEM[0].MSGDESP;
			result.resultCode = data.ROOT.ITEM[0].MSGCODE;
			if (data.ROOT.ITEM[0].MSGCODE == 0)
			{

			foreach (var item in MaterList)
			@@ -2512,8 +3071,8 @@
			materialVoucher.S_TYPE = po.S_OUT_TYPE;
			materialVoucher.S_WLBM = item.item_code;
			materialVoucher.S_WLH = item.N_ROW_NO;
			materialVoucher.S_WLPZBH = data.ROOT.ITEM?.WLPZH;
			materialVoucher.S_WLPZND = data.ROOT.ITEM?.WLPZND;
			materialVoucher.S_WLPZBH = data.ROOT.ITEM?[0].WLPZBH;
			//materialVoucher.S_WLPZND = data.ROOT.ITEM?.WLPZND;
			materialVoucher.S_WH_CODE = po.S_WH_CODE;
			materialVoucher.S_AREA_CODE = po.S_AREA_CODE;
			materialVoucher.F_QTY = item.qty;
			@@ -2522,13 +3081,6 @@
			materialVoucher.UNAME = po.UNAME;
			db.Insertable<MaterialVoucher>(materialVoucher).ExecuteCommand();
			}
			//MaterialVoucher materialVoucher = new MaterialVoucher();
			//materialVoucher.S_NO = po.S_NO;
			//materialVoucher.S_TYPE = po.S_OUT_TYPE;
			//materialVoucher.S_WLPZBH = data.ROOT.ITEM.WLPZBH;
			//materialVoucher.S_WLPZND = data.ROOT.ITEM.WLPZND;
			//materialVoucher.STATUS = 0;
			//db.Insertable<MaterialVoucher>(materialVoucher).ExecuteCommand();
			}
			#endregion

			@@ -2554,7 +3106,7 @@
			/// <param name="cntr_code"></param>
			/// <param name="start"></param>
			/// <returns></returns>
			public static async Task<SimpleResult> jhwtlAddOutboundOrder(SqlSugarClient db, List<Mater> MaterList, string arrival_no, string cntr_code, string start)
			public static async Task<SimpleResult> jhwtlAddOutboundOrder(string GZRQ,SqlSugarClient db, List<Mater> MaterList, string arrival_no, string cntr_code, string start)
			{
			//using (var db = new SqlHelper<object>().GetInstance())
			//{
			@@ -2572,12 +3124,12 @@

			DateTime dateTime;
			DateTime dateTime1;
			string GZRQ = "";
			//string GZRQ = "";
			string PZZDRQ = "";
			if (po.BUDAT != null)
			{
			GZRQ = DateTime.Parse(po.BUDAT.ToString()).ToString("yyyyMMdd");
			}
			//if (po.BUDAT != null)
			//{
			// GZRQ = DateTime.Parse(po.BUDAT.ToString()).ToString("yyyyMMdd");
			//}
			if (po.BLDAT != null)
			{
			PZZDRQ = DateTime.Parse(po.BLDAT.ToString()).ToString("yyyyMMdd");
			@@ -2622,7 +3174,7 @@
			ckbitem.DDH = podetail?.S_DDH;
			//ckbitem.DDHXM = (podetail?.N_ROW_NO);
			ckbitem.WBS = podetail?.S_WBS;
			ckbitem.KCDD = podetail?.S_KCDD;
			ckbitem.KCDD = podetail?.S_ERP_WH_CODE;
			ckbitem.PC = podetail?.S_BATCH_NO;
			JHWBackDto.ITEM1 listitem1 = new JHWBackDto.ITEM1();
			//string[] xlhValues = item.S_SERIAL_NO.Split(',');
			@@ -2746,7 +3298,7 @@
			/// <param name="cntr_code"></param>
			/// <param name="start"></param>
			/// <returns></returns>
			public static async Task<SimpleResult> CXAddOutboundOrder(SqlSugarClient db, List<Mater> MaterList, string arrival_no, string cntr_code, string start)
			public static async Task<SimpleResult> CXAddOutboundOrder(string GZRQ,SqlSugarClient db, List<Mater> MaterList, string arrival_no, string cntr_code, string start)
			{
			// var db = new SqlHelper<object>().GetInstance();

			@@ -2756,15 +3308,15 @@
			try
			{
			//库位信息
			var startinfo = db.Queryable<Location>().Where(it => it.S_CODE == start).First();
			//var startinfo = db.Queryable<Location>().Where(it => it.S_CODE == start).First();
			//出库单详情
			var po = db.Queryable<TN_Outbound_Order>().Includes(s => s.Details).Where(a => a.S_NO == arrival_no).First();

			string GZRQ = "";
			if (po.BUDAT != null)
			{
			GZRQ = DateTime.Parse(po.BUDAT.ToString()).ToString("yyyyMMdd");
			}
			//string GZRQ = "";
			//if (po.BUDAT != null)
			//{
			// GZRQ = DateTime.Parse(po.BUDAT.ToString()).ToString("yyyyMMdd");
			//}

			//来源冲销凭证对应的物料凭证信息
			//var poIn = db.Queryable<TN_Inbound_Order>().Includes(s => s.Details).Where(a => a.S_NO == po.S_BS_NO).First();
			@@ -2797,11 +3349,6 @@
			hEAD.GZRQ = GZRQ;
			hEAD.SRSJ = DateTime.Now.ToString("yyyyMMdd");

			//hEAD.WLPZ = porecord.Where(s => s.S_WLBM == item.item_code && s.S_WLH == item.N_ROW_NO).First()?.S_WLPZBH;
			//hEAD.WLPZNF = porecord.Where(s=>s.S_WLBM==item.item_code&&s.S_WLH==item.N_ROW_NO).First()?.S_WLPZND;

			//hEAD.WLPZ = porecord.First()?.S_WLPZBH;
			//hEAD.WLPZNF = porecord.First()?.S_WLPZND;

			hEAD.WLPZ = porecord.FirstOrDefault()?.S_WLPZBH;
			hEAD.WLPZNF = porecord.FirstOrDefault()?.S_WLPZND;
			@@ -2922,7 +3469,7 @@
			/// <param name="cntr_code"></param>
			/// <param name="start"></param>
			/// <returns></returns>
			public static async Task<SimpleResult> AddOutboundOrder(SqlSugarClient db, List<Mater> MaterList, string arrival_no, string cntr_code, string start)
			public static async Task<SimpleResult> AddOutboundOrder(string GZRQ,SqlSugarClient db, List<Mater> MaterList, string arrival_no, string cntr_code, string start)
			{
			//using (var db = new SqlHelper<object>().GetInstance())
			//{
			@@ -2935,7 +3482,7 @@
			var startinfo = db.Queryable<Location>().Where(it => it.S_CODE == start).First();
			//出库单详情
			var po = db.Queryable<TN_Outbound_Order>().Includes(s => s.Details).Where(a => a.S_NO == arrival_no).First();
			string GZRQ = "";
			//string GZRQ = "";
			string PZZDRQ = "";
			//if (po.Details[0].S_CJRQ != null)
			//{
			@@ -2955,7 +3502,7 @@
			KEY = po.S_NO,
			ZYWLX = "2",
			PZRQ = DateTime.Now.ToString("yyyyMMdd"),
			GZRQ = DateTime.Now.ToString("yyyyMMdd"), // 假设日期格式为"年-月-日"
			GZRQ = GZRQ, // 假设日期格式为"年-月-日"
			GZRY = po.S_CREATOR_NAME,
			ITEM = new List<CkBcakDto.ITEM>
			{
			@@ -2982,7 +3529,7 @@
			ckbitem.YLBH = podetail?.S_YLBH;
			ckbitem.YLXMH = podetail?.S_YLXMH;
			ckbitem.GC = po.S_FACTORY;
			ckbitem.KCDD = podetail?.S_KCDD;
			ckbitem.KCDD = podetail?.S_ERP_WH_CODE;

			CkBcakDto.ITEM1 listitem1 = new CkBcakDto.ITEM1();
			//var CntrItemRels = db.Queryable<CntrItemRel>().Where(a => a.S_ITEM_CODE == item.item_code&&a.N_ROW_NO==item.N_ROW_NO).ToList();
			@@ -3143,8 +3690,25 @@
			#endregion
			if (cntr != null)
			{
			#region 客户指定容器表
			var cir2 = db.Queryable<CGRels>().Where(a => a.S_CNTR_CODE == cntr.S_CODE && a.S_ITEM_CODE == item.item_code ).First();

			if (cir2 != null)
			{
			cir2.S_CNTR_TYPE = S_CNTR_TYPE;
			db.Updateable(cir2).UpdateColumns(it => new { it.S_CNTR_TYPE }).ExecuteCommand();
			}
			else
			{
			//2.插入新的容器物料信息（容器号不变S_SERIAL_NO = item.S_SERIAL_NO,）
			cir2 = new CGRels { S_CNTR_TYPE = S_CNTR_TYPE, S_CNTR_CODE = cntr.S_CODE.Trim(), N_BS_ROW_NO = item.N_ROW_NO, S_ITEM_CODE = item.item_code };
			db.Insertable<CGRels>(cir2).ExecuteCommand();
			}
			#endregion


			#region 1.查看是否有相同物料批次的信息，如果有要累加，不同批次的可以分开
			var cir = db.Queryable<CntrItemRel>().Where(a => a.S_CNTR_CODE == cntr.S_CODE && a.S_ITEM_CODE == item.item_code && a.S_BATCH_NO == item.S_BATCH_NO && a.N_BS_ROW_NO == item.N_ROW_NO && a.S_BS_NO == item.arrival_no).First();
			var cir = db.Queryable<CntrItemRel>().Where(a => a.S_CNTR_CODE == cntr.S_CODE && a.S_ITEM_CODE == item.item_code && a.N_BS_ROW_NO == item.N_ROW_NO && a.S_BS_NO == item.arrival_no).First();
			if (cir != null)
			{
			cir.F_QTY += item.qty;
			@@ -3154,7 +3718,7 @@
			else
			{
			//2.插入新的容器物料信息（容器号不变S_SERIAL_NO = item.S_SERIAL_NO,）
			cir = new CntrItemRel { S_CNTR_TYPE = S_CNTR_TYPE, S_CNTR_CODE = cntr.S_CODE.Trim(), S_UOM = info.S_UOM, S_BATCH_NO = item.S_BATCH_NO, N_BS_ROW_NO = item.N_ROW_NO, F_QTY = item.qty, S_ITEM_CODE = item.item_code, S_BS_NO = item.arrival_no };
			cir = new CntrItemRel { S_CNTR_TYPE = S_CNTR_TYPE, S_CNTR_CODE = cntr.S_CODE.Trim(), S_UOM = info.S_UOM, N_BS_ROW_NO = item.N_ROW_NO, F_QTY = item.qty, S_ITEM_CODE = item.item_code, S_BS_NO = item.arrival_no };
			db.Insertable<CntrItemRel>(cir).ExecuteCommand();
			}
			var count = db.Queryable<CntrItemRel>().Count(a => a.S_CNTR_CODE == cntr.S_CODE);
			@@ -3252,7 +3816,7 @@
			S_DO_NO = itemscddll.LLDH,
			S_AREA_CODE = "HJQ",
			N_ROW_NO = "",
			S_ITEM_CODE = a.WLBM,
			S_ITEM_CODE = a.ZJBM,
			S_ITEM_NAME = "",
			F_QTY = a.XQSL,
			S_ZJBM = a.ZJBM,
			@@ -3354,7 +3918,7 @@
			db.BeginTran();
			foreach (var itemscddll in model.ROOT.SCDDLL)
			{
			var wlbmList = itemscddll.ITEM.Select(x => x.WLBM).Distinct().ToList();
			var wlbmList = itemscddll.ITEM.Select(x => x.ZJBM).Distinct().ToList();
			var itemlist = db.Queryable<TN_Material>()
			.Where(it => wlbmList.Contains(it.S_ITEM_CODE)) // 使用 IN 查询
			.ToList();
			@@ -3377,13 +3941,13 @@
			{
			foreach (var a in itemscddll.ITEM)
			{
			var item = itemlist.Where(it => it.S_ITEM_CODE == a.WLBM).FirstOrDefault();
			var item = itemlist.Where(it => it.S_ITEM_CODE == a.ZJBM).FirstOrDefault();
			if (item == null)
			{
			lLDReturnRoots.GC = itemscddll.GC;
			lLDReturnRoots.LLDH = itemscddll.LLDH;
			lLDReturnRoots.MSGCODE = 1;
			lLDReturnRoots.MSGDESP = $"物料{a.WLBM}物料主数据不存在该物料";
			lLDReturnRoots.MSGDESP = $"物料{a.ZJBM}物料主数据不存在该物料";
			iTEMs.Add(lLDReturnRoots);

			continue;
			@@ -3393,7 +3957,7 @@
			S_DO_NO = itemscddll.LLDH,
			S_AREA_CODE = "HJQ",
			N_ROW_NO = "",
			S_ITEM_CODE = a.WLBM,
			S_ITEM_CODE = a.ZJBM,
			S_ITEM_NAME = item?.S_ITEM_NAME,
			F_QTY = a.XQSL,
			S_ZJBM = a.ZJBM,
			@@ -3401,6 +3965,7 @@
			S_YLXMH = a.YLHXM,
			S_BATCH_NO = "",
			S_ERP_WH_CODE = a.KCDD,

			S_ZJWLTH = a.ZJWLTH,
			S_ZJWLMS = a.ZJWLMS,
			S_ZHFHBS = a.ZHFHBS,
			@@ -3468,21 +4033,21 @@
			lLDReturnRoots.GC = itemscddll.GC;
			lLDReturnRoots.LLDH = itemscddll.LLDH;
			lLDReturnRoots.MSGCODE = 1;
			lLDReturnRoots.MSGDESP = $"执行中领料单，物料{a.WLBM}物料不允许删除";
			lLDReturnRoots.MSGDESP = $"执行中领料单，物料{a.ZJBM}物料不允许删除";
			iTEMs.Add(lLDReturnRoots);
			continue;
			}
			var po1 = po.Details.Where(s => a.WLBM == s.S_ITEM_CODE).ToList();
			var po1 = po.Details.Where(s => a.ZJBM == s.S_ITEM_CODE).ToList();
			if (po1.Count() == 0) //无则新增物料明细
			{
			var item = itemlist.Where(it => it.S_ITEM_CODE == a.WLBM).FirstOrDefault();
			var item = itemlist.Where(it => it.S_ITEM_CODE == a.ZJBM).FirstOrDefault();
			if (item == null)
			{
			;
			lLDReturnRoots.GC = itemscddll.GC;
			lLDReturnRoots.LLDH = itemscddll.LLDH;
			lLDReturnRoots.MSGCODE = 1;
			lLDReturnRoots.MSGDESP = $"物料{a.WLBM}物料主数据不存在该物料";
			lLDReturnRoots.MSGDESP = $"物料{a.ZJBM}物料主数据不存在该物料";
			iTEMs.Add(lLDReturnRoots);
			continue;
			}
			@@ -3491,7 +4056,7 @@
			S_DO_NO = itemscddll.LLDH,
			S_AREA_CODE = "HJQ",
			N_ROW_NO = "",
			S_ITEM_CODE = a.WLBM,
			S_ITEM_CODE = a.ZJBM,
			S_ITEM_NAME = item.S_ITEM_NAME,
			F_QTY = a.XQSL,
			S_ZJBM = a.ZJBM,
			@@ -3524,7 +4089,7 @@
			lLDReturnRoots.GC = itemscddll.GC;
			lLDReturnRoots.LLDH = itemscddll.LLDH;
			lLDReturnRoots.MSGCODE = 1;
			lLDReturnRoots.MSGDESP = $"更新失败，更新数量必须大于当前物料数量{a.WLBM}";
			lLDReturnRoots.MSGDESP = $"更新失败，更新数量必须大于当前物料数量{a.ZJBM}";
			iTEMs.Add(lLDReturnRoots);
			continue;
			}
			@@ -3538,40 +4103,40 @@
			{
			if (a.LLDSCBS == "Y")//如果是删除标识则删除当前所属出库单明细不是删除标记则进行增改判断
			{
			var po1 = po.Details.Where(s => a.WLBM == s.S_ITEM_CODE).FirstOrDefault();
			var po1 = po.Details.Where(s => a.ZJBM == s.S_ITEM_CODE).FirstOrDefault();
			if (po1 != null) //无则新增物料明细
			{
			tN_Ll_Details.Add(po1);
			// db.Deleteable<TN_Ll_detail>().Where(it => it.S_ITEM_CODE == a.WLBM && it.S_DO_NO == po1.First().S_DO_NO).ExecuteCommand();
			// db.Deleteable<TN_Ll_detail>().Where(it => it.S_ITEM_CODE == a.ZJBM && it.S_DO_NO == po1.First().S_DO_NO).ExecuteCommand();
			}
			else
			{
			//result.code = 1;
			//result.msg = $"物料{a.WLBM}物料数据不存在无法删除";
			//throw new Exception($"物料{a.WLBM}物料数据不存在无法删除");
			//result.msg = $"物料{a.ZJBM}物料数据不存在无法删除";
			//throw new Exception($"物料{a.ZJBM}物料数据不存在无法删除");
			lLDReturnRoots.GC = itemscddll.GC;
			lLDReturnRoots.LLDH = itemscddll.LLDH;
			lLDReturnRoots.MSGCODE = 1;
			lLDReturnRoots.MSGDESP = $"删除的物料{a.WLBM}物料数据不存在无法删除";
			lLDReturnRoots.MSGDESP = $"删除的物料{a.ZJBM}物料数据不存在无法删除";
			iTEMs.Add(lLDReturnRoots);
			continue;
			}
			}
			else
			{
			var po1 = po.Details.Where(s => a.WLBM == s.S_ITEM_CODE).ToList();
			var po1 = po.Details.Where(s => a.ZJBM == s.S_ITEM_CODE).ToList();
			if (po1.Count() == 0) //无则新增物料明细
			{
			var item = itemlist.Where(it => it.S_ITEM_CODE == a.WLBM).FirstOrDefault();
			var item = itemlist.Where(it => it.S_ITEM_CODE == a.ZJBM).FirstOrDefault();
			if (item == null)
			{
			//result.code = 1;
			//result.msg = $"物料{a.WLBM}物料主数据不存在该物料";
			//throw new Exception($"物料{a.WLBM}物料主数据不存在该物料");
			//result.msg = $"物料{a.ZJBM}物料主数据不存在该物料";
			//throw new Exception($"物料{a.ZJBM}物料主数据不存在该物料");
			lLDReturnRoots.GC = itemscddll.GC;
			lLDReturnRoots.LLDH = itemscddll.LLDH;
			lLDReturnRoots.MSGCODE = 1;
			lLDReturnRoots.MSGDESP = $"物料{a.WLBM}物料主数据不存在该物料";
			lLDReturnRoots.MSGDESP = $"物料{a.ZJBM}物料主数据不存在该物料";
			iTEMs.Add(lLDReturnRoots);
			continue;
			}
			@@ -3580,7 +4145,7 @@
			S_DO_NO = itemscddll.LLDH,
			S_AREA_CODE = "HJQ",
			N_ROW_NO = "",
			S_ITEM_CODE = a.WLBM,
			S_ITEM_CODE = a.ZJBM,
			S_ITEM_NAME = item.S_ITEM_NAME,
			F_QTY = a.XQSL,
			S_ZJBM = a.ZJBM,
			@@ -3682,7 +4247,7 @@
			/// </summary>
			/// <param name="model"></param>
			/// <returns></returns>
			internal static WeiLiResult Out_Order_Inss(string S_NO)
			internal static WeiLiResult Out_Order_Inss(string S_NO,int N_PRIORITY)
			{
			var result = new WeiLiResult();
			// var db = new SqlHelper<object>().GetInstance();
			@@ -3708,13 +4273,48 @@
			else
			{
			//var az = db.Queryable<AZInventory>().ToList();
			var po1 = new TN_Outbound_Order { S_NO = WMSHelper.GenerateShippNo(), UNAME = po.UNAME, S_FACTORY = po.S_FACTORY, S_CBZX = po.S_CBZX, S_ZZKM = po.S_ZZKM, S_LRZX = po.S_LRZX, BLDAT = po.BLDAT, BUDAT = po.BUDAT, S_OUT_TYPE = po.S_OUT_TYPE, S_BS_TYPE = po.S_BS_TYPE, S_AREA_CODE = po.S_AREA_CODE, S_BS_NO = po.S_NO };
			var po1 = new TN_Outbound_Order { S_NO = WMSHelper.GenerateShippNo(), N_PRIORITY=N_PRIORITY, UNAME = po.UNAME, S_FACTORY = po.S_FACTORY, S_CBZX = po.S_CBZX, S_ZZKM = po.S_ZZKM, S_LRZX = po.S_LRZX, BLDAT = po.BLDAT, BUDAT = po.BUDAT, S_OUT_TYPE = po.S_OUT_TYPE, S_BS_TYPE = po.S_BS_TYPE, S_AREA_CODE = po.S_AREA_CODE, S_BS_NO = po.S_NO };
			List<TN_Ll_detail> tN_Ll_Details = new List<TN_Ll_detail>();
			po1.Details = new List<TN_Outbound_Detail>();
			var list = po.Details.Where(s => s.F_QTY > s.F_ACC_D_QTY&&s.S_ERP_WH_CODE=="4004").Select(s => s.S_ITEM_CODE).Distinct().ToArray();

			var Sitemlist = db.Queryable<CntrItemRel>().Where(s => list.Contains(s.S_ITEM_CODE)).Select(s => s.S_ITEM_CODE).ToArray().Select(x => x.Trim()).ToArray(); ;

			var itemfirs = db.Queryable<CntrItemRel>().Where(s => list.Contains(s.S_ITEM_CODE)).ToList() ;
			var Sitemlist = itemfirs.Select(s => s.S_ITEM_CODE).ToArray().Select(x => x.Trim()).ToArray();



			#region list集合数量
			var extractedArrays = itemfirs.Select(s => new CustomItem
			{
			SITEMCODE = s.S_ITEM_CODE?.Trim() ?? string.Empty,
			FQTY = s.F_QTY,
			FALLOCQTY = s.F_ALLOC_QTY
			}).ToList();

			var extractedArray = extractedArrays
			.GroupBy(x => x.SITEMCODE)
			.Select(g => new CustomItem
			{
			SITEMCODE = g.Key,
			FQTY = g.Sum(x => x.FQTY),
			FALLOCQTY = g.Sum(x => x.FALLOCQTY)
			})
			.ToList();

			var cklist= db.Queryable<TN_Outbound_Order>().Includes(s => s.Details).Where(a => a.N_B_STATE==0).ToList();
			foreach (var ckdetail in cklist)
			{
			foreach (var item in itemfirs)
			{
			var itemfi = ckdetail.Details.Where(s => s.S_ITEM_CODE == item.S_ITEM_CODE).FirstOrDefault();
			if (itemfi!=null)
			{
			var extractedArrayone = extractedArray.Where(s => s.SITEMCODE == item.S_ITEM_CODE).FirstOrDefault();
			extractedArrayone.FQTY = (float)(extractedArrayone.FQTY - itemfi.F_QTY);
			}
			}
			}
			#endregion

			po.Details = po.Details.Where(s => Sitemlist.Contains(s.S_ITEM_CODE)).ToList();
			if (po.Details.Count() > 0)
			{
			@@ -3723,37 +4323,54 @@
			{
			if (a.F_QTY > a.F_ACC_D_QTY)
			{
			po1.Details.Add(new TN_Outbound_Detail
			{
			S_DO_NO = po1.S_NO,
			S_AREA_CODE = "HJQ",
			N_ROW_NO = a.N_ROW_NO,
			S_KCDD = a.S_KCDD,
			S_ITEM_CODE = a.S_ITEM_CODE,
			S_ITEM_NAME = a.S_ITEM_NAME,
			S_UOM = a.S_UOM,
			F_QTY = a.F_QTY - a.F_ACC_D_QTY,
			S_BATCH_NO = a.S_BATCH_NO,
			S_SERIAL_NO = a.S_SERIAL_NO,
			S_CGPZH = a.S_CGPZH,
			S_ZJBM = a.S_ZJBM,
			S_YLBH = a.S_YLBH,
			S_ZJWLTH = a.S_ZJWLTH,
			S_ZJWLMS = a.S_ZJWLMS,
			S_ZHFHBS = a.S_ZHFHBS,
			S_CJRQ = a.S_CJRQ,
			S_LLDSCBS = a.S_LLDSCBS,
			S_SCGLY = a.S_SCGLY,
			S_GXH = a.S_GXH,
			S_XQRQ = a.S_XQRQ,
			S_YLXMH = a.S_YLXMH,
			S_CGPZXMBH = a.S_CGPZXMBH,
			S_ERP_WH_CODE = a.S_ERP_WH_CODE,
			N_ITEM_STATE = a.N_ITEM_STATE
			});
			double difference = a.F_QTY - a.F_ACC_D_QTY;
			a.F_ACC_D_QTY += difference;
			tN_Ll_Details.Add(a);
			var ones = extractedArray.Where(s => s.SITEMCODE == a.S_ITEM_CODE).FirstOrDefault();
			///库存数量
			ones.FQTY = ones.FQTY - ones.FALLOCQTY;
			///出库数量
			double shul = a.F_QTY - a.F_ACC_D_QTY;
			if (ones.FQTY !=0) {
			if (ones.FQTY - shul>=0)
			{
			ones.FQTY = (float)(ones.FQTY - shul);
			}
			else
			{
			shul = ones.FQTY;
			ones.FQTY = 0;
			}
			po1.Details.Add(new TN_Outbound_Detail
			{
			S_DO_NO = po1.S_NO,
			S_AREA_CODE = "HJQ",
			N_ROW_NO = a.N_ROW_NO,
			S_KCDD = a.S_KCDD,
			S_ITEM_CODE = a.S_ITEM_CODE,
			S_ITEM_NAME = a.S_ITEM_NAME,
			S_UOM = a.S_UOM,
			F_QTY = shul,
			S_BATCH_NO = a.S_BATCH_NO,
			S_SERIAL_NO = a.S_SERIAL_NO,
			S_CGPZH = a.S_CGPZH,
			S_ZJBM = a.S_ZJBM,
			S_YLBH = a.S_YLBH,
			S_ZJWLTH = a.S_ZJWLTH,
			S_ZJWLMS = a.S_ZJWLMS,
			S_ZHFHBS = a.S_ZHFHBS,
			S_CJRQ = a.S_CJRQ,
			S_LLDSCBS = a.S_LLDSCBS,
			S_SCGLY = a.S_SCGLY,
			S_GXH = a.S_GXH,
			S_XQRQ = a.S_XQRQ,
			S_YLXMH = a.S_YLXMH,
			S_CGPZXMBH = a.S_CGPZXMBH,
			S_ERP_WH_CODE = a.S_ERP_WH_CODE,
			N_ITEM_STATE = a.N_ITEM_STATE
			});
			double difference = shul;
			a.F_ACC_D_QTY += difference;
			tN_Ll_Details.Add(a);

			}
			}
			else
			{
			@@ -3763,7 +4380,6 @@
			}

			}


			db.Updateable(tN_Ll_Details).UpdateColumns(it => new { it.F_ACC_D_QTY }).ExecuteCommand();
			if (po1.Details.Count() > 0)
			@@ -4112,7 +4728,150 @@

			}

			public static async Task<SimpleResult> AddCenter( SqlSugarClient db, List<TN_Inbound_Detail> MaterList)
			{
			//using (var db = new SqlHelper<object>().GetInstance())
			//{
			// var db = new SqlHelper<object>().GetInstance();
			var result = new SimpleResult();
			try
			{
			#region MyRegion


			List<TN_Center_Inbound_Detail> tN_Center_Inbound_Details = new List<TN_Center_Inbound_Detail>();
			foreach (var item in MaterList)
			{
			bool idadd = true;
			// var cir2 = db.Queryable<CGRels>().Where(a => a.S_ITEM_CODE == item.S_ITEM_CODE && a.S_CNTR_TYPE == "半托").Select(s => s.S_CNTR_CODE).Distinct().ToArray();
			var S_CNTR_CODE = "";



			var lcr = db.Queryable<LocCntrRel>()
			.InnerJoin<CGRels>((l, c) => l.S_CNTR_CODE == c.S_CNTR_CODE)
			.Where((l, c) => c.S_ITEM_CODE == item.S_ITEM_CODE && c.S_CNTR_TYPE == "半托")
			.OrderByDescending((l, c) => l.T_CREATE)
			.Select((l, c) => l).ToList()
			.FirstOrDefault();

			S_CNTR_CODE = lcr.S_CNTR_CODE;
			if (lcr != null)
			{
			//起始库位
			var startloc = db.Queryable<Location>().Where(it => it.S_CODE == lcr.S_LOC_CODE).First();
			var wsc = db.Queryable<WCSTask>().Where(it => it.S_CNTR_CODE == S_CNTR_CODE && it.S_TYPE.Contains("出库") && it.N_B_STATE < 3).First();
			if (wsc != null)
			{
			item.N_B_STATE = 2;
			db.Updateable(item).UpdateColumns(it => new { it.N_B_STATE }).ExecuteCommand();
			}
			else
			{
			if (startloc != null)//&&
			{
			//终点货位
			var endloc = db.Queryable<Location>().Where(it => it.S_AREA_CODE == "QYQXHQ" && it.N_LOCK_STATE == 0 && it.N_CURRENT_NUM == 0).First();

			// var endloc = db.Queryable<Location>().Where(it => it.S_CODE == item.S_END_LOC).First();
			if (endloc != null)
			{
			var optask = new WMSTask
			{
			S_CODE = WMSHelper.GenerateTaskNo(),
			S_START_LOC = startloc.S_CODE,
			S_START_AREA = startloc.S_AREA_CODE,
			S_START_WH = startloc.S_WH_CODE,
			S_END_LOC = endloc.S_CODE,
			S_END_AREA = endloc.S_AREA_CODE,
			S_END_WH = endloc.S_WH_CODE,
			N_PRIORITY = 1,
			S_TYPE = "半托出库",
			N_TYPE = 2,
			N_B_STATE = 0,
			S_BS_NO = "",
			S_CNTR_CODE = S_CNTR_CODE,
			S_OP_DEF_NAME = item.S_BS_TYPE
			};
			var res = db.Insertable(optask).ExecuteCommand() > 0;
			if (res)
			{
			startloc.N_LOCK_STATE = 2;
			startloc.S_LOCK_STATE = "出库锁";
			db.Updateable(startloc).UpdateColumns(it => new { it.S_LOCK_STATE, it.N_LOCK_STATE }).ExecuteCommand();
			var models = db.Queryable<Location>().Where(a => a.S_CODE == endloc.S_CODE).First();
			// if (model != null && model.S_LOCK_STATE.Trim() == "无")
			if (models != null && models.N_LOCK_STATE == 0)
			{
			models.N_LOCK_STATE = 1;
			models.S_LOCK_STATE = Location.GetLockStateStr(1);
			res = db.Updateable(models).UpdateColumns(it => new { it.N_LOCK_STATE, it.S_LOCK_STATE }).ExecuteCommand() > 0;
			}
			item.N_B_STATE = 2;
			db.Updateable(item).UpdateColumns(it => new { it.N_B_STATE }).ExecuteCommand();


			}
			}
			else
			{
			idadd = false;
			LogHelper.Info($" 库区AGVXHQ无空货位");

			}
			}
			else
			{
			idadd = false;
			LogHelper.Info($" 库区无货位");
			}
			}

			}
			else
			{
			idadd = false;
			LogHelper.Info($"物料{item.S_ITEM_CODE}未找到容器对应的货位信息，请联系人工绑定关系");
			}
			if (!idadd)
			{
			TN_Center_Inbound_Detail tN_Center_Inbound_Detail = new TN_Center_Inbound_Detail();
			tN_Center_Inbound_Detail.S_IO_NO = item.S_IO_NO;
			tN_Center_Inbound_Detail.N_ROW_NO = item.N_ROW_NO;
			tN_Center_Inbound_Detail.S_ITEM_CODE = item.S_ITEM_CODE;
			tN_Center_Inbound_Detail.F_QTY = item.F_QTY;
			tN_Center_Inbound_Detail.S_ITEM_STATE = item.S_ITEM_STATE;
			tN_Center_Inbound_Detail.S_ITEM_NAME = item.S_ITEM_NAME;
			tN_Center_Inbound_Detail.F_ACC_B_QTY = item.F_ACC_B_QTY;
			tN_Center_Inbound_Detail.S_KCDD = item.S_KCDD;
			tN_Center_Inbound_Detail.S_UOM = item.S_UOM;//计量单位
			tN_Center_Inbound_Detail.S_BATCH_NO = item.S_BATCH_NO;
			tN_Center_Inbound_Detail.S_CGPZH = item.S_CGPZH;
			tN_Center_Inbound_Detail.S_CGPZXMBH = item.S_CGPZXMBH;
			tN_Center_Inbound_Detail.S_CKPZKJND = item.S_CKPZKJND;
			tN_Center_Inbound_Detail.S_CKPZXM = item.S_CKPZXM;
			tN_Center_Inbound_Detail.S_CXWLPZBH = item.S_CXWLPZBH;
			tN_Center_Inbound_Detail.S_HWSJJYZT = item.S_HWSJJYZT;
			tN_Center_Inbound_Detail.S_JYPBH = item.S_JYPBH;
			tN_Center_Inbound_Detail.S_KJPZSSRQ = item.S_KJPZSSRQ;
			tN_Center_Inbound_Detail.S_KJPZSRSJ = item.S_KJPZSRSJ;
			tN_Center_Inbound_Details.Add(tN_Center_Inbound_Detail);

			}

			}
			db.Insertable(tN_Center_Inbound_Details).ExecuteCommand();
			#endregion
			}
			catch (Exception e)
			{

			throw ;
			}

			return result;

			}

			/// <summary>
			/// 内采入库回调
			@@ -4133,6 +4892,11 @@
			db.BeginTran();

			var po = db.Queryable<TN_Inbound_Order>().Includes(p => p.Details).Where(a => a.S_NO == model.S_NO).First();





			LogHelper.Info($"进来了2");
			#region MyRegion
			if (po.Details.Count > 0)
			@@ -4220,8 +4984,20 @@
			List<TN_Inbound_Detail> tN_Inbound_Details = new List<TN_Inbound_Detail>();
			po.Details = po.Details.Where(d => model.Wlist.Any(w =>
			w.S_ITEM_CODE == d.S_ITEM_CODE &&
			w.N_ROW_NO == d.N_ROW_NO))
			w.N_ROW_NO == d.N_ROW_NO)).OrderBy(s => s.N_ROW_NO)
			.ToList();



			var gzra = db.Queryable<TN_GZ_SZ>().Where(a => a.C_ENABLE == "Y").First();
			var GZRQ = DateTime.Now.ToString("yyyyMMdd");
			if (gzra != null)
			{
			GZRQ = gzra.S_GZRQ.ToString("yyyyMMdd");
			}
			#region MyRegion


			if (po.S_IN_TYPE == "内采入库")
			{
			List<NcRkDto.ITEM> listitem = new List<NcRkDto.ITEM>();
			@@ -4260,6 +5036,13 @@
			tN_Inbound_Details.Add(item);

			}
			string combinedIds = string.Join(",", po.Details.Select(x => x.N_ROW_NO));
			var KEY = WCSHelper.Generate13DigitIds();
			var s_key = db.Queryable<TN_InBounder_Sh>().Where(a => a.S_NO == model.S_NO && a.N_ROW_NO == combinedIds).First();
			if (s_key != null)
			{
			KEY = s_key.S_KEY;
			}
			NcRkDto.Root roots = new NcRkDto.Root
			{
			ROOT = new NcRkDto.ROOT
			@@ -4269,9 +5052,9 @@
			HEAD = new NcRkDto.HEAD
			{

			KEY = po.S_NO,
			GZRQ = DateTime.Now.ToString("yyyyMMdd"),
			GZRY = model.GZRY,
			KEY = KEY,
			GZRQ = GZRQ,
			GZRY = model.GZRY,//GenerateTaskNo
			WLPZBH = po.S_NO,
			WLPZND = po.S_WLPZND
			},
			@@ -4286,8 +5069,7 @@
			var json = JsonConvert.SerializeObject(roots.ROOT);
			string xml = JsonConvert.DeserializeXmlNode(json, "ROOT").OuterXml;

			// 现在 root 对象包含了您定义的假数据
			// 发送POST请求

			LogHelper.Info($"内采收货xml数据{xml}");

			#region MyRegion
			@@ -4312,9 +5094,6 @@
			// 将 XmlDocument 转换为 JSON 字符串
			//JObject jsonObject = JsonConvert.DeserializeObject<JObject>(JsonConvert.SerializeXmlNode(xmlDoc));
			#endregion





			#region sap回调
			@@ -4345,15 +5124,14 @@
			//添加凭证记录表
			result.resultMsg = data.ROOT.ITEM.MSGDESP;
			result.resultCode = data.ROOT.ITEM.MSGCODE;
			//MaterialVoucher materialVoucher = new MaterialVoucher();
			if (data.ROOT.ITEM.MSGCODE == 0)
			{
			//materialVoucher.S_NO = model.S_NO;
			//materialVoucher.S_TYPE = po.S_IN_TYPE;
			//materialVoucher.S_WLPZBH = data.ROOT.ITEM.WLPZH;
			//materialVoucher.S_WLPZND = data.ROOT.ITEM.WLPZND;
			//materialVoucher.STATUS = 0;
			//db.Insertable<MaterialVoucher>(materialVoucher).ExecuteCommand();
			if (tN_Inbound_Details.Count() > 0)
			{
			db.Updateable(tN_Inbound_Details).UpdateColumns(it => new { it.N_B_STATE }).ExecuteCommand();
			}
			await AddCenter(db, po.Details);

			List<MaterialVoucher> materials = new List<MaterialVoucher>();
			foreach (var item in model.Wlist)
			{
			@@ -4374,6 +5152,16 @@
			db.Insertable<MaterialVoucher>(materials).ExecuteCommand();
			}
			}
			else
			{

			TN_InBounder_Sh tN_InBounder_Sh = new TN_InBounder_Sh();
			tN_InBounder_Sh.S_KEY = KEY;
			tN_InBounder_Sh.N_ROW_NO = combinedIds;
			tN_InBounder_Sh.S_NO = po.S_NO;
			db.Insertable<TN_InBounder_Sh>(tN_InBounder_Sh).ExecuteCommand();

			}


			}
			@@ -4381,16 +5169,23 @@
			{
			DateTime dateTime;
			DateTime dateTime1;
			string GZRQ = "";
			//string GZRQ = "";
			string PZZDRQ = "";
			if (po.BUDAT != null)
			{
			GZRQ = DateTime.Parse(po.BUDAT.ToString()).ToString("yyyyMMdd");
			}
			//if (po.BUDAT != null)
			//{
			// GZRQ = DateTime.Parse(po.BUDAT.ToString()).ToString("yyyyMMdd");
			//}
			if (po.BLDAT != null)
			{
			PZZDRQ = DateTime.Parse(po.BLDAT.ToString()).ToString("yyyyMMdd");

			}
			string combinedIds = string.Join(",", po.Details.Select(x => x.N_ROW_NO));
			var KEY = WCSHelper.Generate13DigitIds();
			var s_key = db.Queryable<TN_InBounder_Sh>().Where(a => a.S_NO == model.S_NO && a.N_ROW_NO == combinedIds).ToList().FirstOrDefault();
			if (s_key != null)
			{
			KEY = s_key.S_KEY;
			}
			JHWBackDto.Root myRoot = new JHWBackDto.Root
			{
			@@ -4398,7 +5193,7 @@
			{
			HEAD = new JHWBackDto.HEAD
			{
			KEY = po.S_NO,
			KEY = KEY,
			GZRQ = GZRQ,
			PZZDRQ = PZZDRQ,
			YHM = po.UNAME,
			@@ -4413,11 +5208,12 @@

			}
			};

			//回参物料信息
			List<JHWBackDto.ITEM> iTEMs = new List<JHWBackDto.ITEM>();
			foreach (var item in po.Details)
			{
			// var podetail = po.Details.Where(s => s.S_ITEM_CODE == item.S_ITEM_CODE).FirstOrDefault();
			// var podetail = po.Details.Where(s => s.S_ITEM_CODE == item.S_ITEM_CODE).FirstOrDefault();
			JHWBackDto.ITEM ckbitem = new JHWBackDto.ITEM();
			ckbitem.WLBH = item.S_ITEM_CODE;
			ckbitem.GC = po.S_FACTORY;
			@@ -4503,6 +5299,11 @@
			result.resultCode = data.ROOT.ITEM.MSGCODE;
			if (data.ROOT.ITEM.MSGCODE == 0)
			{
			if (tN_Inbound_Details.Count() > 0)
			{
			db.Updateable(tN_Inbound_Details).UpdateColumns(it => new { it.N_B_STATE }).ExecuteCommand();
			}
			await AddCenter(db, po.Details);
			List<MaterialVoucher> materials = new List<MaterialVoucher>();
			foreach (var item in model.Wlist)
			{
			@@ -4523,6 +5324,17 @@
			db.Insertable<MaterialVoucher>(materials).ExecuteCommand();
			}
			}
			else
			{

			TN_InBounder_Sh tN_InBounder_Sh = new TN_InBounder_Sh();
			tN_InBounder_Sh.S_KEY = KEY;
			tN_InBounder_Sh.N_ROW_NO = combinedIds;
			tN_InBounder_Sh.S_NO = po.S_NO;
			db.Insertable<TN_InBounder_Sh>(tN_InBounder_Sh).ExecuteCommand();

			}

			#endregion

			}
			@@ -4564,6 +5376,13 @@
			tN_Inbound_Details.Add(item);

			}
			string combinedIds = string.Join(",", po.Details.Select(x => x.N_ROW_NO));
			var KEY = WCSHelper.Generate13DigitIds();
			var s_key = db.Queryable<TN_InBounder_Sh>().Where(a => a.S_NO == model.S_NO && a.N_ROW_NO == combinedIds).First();
			if (s_key != null)
			{
			KEY = s_key.S_KEY;
			}
			WcRkBc.Root roots = new WcRkBc.Root
			{
			ROOT = new WcRkBc.ROOT
			@@ -4572,8 +5391,8 @@
			{
			HEAD = new WcRkBc.HEAD
			{
			KEY = po.S_NO,
			GZRQ = DateTime.Now.ToString("yyyyMMdd"),
			KEY = KEY,
			GZRQ = GZRQ,
			GZRY = model.GZRY,
			GC = po.S_FACTORY
			},
			@@ -4648,6 +5467,11 @@
			result.resultCode = data.ROOT.ITEM.MSGCODE;
			if (data.ROOT.ITEM.MSGCODE == 0)
			{
			if (tN_Inbound_Details.Count() > 0)
			{
			db.Updateable(tN_Inbound_Details).UpdateColumns(it => new { it.N_B_STATE }).ExecuteCommand();
			}
			await AddCenter(db, po.Details);
			;
			List<MaterialVoucher> materials = new List<MaterialVoucher>();
			foreach (var item in model.Wlist)
			@@ -4669,6 +5493,16 @@
			}

			}
			else
			{

			TN_InBounder_Sh tN_InBounder_Sh = new TN_InBounder_Sh();
			tN_InBounder_Sh.S_KEY = KEY;
			tN_InBounder_Sh.N_ROW_NO = combinedIds;
			tN_InBounder_Sh.S_NO = po.S_NO;
			db.Insertable<TN_InBounder_Sh>(tN_InBounder_Sh).ExecuteCommand();

			}

			}

			@@ -4676,12 +5510,12 @@
			{

			var materpz = db.Queryable<TN_Inbound_Order>().Where(s => s.S_NO == po.S_NO).First();
			string GZRQ = "";
			//string GZRQ = "";
			LogHelper.Info($"冲销入库入库{po.BUDAT}");
			if (po.BUDAT != null)
			{
			GZRQ = DateTime.Parse(po.BUDAT.ToString()).ToString("yyyyMMdd");
			}
			//if (po.BUDAT != null)
			//{
			// GZRQ = DateTime.Parse(po.BUDAT.ToString()).ToString("yyyyMMdd");
			//}

			//出库回调入参
			CXCkBackDto.Root roots = new CXCkBackDto.Root
			@@ -4768,14 +5602,15 @@
			//添加凭证记录表
			if (data != null)
			{
			List<TN_Inbound_Detail> tN_Inbound_Detailcx = new List<TN_Inbound_Detail>();
			List<MaterialVoucher> materiallist = new List<MaterialVoucher>();
			foreach (var item in data.ROOT.ITEM)
			{
			if (item.MSGCODE == 0)
			{

			var onr = po.Details.Where(s => s.N_ROW_NO == item.WLPZHXM).FirstOrDefault();

			onr.N_B_STATE = 1;
			tN_Inbound_Detailcx.Add(onr);
			MaterialVoucher materialVoucher = new MaterialVoucher();
			materialVoucher.S_NO = po.S_NO;
			materialVoucher.S_TYPE = po.S_IN_TYPE;
			@@ -4801,6 +5636,11 @@
			}


			}
			if (tN_Inbound_Detailcx.Count() > 0)
			{
			db.Updateable(tN_Inbound_Detailcx).UpdateColumns(it => new { it.N_B_STATE }).ExecuteCommand();
			await AddCenter(db, tN_Inbound_Detailcx);
			}
			if (materiallist.Count() > 0)
			{
			@@ -4838,12 +5678,8 @@
			//}
			//db.Insertable<MaterialVoucher>(materialVoucher).ExecuteCommand();
			}

			if (tN_Inbound_Details.Count() > 0)
			{
			db.Updateable(tN_Inbound_Details).UpdateColumns(it => new { it.N_B_STATE }).ExecuteCommand();
			}
			var newpodetai= db.Queryable<TN_Inbound_Detail>().Where(a => a.S_IO_NO == model.S_NO).ToList();
			#endregion
			var newpodetai = db.Queryable<TN_Inbound_Detail>().Where(a => a.S_IO_NO == model.S_NO).ToList();
			int cout = newpodetai.Where(s => s.N_B_STATE != 1).Count();
			if (cout==0)
			{
			@@ -4891,11 +5727,16 @@
			List<OutboundRecord> records = new List<OutboundRecord>();
			foreach (var item in po)
			{

			var pz = pzs.Where(s => s.S_WLBM == item.S_ITEM_CODE && s.S_WLH == item.N_BS_ROW_NO).ToList().FirstOrDefault();

			var S_TYPE = "回库";
			if (pz!=null)
			{
			S_TYPE = pz.S_TYPE;
			}
			OutboundRecord outboundRecord = new OutboundRecord();
			outboundRecord.S_NO = item.S_BS_NO;
			outboundRecord.S_TYPE = pz?.S_TYPE;
			outboundRecord.S_TYPE = S_TYPE;
			outboundRecord.S_WLPZBH = pz?.S_WLBM;
			outboundRecord.S_WLPZND = pz?.S_WLPZND;
			outboundRecord.S_WLBM = item.S_ITEM_CODE;