From f42e4c5c9f91d983ae2e87d3b6b600d1c8e54087 Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期一, 03 十一月 2025 15:07:34 +0800
Subject: [PATCH] 优化盘点
---
新建文件夹/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/DeliveryOrderServices.cs | 13 ++++++++-----
新建文件夹/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/CabinOrderServices.cs | 11 ++++++++---
新建文件夹/WIDESEA_WMSServer/WIDESEA_DTO/SquareCabin/TowcsDto.cs | 4 ++--
3 files changed, 18 insertions(+), 10 deletions(-)
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_DTO/SquareCabin/TowcsDto.cs" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_DTO/SquareCabin/TowcsDto.cs"
index de1a4e0..390f4d2 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_DTO/SquareCabin/TowcsDto.cs"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_DTO/SquareCabin/TowcsDto.cs"
@@ -326,8 +326,8 @@
{
public string customerCode { get; set; }
public string materialCode { get; set; }
- public string externalOrderNo { get; set; }
- public string orderNo { get; set; }
+ public string externalOrderNo { get; set; }//wms鍑哄簱鍗曞彿
+ public string orderNo { get; set; }//绔嬫柟浠�
public string orderType { get; set; }
public List<EdiOrderDetailDto> details { get; set; }
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/CabinOrderServices.cs" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/CabinOrderServices.cs"
index c4b01fb..826e505 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/CabinOrderServices.cs"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/CabinOrderServices.cs"
@@ -619,10 +619,15 @@
List<Dt_InventoryInfo> inventoryInfos = _InventoryInfos.Where(x => x.MaterielCode == inventory_Batch.MaterielCode && x.BatchNo == inventory_Batch.BatchNo).ToList();
//鑾峰彇绔嬪簱鐩樼偣宸紓鏁�
var inventoryLK = inventoryInfos.Where(x => x.WarehouseCode == WareCodeLK).First();
- var LkQty = Math.Abs(inventoryLK.SupplyQuantity);
+ //var LkQty = Math.Abs(inventoryLK.SupplyQuantity);
+ var LkQty = inventoryLK.SupplyQuantity;
+
//鑾峰彇澶т欢搴撶洏鐐瑰樊寮傛暟
var inventoryDJ = inventoryInfos.Where(x => x.WarehouseCode == WareCodeDJ).ToList();
- var DJQty = Math.Abs(inventoryDJ.Sum(x => x.SupplyQuantity));
+ //var DJQty = Math.Abs(inventoryDJ.Sum(x => x.SupplyQuantity));
+ var DJQty = inventoryDJ.Sum(x => x.SupplyQuantity);
+
+
if (LkQty + DJQty != Qty) throw new Exception($"銆恵order.order_no}銆戠墿鏂欑紪鍙枫�恵item.goods_no}銆戠墿鏂欐壒娆°�恵item.batch_num}銆戠殑鐗╂枡淇℃伅涓庣墿鏂欐壒娆′俊鎭洏鐩堟暟閲忎笉绗�");
if (LkQty == 0)//绔嬪簱鏃犲樊寮�
{
@@ -780,7 +785,7 @@
Details = order.details.Select(d => new Dt_CabinOrderDetail
{
Goods_no = d.goods_no,
- Order_qty = LkQty,
+ Order_qty =Math.Abs( LkQty),
Batch_num = d.batch_num,
Exp_date = d.exp_date,
Reservoirarea = WareCodeLK,
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/DeliveryOrderServices.cs" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/DeliveryOrderServices.cs"
index 396f697..f61e1a2 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/DeliveryOrderServices.cs"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/DeliveryOrderServices.cs"
@@ -617,11 +617,14 @@
List<Dt_InventoryInfo> inventoryInfos = _InventoryInfos.Where(x => x.MaterielCode == inventory_Batch.MaterielCode && x.BatchNo == inventory_Batch.BatchNo).ToList();
//鑾峰彇绔嬪簱鐩樼偣宸紓鏁�.銆傘�傘�傘�傘�傘�傘�傘�傘�傘�傘�傘��
var inventoryLK = inventoryInfos.Where(x => x.WarehouseCode == WareCodeLK).First();
- var LkQty = Math.Abs(inventoryLK.SupplyQuantity);
+ //var LkQty = Math.Abs(inventoryLK.SupplyQuantity);
+ var LkQty = inventoryLK.SupplyQuantity;
//鑾峰彇澶т欢搴撶洏鐐瑰樊寮傛暟
var inventoryDJ = inventoryInfos.Where(x => x.WarehouseCode == WareCodeDJ).ToList();
- var DJQty = Math.Abs(inventoryDJ.Sum(x => x.SupplyQuantity));
- if (LkQty + DJQty != Qty) throw new Exception($"銆恵order.order_no}銆戠墿鏂欑紪鍙枫�恵item.goods_no}銆戠墿鏂欐壒娆°�恵item.batch_num}銆戠殑鐗╂枡淇℃伅涓庣墿鏂欐壒娆′俊鎭洏鐩堟暟閲忎笉绗�");
+ //var DJQty = Math.Abs(inventoryDJ.Sum(x => x.SupplyQuantity));
+ var DJQty = inventoryDJ.Sum(x => x.SupplyQuantity);
+ var count = Math.Abs(LkQty + DJQty);
+ if (count != Qty) throw new Exception($"銆恵order.order_no}銆戠墿鏂欑紪鍙枫�恵item.goods_no}銆戠墿鏂欐壒娆°�恵item.batch_num}銆戠殑鐗╂枡淇℃伅涓庣墿鏂欐壒娆′俊鎭洏浜忔暟閲忎笉绗�");
if (LkQty == 0)//绔嬪簱鏃犲樊寮�
{
#region 搴撳瓨銆佸簱瀛樻壒娆″钩璐�
@@ -764,7 +767,7 @@
deliveryOrdersAdd.Add(cabinOrder);
}
#endregion
-
+ //杩欓噷
#region 鍒涘缓绔嬪簱鐩樼偣鍗�
var entityOrder = new Dt_DeliveryOrder
{
@@ -778,7 +781,7 @@
Details = order.details.Select(d => new Dt_DeliveryOrderDetail
{
Goods_no = d.goods_no,
- Order_qty = LkQty,
+ Order_qty = Math.Abs(LkQty), //缁欎笅娓竁CS鐨勬槸瑕佹暣鏁�
Batch_num = d.batch_num,
Exp_date = d.exp_date,
Reservoirarea = WareCodeLK,
--
Gitblit v1.9.3