From d57a9111a743c8979119d12ba5c10a48d81b15ce Mon Sep 17 00:00:00 2001
From: heshaofeng <heshaofeng@hnkhzn.com>
Date: 星期四, 04 十二月 2025 10:03:54 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu
---
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundPickingService.cs | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundPickingService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundPickingService.cs"
index 341570f..e8415a6 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundPickingService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundPickingService.cs"
@@ -10,6 +10,7 @@
using System.Text;
using System.Text.Json;
using System.Threading.Tasks;
+using WIDESEA_BasicService;
using WIDESEA_Common.CommonEnum;
using WIDESEA_Common.LocationEnum;
using WIDESEA_Common.OrderEnum;
@@ -2746,7 +2747,7 @@
StockId = 0,
OrderQuantity = outboundOrderDetail.OrderQuantity,
AssignQuantity = outboundOrderDetail.OverOutQuantity,
- PickedQty = 0,
+ PickedQty = outboundOrderDetail.NoStockOutQty,
LocationCode = "绌�",
PalletCode = "绌�",
TaskNum = 0,
@@ -2838,6 +2839,9 @@
.Where(it => it.OrderId == inboundOrder.Id).ExecuteCommand();
}
//鍑哄簱鍥炰紶MES
+
+ var documentNo = UniqueValueGenerator.Generate();
+
var outfeedmodel = new FeedbackOutboundRequestModel
{
reqCode = Guid.NewGuid().ToString(),
@@ -2847,7 +2851,7 @@
operationType = 1,
Operator = App.User.UserName,
orderNo = outboundOrder.UpperOrderNo,
- documentsNO = outboundOrder.OrderNo,
+ documentsNO = documentNo,
status = outboundOrder.OrderStatus,
details = new List<FeedbackOutboundDetailsModel>()
};
@@ -2879,9 +2883,9 @@
qty = lockInfo.PickedQty
}).ToList()
}).ToList();
- feedmodel.details.AddRange(groupdata);
+ outfeedmodel.details.AddRange(groupdata);
}
- var result = await _invokeMESService.FeedbackOutbound(feedmodel);
+ var result = await _invokeMESService.FeedbackOutbound(outfeedmodel);
if (result != null && result.code == 200)
{
await _outboundOrderDetailService.Db.Updateable<Dt_OutboundOrderDetail>()
@@ -2973,10 +2977,6 @@
if (dborder != null && dborder.SignSeq == 0)
{
return content.Error("鍙湁鎷垮埌閲嶆缁撴灉鎵嶈兘鍏ュ簱锛�");
- }
- else
- {
- return content.Error("娌℃湁鎵惧埌閲嶆鍗曟嵁鏁版嵁銆�");
}
}
// Dt_InboundOrder inboundOrder = GetInboundOrder(materielGroupDTO.OrderNo);
--
Gitblit v1.9.3