From 9b7acc479dc747c8c78eae84d3f83e1347aa478d Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期二, 04 十一月 2025 12:53:04 +0800
Subject: [PATCH] 优化
---
新建文件夹/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/InventoryServices.cs | 55 +++++++++++--------------------------------------------
新建文件夹/WIDESEA_WMSServer/WIDESEA_DTO/SquareCabin/OrderDto.cs | 1 +
2 files changed, 12 insertions(+), 44 deletions(-)
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_DTO/SquareCabin/OrderDto.cs" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_DTO/SquareCabin/OrderDto.cs"
index ffe4d07..cc3613f 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_DTO/SquareCabin/OrderDto.cs"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_DTO/SquareCabin/OrderDto.cs"
@@ -312,6 +312,7 @@
/// 搴撳瓨鏁伴噺(涓氬姟鏁伴噺)
/// </summary>
public decimal business_qty { get; set; }
+ public decimal actual_qty { get; set; }
/// <summary>
/// <summary>
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/InventoryServices.cs" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/InventoryServices.cs"
index ec8fbe9..00f08fa 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/InventoryServices.cs"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/InventoryServices.cs"
@@ -44,59 +44,26 @@
/// <param name="batch_num">鎵瑰彿</param>
/// <returns></returns>
/// <exception cref="NotImplementedException"></exception>
- public WebResponseContent GetInventoryList(int[] key)
+ public WebResponseContent GetInventoryList(int[] keys)
{
var responseContent = new WebResponseContent();
try
{
-
- List<Dt_Inventory_Batch> UpdateBatches = new List<Dt_Inventory_Batch>();
//鏍规嵁id鏌ヨ搴撳瓨鎵规淇℃伅琛紝鑾峰彇鍒颁粬浠殑鍟嗗搧缂栫爜鍜屾壒娆″彿
- var inventoryBatches = _inventoryBatchServices.Repository.QueryData(); //鏌ュ叏閮�
+ var inventoryBatches = _inventoryBatchServices.Repository.QueryData(x => keys.Contains(x.Id)); //鏌ュ叏閮�
- var inventory = inventoryBatches.Where(x => key.Contains(x.Id)).Select(x => new { x.MaterielCode, x.BatchNo }).ToList();
- if (inventory.Count < 1)
+ var url = "http://121.37.118.63:80/GYZ2/95fck/repositoryInfo";
+ foreach (var item in inventoryBatches)
{
- return WebResponseContent.Instance.Error("娌℃湁鎵惧埌搴撳瓨鎵规淇℃伅");
- }
-
- var requestData = inventory.Select(x => new { goods_no = x.MaterielCode, batch_num = x.BatchNo }).Distinct().ToList();
-
- foreach (var item in requestData)
- {
-
- var url = "http://127.0.0.1:4523/m2/5660322-5340849-default/370999979?apifoxApiId=370999979";
- var result = HttpHelper.Post(url, new { item.goods_no, item.batch_num }.ToJsonString());
+ var result = HttpHelper.Post(url, new { goods_no = item.MaterielCode, batch_num = item.BatchNo }.ToJsonString());
var response = JsonConvert.DeserializeObject<UpstreamResponse<InventoryInfo>>(result);
-
- if (response.resultCode != "0")
- {
- //return responseContent.Error(response.resultMsg ?? "涓婃父鎺ュ彛杩斿洖澶辫触");
- _infoService.AddMessageInfo(MessageGroupByEnum.SynchronismAlarm, "Erp鍚屾澶辫触", "涓婃父鎺ュ彛杩斿洖澶辫触");
- continue;
-
- }
-
- if (response.data == null || !response.data.Any())
- {
- return responseContent.OK("鏃犳柊搴撳瓨鏁版嵁");
- }
- var materialCodes = response.data.Select(x => x.goods_no).Distinct().ToList();
- var batchNos = response.data.Select(x => x.batch_num).Distinct().ToList();
- foreach (var inventoryInfo in response.data)
- {
- //// 浣跨敤 FirstOrDefault 閬垮厤鎵句笉鍒拌褰曟椂鎶涘嚭寮傚父
- var Inver = inventoryBatches.FirstOrDefault(x => x.MaterielCode == item.goods_no && x.BatchNo == item.batch_num);
-
- if (Inver != null)
- {
- Inver.ERPStockQuantity = inventoryInfo.business_qty;
- UpdateBatches.Add(Inver);
- }
- }
+ if (response == null) continue;
+ var data = response.data.FirstOrDefault();
+ if (data != null)
+ item.ERPStockQuantity = data.business_qty;
}
- _inventoryBatchServices.UpdateData(UpdateBatches);
+ _inventoryBatchServices.UpdateData(inventoryBatches);
return responseContent.OK("搴撳瓨淇℃伅鍚屾瀹屾垚");
}
@@ -105,7 +72,7 @@
return responseContent.Error("鍚屾澶辫触: " + ex.Message);
}
}
-
+
public ApiResponse<Dt_InventoryInfo> OrderFeedback(EdiOrderCallbackRequest request)
--
Gitblit v1.9.3