From 2ae5aa151f7b40a082e34aa7ed22b4b64edd1d3c Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期三, 11 六月 2025 17:13:56 +0800
Subject: [PATCH] 修改堆垛机通讯协议及交互逻辑
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Service/InboundOrderService.cs | 25 ++++++++++++++++++++++---
1 files changed, 22 insertions(+), 3 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Service/InboundOrderService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Service/InboundOrderService.cs"
index 9fd4301..5bca9a1 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Service/InboundOrderService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Service/InboundOrderService.cs"
@@ -58,6 +58,7 @@
Dt_StockInfo? stockInfo = _stockService.StockInfoService.GetStockByPalletCode(materielGroupDTO.PalletCode);
+ //if (stockInfo != null) throw new Exception($"鎵樼洏鍙枫�恵materielGroupDTO.PalletCode}銆戝凡瀛樺湪");
(bool, string, object?) result = CheckMaterielGroupParam(materielGroupDTO, matSerialNumberDTOs, materielInfos, materielCodes, inboundOrder, stockInfo);
if (!result.Item1) return content = WebResponseContent.Instance.Error(result.Item2);
@@ -71,7 +72,8 @@
List<Dt_StockInfoDetail> stockInfoDetails = _mapper.Map<List<Dt_StockInfoDetail>>(matSerialNumberDTOs);
stockInfoDetails.ForEach(x =>
{
- x.Status = 0;
+ //x.Status = 0;
+ x.Status = StockStatusEmun.缁勭洏鏆傚瓨.ObjToInt();
x.OrderNo = inboundOrder.OrderNo;
x.MaterielName = materielInfos.FirstOrDefault(v => v.MaterielCode == x.MaterielCode)?.MaterielName ?? "";
x.StockId = stockInfo.Id != 0 ? stockInfo.Id : 0;
@@ -87,12 +89,23 @@
for (int i = 0; i < materielCodes.Count; i++)
{
decimal stockQuantity = stockInfoDetails.Where(x => x.MaterielCode == materielCodes[i]).Sum(x => x.StockQuantity);
- inboundOrderDetails.AddRange(_inboundOrderDetailService.UpdateReceiptQuantity(inboundOrder.Details.Where(x => x.MaterielCode == materielCodes[i]).ToList(), stockQuantity));
+ List<Dt_InboundOrderDetail> orderDetails = inboundOrder.Details.Where(x => x.MaterielCode == materielCodes[i]).ToList();
+ if (orderDetails.Count > 0)
+ {
+ var OrderQuantity = orderDetails.Sum(x => x.OrderQuantity);
+ if (OrderQuantity < stockQuantity) throw new Exception("缁勭洏鏁伴噺瓒呭嚭鍗曟嵁鏁伴噺");
+ inboundOrderDetails.AddRange(_inboundOrderDetailService.UpdateReceiptQuantity(orderDetails, stockQuantity));
+ }
}
List<int> updateDetailIds = inboundOrderDetails.Select(x => x.Id).ToList();
if (inboundOrderDetails.FirstOrDefault(x => x.OrderDetailStatus != OrderDetailStatusEnum.Over.ObjToInt()) == null && inboundOrder.Details.FirstOrDefault(x => !updateDetailIds.Contains(x.Id) && x.OrderDetailStatus != OrderDetailStatusEnum.Over.ObjToInt()) == null)
{
inboundOrder.OrderStatus = InboundStatusEnum.鍏ュ簱瀹屾垚.ObjToInt();
+ BaseDal.DeleteAndMoveIntoHty(inboundOrder, App.User.UserId == 0 ? OperateType.鑷姩瀹屾垚 : OperateType.浜哄伐瀹屾垚);
+ for (int i = 0; i < inboundOrderDetails.Count; i++)
+ {
+ _inboundOrderDetailService.Repository.DeleteAndMoveIntoHty(inboundOrderDetails[i], App.User.UserId == 0 ? OperateType.鑷姩瀹屾垚 : OperateType.浜哄伐瀹屾垚);
+ }
}
else if (inboundOrder.OrderStatus == InboundStatusEnum.鏈紑濮�.ObjToInt())
{
@@ -103,7 +116,7 @@
}
catch (Exception ex)
{
- content = WebResponseContent.Instance.Error(ex.Message);
+ content.Error(ex.Message);
}
finally
{
@@ -214,6 +227,12 @@
return (true, "鎴愬姛", materielGroupDTO);
}
+ /// <summary>
+ /// PDA鍒嗛〉鏌ヨ鏁版嵁
+ /// </summary>
+ /// <param name="pageNo">椤电爜</param>
+ /// <param name="orderNo">璁㈠崟鍙�</param>
+ /// <returns></returns>
public WebResponseContent QueryOrderInfo(int pageNo, string orderNo)
{
if (string.IsNullOrEmpty(orderNo))
--
Gitblit v1.9.3