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 | 98 ++++++++++++++++++++++++++++--------------------
1 files changed, 57 insertions(+), 41 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 4410ea2..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"
@@ -4,8 +4,10 @@
using System;
using System.Collections.Generic;
using System.Linq;
+using System.Reflection.Metadata;
using System.Text;
using System.Threading.Tasks;
+using WIDESEA_Common.OrderEnum;
using WIDESEA_Common.StockEnum;
using WIDESEA_Common.TaskEnum;
using WIDESEA_Common.WareHouseEnum;
@@ -52,7 +54,7 @@
if (response.resultCode != "0")
{
- SendErrorToUpstream(8, "", response.resultMsg ?? "涓婃父鎺ュ彛杩斿洖澶辫触", "");
+ //SendErrorToUpstream(8, "", response.resultMsg ?? "涓婃父鎺ュ彛杩斿洖澶辫触", "");
return responseContent.Error(response.resultMsg ?? "涓婃父鎺ュ彛杩斿洖澶辫触");
}
@@ -80,7 +82,7 @@
catch (Exception ex)
{
Db.Ado.RollbackTran();
- SendErrorToUpstream(8, "", ex.Message, "");
+ //SendErrorToUpstream(8, "", ex.Message, "");
return responseContent.Error("鍚屾澶辫触: " + ex.Message);
}
}
@@ -123,7 +125,8 @@
{
#region 澶勭悊鍏ュ簱璁㈠崟
- Dt_CabinOrder cabinOrder = Db.Queryable<Dt_CabinOrder>().Where(x => x.Order_no == request.orderNo && x.Warehouse_no == reslut).Includes(x => x.Details).First();
+ Dt_CabinOrder cabinOrder = Db.Queryable<Dt_CabinOrder>().Where(x => x.Order_no == request.externalOrderNo && x.Warehouse_no == reslut).Includes(x => x.Details).First();
+ if (cabinOrder == null) throw new Exception($"鏈壘鍒板叆搴撳崟鍙枫�恵request.externalOrderNo}銆戠殑鍏ュ簱鍗曚俊鎭�");
#region 鍒ゆ柇鏄惁涓虹洏鐩堝叆搴撳崟
if (cabinOrder.Order_type == "5")
{
@@ -176,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($"鍏ュ簱鍗曟槑缁嗗凡瀹屾垚");
@@ -226,42 +233,45 @@
ProductionDate = detail.finishDate.ToString("yyyy-MM-dd"),
ShelfLife = 0,
ValidityPeriod = cabinOrderDetail.Exp_date,
- Remark = "WCS鍥炰紶鍒涘缓"
+ Remark = "鏅鸿兘绔嬪簱"
};
BaseDal.Db.Insertable(inventoryInfo).ExecuteCommand();
}
#endregion
- #region 鍒涘缓搴撳瓨鎵规淇℃伅
- // 6锔忊儯 鏌ヨ搴撳瓨鎵规淇℃伅
- var inventory_Batch = BaseDal.Db.Queryable<Dt_Inventory_Batch>()
- .First(x => x.MaterielCode == inventoryInfo.MaterielCode && x.BatchNo == inventoryInfo.BatchNo);
+ #region 鍒涘缓搴撳瓨鎵规淇℃伅 鍙湁涓嶆槸璋冩嫧鍏ュ簱鍗曪紙115锛夋墠瀵规壒娆′俊鎭繘琛屼慨鏀�
+ if (cabinOrder.Order_type != InOrderTypeEnum.Allocat.ObjToInt().ToString())
+ {
+ // 6锔忊儯 鏌ヨ搴撳瓨鎵规淇℃伅
+ var inventory_Batch = BaseDal.Db.Queryable<Dt_Inventory_Batch>()
+ .First(x => x.MaterielCode == inventoryInfo.MaterielCode && x.BatchNo == inventoryInfo.BatchNo);
- if (inventory_Batch != null)
- {
- inventory_Batch.StockQuantity += orderQty;
- inventory_Batch.AvailableQuantity += orderQty;
- BaseDal.Db.Updateable(inventory_Batch).ExecuteCommand();
- }
- else
- {
- inventory_Batch = new Dt_Inventory_Batch
+ if (inventory_Batch != null)
{
- MaterielCode = inventoryInfo.MaterielCode,
- MaterielName = inventoryInfo.MaterielName,
- MaterielSpec = inventoryInfo.MaterielSpec,
- BatchNo = inventoryInfo.BatchNo,
- StockQuantity = inventoryInfo.StockQuantity,
- OutboundQuantity = inventoryInfo.OutboundQuantity,
- AvailableQuantity = inventoryInfo.AvailableQuantity,
- SupplyQuantity = inventoryInfo.SupplyQuantity,
- ERPStockQuantity = 0,
- Status = false,
- ProductionDate = detail.finishDate.ToString("yyyy-MM-dd"),
- ValidityPeriod = inventoryInfo.ValidityPeriod,
- Remark = "鑷姩鍒涘缓"
- };
- BaseDal.Db.Insertable(inventory_Batch).ExecuteCommand();
+ inventory_Batch.StockQuantity += orderQty;
+ inventory_Batch.AvailableQuantity += orderQty;
+ BaseDal.Db.Updateable(inventory_Batch).ExecuteCommand();
+ }
+ else
+ {
+ inventory_Batch = new Dt_Inventory_Batch
+ {
+ MaterielCode = inventoryInfo.MaterielCode,
+ MaterielName = inventoryInfo.MaterielName,
+ MaterielSpec = inventoryInfo.MaterielSpec,
+ BatchNo = inventoryInfo.BatchNo,
+ StockQuantity = inventoryInfo.StockQuantity,
+ OutboundQuantity = inventoryInfo.OutboundQuantity,
+ AvailableQuantity = inventoryInfo.AvailableQuantity,
+ SupplyQuantity = inventoryInfo.SupplyQuantity,
+ ERPStockQuantity = 0,
+ Status = false,
+ ProductionDate = detail.finishDate.ToString("yyyy-MM-dd"),
+ ValidityPeriod = inventoryInfo.ValidityPeriod.ObjToDate(),
+ Remark = "鑷姩鍒涘缓"
+ };
+ BaseDal.Db.Insertable(inventory_Batch).ExecuteCommand();
+ }
}
#endregion
@@ -286,6 +296,8 @@
SupplyQuantity = 0,
Remark = "鍏ュ簱"
};
+ //杩欓噷杩欓噷鐨勫叆搴撹皟鎷ㄥ崟鐘舵�佹槸115锛屽氨灏嗚皟鎷ㄤ换鍔＄姸鎬佹敼涓�7
+ if (cabinOrder.Order_type == InOrderTypeEnum.Allocat.ObjToInt().ToString()) supplyTask_Hty.TaskType = TaskTypeEnum.AllocatIn.ObjToInt();
BaseDal.Db.Insertable(supplyTask_Hty).ExecuteCommand();
#endregion
}
@@ -293,7 +305,9 @@
break;
case "2":
{
- Dt_DeliveryOrder cabinOrder = Db.Queryable<Dt_DeliveryOrder>().Where(x => x.Out_no == request.orderNo && x.Warehouse_no == reslut).Includes(x => x.Details).First();
+ Dt_DeliveryOrder cabinOrder = Db.Queryable<Dt_DeliveryOrder>().Where(x => x.Out_no == request.externalOrderNo && x.Warehouse_no == reslut).Includes(x => x.Details).First();
+ if (cabinOrder == null) throw new Exception($"鏈壘鍒板嚭搴撳崟鍙枫�恵request.externalOrderNo}銆戠殑鍏ュ簱鍗曚俊鎭�");
+
if (cabinOrder.Out_type == "6")
{
foreach (var item in cabinOrder.Details)
@@ -345,13 +359,14 @@
else
{
#region 鎵惧嚭搴撲换鍔�
- Dt_SupplyTask supplyTask = Db.Queryable<Dt_SupplyTask>().Where(x => x.MaterielCode == detail.productCode && x.BatchNo == detail.batchNo && x.OrderNo == request.orderNo && x.WarehouseCode == reslut && x.TaskStatus == SupplyStatusEnum.NewOut.ObjToInt()).First();
- if (supplyTask == null) throw new Exception($"鏈壘鍒拌鍗曞彿銆恵request.orderNo}銆戠墿鏂欑紪鍙枫�恵detail.productCode}銆戠殑鍑哄簱浠诲姟");
+ Dt_SupplyTask supplyTask = Db.Queryable<Dt_SupplyTask>().Where(x => x.MaterielCode == detail.productCode && x.BatchNo == detail.batchNo && x.OrderNo == request.externalOrderNo && x.WarehouseCode == reslut && x.TaskStatus == SupplyStatusEnum.NewOut.ObjToInt()).First();
+ if (supplyTask == null) throw new Exception($"鏈壘鍒拌鍗曞彿銆恵request.externalOrderNo}銆戠墿鏂欑紪鍙枫�恵detail.productCode}銆戠殑鍑哄簱浠诲姟");
if (supplyTask.StockQuantity != orderQty) throw new Exception($"璁㈠崟鍙枫�恵request.orderNo}銆戠墿鏂欑紪鍙枫�恵detail.productCode}銆戠殑鍑哄簱鏁伴噺涓庡嚭搴撲换鍔℃暟閲忎笉鐩哥瓑");
#endregion
#region 澶勭悊鍑哄簱鍗曘�佸簱瀛樹俊鎭�佸嚭搴撲换鍔°�佽皟鎷ㄤ换鍔�
- _deliveryOrderServices.OutTaskFinish(supplyTask);
+ var content = _deliveryOrderServices.OutTaskFinish(supplyTask);
+ if (!content.Status) throw new Exception(content.Message);
#endregion
}
}
@@ -360,8 +375,8 @@
{
var WarehouseLK = WarehouseEnum.绔嬪簱.ObjToInt().ToString("000");
#region 鎵剧洏鐐逛换鍔�
- Dt_SupplyTask supplyTask = Db.Queryable<Dt_SupplyTask>().Where(x => x.MaterielCode == detail.productCode && x.BatchNo == detail.batchNo && x.OrderNo == request.orderNo && x.WarehouseCode == WarehouseLK && x.TaskStatus == SupplyStatusEnum.NewCheck.ObjToInt()).First();
- if (supplyTask == null) throw new Exception($"鏈壘鍒拌鍗曞彿銆恵request.orderNo}銆戠墿鏂欑紪鍙枫�恵detail.productCode}銆戠殑鐩樼偣浠诲姟");
+ Dt_SupplyTask supplyTask = Db.Queryable<Dt_SupplyTask>().Where(x => x.MaterielCode == detail.productCode && x.BatchNo == detail.batchNo && x.OrderNo == request.externalOrderNo && x.WarehouseCode == WarehouseLK && x.TaskStatus == SupplyStatusEnum.NewCheck.ObjToInt()).First();
+ if (supplyTask == null) throw new Exception($"鏈壘鍒拌鍗曞彿銆恵request.externalOrderNo}銆戠墿鏂欑紪鍙枫�恵detail.productCode}銆戠殑鐩樼偣浠诲姟");
#endregion
if (detail.isLossOrProfit == 1) // 鐩樹簭
{
@@ -375,7 +390,8 @@
{
supplyTask.SupplyQuantity = supplyTask.StockQuantity;
}
- _deliveryOrderServices.CheckTaskFinish(supplyTask);
+ var content = _deliveryOrderServices.CheckTaskFinish(supplyTask);
+ if (!content.Status) throw new Exception(content.Message);
}
break;
}
--
Gitblit v1.9.3