From 4b4db960821387e8e29151ca15a1a7a2825f5f6f Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-JIE70N9>
Date: 星期五, 20 六月 2025 16:31:10 +0800
Subject: [PATCH] Merge branch 'master' of http://47.95.120.53:8083/r/JC34WMS
---
Wms/WMS.BLL/HttpServer.cs | 66 ++++++++++++++++----------------
1 files changed, 33 insertions(+), 33 deletions(-)
diff --git a/Wms/WMS.BLL/HttpServer.cs b/Wms/WMS.BLL/HttpServer.cs
index 6999955..97b2d33 100644
--- a/Wms/WMS.BLL/HttpServer.cs
+++ b/Wms/WMS.BLL/HttpServer.cs
@@ -50,7 +50,7 @@
throw new Exception("璧峰浣嶇疆涓嶈兘涓虹┖");
}
//鑾峰彇鍌ㄤ綅淇℃伅
- var locateInfo = Db.Queryable<SysStorageLocat>().First(m => m.IsDel == "0" && m.WareHouseNo == houseNo && m.LocatNo == Strlocate);
+ var locateInfo = Db.Queryable<SysStorageLocat>().First(m => m.IsDel == "0" && m.WareHouseNo == "W04" && m.LocatNo == Strlocate);
if (locateInfo == null)
{
throw new Exception("鏈煡璇㈠埌绌哄偍浣�");
@@ -103,7 +103,7 @@
PalletNo = palletNo,
Qty = palletNum,
FullQty = pNum,
- Status = "3", //涓婃灦瀹屾垚
+ Status = "2", //涓婃灦瀹屾垚
Type = "1", //0 鐗╂枡鎵� 1 绌烘墭
LotNo = "",
LotText = "",
@@ -170,10 +170,10 @@
InspectQty = 0,
ASNNo = modelpb.ASNNo,
ASNDetailNo = modelpb.ASNDetailNo,
- WareHouseNo = locate.WareHouseNo,
- RoadwayNo = locate.RoadwayNo,
- AreaNo = locate.AreaNo,
- LocatNo = locate.LocatNo,
+ //WareHouseNo = locate.WareHouseNo,
+ //RoadwayNo = locate.RoadwayNo,
+ //AreaNo = locate.AreaNo,
+ //LocatNo = locate.LocatNo,
PalletNo = modelpb.PalletNo,
PalletNo2 = modelpb.PalletNo2,
PalletNo3 = modelpb.PalletNo3,
@@ -257,8 +257,8 @@
BackDate = DateTime.Now, //杩斿洖鏃堕棿
StartRoadway = "", // 璧峰宸烽亾
StartLocat = Strlocate,//璧峰浣嶇疆
- EndLocat = locateInfo.LocatNo,//鐩爣浣嶇疆
- EndRoadway = locateInfo.RoadwayNo, // 鐩爣宸烽亾
+ EndLocat = locate.LocatNo,//鐩爣浣嶇疆
+ EndRoadway = locate.RoadwayNo, // 鐩爣宸烽亾
PalletNo = palletNo,//鎵樼洏鐮�
IsSend = 1,//鏄惁鍙啀娆′笅鍙�
IsCancel = 1,//鏄惁鍙彇娑�
@@ -320,7 +320,7 @@
#endregion
- return null;
+ return comDto;
}
catch (Exception e)
{
@@ -720,18 +720,18 @@
//鎵樼洏搴撳瓨淇℃伅
var stockDetail = Db.Queryable<DataStockDetail>().Where(m => m.PalletNo == palletNo).ToList();
//楠岃瘉鐗╂枡鏄惁鏈夋垚鍝�
- foreach (var item in stockDetail)
- {
- var skuItem = skuList.First(m => m.SkuNo == item.SkuNo);
- if (skuItem.SkuNo == "100099")
- {
- continue;
- }
- if (skuItem.Type != "2")
- {
- throw new Exception("鎵樼洏涓婃湁涓嶆槸鎴愬搧鐨勭墿鏂�");
- }
- }
+ //foreach (var item in stockDetail)
+ //{
+ // var skuItem = skuList.First(m => m.SkuNo == item.SkuNo);
+ // if (skuItem.SkuNo == "100099")
+ // {
+ // continue;
+ // }
+ // if (skuItem.Type != "2")
+ // {
+ // throw new Exception("鎵樼洏涓婃湁涓嶆槸鎴愬搧鐨勭墿鏂�");
+ // }
+ //}
var upShelfOld = Db.Queryable<BllPalletUpShelf>().First(m => m.IsDel == "0" && m.PalletNo == palletNo && (m.Status == "0" || m.Status == "1"));
if (upShelfOld != null) //姝ｅ父鍏ュ簱
@@ -1027,18 +1027,18 @@
var oldTaskNo = ""; //鏃т换鍔″彿
var stockDetail = Db.Queryable<DataStockDetail>().Where(m => m.PalletNo == palletNo).ToList();
//楠岃瘉鐗╂枡鏄惁鏈夋垚鍝�
- foreach (var item in stockDetail)
- {
- var skuItem = skuList.First(m => m.SkuNo == item.SkuNo);
- if (skuItem.SkuNo == "100099")
- {
- continue;
- }
- if (skuItem.Type != "2")
- {
- throw new Exception("鎵樼洏涓婃湁涓嶆槸鎴愬搧鐨勭墿鏂�");
- }
- }
+ //foreach (var item in stockDetail)
+ //{
+ // var skuItem = skuList.First(m => m.SkuNo == item.SkuNo);
+ // if (skuItem.SkuNo == "100099")
+ // {
+ // continue;
+ // }
+ // if (skuItem.Type != "2")
+ // {
+ // throw new Exception("鎵樼洏涓婃湁涓嶆槸鎴愬搧鐨勭墿鏂�");
+ // }
+ //}
var upShelfOld = Db.Queryable<BllPalletUpShelf>().First(m => m.IsDel == "0" && m.PalletNo == palletNo && (m.Status == "0" || m.Status == "1"));
--
Gitblit v1.8.0