From d07f25c163706ac46a83bd2c63db1e3c52715222 Mon Sep 17 00:00:00 2001
From: zhaowc <526854230@qq.com>
Date: 星期四, 27 三月 2025 15:54:25 +0800
Subject: [PATCH] 解决问题
---
Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs b/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
index d163829..e8d8a3c 100644
--- a/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
+++ b/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
@@ -156,6 +156,7 @@
data.ProductionTime = boxInfo.ProductionTime!= null ? ((DateTime)boxInfo.ProductionTime).ToString("yyyy-MM-dd"):"";
data.ExpirationTime = boxInfo.ExpirationTime != null ? ((DateTime)boxInfo.ExpirationTime).ToString("yyyy-MM-dd") : "";
data.StoreTime = boxInfo.StoreTime != null ? ((DateTime)boxInfo.StoreTime).ToString("yyyy-MM-dd") : "";
+
}
}
}
@@ -163,6 +164,7 @@
var labelQty = Db.Queryable<BllBoxInfo>().Where(m => m.IsDel == "0" && m.ASNDetailNo == id).Sum(m => m.Qty);
var qty = detail.Qty - labelQty;
data.Qty = qty.ToString();
+ data.SupplierLot = detail.SupplierLot;
return data;
}
catch (Exception e)
@@ -213,7 +215,7 @@
break;
case "6"://浠ｅ偍鍏ュ簱
skuType = "(0,1,2,3,4)";
- IsPack = 2; //涓嶈创
+ //IsPack = 2; //涓嶈创
break;
case "7"://瀵勫瓨鍏ュ簱
//skuType = "(3)";
@@ -1071,6 +1073,7 @@
CustomerNo = model.Customer,
CustomerName = custname,
OrderCode = model.OrderCode,
+ Status = "0",
};
// 鍏ュ簱鏄庣粏琛ㄤ俊鎭�
@@ -1113,10 +1116,17 @@
LotNo = asnDetailModel.LotNo,
LotText = "",
Qty = (decimal)asnDetailModel.Qty,
- PackagNo = asnDetailModel.PackagNo,
+ FactQty = 0,
+ CompleteQty = 0,
+ Price = 0,
+ Money = 0,
+ IsBale = "",
+ IsBelt = "",
+ PackagNo = skuModel.PackagNo,
SupplierLot = asnDetailModel.SupplierLot,
Status = "0",
CreateUser = 0
+
};
detailModels.Add(detailModel);
@@ -1236,6 +1246,10 @@
{
throw new Exception("澶嶆牳澶辫触锛屽鏍镐汉鍛樺拰鍏抽棴璁㈠崟浜哄憳涓嶈兘鐩稿悓锛�");
}
+ if (date.Id == notice.CreateUser)
+ {
+ throw new Exception("澶嶆牳澶辫触锛屽鏍镐汉鍛樺拰鍒涘缓璁㈠崟浜哄憳涓嶈兘鐩稿悓锛�");
+ }
//鍗曟嵁绫诲瀷鏄� 鎴愬搧鍏ュ簱鎴栭噰璐叆搴� 鍒ゆ柇鍏ュ簱鐗╂枡鏄惁鍚堟牸
if (notice.Type == "0" || notice.Type == "1")
{
@@ -1269,7 +1283,7 @@
};
#region 閫氳繃鎺ュ彛鍙戦�佽嚦erp 鎴� mes
- //绯荤粺瀵规帴鍚庢斁寮�
+ ////绯荤粺瀵规帴鍚庢斁寮�
var jsonData = JsonConvert.SerializeObject(asnInfo);
var mesList = new List<string>() { "0", "4" }; //0 鎴愬搧鍏ュ簱 4浣欐枡閫�鍥炲叆搴�
var erpList = new List<string>() { "1", "2", "3" }; //1 閲囪喘鍏ュ簱 2涓棿鍝佸叆搴� 3 閫�璐у叆搴�
@@ -1286,7 +1300,7 @@
var mesData = new FinishAsnModel()
{
no = asnInfo.OrderCode,
- qty = asnInfo.AsnDetails.Sum(m=>m.Qty)
+ qty = asnInfo.AsnDetails.Sum(m => m.Qty)
};
jsonData = JsonConvert.SerializeObject(mesData);
//璋冪敤鎺ュ彛
@@ -1309,7 +1323,7 @@
}
}
-
+
#endregion
notice.Status = "4";
--
Gitblit v1.8.0