From f3ad86fe50a0d2ba81b203517184264eea7bf0c0 Mon Sep 17 00:00:00 2001 From: hudong <Administrator@PC-20250329JZUF> Date: 星期四, 05 六月 2025 17:04:44 +0800 Subject: [PATCH] 入库审核逻辑更改 代码修改 --- api/WmsSpaHelper.cs | 368 ++++++++++++++++++++++++++++++++++++++-------------- 1 files changed, 267 insertions(+), 101 deletions(-) diff --git a/api/WmsSpaHelper.cs b/api/WmsSpaHelper.cs index b054b44..ca8958c 100644 --- a/api/WmsSpaHelper.cs +++ b/api/WmsSpaHelper.cs @@ -30,7 +30,6 @@ using System.Security.Policy; using HH.WCS.Mobox3.pinggao.models; using static HH.WCS.Mobox3.pinggao.wms.WMSHelper; -using WHTest; using System.Net; using SqlSugar; using static HH.WCS.Mobox3.pinggao.models.SapRoot.GYSDto; @@ -46,6 +45,34 @@ } + public static bool MaterPanduan(string ItemCode,double count) { + bool panduan = true; + var db = new SqlHelper<object>().GetInstance(); + + var po = db.Queryable<TN_Material_KC>().Where(a => a.S_ITEM_CODE == ItemCode).First(); + + var po1 = db.Queryable<CntrItemRel>().Where(a => a.S_ITEM_CODE == ItemCode).First(); + if (po != null) + { + if (po1!=null) + { + double sl= po1.F_QTY + count; + if (sl>po.N_COUNT) + { + panduan = false; + } + } + if (count > po.N_COUNT) + { + panduan = false; + } + } + else + { + panduan = false; + } + return panduan; + } /// <summary> /// 鏁版嵁 /// </summary> @@ -1134,9 +1161,9 @@ result.resultCode = 1; result.resultMsg = $"鐗╂枡{a.WLBM}鐗╂枡涓绘暟鎹笉瀛樺湪璇ョ墿鏂�; - result.resultMsg = "澶辫触"; result.WLPZBH = itemwlpz.HEAD.WLPZH; result.WLPZND = itemwlpz.HEAD.ND; + simpleResults.Add(result); continue; /* throw new Exception($"鐗╂枡{a.WLH}鐗╂枡涓绘暟鎹笉瀛樺湪璇ョ墿鏂�)*/ ; @@ -1186,9 +1213,10 @@ po.Details = new List<TN_Inbound_Detail>(); if (itemwlpz.ITEM.Count > 0) { - itemwlpz.ITEM.ForEach(a => + foreach (var a in itemwlpz.ITEM) + { - + po.Details.Add(new TN_Inbound_Detail { S_IO_NO = itemwlpz.HEAD.WLPZH, @@ -1210,7 +1238,7 @@ }); //} - }); + } db.Insertable<TN_Inbound_Order>(po).ExecuteCommand(); db.Insertable<TN_Inbound_Detail>(po.Details).ExecuteCommand(); db.CommitTran(); @@ -1224,7 +1252,7 @@ var Details = new List<TN_Inbound_Detail>(); if (itemwlpz.ITEM.Count > 0) { - itemwlpz.ITEM.ForEach(a => + foreach (var a in itemwlpz.ITEM) { if (po.Details.Where(s => s.S_ITEM_CODE == a.WLBM).Count() > 0) { @@ -1254,19 +1282,20 @@ }); } - }); + } db.Insertable<TN_Inbound_Detail>(Details).ExecuteCommand(); db.CommitTran(); } } } - result.resultMsg = "鎴愬姛"; - result.WLPZBH = itemwlpz.HEAD.WLPZH; - result.WLPZND = itemwlpz.HEAD.ND; - result.resultCode = 0; - result.resultMsg = ""; - simpleResults.Add(result); + + var result2 = new SimpleResult(); + result2.resultMsg = "鎴愬姛"; + result2.WLPZBH = itemwlpz.HEAD.WLPZH; + result2.WLPZND = itemwlpz.HEAD.ND; + result2.resultCode = 0; + simpleResults.Add(result2); db.CommitTran(); } } @@ -1332,8 +1361,10 @@ po.Details = new List<TN_Inbound_Detail>(); if (itemwlpz.ITEM.Count > 0) { - itemwlpz.ITEM.ForEach(a => + foreach (var a in itemwlpz.ITEM) + { + #region 涓嶉渶瑕� //if (a.ITEM1.Select(s => s.XLH).Count() > 0)//鍒ゆ柇搴忓垪鍙锋槸鍚︿负澶氫釜 //{ @@ -1385,7 +1416,7 @@ }); //} - }); + } db.Insertable<TN_Inbound_Order>(po).ExecuteCommand(); db.Insertable<TN_Inbound_Detail>(po.Details).ExecuteCommand(); db.CommitTran(); @@ -1397,7 +1428,8 @@ var Details = new List<TN_Inbound_Detail>(); if (itemwlpz.ITEM.Count > 0) { - itemwlpz.ITEM.ForEach(a => + foreach (var a in itemwlpz.ITEM) + { if (po.Details.Where(s => s.S_ITEM_CODE == a.WLBH).Count() > 0) { @@ -1432,7 +1464,7 @@ }); } - }); + } db.Insertable<TN_Inbound_Detail>(Details).ExecuteCommand(); db.CommitTran(); @@ -1732,6 +1764,15 @@ internal static SimpleResult InboundOrderSorting(MPSorting model) { var result = new SimpleResult(); + foreach (var a in model.MaterList) + { + bool v = MaterPanduan(a.item_code, a.qty); + if (v) + { + result.resultMsg = $"鐗╂枡{a.item_code}鏁伴噺瓒呰繃 搴撳瓨鎬绘暟"; + return result; + } + } //鍒ゆ柇璧峰搴撲綅鏄惁閿佸畾 // var db = new SqlHelper<object>().GetInstance(); using (var db = new SqlHelper<object>().GetInstance()) @@ -1756,7 +1797,7 @@ result.resultMsg = "鎴愬姛"; result.resultCode = 0; //鏍¢獙鍏ュ簱鍗曟暟閲忥紝涓嶅彲浠ヨ秴锛屾垚鍔熷悗鎻掑叆鎵樼洏鐗╂枡琛紝鏇存柊鍏ュ簱鍗曠疮璁℃暟閲�- result = AddInboundOrder(model.MaterList, model.cntr_code); + result = AddInboundOrder(model.MaterList, model.cntr_code,model.cntr_type); #region MyRegion @@ -1854,13 +1895,17 @@ return result; } //鍒ゆ柇鎵樼洏鏄惁宸茬粡鐢熸垚浠诲姟锛屽鏋滄病鏈夊垯鐢熸垚 - var wmsTaskcs = WMSHelper.GetWmsTaskByCntr(model.cntr_code); - if (wmsTaskcs != null) + if (!string.IsNullOrEmpty(model.cntr_code)) { - result.resultCode = 3; - result.resultMsg = $"璧风偣{model.start} 鎵樼洏{model.cntr_code}宸茬粡鍒涘缓浠诲姟锛岃鍕块噸澶嶇敵璇�; - return result; + var wmsTaskcs = WMSHelper.GetWmsTaskByCntr(model.cntr_code); + if (wmsTaskcs != null) + { + result.resultCode = 3; + result.resultMsg = $"璧风偣{model.start} 鎵樼洏{model.cntr_code}宸茬粡鍒涘缓浠诲姟锛岃鍕块噸澶嶇敵璇�; + return result; + } } + //鍑哄簱 if (model.Type==2) { @@ -1881,6 +1926,16 @@ { start= db.Queryable<Location>().Where(it => it.S_CODE == loc.S_LOC_CODE).First(); } + } + else if (!string.IsNullOrEmpty(model.item_code)) + { + start = db.Queryable<LocCntrRel>() + .LeftJoin<CntrItemRel>((lcr, cir) => lcr.S_CNTR_CODE == cir.S_CNTR_CODE&&cir.S_CNTR_TYPE=="鍗婃墭") + .Where((lcr, cir) => cir.S_CNTR_CODE != null) + .LeftJoin<Location>((lcr, cir, loc) => lcr.S_LOC_CODE == loc.S_CODE && loc.S_AREA_CODE == "HJQ") + .OrderBy((lcr, cir) => cir.T_CREATE) + .Select((lcr, cir, loc) => loc).ToList() // 杩斿洖 Location 瀵硅薄 + .FirstOrDefault(); // 鎴栬� Take(1).ToList()[0] } else { @@ -1908,7 +1963,7 @@ start = db.Queryable<LocCntrRel>() .LeftJoin<CntrItemRel>((lcr, cir) => lcr.S_CNTR_CODE == cir.S_CNTR_CODE) .Where((lcr, cir) => cir.S_CNTR_CODE == null) // 鎵惧嚭鏈鍗犵敤鐨勫鍣�- .LeftJoin<Location>((lcr, cir, loc) => lcr.S_LOC_CODE == loc.S_CODE&&loc.S_AREA_CODE== "HJQ") + .LeftJoin<Location>((lcr, cir, loc) => lcr.S_LOC_CODE == loc.S_CODE && loc.S_AREA_CODE == "HJQ") .Select((lcr, cir, loc) => loc).ToList() // 杩斿洖 Location 瀵硅薄 .FirstOrDefault(); // 鎴栬� Take(1).ToList()[0] } @@ -1952,6 +2007,7 @@ Location end = new Location(); 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(); @@ -2087,7 +2143,11 @@ } //閫氱敤鎺ュ彛 瀵瑰鍣ㄨ揣鍝佺殑鍒犲噺 鍜岀敓鎴愬洖搴撳崟 閮借鐢ㄧ殑鎺ュ彛 - result = await TYAddOutboundOrder(db, model.MaterList, model.arrival_no, model.cntr_code, model.IsHK, model.start, po.S_OUT_TYPE); + result = await TYAddOutboundOrder(db, model.MaterList, model.arrival_no, model.cntr_code, model.IsHK, model.start, po.S_OUT_TYPE,model.cntr_type); + if (result.resultCode==1) + { + return result; + } #region 鍗囬檷閲� bool adds = true; @@ -2184,7 +2244,7 @@ LogHelper.Info($"mobox 搴撳尯闄嶉噺鎺ュ彛杩斿洖涓虹┖"); } - if (adds) addOnShelves(po, model.cntr_code, 2); + //if (adds) addOnShelves(po, model.cntr_code, 2); } else LogHelper.Info($"鎵樼洏{model.cntr_code}鏃犻渶瑕佸崌闄嶉噺鐨勭墿鏂�); @@ -2195,6 +2255,7 @@ } catch (Exception e) { + LogHelper.Info($"鎶ラ敊{e.Message}"); result.resultMsg = e.Message; db.RollbackTran(); return result; @@ -2203,7 +2264,7 @@ } } - 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) + 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) { // var db = new SqlHelper<object>().GetInstance(); //using (var db = new SqlHelper<object>().GetInstance()) @@ -2234,6 +2295,7 @@ 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) @@ -2242,10 +2304,8 @@ } else { - db.Updateable(cir).UpdateColumns(it => new { it.F_QTY, it.F_ALLOC_QTY, it.T_MODIFY }).ExecuteCommand(); + db.Updateable(cir).UpdateColumns(it => new { it.F_QTY,it.S_CNTR_TYPE, it.F_ALLOC_QTY, it.T_MODIFY }).ExecuteCommand(); //娣诲姞鍥炲簱浣滀笟 - - } } else @@ -2256,31 +2316,7 @@ LogHelper.Info($"鐗╂枡涓嶅瓨鍦▄item.item_code}"); return result; } - if (isHK) - { - 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 = startinfo.S_CODE, - S_END_AREA = startinfo.S_AREA_CODE, - S_END_WH = startinfo.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, 1); - result.resultMsg = $"鍒涘缓浣滀笟鎴愬姛锛屼綔涓氬彿{wmsTask.S_CODE}"; - } - } + OutboundRecord outboundRecord = new OutboundRecord(); outboundRecord.S_WLPZBH = pz?.S_WLPZBH; outboundRecord.S_WLPZND = pz?.S_WLPZND; @@ -2300,14 +2336,65 @@ return result; } } - db.Insertable<OutboundRecord>(records).ExecuteCommand(); + 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; + } + //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}"; + } + } + 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; @@ -3055,9 +3142,9 @@ /// <param name="cntr_code"></param> /// <returns></returns> [ApiExplorerSettings(IgnoreApi = true)] - public static SimpleResult AddInboundOrder(List<Mater> MaterList, string cntr_code) + public static SimpleResult AddInboundOrder(List<Mater> MaterList, string cntr_code,string S_CNTR_TYPE) { - var result = new SimpleResult(); + var result = new SimpleResult(); // var db = new SqlHelper<object>().GetInstance(); using (var db = new SqlHelper<object>().GetInstance()) { @@ -3100,12 +3187,13 @@ if (cir != null) { cir.F_QTY += item.qty; - db.Updateable(cir).UpdateColumns(it => new { it.F_QTY }).ExecuteCommand(); + cir.S_CNTR_TYPE = S_CNTR_TYPE; + db.Updateable(cir).UpdateColumns(it => new { it.F_QTY,it.S_CNTR_TYPE }).ExecuteCommand(); } else { //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 }; + 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 }; db.Insertable<CntrItemRel>(cir).ExecuteCommand(); } var count = db.Queryable<CntrItemRel>().Count(a => a.S_CNTR_CODE == cntr.S_CODE); @@ -3204,7 +3292,7 @@ lLDReturnRoots.MSGDESP = $"鐗╂枡{a.WLBM}鐗╂枡涓绘暟鎹笉瀛樺湪璇ョ墿鏂�; iTEMs.Add(lLDReturnRoots); - break ; + continue; } po.Details.Add(new TN_Ll_detail { @@ -3212,7 +3300,7 @@ S_AREA_CODE = "HJQ", N_ROW_NO = "", S_ITEM_CODE = a.WLBM, - S_ITEM_NAME = item.S_ITEM_NAME, + S_ITEM_NAME = item?.S_ITEM_NAME, F_QTY = a.XQSL, S_ZJBM = a.ZJBM, S_YLBH = a.YLBH, @@ -3232,8 +3320,23 @@ } if (po.Details.Count()>0) { + LLDReturnRoot.ITEM lLDReturnRoot1 = new LLDReturnRoot.ITEM(); + lLDReturnRoot1.GC = itemscddll.GC; + lLDReturnRoot1.LLDH = itemscddll.LLDH; + lLDReturnRoot1.MSGCODE = 0; + lLDReturnRoot1.MSGDESP = $"鎴愬姛"; + iTEMs.Add(lLDReturnRoot1); var result1 = db.Insertable<TN_Ll_Order>(po).ExecuteCommand() > 0; db.Insertable<TN_Ll_detail>(po.Details).ExecuteCommand(); + } + else + { + LLDReturnRoot.ITEM lLDReturnRoot1 = new LLDReturnRoot.ITEM(); + lLDReturnRoot1.GC = itemscddll.GC; + lLDReturnRoot1.LLDH = itemscddll.LLDH; + lLDReturnRoot1.MSGCODE = 0; + lLDReturnRoot1.MSGDESP = $"鎴愬姛,鏃犳暟鎹坊鍔�; + iTEMs.Add(lLDReturnRoot1); } } @@ -3256,7 +3359,7 @@ lLDReturnRoots.MSGCODE = 1; lLDReturnRoots.MSGDESP = $"鎵ц涓鏂欏崟锛岀墿鏂檣a.WLBM}鐗╂枡涓嶅厑璁稿垹闄�; iTEMs.Add(lLDReturnRoots); - break; + continue; } var po1 = po.Details.Where(s => a.WLBM == s.S_ITEM_CODE).ToList(); if (po1.Count() == 0) //鏃犲垯鏂板鐗╂枡鏄庣粏 @@ -3272,7 +3375,7 @@ lLDReturnRoots.MSGCODE = 1; lLDReturnRoots.MSGDESP = $"鐗╂枡{a.WLBM}鐗╂枡涓绘暟鎹笉瀛樺湪璇ョ墿鏂�; iTEMs.Add(lLDReturnRoots); - break; + continue; } TN_Ll_detail tN_Outbound_Detail = new TN_Ll_detail { @@ -3316,7 +3419,7 @@ lLDReturnRoots.MSGCODE = 1; lLDReturnRoots.MSGDESP = $"鏇存柊澶辫触锛屾洿鏂版暟閲忓繀椤诲ぇ浜庡綋鍓嶇墿鏂欐暟閲弡a.WLBM}"; iTEMs.Add(lLDReturnRoots); - break; + continue; } } } @@ -3401,16 +3504,26 @@ //娣诲姞鏁版嵁 if (listtn.Count() > 0) { + LLDReturnRoot.ITEM lLDReturnRoot1 = new LLDReturnRoot.ITEM(); + lLDReturnRoot1.GC = itemscddll.GC; + lLDReturnRoot1.LLDH = itemscddll.LLDH; + lLDReturnRoot1.MSGCODE = 0; + lLDReturnRoot1.MSGDESP = $"鎴愬姛"; + iTEMs.Add(lLDReturnRoot1); db.Insertable<TN_Ll_detail>(listtn).ExecuteCommand(); + } + else + { + LLDReturnRoot.ITEM lLDReturnRoot1 = new LLDReturnRoot.ITEM(); + lLDReturnRoot1.GC = itemscddll.GC; + lLDReturnRoot1.LLDH = itemscddll.LLDH; + lLDReturnRoot1.MSGCODE = 0; + lLDReturnRoot1.MSGDESP = $"鎴愬姛,鏃犳暟鎹坊鍔�; + iTEMs.Add(lLDReturnRoot1); } } - - lLDReturnRoots.GC = itemscddll.GC; - lLDReturnRoots.LLDH = itemscddll.LLDH; - lLDReturnRoots.MSGCODE = 0; - lLDReturnRoots.MSGDESP = $"鎴愬姛"; - iTEMs.Add(lLDReturnRoots); + db.CommitTran(); } @@ -3968,6 +4081,10 @@ result.resultMsg = "鏁版嵁涓嶅瓨鍦�; return result; } + 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)) + .ToList(); if (po.S_IN_TYPE == "鍐呴噰鍏ュ簱") { List<NcRkDto.ITEM> listitem = new List<NcRkDto.ITEM>(); @@ -4071,7 +4188,7 @@ // 鍑嗗璇锋眰鍙傛暟 ZscmNc request = new ZscmNc(); request.Input = "<?xml version=\"1.0\" encoding=\"utf-8\" ?>" + xml; - LogHelper.Info($"鍐呴噰SAP鍥炶皟"); + LogHelper.Info($"鍐呴噰SAP鍥炶皟{service.Url}"); // 璋冪敤Web Service ZscmNcResponse responses = service.ZscmNc(request); @@ -4089,22 +4206,39 @@ //娣诲姞鍑瘉璁板綍琛� result.resultMsg = data.ROOT.ITEM.MSGDESP; result.resultCode = data.ROOT.ITEM.MSGCODE; - MaterialVoucher materialVoucher = new MaterialVoucher(); + //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(); + //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(); + List<MaterialVoucher> materials = new List<MaterialVoucher>(); + foreach (var item in model.Wlist) + { + MaterialVoucher materialVoucher = new MaterialVoucher(); + materialVoucher.S_NO = po.S_NO; + materialVoucher.S_WLBM = item.S_ITEM_CODE; + materialVoucher.S_WLH = item.N_ROW_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; + materials.Add(materialVoucher); + } + + if (materials.Count() > 0) + { + + db.Insertable<MaterialVoucher>(materials).ExecuteCommand(); + } } } - else - - if (po.S_IN_TYPE == "璁″垝澶栭�鏂欏叆搴�) + else if (po.S_IN_TYPE == "璁″垝澶栭�鏂欏叆搴�) { DateTime dateTime; DateTime dateTime1; @@ -4229,13 +4363,25 @@ result.resultCode = data.ROOT.ITEM.MSGCODE; if (data.ROOT.ITEM.MSGCODE == 0) { - MaterialVoucher materialVoucher = new MaterialVoucher(); - materialVoucher.S_NO = po.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(); + List< MaterialVoucher > materials = new List< MaterialVoucher >(); + foreach (var item in model.Wlist) + { + MaterialVoucher materialVoucher = new MaterialVoucher(); + materialVoucher.S_NO = po.S_NO; + materialVoucher.S_WLBM = item.S_ITEM_CODE; + materialVoucher.S_WLH = item.N_ROW_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; + materials.Add( materialVoucher ); + } + + if (materials.Count() > 0) + { + + db.Insertable<MaterialVoucher>(materials).ExecuteCommand(); + } } #endregion @@ -4360,15 +4506,34 @@ result.resultCode = data.ROOT.ITEM.MSGCODE; if (data.ROOT.ITEM.MSGCODE == 0) { - MaterialVoucher materialVoucher = new MaterialVoucher(); - materialVoucher.S_NO = model.S_NO; - materialVoucher.S_TYPE = po.S_IN_TYPE; - materialVoucher.S_WLPZBH = data.ROOT.ITEM?.WLPZH; - LogHelper.Info("鍊�: " + data.ROOT.ITEM?.WLPZH); - LogHelper.Info("鍊�: " + materialVoucher.S_WLPZBH); - materialVoucher.S_WLPZND = data.ROOT.ITEM?.WLPZND; - materialVoucher.STATUS = 0; - db.Insertable<MaterialVoucher>(materialVoucher).ExecuteCommand(); + //MaterialVoucher materialVoucher = new MaterialVoucher(); + //materialVoucher.S_NO = model.S_NO; + //materialVoucher.S_TYPE = po.S_IN_TYPE; + //materialVoucher.S_WLPZBH = data.ROOT.ITEM?.WLPZH; + //LogHelper.Info("鍊�: " + data.ROOT.ITEM?.WLPZH); + //LogHelper.Info("鍊�: " + materialVoucher.S_WLPZBH); + //materialVoucher.S_WLPZND = data.ROOT.ITEM?.WLPZND; + //materialVoucher.STATUS = 0; + //db.Insertable<MaterialVoucher>(materialVoucher).ExecuteCommand(); + List<MaterialVoucher> materials = new List<MaterialVoucher>(); + foreach (var item in model.Wlist) + { + MaterialVoucher materialVoucher = new MaterialVoucher(); + materialVoucher.S_NO = po.S_NO; + materialVoucher.S_WLBM = item.S_ITEM_CODE; + materialVoucher.S_WLH = item.N_ROW_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; + materials.Add(materialVoucher); + } + if (materials.Count() > 0) + { + + db.Insertable<MaterialVoucher>(materials).ExecuteCommand(); + } + } //else //{ @@ -4581,17 +4746,18 @@ var po = db.Queryable<CntrItemRel>().Where(a => a.S_CNTR_CODE == S_CNTR_CODE && a.S_BS_NO == taskno).ToList(); LogHelper.Info("娣诲姞鍏ュ簱璁板綍琛╬o" + po.Count()); - var pz = db.Queryable<MaterialVoucher>().Where(a => a.S_NO == taskno).First(); - var ass = pz == null; + var pzs = db.Queryable<MaterialVoucher>().Where(a => a.S_NO == taskno).ToList(); + var ass = pzs == null; LogHelper.Info("娣诲姞鍏ュ簱璁板綍琛╬z" + ass); 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).First(); OutboundRecord outboundRecord = new OutboundRecord(); outboundRecord.S_NO = item.S_BS_NO; outboundRecord.S_TYPE = pz?.S_TYPE; - outboundRecord.S_WLPZBH = pz?.S_WLPZBH; + outboundRecord.S_WLPZBH = pz?.S_WLBM; outboundRecord.S_WLPZND = pz?.S_WLPZND; outboundRecord.S_WLBM = item.S_ITEM_CODE; outboundRecord.S_SL = item.F_QTY; -- Gitblit v1.9.1