From 2920728d7908da2ee196f3af8b3d1c635696e9a1 Mon Sep 17 00:00:00 2001
From: zwc <526854230@qq.com>
Date: 星期三, 15 一月 2025 15:47:15 +0800
Subject: [PATCH] 修改问题
---
Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs | 79 ++++++++++++++++++++++++++++++++++++++-
1 files changed, 77 insertions(+), 2 deletions(-)
diff --git a/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs b/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
index 0391053..90d2952 100644
--- a/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
+++ b/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
@@ -410,6 +410,20 @@
if (model.Type == "0")//鎴愬搧鍏ュ簱鍗曚笅鍙慦CS淇℃伅
{
+ //璁＄畻鍑烘�荤鏁�
+ var packmodel = Db.Queryable<SysPackag>().First(w=>w.PackagNo == detailModel.SkuNo);
+ int xqty = 0;
+ if (packmodel.L1Name == "绠�") {
+ xqty = (int)detailModel.Qty;
+ }
+ if (packmodel.L2Name == "绠�")
+ {
+ xqty = (int)(detailModel.Qty / packmodel.L2Num);
+ }
+ if (packmodel.L3Name == "绠�")
+ {
+ xqty = (int)(detailModel.Qty/ packmodel.L2Num / packmodel.L3Num);
+ }
addOder.Add(new ResponseOrderTaskModel()
{
OrderNo = model.ASNNo,
@@ -417,7 +431,7 @@
SkuNo = detailModel.SkuNo,
SkuName = detailModel.SkuName,
BoxType = detailModel.Standard,
- Qty = (int)detailModel.Qty,
+ Qty = xqty,
TaskType = 0
});
}
@@ -1009,10 +1023,11 @@
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
- public HttpReturnModel HttpCreateAsn(AsnInfo model)
+ public HttpReturnModel HttpCreateAsn(AsnInfo model, string url)
{
try
{
+ var addOder = new List<ResponseOrderTaskModel>();
var resultModel = new HttpReturnModel() { Success = "-1", Message = "" };
if (string.IsNullOrEmpty(model.AsnType))
{
@@ -1105,7 +1120,37 @@
};
detailModels.Add(detailModel);
+
+ if (model.AsnType == "0")//鎴愬搧鍏ュ簱鍗曚笅鍙慦CS淇℃伅
+ {
+ //璁＄畻鍑烘�荤鏁�
+ var packmodel = Db.Queryable<SysPackag>().First(w => w.PackagNo == detailModel.SkuNo);
+ int xqty = 0;
+ if (packmodel.L1Name == "绠�")
+ {
+ xqty = (int)detailModel.Qty;
+ }
+ if (packmodel.L2Name == "绠�")
+ {
+ xqty = (int)(detailModel.Qty / packmodel.L2Num);
+ }
+ if (packmodel.L3Name == "绠�")
+ {
+ xqty = (int)(detailModel.Qty / packmodel.L2Num / packmodel.L3Num);
+ }
+ addOder.Add(new ResponseOrderTaskModel()
+ {
+ OrderNo = asnNo,
+ LotNo = asnDetailModel.LotNo,
+ SkuNo = asnDetailModel.SkuNo,
+ SkuName = skuModel.SkuName,
+ BoxType = skuModel.Standard,
+ Qty = (int)asnDetailModel.Qty,
+ TaskType = 0
+ });
+ }
}
+
Db.BeginTran();
// 鎻掑叆鍏ュ簱鍗曟�昏〃
@@ -1115,6 +1160,36 @@
Db.Insertable(detailModels).ExecuteCommand();
Db.CommitTran();
+
+ if (addOder.Count > 0)
+ {
+ // 姝ｅ紡杩愯绋嬪簭鏀惧紑
+ 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");
+
+ //瑙ｆ瀽杩斿洖鏁版嵁
+ var wcsModel = JsonConvert.DeserializeObject<WcsModel>(response);
+ if (wcsModel.StatusCode == 0)
+ {
+
+ }
+ if (wcsModel.StatusCode == -1)
+ {
+ throw new Exception($"涓嬪彂WCS澶辫触锛歿wcsModel.Msg}");
+ }
+ }
+ catch (Exception ex)
+ {
+ throw new Exception(ex.Message);
+ }
+ }
+
resultModel.Success = "0";
resultModel.Message = "鎴愬姛";
return resultModel;
--
Gitblit v1.8.0