From 6d115888b0b2cf700118fbf6d6bc890827040aed Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期五, 31 十月 2025 18:02:10 +0800
Subject: [PATCH] 优化PDA
---
新建文件夹/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/InventoryServices.cs | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/InventoryServices.cs" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/InventoryServices.cs"
index 90251da..37bc1f4 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/InventoryServices.cs"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/InventoryServices.cs"
@@ -54,7 +54,7 @@
if (response.resultCode != "0")
{
- SendErrorToUpstream(8, "", response.resultMsg ?? "涓婃父鎺ュ彛杩斿洖澶辫触", "");
+ //SendErrorToUpstream(8, "", response.resultMsg ?? "涓婃父鎺ュ彛杩斿洖澶辫触", "");
return responseContent.Error(response.resultMsg ?? "涓婃父鎺ュ彛杩斿洖澶辫触");
}
@@ -82,7 +82,7 @@
catch (Exception ex)
{
Db.Ado.RollbackTran();
- SendErrorToUpstream(8, "", ex.Message, "");
+ //SendErrorToUpstream(8, "", ex.Message, "");
return responseContent.Error("鍚屾澶辫触: " + ex.Message);
}
}
@@ -179,8 +179,12 @@
#endregion
else
{
- if (cabinOrder == null || cabinOrder.OdrderStatus == "宸插畬鎴�")
- throw new Exception($"鍏ュ簱鍗曞凡瀹屾垚");
+ if (cabinOrder.OdrderStatus == "宸插畬鎴�")
+ return new ApiResponse<Dt_InventoryInfo>
+ {
+ code = "0",
+ msg = "鎴愬姛"
+ };
Dt_CabinOrderDetail cabinOrderDetail = cabinOrder.Details.Where(x => x.Goods_no == detail.productCode && x.Batch_num == detail.batchNo && x.Status == 1).First();
if (cabinOrderDetail == null || cabinOrderDetail.OrderDetailStatus == "宸插畬鎴�")
throw new Exception($"鍏ュ簱鍗曟槑缁嗗凡瀹屾垚");
@@ -229,7 +233,7 @@
ProductionDate = detail.finishDate.ToString("yyyy-MM-dd"),
ShelfLife = 0,
ValidityPeriod = cabinOrderDetail.Exp_date,
- Remark = "WCS鍥炰紶鍒涘缓"
+ Remark = "鏅鸿兘绔嬪簱"
};
BaseDal.Db.Insertable(inventoryInfo).ExecuteCommand();
}
@@ -263,7 +267,7 @@
ERPStockQuantity = 0,
Status = false,
ProductionDate = detail.finishDate.ToString("yyyy-MM-dd"),
- ValidityPeriod = inventoryInfo.ValidityPeriod,
+ ValidityPeriod = inventoryInfo.ValidityPeriod.ObjToDate(),
Remark = "鑷姩鍒涘缓"
};
BaseDal.Db.Insertable(inventory_Batch).ExecuteCommand();
--
Gitblit v1.9.3