From 2f5967638873799cab3195ed44c422cfbb81d710 Mon Sep 17 00:00:00 2001
From: pan <antony1029@163.com>
Date: 星期二, 02 十二月 2025 14:16:08 +0800
Subject: [PATCH] 提交
---
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_AllocateService/AllocateService.cs | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 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_AllocateService/AllocateService.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_AllocateService/AllocateService.cs"
index 1908f29..dabfebd 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_AllocateService/AllocateService.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_AllocateService/AllocateService.cs"
@@ -326,15 +326,15 @@
{
var distinctDetails = allocateOrder.Details
- .GroupBy(d => string.IsNullOrEmpty(d.Barcode)
- ? $"{d.MaterielCode}_{d.BatchNo}_{d.SupplyCode}_{d.WarehouseCode}"
- : d.Barcode)
- .Select(g => new
- {
- Detail = g.First(),
- //姹囨�诲垎缁勫唴鐨勬暟閲�
- Qty = g.Sum(x => x.BarcodeQty ?? x.OrderQuantity)
- }).ToList();
+ .GroupBy(d => string.IsNullOrEmpty(d.Barcode)
+ ? $"{d.MaterielCode}_{d.BatchNo}_{d.SupplyCode}_{d.WarehouseCode}"
+ : d.Barcode)
+ .Select(g => new
+ {
+ Detail = g.First(),
+ //姹囨�诲垎缁勫唴鐨勬暟閲�
+ Qty = g.Sum(x => x.BarcodeQty ?? x.OrderQuantity)
+ }).ToList();
return new Dt_OutboundOrder()
{
@@ -357,8 +357,8 @@
MaterielName = "",
BatchNo = item.Detail.BatchNo,
OrderQuantity = item.Detail.OrderQuantity,
- BarcodeQty = (decimal)item.Detail.BarcodeQty,
- BarcodeUnit = item.Detail.BarcodeUnit,
+ BarcodeQty = item.Detail.BarcodeQty??0,
+ BarcodeUnit = item.Detail.BarcodeUnit??"",
LockQuantity = 0,
lineNo = item.Detail.LineNo,
OverOutQuantity = 0,
--
Gitblit v1.9.3