From 991673416fdeb3a4be2837bfd70ba6284ad314d5 Mon Sep 17 00:00:00 2001
From: pan <antony1029@163.com>
Date: 星期二, 02 十二月 2025 22:38:05 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu
---
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs | 74 ++++++++++++++++++++++++++++++------
1 files changed, 61 insertions(+), 13 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_TaskInfoService/TaskService.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_TaskInfoService/TaskService.cs"
index 76d06f2..05dfb19 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_TaskInfoService/TaskService.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_TaskInfoService/TaskService.cs"
@@ -18,6 +18,7 @@
using AutoMapper;
using Dm.filter;
using MailKit.Search;
+using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Logging;
using Newtonsoft.Json;
using Org.BouncyCastle.Asn1.Ocsp;
@@ -830,17 +831,17 @@
int newStatus = orderDetail.OrderDetailStatus;
// 鏍规嵁瀹為檯鏋氫妇鍊艰皟鏁�
- // 1. 妫�鏌ユ槸鍚﹀凡瀹屾垚锛堝凡鍑哄簱鏁伴噺 >= 闇�姹傛暟閲忥級
+ // 妫�鏌ユ槸鍚﹀凡瀹屾垚锛堝凡鍑哄簱鏁伴噺 >= 闇�姹傛暟閲忥級
if (orderDetail.OverOutQuantity >= orderDetail.NeedOutQuantity)
{
newStatus = (int)OrderDetailStatusEnum.Over; // 宸插畬鎴�
}
- // 2. 妫�鏌ユ槸鍚︽湁閮ㄥ垎鍑哄簱鎴栨湁閿佸畾鏁伴噺
+ // 妫�鏌ユ槸鍚︽湁閮ㄥ垎鍑哄簱鎴栨湁閿佸畾鏁伴噺
else if (orderDetail.OverOutQuantity > 0 || orderDetail.LockQuantity > 0)
{
newStatus = (int)OrderDetailStatusEnum.Outbound; // 閮ㄥ垎瀹屾垚/杩涜涓�
}
- // 3. 鍚﹀垯涓烘柊璁㈠崟
+ // 鍚﹀垯涓烘柊璁㈠崟
else
{
newStatus = (int)OrderDetailStatusEnum.New; // 鏂板缓
@@ -1054,22 +1055,25 @@
};
foreach (var item in detailLocks)
{
- var barModel = new BarcodeInfo
+ if (item.PickedQty > 0)
{
Barcode = item.CurrentBarcode,
SupplyCode = item.SupplyCode,
BatchNo = item.BatchNo,
- Unit = item.BarcodeUnit,
+ Unit = detail.BarcodeUnit,
Qty = 0
};
// 鍗曚綅涓嶄竴鑷存椂杞崲
- if (item.BarcodeUnit != item.Unit)
+ if (detail.BarcodeUnit != detail.Unit)
{
- var convertResult = await _materialUnitService.ConvertAsync(item.MaterielCode, item.PickedQty, item.Unit, item.BarcodeUnit);
+ var convertResult = await _materialUnitService.ConvertAsync(item.MaterielCode, item.PickedQty, detail.Unit, detail.BarcodeUnit);
barModel.Unit = convertResult.Unit;
barModel.Qty = convertResult.Quantity;
}
-
+ else
+ {
+ barModel.Qty = item.PickedQty;
+ }
detailModel.Qty += barModel.Qty;
detailModel.Barcodes.Add(barModel);
}
@@ -1135,25 +1139,69 @@
};
foreach (var item in detailLocks)
{
- var barModel = new WIDESEA_DTO.Outbound.BarcodesModel
+ if (item.PickedQty > 0)
{
+<<<<<<< .mine
+ var barModel = new WIDESEA_DTO.Outbound.BarcodesModel
+ {
+ barcode = item.CurrentBarcode,
+ supplyCode = item.SupplyCode,
+ batchNo = item.BatchNo,
+ unit = item.BarcodeUnit,
+ qty = item.PickedQty
+ };
+ // 鍗曚綅涓嶄竴鑷存椂杞崲
+ if (item.BarcodeUnit != item.Unit)
+ {
+ var convertResult = await _materialUnitService.ConvertAsync(item.MaterielCode, item.PickedQty, item.Unit, item.BarcodeUnit);
+ barModel.unit = convertResult.Unit;
+ barModel.qty = convertResult.Quantity;
+ }
+
+ detailModel.qty += barModel.qty;
+ detailModel.currentDeliveryQty += barModel.qty;
+ detailModel.barcodes.Add(barModel);
+=======
barcode = item.CurrentBarcode,
supplyCode = item.SupplyCode,
batchNo = item.BatchNo,
- unit = item.BarcodeUnit,
+ unit = detail.BarcodeUnit,
qty = item.PickedQty
};
// 鍗曚綅涓嶄竴鑷存椂杞崲
- if (item.BarcodeUnit != item.Unit)
+ if (detail.BarcodeUnit != detail.Unit)
{
- var convertResult = await _materialUnitService.ConvertAsync(item.MaterielCode, item.PickedQty, item.Unit, item.BarcodeUnit);
+ var convertResult = await _materialUnitService.ConvertAsync(item.MaterielCode, item.PickedQty, detail.Unit, detail.BarcodeUnit);
barModel.unit = convertResult.Unit;
barModel.qty = convertResult.Quantity;
+
+
+
+
+
+
+
+>>>>>>> .theirs
+ }
+<<<<<<< .mine
+
+
+
+
+
+
+
+
+=======
+ else
+ {
+ barModel.qty = item.PickedQty;
}
- detailModel.qty += barModel.qty;
+ detailModel.qty += barModel.qty;
detailModel.currentDeliveryQty += barModel.qty;
detailModel.barcodes.Add(barModel);
+>>>>>>> .theirs
}
feedmodel.details.Add(detailModel);
}
--
Gitblit v1.9.3