WMSPrjInstance/HH-0126_HeNanPingGao.git

			@@ -654,7 +654,87 @@
			}
			return simpleResults;
			}

			/// <summary>
			/// sap-wmsg供应商息添加SimpleResult
			/// </summary>
			/// <param name="model"></param>
			/// <returns></returns>
			internal static Orderback.Root GYS_In(GYSDto.Root model)
			{
			var orderResponse = new Orderback.Root
			{
			ROOT = new Orderback.ROOT
			{
			ITEM = new List<Orderback.ITEM> { }

			}
			};

			List<Orderback.ITEM> tEMs = new List<Orderback.ITEM>();
			var db = new SqlHelper<object>().GetInstance();
			try
			{
			db.BeginTran();
			foreach (var item in model.ROOT.GYSXX)
			{
			Orderback.ITEM iTEM = new Orderback.ITEM();


			//创建入库单主子表
			var po = WMSHelper.GetGYSBMOrder(item.JBXX.GYSBM);
			if (po == null)
			{
			po = new TN_Supplier { S_GYSBM= item.JBXX.GYSBM , S_MDMBM = item.JBXX.MDMBM, };
			po.Details = new List<TN_Supplier_detial>();
			if (item.GYSHB.Count > 0)
			{
			item.GYSHB.ForEach(a =>
			{
			po.Details.Add(new TN_Supplier_detial
			{
			S_DO_GYSBM = a.GYSBM,
			S_CGZZ = a.CGZZ,
			S_HB = a.HB,

			});
			//}
			});
			db.Insertable<TN_Supplier>(po).ExecuteCommand();
			db.Insertable<TN_Supplier_detial>(po.Details).ExecuteCommand();
			}
			}
			else
			{
			db.Deleteable<TN_Supplier>().Where(it => it.S_GYSBM == po.S_GYSBM).ExecuteCommand();
			db.Deleteable<TN_Supplier_detial>().Where(it => it.S_DO_GYSBM == po.S_GYSBM).ExecuteCommand();
			//iTEM.SCDDH = item.JBXX.GYSBM;
			//iTEM.MSGCODE = "1";
			//iTEM.MSGDESP = $"{item.JBXX.GYSBM}已存在";
			//tEMs.Add(iTEM);
			}
			iTEM.SCDDH = item.JBXX.GYSBM;
			iTEM.MSGCODE = "0";
			iTEM.MSGDESP = $"成功";
			tEMs.Add(iTEM);
			}
			orderResponse.ROOT.ITEM = tEMs;
			db.CommitTran();
			}
			catch (Exception e)
			{
			Orderback.ITEM iTEM = new Orderback.ITEM();
			iTEM.SCDDH = "";
			iTEM.GC = "";
			iTEM.MSGCODE = "1";
			iTEM.MSGDESP = e.Message;
			tEMs.Add(iTEM);
			orderResponse.ROOT.ITEM = tEMs;
			db.RollbackTran();
			return orderResponse;
			throw;
			}
			return orderResponse;
			}
			/// <summary>
			/// sap-wms生产订单信息添加SimpleResult
			/// </summary>
			@@ -1042,8 +1122,6 @@
			var po = WMSHelper.GetInboundOrder(itemwlpz.HEAD.WLPZH);
			if (po == null)
			{


			#region MyRegion
			po = new TN_Inbound_Order { S_NO = itemwlpz.HEAD.WLPZH, S_WLPZND = itemwlpz.HEAD.ND, S_FACTORY = itemwlpz.ITEM[0].GC, S_IN_TYPE = "内采入库", S_BS_TYPE = itemwlpz.HEAD.YDLX };
			po.Details = new List<TN_Inbound_Detail>();
			@@ -1051,28 +1129,7 @@
			{
			itemwlpz.ITEM.ForEach(a =>
			{
			//if (a.ITEM1.Select(s => s.XLH).Count() > 0)//判断序列号是否为多个
			//{
			// foreach (var item in a.ITEM1.Select(s => s.XLH))
			// {
			// po.Details.Add(new TN_Inbound_Detail
			// {
			// S_IO_NO = model.ROOT.WLPZ.HEAD.WLPZBH,
			// N_ROW_NO = po.Details.Count + 1,
			// S_ITEM_CODE = a.WLH,
			// F_QTY = a.SL,
			// S_ITEM_STATE = "物料",
			// S_ITEM_NAME = "物料",
			// F_ACC_B_QTY = 0,
			// S_KCDD = a.KCDD,
			// S_UOM = a.JBJLDW,//计量单位
			// S_SERIAL_NO = item,
			// S_BATCH_NO = a.PC,
			// });
			// }
			//}
			//else
			//{

			po.Details.Add(new TN_Inbound_Detail
			{
			S_IO_NO = itemwlpz.HEAD.WLPZH,
			@@ -1114,7 +1171,6 @@
			{
			var poq = po.Details.Where(s => s.S_ITEM_CODE == a.WLBM).FirstOrDefault();
			poq.F_QTY = a.SL;

			db.Updateable(poq).UpdateColumns(it => new { it.F_QTY }).ExecuteCommand();
			}
			else
			@@ -1125,7 +1181,7 @@
			N_ROW_NO = a.WLPZHXM,
			S_ITEM_CODE = a.WLBM,
			F_QTY = a.SL,
			S_ITEM_STATE = "物料",
			S_ITEM_STATE = "正常",
			S_ITEM_NAME = "物料",
			S_CKPZKJND = a.CKPZND,
			F_ACC_B_QTY = 0,
			@@ -1146,9 +1202,6 @@
			}
			}
			}



			result.resultMsg = "成功";
			result.WLPZBH = itemwlpz.HEAD.WLPZH;
			result.WLPZND = itemwlpz.HEAD.ND;
			@@ -1161,7 +1214,6 @@
			catch (Exception e)
			{
			var result = new SimpleResult();

			result.resultMsg = "失败";
			result.WLPZBH = "";
			result.WLPZND = "0";
			@@ -1735,6 +1787,7 @@
			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();
			@@ -1745,7 +1798,7 @@
			return result;

			}
			po.S_OUT_TYPE = "成本中心出库";

			//根据不同出库类型回调sap
			if (po.S_OUT_TYPE == "冲销出库")
			{
			@@ -1797,8 +1850,8 @@
			if (cntr.Count() > 0)
			{
			db.BeginTran();
			//1.查看是否有相同物料批次的信息，如果有要累减少，不同批次的可以分开
			var cir = db.Queryable<CntrItemRel>().Where(a => a.S_CNTR_CODE == cntr_code && a.S_ITEM_CODE == item.item_code && a.N_BS_ROW_NO == item.N_ROW_NO).First();//&& a.S_BATCH_NO == item.S_BATCH_NO
			//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;
			@@ -1923,21 +1976,36 @@
			//回参物料信息
			List<CBcenterBackDto.HEADItem> iTEMs = new List<CBcenterBackDto.HEADItem>();
			List<OutboundRecord> records = new List<OutboundRecord>();
			string GZRQ = "";
			string PZZDRQ = "";
			if (po.BUDAT != null)
			{
			GZRQ = DateTime.Parse(po.BUDAT.ToString()).ToString("yyyyMMdd");
			}
			if (po.BLDAT != null)
			{
			PZZDRQ = DateTime.Parse(po.BLDAT.ToString()).ToString("yyyyMMdd");

			}
			foreach (var item in MaterList)
			{
			var podetail = po.Details.Where(s => s.S_ITEM_CODE == item.item_code).FirstOrDefault();
			CBcenterBackDto.HEADItem ckbitem = new CBcenterBackDto.HEADItem();
			ckbitem.WLBH = item.item_code;
			ckbitem.KEY = arrival_no;

			ckbitem.SL = item.qty;
			ckbitem.CBZX = po.S_CBZX;
			ckbitem.WLBH = item.item_code;
			ckbitem.SL = item.qty;
			ckbitem.KCDD = podetail?.S_KCDD;
			ckbitem.LRZX = po.S_LRZX;
			ckbitem.ZZKM = po.S_ZZKM;
			ckbitem.GC = po.S_FACTORY;
			ckbitem.GZRY = po.S_CREATOR_NAME;
			ckbitem.PZRQ = DateTime.Now.ToString();
			ckbitem.GZRY = po.UNAME;

			ckbitem.KCDD = podetail?.S_KCDD;
			ckbitem.PC = podetail?.S_BATCH_NO;
			ckbitem.PZRQ = PZZDRQ;
			ckbitem.GZRQ = GZRQ;



			CBcenterBackDto.ITEM listitem1 = new CBcenterBackDto.ITEM();
			@@ -1947,7 +2015,7 @@
			// .Where(s => s.S_ITEM_CODE == item.item_code)
			// .Select(s => s.S_SERIAL_NO));
			//string[] xlhValues = serialNos.Split(',');
			string[] xlhValues = item.S_SERIAL_NO.Split(',');
			// string[] xlhValues = item.S_SERIAL_NO.Split(',');
			listitem1.XLH= podetail?.S_SERIAL_NO.Split(',').ToList();
			//foreach (var xlhValue in xlhValues)
			//{
			@@ -2001,16 +2069,20 @@
			xmlDoc.LoadXml(responses.Output.ToString());
			JObject jsonObject = JsonConvert.DeserializeObject<JObject>(JsonConvert.SerializeXmlNode(xmlDoc));
			var data = JsonConvert.DeserializeObject<ReturnWcBcak.Root>(jsonObject.ToString());

			//添加凭证记录表
			result.resultMsg = data.ROOT.ITEM.MSGDESP;
			result.resultCode = data.ROOT.ITEM.MSGCODE;
			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();
			if (data.ROOT.ITEM.MSGCODE == 0)
			{
			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

			db.CommitTran();
			@@ -2018,7 +2090,7 @@
			catch (Exception ex)
			{
			db.RollbackTran();
			LogHelper.Info("计划外退料回调报错" + ex.Message);
			LogHelper.Info("成本中心回调报错" + ex.Message);
			Console.WriteLine(ex.Message);

			throw;
			@@ -2144,7 +2216,7 @@
			//json转xml
			string xml = JsonConvert.DeserializeXmlNode(json, "ROOT").OuterXml;

			LogHelper.Info($"出计划外发料出库xml数据{xml}");
			LogHelper.Info($"计划外发料出库xml数据{xml}");
			// 创建 StringContent 并指定媒体类型为 "text/xml"
			//HttpContent content = new StringContent(xml, Encoding.UTF8, "application/xml");
			//string url = Settings.WCSSeverUrl + "/api/WmsSap/cesReceiveXmlData";
			@@ -2570,8 +2642,8 @@
			}
			else
			{
			//2.插入新的容器物料信息（容器号不变）
			cir = new CntrItemRel { S_CNTR_CODE = cntr.S_CODE.Trim(), S_BATCH_NO = item.S_BATCH_NO, S_SERIAL_NO = item.S_SERIAL_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 };
			//2.插入新的容器物料信息（容器号不变S_SERIAL_NO = item.S_SERIAL_NO,）
			cir = new CntrItemRel { 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 };
			db.Insertable<CntrItemRel>(cir).ExecuteCommand();
			}
			var count = db.Queryable<CntrItemRel>().Count(a => a.S_CNTR_CODE == cntr.S_CODE);
			@@ -2900,7 +2972,7 @@
			else
			{
			//var az = db.Queryable<AZInventory>().ToList();
			var po1 = new TN_Outbound_Order { S_NO = WMSHelper.GenerateShippNo(), S_FACTORY = po.S_FACTORY, 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(),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 };

			po1.Details = new List<TN_Outbound_Detail>();
			if (po.Details.Count() > 0)
			@@ -2914,8 +2986,10 @@
			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,