From cd259233c8d14b27e745a7657ad46549335fbca9 Mon Sep 17 00:00:00 2001
From: z8018 <1282578289@qq.com>
Date: 星期五, 19 十二月 2025 20:21:58 +0800
Subject: [PATCH] Merge branch 'htq20251215' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu into htq20251215
---
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Allocate/AllocateOrderController.cs | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 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_WMSServer/Controllers/Allocate/AllocateOrderController.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_WMSServer/Controllers/Allocate/AllocateOrderController.cs"
index 5578ed4..0920a53 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_WMSServer/Controllers/Allocate/AllocateOrderController.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_WMSServer/Controllers/Allocate/AllocateOrderController.cs"
@@ -51,16 +51,20 @@
//allocateOrder.OrderType = businessType == BusinessTypeEnum.鏅轰粨璋冨閮ㄤ粨搴� ? 215 : 115;
if (businessType == BusinessTypeEnum.鏅轰粨璋冨閮ㄤ粨搴�)
{
- allocateOrder.OrderType = 115;
+ allocateOrder.OrderType = 215;
}
else if (businessType == BusinessTypeEnum.澶栭儴浠撳簱璋冩櫤浠�)
{
- allocateOrder.OrderType = 215;
+ allocateOrder.OrderType = 115;
+ }
+ else if (businessType == BusinessTypeEnum.鏅轰粨璋冩櫤浠�)
+ {
+ allocateOrder.OrderType = 117;
}
foreach (var detailDto in model.Details)
{
- if (businessType == BusinessTypeEnum.鏅轰粨璋冨閮ㄤ粨搴� && (detailDto.Barcodes == null || !detailDto.Barcodes.Any()))
+ if (businessType == BusinessTypeEnum.澶栭儴浠撳簱璋冩櫤浠� && (detailDto.Barcodes == null || !detailDto.Barcodes.Any()))
{
return WebResponseContent.Instance.Error($"鏉＄爜涓嶈兘涓虹┖");
}
@@ -81,7 +85,7 @@
BarcodeQty = barcodeDto.Qty,
BarcodeUnit = barcodeDto.Unit,
ValidDate = barcodeDto.validDate,
-
+ BoxSN = barcodeDto.BoxSN
};
allocateOrder.Details.Add(orderDetail);
}
@@ -94,7 +98,10 @@
MaterielCode = detailDto.MaterialCode,
LineNo = detailDto.LineNo,
OrderQuantity = detailDto.Qty,
- Unit = detailDto.Unit
+ Unit = detailDto.Unit,
+ BarcodeUnit =detailDto.Unit,
+ BarcodeQty=detailDto.Qty,
+
};
allocateOrder.Details.Add(orderDetail);
}
--
Gitblit v1.9.3