From c84eb83d59f5d3057a6f3dbc375d3c98a6447c2f Mon Sep 17 00:00:00 2001
From: yangpeixing <yangpeixing@hnkhzn.com>
Date: 星期五, 13 三月 2026 17:00:56 +0800
Subject: [PATCH] 1
---
WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Base/InboundOrderService.cs | 244 ++++++++++++++++++++++--------------------------
1 files changed, 111 insertions(+), 133 deletions(-)
diff --git a/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Base/InboundOrderService.cs b/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Base/InboundOrderService.cs
index d841b3d..2d7c7d1 100644
--- a/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Base/InboundOrderService.cs
+++ b/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Base/InboundOrderService.cs
@@ -20,6 +20,7 @@
using WIDESEA_Core.CodeConfigEnum;
using WIDESEA_Core.Enums;
using WIDESEA_Core.Helper;
+using WIDESEA_Core.Log;
using WIDESEA_Core.Utilities;
using WIDESEA_DTO;
using WIDESEA_DTO.Basic;
@@ -110,7 +111,7 @@
{
string serialNumber = serialNumberObj?.ToString();
if (!string.IsNullOrEmpty(serialNumber))
- {
+ {
serialNumbers.Add(serialNumber);
}
else
@@ -322,7 +323,7 @@
decimal totalQuantity = stockInfo.Details.Sum(x => x.StockQuantity);
inboundOrder.OrderStatus = InOrderStatusEnum.鍏ュ簱涓�.ObjToInt();
-
+
_unitOfWorkManage.BeginTran();
if (stockInfo.Id == 0)
{
@@ -469,7 +470,8 @@
Dt_InboundOrderDetail notGroupDetail = new Dt_InboundOrderDetail();
- notGroupDetail = inboundOrder.Details.Where(x => x.OrderDetailStatus <= OrderDetailStatusEnum.Inbounding.ObjToInt() && x.MaterielCode == model.MaterielCode && x.BatchNo == model.LotNo).FirstOrDefault();
+ notGroupDetail = inboundOrder.Details.Where(x => x.OrderDetailStatus <= OrderDetailStatusEnum.Inbounding.ObjToInt() && x.MaterielCode == model.MaterielCode && x.BatchNo == model.LotNo && x.OrderQuantity > x.ReceiptQuantity).FirstOrDefault();
+
if (notGroupDetail.MaterielType == 1)
{
stockInfo.WarehouseId = 6;
@@ -1298,7 +1300,7 @@
public int GetPalletType(Dt_Warehouse warehouse, string palletCode)
{
- if (warehouse.WarehouseCode == WarehouseEnum.SC01_BC.ObjToString())
+ if (warehouse.WarehouseCode.Contains("BC"))
{
Dt_PalletTypeInfo palletTypeInfo = _palletTypeInfoRepository.QueryFirst(x => x.CodeStartStr == palletCode.Substring(0, 3));
if (palletTypeInfo == null)
@@ -1316,35 +1318,7 @@
}
return palletTypeInfo.PalletType;
}
-
- //else if (warehouse.WarehouseCode == WarehouseEnum.HA152.ObjToString())
- //{
- // Dt_PalletTypeInfo palletTypeInfo = _palletTypeInfoRepository.QueryFirst(x => x.CodeStartStr == palletCode.Substring(0, 2));
- // if (palletTypeInfo == null)
- // {
- // throw new Exception($"鎵樼洏鍙烽敊璇�");
- // }
- // return palletTypeInfo.PalletType;
- //}
- //else if (warehouse.WarehouseCode == WarehouseEnum.HA57.ObjToString())
- //{
- // Dt_PalletTypeInfo palletTypeInfo = _palletTypeInfoRepository.QueryFirst(x => x.CodeStartStr == palletCode.Substring(0, 3));
- // if (palletTypeInfo == null)
- // {
- // throw new Exception($"鎵樼洏鍙烽敊璇�");
- // }
- // return palletTypeInfo.PalletType;
- //}
- //else if (warehouse.WarehouseCode == WarehouseEnum.HA58.ObjToString())
- //{
- // Dt_PalletTypeInfo palletTypeInfo = _palletTypeInfoRepository.QueryFirst(x => x.CodeStartStr == palletCode.Substring(0, 2));
- // if (palletTypeInfo == null)
- // {
- // throw new Exception($"鎵樼洏鍙烽敊璇�");
- // }
- // return palletTypeInfo.PalletType;
- //}
- return -1;
+ return 0;
}
/// <summary>
/// 鍒ゆ柇姝ｇ‘鏃堕棿鏍煎紡
@@ -1581,7 +1555,7 @@
{
OrderId = orderDetail1.OrderId,
MaterielCode = item.MaterielCode,
- MaterielType=item.MaterielType,
+ MaterielType = item.MaterielType,
BatchNo = item.BatchNo,
OrderQuantity = item.OrderQuantity,
ReceiptQuantity = 0,
@@ -1753,6 +1727,7 @@
_inboundOrderDetailService.DeleteData(item);
}
BaseDal.DeleteData(oldOutboundOrder);
+ WriteLog.Write_Log("API", "SMOM鎺ㄩ�佸叆搴撳崟鎹彇娑�", "璇锋眰鎴愬姛", new { 璇锋眰鎶ユ枃 = oldOutboundOrder, 鎺ユ敹鎶ユ枃 = content });
content = WebResponseContent.Instance.OK();
}
catch (Exception ex)
@@ -1777,11 +1752,11 @@
List<Dt_InboundOrder> dt_ReceiveOrders = new List<Dt_InboundOrder>();
if (string.IsNullOrEmpty(orderNo))
{
- dt_ReceiveOrders = Db.Queryable<Dt_InboundOrder>().Where(x => x.OrderStatus < InboundStatusEnum.鍏ュ簱瀹屾垚.ObjToInt() && x.WarehouseId == warehouseId).Includes(x => x.Details).OrderByDescending(x => x.CreateDate).ToPageList(pageNo, 10);
+ dt_ReceiveOrders = Db.Queryable<Dt_InboundOrder>().Where(x => x.OrderStatus < InboundStatusEnum.鍏ュ簱瀹屾垚.ObjToInt() && x.WarehouseId == warehouseId).Includes(x => x.Details).OrderByDescending(x => x.CreateDate).ToPageList(pageNo, 50);
}
else
{
- dt_ReceiveOrders = Db.Queryable<Dt_InboundOrder>().Where(x => (x.OrderNo.Contains(orderNo)) && x.OrderStatus < InboundStatusEnum.鍏ュ簱瀹屾垚.ObjToInt() && x.WarehouseId == warehouseId).Includes(x => x.Details).OrderByDescending(x => x.CreateDate).ToPageList(pageNo, 10);
+ dt_ReceiveOrders = Db.Queryable<Dt_InboundOrder>().Where(x => (x.OrderNo.Contains(orderNo)) && x.OrderStatus < InboundStatusEnum.鍏ュ簱瀹屾垚.ObjToInt() && x.WarehouseId == warehouseId).Includes(x => x.Details).OrderByDescending(x => x.CreateDate).ToPageList(pageNo, 50);
}
content.OK(data: dt_ReceiveOrders);
@@ -1845,7 +1820,10 @@
};
_unitOfWorkManage.BeginTran();
Db.InsertNav(erpProScrapSheet).Include(x => x.Details).ExecuteCommand();
+ WriteLog.Write_Log("API", "erp鍗曟嵁涓嬪彂", "璇锋眰鎴愬姛", new { 璇锋眰鎶ユ枃 = erpProScrapSheet, 鎺ユ敹鎶ユ枃 = WebResponseContent.Instance.OK() });
+
_unitOfWorkManage.CommitTran();
+
return WebResponseContent.Instance.OK();
}
@@ -1944,7 +1922,7 @@
}
//鍙嶆嫞鍥炲簱鍗�
public WebResponseContent ReceiveReturnOrder(List<HouseReturnOrder> houseReturnOrder)
- {
+ {
try
{
Random random = new Random();
@@ -1952,119 +1930,119 @@
_unitOfWorkManage.BeginTran();
foreach (var item in houseReturnOrder)
{
- int randomNum = random.Next(1, 1000);
- string datePart = DateTime.Now.ToString("yyyyMMdd");
- Dt_ReturnOrder returnOrder = _returnOrderRepository.QueryFirst(x => x.LPNNo == item.LPNNo && x.OrderStatus == InOrderStatusEnum.鏈紑濮�.ObjToInt());
- if (returnOrder == null)
+ int randomNum = random.Next(1, 1000);
+ string datePart = DateTime.Now.ToString("yyyyMMdd");
+ Dt_ReturnOrder returnOrder = _returnOrderRepository.QueryFirst(x => x.LPNNo == item.LPNNo && x.OrderStatus == InOrderStatusEnum.鏈紑濮�.ObjToInt());
+ if (returnOrder == null)
+ {
+ Dt_ReturnOrder newReturnOrder = new Dt_ReturnOrder
{
- Dt_ReturnOrder newReturnOrder = new Dt_ReturnOrder
- {
- OrderType = OrderTypeEnum.鍙嶆嫞鍥炲簱鍗�.ObjToInt(),
- MaterielCode = item.MaterielCode,
- MaterielName = item.MaterielName,
+ OrderType = OrderTypeEnum.鍙嶆嫞鍥炲簱鍗�.ObjToInt(),
+ MaterielCode = item.MaterielCode,
+ MaterielName = item.MaterielName,
MaterieSpec = item.MaterieSpec,
- BatchNo = item.BatchNo,
- OrderQuantity = item.OrderQuantity,
+ BatchNo = item.BatchNo,
+ OrderQuantity = item.OrderQuantity,
Remark = item.Remark,
- LinId = item.LinId,
- LPNNo = item.LPNNo,
+ LinId = item.LinId,
+ LPNNo = item.LPNNo,
LocationCode = item.LocationCode,
WarehouseCode = item.WarehouseCode,
System = item.System,
- OrderStatus = InOrderStatusEnum.鏈紑濮�.ObjToInt(),
- Creater = "SMOM",
- CreateDate = DateTime.Now
- };
- _returnOrderRepository.AddData(newReturnOrder);
+ OrderStatus = InOrderStatusEnum.鏈紑濮�.ObjToInt(),
+ Creater = "SMOM",
+ CreateDate = DateTime.Now
+ };
+ _returnOrderRepository.AddData(newReturnOrder);
Dt_StockInfo stockInfo = _stockRepository.StockInfoRepository.Db.Queryable<Dt_StockInfo, Dt_StockInfoDetail>((stock, detail) => stock.Id == detail.StockId).Where((stock, detail) => stock.PalletCode == item.LPNNo && stock.LocationCode == item.LocationCode).First();
- Dt_OutboundOrderDetail outboundOrderDetail = new Dt_OutboundOrderDetail();
- Dt_OutboundOrder outboundOrder = new Dt_OutboundOrder();
- if (stockInfo == null)
- {
+ Dt_OutboundOrderDetail outboundOrderDetail = new Dt_OutboundOrderDetail();
+ Dt_OutboundOrder outboundOrder = new Dt_OutboundOrder();
+ if (stockInfo == null)
+ {
Dt_Warehouse warehouse = _warehouseService.Repository.QueryData(x => x.WarehouseCode == item.WarehouseCode).FirstOrDefault();
- if (warehouse == null)
- {
+ if (warehouse == null)
+ {
return WebResponseContent.Instance.Error($"璇ヤ粨搴撶紪鍙穥item.WarehouseCode}鏈厤缃�");
- }
- Dt_StockInfoDetail stockInfoDetail = new Dt_StockInfoDetail
- {
- MaterielCode = item.MaterielCode,
- MaterielName = item.MaterielName,
+ }
+ Dt_StockInfoDetail stockInfoDetail = new Dt_StockInfoDetail
+ {
+ MaterielCode = item.MaterielCode,
+ MaterielName = item.MaterielName,
MaterieSpec = item.MaterieSpec,
- BatchNo = item.BatchNo,
- LinId = item.LinId,
- Status = StockStatusEmun.缁勭洏鏆傚瓨.ObjToInt(),
- Creater = "SMOM",
- CreateDate = DateTime.Now,
- OrderNo = newReturnOrder.OrderNo,
- StockQuantity = item.OrderQuantity,
- };
- Dt_StockInfo stockInfo1 = new Dt_StockInfo
- {
- PalletCode = item.LPNNo,
- WarehouseId = warehouse.WarehouseId,
- BatchNo = item.BatchNo,
- PalletType = GetPalletType(warehouse, item.LPNNo),
- IsFull = true,
- StockStatus = (int)StockStatusEmun.鍙嶆嫞鍏ュ簱,
- Creater = "WMS",
- CreateDate = DateTime.Now,
- MaterialType = (int)InventoryMaterialType.鍘熸潗鏂�,
- Materialweight = 0,
- Wlstatus = (int)InventoryMaterialStatus.鍚堟牸,
- Mgeneratetime = DateTime.Now,
- Details = new List<Dt_StockInfoDetail> { stockInfoDetail }
- };
- Db.InsertNav(stockInfo1).Include(x => x.Details).ExecuteCommand();
- }
- else
- {
- outboundOrderDetail = new Dt_OutboundOrderDetail
- {
- MaterielCode = item.MaterielCode,
- MaterielName = item.MaterielName,
- MaterieSpec = item.MaterieSpec,
- BatchNo = item.BatchNo,
- OrderQuantity = stockInfo.Details.Sum(x => x.StockQuantity),
- Remark = item.Remark,
- LinId = item.LinId,
- LPNNo = item.LPNNo,
- Creater = "SMOM",
- CreateDate = DateTime.Now,
- LocationName = item.LocationCode
- };
- outboundOrder = new Dt_OutboundOrder
- {
- OrderNo = "FJCK" + $"{datePart}{randomNum}",
- UpperOrderNo = "WMSFJCK" + $"{datePart}{randomNum}",
- OrderStatus = OutOrderStatusEnum.鏈紑濮�.ObjToInt(),
- OrderType = OrderTypeEnum.鍙嶆嫞鍑哄簱鍗�.ObjToInt(),
- InoutType = InoutTypeEnum.OtherOut.ToString(),
- System = item.System,
- Creater = "SMOM",
- CreateDate = DateTime.Now,
- CreateType = OrderCreateTypeEnum.UpperSystemPush.ObjToInt(),
- Details = new List<Dt_OutboundOrderDetail> { outboundOrderDetail }
- };
- Db.InsertNav(outboundOrder).Include(x => x.Details).ExecuteCommand();
- }
-
+ BatchNo = item.BatchNo,
+ LinId = item.LinId,
+ Status = StockStatusEmun.缁勭洏鏆傚瓨.ObjToInt(),
+ Creater = "SMOM",
+ CreateDate = DateTime.Now,
+ OrderNo = newReturnOrder.OrderNo,
+ StockQuantity = item.OrderQuantity,
+ };
+ Dt_StockInfo stockInfo1 = new Dt_StockInfo
+ {
+ PalletCode = item.LPNNo,
+ WarehouseId = warehouse.WarehouseId,
+ BatchNo = item.BatchNo,
+ PalletType = GetPalletType(warehouse, item.LPNNo),
+ IsFull = true,
+ StockStatus = (int)StockStatusEmun.鍙嶆嫞鍏ュ簱,
+ Creater = "WMS",
+ CreateDate = DateTime.Now,
+ MaterialType = (int)InventoryMaterialType.鍘熸潗鏂�,
+ Materialweight = 0,
+ Wlstatus = (int)InventoryMaterialStatus.鍚堟牸,
+ Mgeneratetime = DateTime.Now,
+ Details = new List<Dt_StockInfoDetail> { stockInfoDetail }
+ };
+ Db.InsertNav(stockInfo1).Include(x => x.Details).ExecuteCommand();
}
else
{
- Dt_StockInfo stockInfo = _stockRepository.StockInfoRepository.Db.Queryable<Dt_StockInfo, Dt_StockInfoDetail>((stock, detail) => stock.Id == detail.StockId).Where((stock, detail) => stock.PalletCode == item.LPNNo && stock.StockStatus == StockStatusEmun.浣欐枡閫�搴�.ObjToInt()).First();
- stockInfo.StockStatus = StockStatusEmun.鍙嶆嫞鍏ュ簱.ObjToInt();
- returnOrder.LinId = item.LinId;
+ outboundOrderDetail = new Dt_OutboundOrderDetail
+ {
+ MaterielCode = item.MaterielCode,
+ MaterielName = item.MaterielName,
+ MaterieSpec = item.MaterieSpec,
+ BatchNo = item.BatchNo,
+ OrderQuantity = stockInfo.Details.Sum(x => x.StockQuantity),
+ Remark = item.Remark,
+ LinId = item.LinId,
+ LPNNo = item.LPNNo,
+ Creater = "SMOM",
+ CreateDate = DateTime.Now,
+ LocationName = item.LocationCode
+ };
+ outboundOrder = new Dt_OutboundOrder
+ {
+ OrderNo = "FJCK" + $"{datePart}{randomNum}",
+ UpperOrderNo = "WMSFJCK" + $"{datePart}{randomNum}",
+ OrderStatus = OutOrderStatusEnum.鏈紑濮�.ObjToInt(),
+ OrderType = OrderTypeEnum.鍙嶆嫞鍑哄簱鍗�.ObjToInt(),
+ InoutType = InoutTypeEnum.OtherOut.ToString(),
+ System = item.System,
+ Creater = "SMOM",
+ CreateDate = DateTime.Now,
+ CreateType = OrderCreateTypeEnum.UpperSystemPush.ObjToInt(),
+ Details = new List<Dt_OutboundOrderDetail> { outboundOrderDetail }
+ };
+ Db.InsertNav(outboundOrder).Include(x => x.Details).ExecuteCommand();
+ }
+
+ }
+ else
+ {
+ Dt_StockInfo stockInfo = _stockRepository.StockInfoRepository.Db.Queryable<Dt_StockInfo, Dt_StockInfoDetail>((stock, detail) => stock.Id == detail.StockId).Where((stock, detail) => stock.PalletCode == item.LPNNo && stock.StockStatus == StockStatusEmun.浣欐枡閫�搴�.ObjToInt()).First();
+ stockInfo.StockStatus = StockStatusEmun.鍙嶆嫞鍏ュ簱.ObjToInt();
+ returnOrder.LinId = item.LinId;
returnOrder.System = item.System;
returnOrder.WarehouseCode = item.WarehouseCode;
returnOrder.LocationCode = item.LocationCode;
- returnOrder.OrderType = OrderTypeEnum.鍙嶆嫞鍥炲簱鍗�.ObjToInt();
- returnOrder.OrderQuantity += item.OrderQuantity;
- returnOrder.ReceiptQuantity += item.OrderQuantity;
- _returnOrderRepository.UpdateData(returnOrder);
- _stockRepository.StockInfoRepository.UpdateData(stockInfo);
+ returnOrder.OrderType = OrderTypeEnum.鍙嶆嫞鍥炲簱鍗�.ObjToInt();
+ returnOrder.OrderQuantity += item.OrderQuantity;
+ returnOrder.ReceiptQuantity += item.OrderQuantity;
+ _returnOrderRepository.UpdateData(returnOrder);
+ _stockRepository.StockInfoRepository.UpdateData(stockInfo);
- }
+ }
}
_unitOfWorkManage.CommitTran();
return WebResponseContent.Instance.OK();
--
Gitblit v1.9.3