From 6aa034c0c53cc7d49302dea596864fc61c705dda Mon Sep 17 00:00:00 2001
From: chengsc <Demo@DESKTOP-CPA90BF>
Date: 星期五, 01 十一月 2024 18:56:43 +0800
Subject: [PATCH] 修改问题
---
Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs | 74 ++++++++++++++++++++++++++++++++-----
1 files changed, 64 insertions(+), 10 deletions(-)
diff --git a/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
index 47e501b..7519147 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
@@ -1869,19 +1869,73 @@
////绋嬪簭姝ｅ紡鍙戝竷鍚庢斁寮�
//var time1 = DateTime.Now;//鍙戦�佹椂闂� .ToString("yyyy-MM-dd HH:mm:ss")
- //var response = HttpHelper.DoPost(url, jsonData, "鑾峰彇绠辩爜淇℃伅", "璧嬬爜");
+ ////var response = HttpHelper.DoGet(url, jsonData, "鑾峰彇绠辩爜淇℃伅", "璧嬬爜");
//var time2 = DateTime.Now;//杩斿洖鏃堕棿 .ToString("yyyy-MM-dd HH:mm:ss")
////瑙ｆ瀽杩斿洖鏁版嵁
- //var fuMaModel = JsonConvert.DeserializeObject<FuMaModel>(response);
- //if (fuMaModel.Success == 0)
+ //var fuMaModel = JsonConvert.DeserializeObject<FuMaGetBoxModel>(response);
+ //if (fuMaModel.IsSuccess)
//{
+ // //璧嬬爜杩斿洖淇℃伅鎴愬姛鐘舵��
+ // if (fuMaModel.Product == null || fuMaModel.Barcodes.Count == 0)
+ // {
+ // throw new Exception("浜у搧淇℃伅鎴栫鏀俊鎭负绌�");
+ // }
+ // foreach (var item in fuMaModel.Barcodes)
+ // {
+ // if (item.Barcode != boxNo)
+ // {
+ // throw new Exception("鑾峰彇淇℃伅涓嶄竴鑷�");
+ // }
+
+ // var sku = Db.Queryable<SysMaterials>().First(m => m.IsDel == "0" && m.SkuNo == fuMaModel.Product.ProductCode);
+ // if (sku == null)
+ // {
+ // throw new Exception("鏈煡璇㈠埌绠辩爜涓殑鐗╂枡淇℃伅");
+ // }
+ // //var boxInfo = new BllBoxInfo()
+ // //{
+ // // ASNNo = "",
+ // // //ASNDetailNo = 0,
+ // // OrderCode = "",
+ // // //BindNo = 0,
+ // // BoxNo = item.BoxNo,
+ // // BoxNo2 = item.BoxNo2,
+ // // BoxNo3 = item.Barcode,
+ // // PalletNo = "",
+ // // Qty = item.Qty,
+ // // FullQty = item.FullQty,
+ // // Status = "0",
+ // // SkuNo = item.SkuNo,
+ // // SkuName = sku.SkuName,
+ // // LotNo = item.LotNo,
+ // // LotText = item.LotText,
+ // // SupplierLot = item.SupplierLot,
+ // // ProductionTime = item.ProductionTime,
+ // // ExpirationTime = item.ExpirationTime,
+ // // //CompleteTime = comTime,
+ // // InspectMark = item.InspectMark,
+ // // BitBoxMark = item.BitBoxMark,
+ // // InspectStatus = item.InspectStatus,
+ // // Origin = "璧嬬爜",
+ // // Standard = item.Standard,
+ // // PackageStandard = item.PackageStandard,
+ // // StoreTime = item.StoreTime,
+ // // QtyOrd = item.QtyOrd,
+ // // QtyCount = item.QtyCount,
+ // // CreateUser = 0,
+ // // CreateTime = comTime,
+ // //};
+ // //list.Add(boxInfo);
+ // }
+ // Db.Insertable(list).ExecuteCommand();
//}
- //if (fuMaModel.Success == -1)
+ //else
//{
+ // //璧嬬爜杩斿洖淇℃伅澶辫触鐘舵��
// throw new Exception($"璧嬬爜绯荤粺杩斿洖鐘舵�佸紓甯革細{fuMaModel.Message}");
- //}
+ //}
#endregion
}
@@ -1896,7 +1950,7 @@
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
- public List<BoxInfoDto> GetBindBoxInfos(BoxInfoVm model)
+ public List<BoxInfoDto> GetBindBoxInfos(BoxInfoVm model, string url)
{
try
{
@@ -1916,7 +1970,7 @@
var count = Db.Queryable<BllBoxInfo>().Count(m => m.IsDel == "0" && m.Status == "0" && m.BoxNo == model.BoxNo);
if (count == 0)
{
- GetBoxInfoByFuMa(model.BoxNo, ""); //浠庤祴鐮佺郴缁熻幏鍙栫鐮佷俊鎭�
+ GetBoxInfoByFuMa(model.BoxNo, url); //浠庤祴鐮佺郴缁熻幏鍙栫鐮佷俊鎭�
}
}
}
@@ -1953,7 +2007,7 @@
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
- public List<BoxInfoDto> GetBindBoxInfo2s(BoxInfoVm model)
+ public List<BoxInfoDto> GetBindBoxInfo2s(BoxInfoVm model, string url)
{
try
{
@@ -2019,8 +2073,8 @@
}
else
{
- // GetBoxInfoByFuMa(model.BoxNo3, ""); //浠庤祴鐮佺郴缁熻幏鍙栫鐮佷俊鎭�
- }
+ GetBoxInfoByFuMa(model.BoxNo3, url); //浠庤祴鐮佺郴缁熻幏鍙栫鐮佷俊鎭�
+ }
}
}
}
--
Gitblit v1.8.0