From 0653b5bee559d54fe8ac519aa98115e6a8aa31b0 Mon Sep 17 00:00:00 2001 From: chengsc <Demo@DESKTOP-CPA90BF> Date: 星期三, 30 十月 2024 08:16:13 +0800 Subject: [PATCH] 修改问题 --- Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs | 4 +- Wms/Wms/appsettings.json | 4 +- Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs | 50 ++++++++++++------------ HTML/views/SOSetting/ExportNotice.html | 2 Wms/Wms/Controllers/DownApiController.cs | 8 ++-- Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs | 11 +++-- 6 files changed, 40 insertions(+), 39 deletions(-) diff --git a/HTML/views/SOSetting/ExportNotice.html b/HTML/views/SOSetting/ExportNotice.html index 0cda1be..3be73b7 100644 --- a/HTML/views/SOSetting/ExportNotice.html +++ b/HTML/views/SOSetting/ExportNotice.html @@ -372,7 +372,7 @@ <i class="layui-icon layui-icon-delete"></i>鍙栨秷鍒嗛厤 </a>`; } - if( d.Status == '2' || d.Status == '3'|| (d.Status == '4' && d.Type == "1")){ + if( d.Status == '1' ||d.Status == '2' || d.Status == '3'|| (d.Status == '4' && d.Type == "1")){ html += `<a class="layui-btn layui-btn-normal layui-btn-xs outClass" lay-event="outKu"> <i class="layui-icon layui-icon-ok"></i>鍑哄簱 </a>`; diff --git a/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs b/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs index a953fe4..d7eeeee 100644 --- a/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs +++ b/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs @@ -429,34 +429,34 @@ { new OperationASNServer().AddLogOperationAsn("鍏ュ簱浣滀笟", "鍏ュ簱鍗曟嵁", model.ASNNo, "娣诲姞", $"娣诲姞浜嗗崟鎹彿涓簕model.ASNNo}鐨勫崟鎹俊鎭�", Convert.ToInt32(model.CreateUser)); - //if (addOder.Count > 0) - //{ - // // 姝e紡杩愯绋嬪簭鏀惧紑 - // var jsonData = JsonConvert.SerializeObject(addOder); - // string response = ""; + if (addOder.Count > 0) + { + // 姝e紡杩愯绋嬪簭鏀惧紑 + var jsonData = JsonConvert.SerializeObject(addOder); + string response = ""; - // try - // { - // var time1 = DateTime.Now;//鍙戦�佹椂闂� .ToString("yyyy-MM-dd HH:mm:ss") - // //缁橶CS涓嬪彂鍏ュ簱鍗曚俊鎭� - // response = HttpHelper.DoPost(url, jsonData, "涓嬪彂缁橶CS鍑哄簱鍛戒护", "WCS"); + try + { + var time1 = DateTime.Now;//鍙戦�佹椂闂� .ToString("yyyy-MM-dd HH:mm:ss") + //缁橶CS涓嬪彂鍏ュ簱鍗曚俊鎭� + response = HttpHelper.DoPost(url, jsonData, "涓嬪彂缁橶CS鍑哄簱鍛戒护", "WCS"); - // //////瑙f瀽杩斿洖鏁版嵁 - // var wcsModel = JsonConvert.DeserializeObject<WcsModel>(response); - // if (wcsModel.StatusCode == 0) - // { - - // } - // if (wcsModel.StatusCode == -1) - // { + //瑙f瀽杩斿洖鏁版嵁 + var wcsModel = JsonConvert.DeserializeObject<WcsModel>(response); + if (wcsModel.StatusCode == 0) + { - // } - // } - // catch (Exception ex) - // { - // throw new Exception(ex.Message); - // } - //} + } + if (wcsModel.StatusCode == -1) + { + throw new Exception($"涓嬪彂WCS澶辫触锛歿wcsModel.Msg}"); + } + } + catch (Exception ex) + { + throw new Exception(ex.Message); + } + } return strMessage; } else diff --git a/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs b/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs index 7af51a0..94c10e0 100644 --- a/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs +++ b/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs @@ -180,6 +180,7 @@ //鍒ゆ柇鎵樼洏缁戝畾淇℃伅涓槸鍚︽湁 var bind = Db.Queryable<BllPalletBind>().First(m => m.IsDel == "0" && m.ASNDetailNo == detail.Id && m.PalletNo == model.PalletNo && m.Status != "2"); var bindId = 0; + var boxQtyZong = model.Detail.Sum(m => m.Qty); if (bind == null) { bind = new BllPalletBind @@ -189,7 +190,7 @@ PalletNo = model.PalletNo, PalletNo2 = "", PalletNo3 = "", - Qty = model.Qty, + Qty = boxQtyZong, FullQty = pNum, Status = "0",//绛夊緟鎵ц Type = model.Type, //鎵樼洏绫诲瀷 0鐗╂枡鎵� 1绌烘墭鐩樻墭 @@ -316,8 +317,8 @@ Standard = box.Standard, PackageStandard = box.PackageStandard, StoreTime = box.StoreTime, - QtyCount = (int)box.QtyCount, - QtyOrd = (int)box.QtyOrd, + QtyCount = box.QtyCount.HasValue? (int)box.QtyCount : 0, + QtyOrd = box.QtyOrd.HasValue ? (int)box.QtyOrd : 0, CreateUser = userId, CreateTime = comTime, }; @@ -1621,7 +1622,7 @@ - var areaNoStr = "A03"; + var areaNoStr = "A07"; var allotLocate = new AllotLocation(); #region 鏍规嵁sku纭鍖哄煙鍒掑垎 @@ -2294,7 +2295,7 @@ SysStorageLocat locate; var areaList = new List<string>(); - areaList.Add("A03"); + areaList.Add("A07"); locate = allotLocate.GetSuiTableLocate(houseNo, areaList, roadwayNo); Db.BeginTran(); diff --git a/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs b/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs index e70f362..1a22d15 100644 --- a/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs +++ b/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs @@ -3357,9 +3357,9 @@ var needQty = detail.Qty - detail.AllotQty; //鍒嗛厤鐨勫嚭搴撴暟閲� var outQty = model.StockList.Select(s => s.Qty).ToList().Sum(); - if (outQty != needQty) + if (outQty < needQty) { - throw new Exception("鎿嶄綔澶辫触锛屽嚭搴撴暟閲忎笌璁″垝鏁伴噺涓嶄竴鑷达紒"); + throw new Exception("鎿嶄綔澶辫触锛屽嚭搴撴暟閲忎笉鑳藉ぇ浜庤鍒掓暟閲忥紒"); } } diff --git a/Wms/Wms/Controllers/DownApiController.cs b/Wms/Wms/Controllers/DownApiController.cs index f407a96..b0fafc1 100644 --- a/Wms/Wms/Controllers/DownApiController.cs +++ b/Wms/Wms/Controllers/DownApiController.cs @@ -225,8 +225,8 @@ var list = _asnPalletBindSvc.RequestRoadWayModel(model.PalletNo, model.HouseNo); LogFile.SaveLogToFile($"WCS鐢宠宸烽亾杩斿洖锛�( {JsonConvert.SerializeObject(list)} ),", logStr); - new OperationASNServer().AddLogOperationAsn("鍏ュ簱浣滀笟", "鍏ュ簱鏃ュ織", model.PalletNo.Substring(0, 8), - "鐢宠宸烽亾", $"鐢宠宸烽亾鎵樼洏鍙凤細{model.PalletNo.Substring(0, 8)}鐨勬垚鍔熶俊鎭�", 2); + new OperationASNServer().AddLogOperationAsn("鍏ュ簱浣滀笟", "鍏ュ簱鏃ュ織", model.PalletNo, + "鐢宠宸烽亾", $"鐢宠宸烽亾鎵樼洏鍙凤細{model.PalletNo}鐨勬垚鍔熶俊鎭�", 2); return Ok(new { Success = 0, Message = "鐢宠宸烽亾鎴愬姛", TaskList = list }); } @@ -246,8 +246,8 @@ catch (Exception e) { LogFile.SaveLogToFile($"WCS鐢宠宸烽亾杩斿洖锛�( {e.Message} ),", logStr); - new OperationASNServer().AddLogOperationAsn("鍏ュ簱浣滀笟", "鍏ュ簱鏃ュ織", model.PalletNo.Substring(0, 8), - "鐢宠宸烽亾", $"鐢宠宸烽亾鎵樼洏鍙凤細{model.PalletNo.Substring(0, 8)}鐨勫け璐ヤ俊鎭�", 2); + new OperationASNServer().AddLogOperationAsn("鍏ュ簱浣滀笟", "鍏ュ簱鏃ュ織", model.PalletNo, + "鐢宠宸烽亾", $"鐢宠宸烽亾鎵樼洏鍙凤細{model.PalletNo}鐨勫け璐ヤ俊鎭�", 2); return Ok(new ErpModel { Success = -1, Message = e.Message }); } diff --git a/Wms/Wms/appsettings.json b/Wms/Wms/appsettings.json index 0b01b9f..2f6ab74 100644 --- a/Wms/Wms/appsettings.json +++ b/Wms/Wms/appsettings.json @@ -25,13 +25,13 @@ "ApiUrlConfig": { "ErpHost": "http://10.110.24.30:8081", //erpIP "MesHost": "http://10.110.24.30:8081", //mesIP - "WcsHost": "http://localhost:5005", // "http://localhost:57061", //wcsIPhttp://localhost:57061/ + "WcsHost": "http://10.18.52.10:5005", // "http://localhost:57061", //wcsIPhttp://localhost:57061/ "BoxHost": "http://10.110.24.30:8081", //boxIP // WCS "IssueComApiUrl": "/api/demo/wcsTasks", //涓嬪彂鍛戒护(鍑哄簱銆佺Щ搴�) "IssueComApiUrl2": "/api/demo/wcsTask", //"/api/WCSApi/AddTask", //閲嶆柊涓嬪彂鍛戒护(鍑哄簱銆佺Щ搴�) - "AddOrderTaskUrl": "/api/demo/addOrderTask", //WMS缁橶CS涓嬪彂鐨勫叆搴撳崟浠诲姟 + "AddOrderTaskUrl": "/api/demo/orderTask", //WMS缁橶CS涓嬪彂鐨勫叆搴撳崟浠诲姟 // ERP "AsnFinishUrl": "/api/wmsInterface/OutStockTask", //鍏ュ簱璁㈠崟鍏抽棴 -- Gitblit v1.8.0