From 48e2278d7ac330c7f05deda6f884acb6f01206b4 Mon Sep 17 00:00:00 2001
From: yangpeixing <yangpeixing@hnkhzn.com>
Date: 星期一, 13 四月 2026 17:13:51 +0800
Subject: [PATCH] 1
---
WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Base/InboundOrderService.cs | 477 +++++++++++++++++++++++++++-------------------------------
1 files changed, 223 insertions(+), 254 deletions(-)
diff --git a/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Base/InboundOrderService.cs b/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Base/InboundOrderService.cs
index 032d583..1aaac7e 100644
--- a/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Base/InboundOrderService.cs
+++ b/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Base/InboundOrderService.cs
@@ -161,6 +161,10 @@
return WebResponseContent.Instance.Error($"鏈壘鍒板叆搴撳崟鏄庣粏淇℃伅");
}
List<MatSerNumAnalysisModel> models = CodeAnalysisHelper.CodeAnalysis<MatSerNumAnalysisModel>(AnalysisCodeEnum.MatSerNumAnalysis, serialNumbers);
+
+ models.FirstOrDefault().DeliveryNote = models.FirstOrDefault()?.DeliveryNote.Replace("BS:", "");
+ models.FirstOrDefault().LotNo = models.FirstOrDefault()?.LotNo.Replace("DN:", "");
+
//楠岃瘉鍒ゆ柇鏃堕棿鏍煎紡
WebResponseContent IsValidContent = IsValidMCDates(models);
if (!IsValidContent.Status)
@@ -178,13 +182,9 @@
///鎵炬暟閲忓尮閰嶇殑
if (warehouse.WarehouseCode.Contains("BC"))
{
- inboundOrderDetails = inboundOrder.Details.Where(x => x.MaterielCode == materielCode && x.SupplierBatch == (models.FirstOrDefault()?.LotNo ?? "") && x.OrderQuantity > x.ReceiptQuantity && x.OrderQuantity == (quantitys.FirstOrDefault())).ToList();
+ inboundOrderDetails = inboundOrder.Details.Where(x => x.MaterielCode == materielCode && x.SupplierBatch == (models.FirstOrDefault()?.DeliveryNote ?? "") && x.OrderQuantity > x.ReceiptQuantity && x.OrderQuantity == (quantitys.FirstOrDefault())).ToList();
}
- else
- {
- inboundOrderDetails = inboundOrder.Details.Where(x => x.MaterielCode == materielCode && x.BatchNo == (models.FirstOrDefault()?.LotNo ?? "")).ToList();
- }
-
+
if (inboundOrderDetails == null || inboundOrderDetails.Count <= 0)
{
@@ -264,13 +264,8 @@
///鎵炬暟閲忓尮閰嶇殑
if (warehouse.WarehouseCode.Contains("BC"))
{
- notGroupDetail = inboundOrderDetails.Where(x => x.OrderDetailStatus <= OrderDetailStatusEnum.Inbounding.ObjToInt() && x.MaterielCode == model.MaterielCode && x.SupplierBatch == model.LotNo && x.OrderQuantity > x.ReceiptQuantity).FirstOrDefault();
+ notGroupDetail = inboundOrderDetails.Where(x => x.OrderDetailStatus <= OrderDetailStatusEnum.Inbounding.ObjToInt() && x.MaterielCode == model.MaterielCode && x.SupplierBatch == model.DeliveryNote && x.OrderQuantity > x.ReceiptQuantity).FirstOrDefault();
}
- else
- {
- notGroupDetail = inboundOrderDetails.Where(x => x.OrderDetailStatus <= OrderDetailStatusEnum.Inbounding.ObjToInt() && x.MaterielCode == model.MaterielCode && x.BatchNo == model.LotNo && x.OrderQuantity > x.ReceiptQuantity).FirstOrDefault();
- }
-
if (notGroupDetail == null)
{
@@ -366,26 +361,29 @@
string json = JsonConvert.SerializeObject(item);
Dictionary<string, object> delKeyDict = JsonConvert.DeserializeObject<Dictionary<string, object>>(json);
+ string serialNumber = string.Empty;
+ decimal quantity = 0;
+ // 绗竴姝ワ細璇诲彇serialNumber骞舵牎楠�
if (delKeyDict.TryGetValue("serialNumber", out object serialNumberObj))
{
- string serialNumber = serialNumberObj?.ToString();
- if (!string.IsNullOrEmpty(serialNumber))
- {
- serialNumbers.Add(serialNumber);
- }
- else
+ serialNumber = serialNumberObj?.ToString();
+ if (string.IsNullOrEmpty(serialNumber))
{
return WebResponseContent.Instance.Error("serialNumber鐨勫�间负绌�");
}
}
+ else
+ {
+ return WebResponseContent.Instance.Error("缂哄皯serialNumber瀛楁");
+ }
+
if (delKeyDict.TryGetValue("quantity", out object quantityObj))
{
if (quantityObj == null)
{
return WebResponseContent.Instance.Error("鐗╂枡鏁伴噺鐨勫�间负绌�");
}
- decimal quantity;
try
{
quantity = Convert.ToDecimal(quantityObj);
@@ -398,13 +396,30 @@
{
return WebResponseContent.Instance.Error("鐗╂枡鏁伴噺蹇呴』澶т簬0");
}
-
- quantitys.Add(quantity);
}
else
{
return WebResponseContent.Instance.Error("缂哄皯鐗╂枡鏁伴噺瀛楁");
}
+
+ var keyValuePairs = serialNumber.Split(',');
+ List<string> newKeyValuePairs = new List<string>();
+ bool qFieldUpdated = false;
+
+ foreach (var pair in keyValuePairs)
+ {
+ if (pair.StartsWith("Q:"))
+ {
+ newKeyValuePairs.Add($"Q:{quantity}");
+ qFieldUpdated = true;
+ }
+ else
+ {
+ newKeyValuePairs.Add(pair);
+ }
+ }
+ string updatedSerialNumber = string.Join(',', newKeyValuePairs);
+ serialNumbers.Add(updatedSerialNumber);
}
Dt_Warehouse warehouse = _warehouseService.Repository.QueryFirst(x => x.WarehouseId == warehouseId);
if (warehouse == null)
@@ -454,7 +469,7 @@
Materialweight = 0,
Wlstatus = (int)InventoryMaterialStatus.鍚堟牸,
Mgeneratetime = DateTime.Now,
- WarehouseId = warehouse.WarehouseId,
+ WarehouseId = 0,
System = inboundOrder.System,
Details = new List<Dt_StockInfoDetail>()
};
@@ -464,12 +479,26 @@
return WebResponseContent.Instance.Error($"鎵樼洏鍙烽噸澶�,璇ユ墭鐩樺凡缁勮繃鐗╂枡");
}
List<Dt_StockInfoDetail> stockInfoDetails = new List<Dt_StockInfoDetail>();
+ _unitOfWorkManage.BeginTran();
foreach (var model in models)
{
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.SupplierBatch == model.LotNo && x.OrderQuantity > x.ReceiptQuantity && x.OrderQuantity == model.Quantity).FirstOrDefault();
+ if (notGroupDetail == null)
+ {
+ return WebResponseContent.Instance.Error($"璇锋鏌ョ墿鏂欎俊鎭潯鐮佸拰鍏ュ簱鍗曟槑缁嗘槸鍚﹀搴旀纭�");
+ }
+
+ if (notGroupDetail.MaterielType == 1)
+ {
+ stockInfo.WarehouseId = 6;
+ }
+ else if (notGroupDetail.MaterielType == 2)
+ {
+ stockInfo.WarehouseId = 5;
+ }
if (notGroupDetail == null)
{
@@ -522,7 +551,7 @@
inboundOrder.OrderStatus = InOrderStatusEnum.鍏ュ簱涓�.ObjToInt();
- _unitOfWorkManage.BeginTran();
+
if (stockInfo.Id == 0)
{
_stockRepository.StockInfoRepository.Db.InsertNav(stockInfo).Include(x => x.Details).ExecuteCommand();
@@ -565,29 +594,6 @@
var quantities = new List<decimal>();
var lotNos = new List<string>();
var materielCodes = new List<string>();
-
- foreach (var item in saveModel.DelKeys)
- {
- var delKeyDict = item as IDictionary<string, object>;
- if (delKeyDict == null)
- {
- string json = JsonConvert.SerializeObject(item);
- delKeyDict = JsonConvert.DeserializeObject<Dictionary<string, object>>(json);
- }
-
- // 澶勭悊搴忓垪鍙�
- if (!delKeyDict.TryGetValue("serialNumber", out object serialNumberObj) || serialNumberObj == null)
- {
- return WebResponseContent.Instance.Error("缂哄皯serialNumber瀛楁鎴栧�间负绌�");
- }
-
- string serialNumber = serialNumberObj.ToString();
- if (string.IsNullOrWhiteSpace(serialNumber))
- {
- return WebResponseContent.Instance.Error("serialNumber鐨勫�间负绌�");
- }
- serialNumbers.Add(serialNumber);
- }
// 鑾峰彇浠撳簱淇℃伅
Dt_Warehouse warehouse = _warehouseService.Repository.QueryFirst(x => x.WarehouseId == warehouseId);
if (warehouse == null)
@@ -612,8 +618,7 @@
.LeftJoin<Dt_InboundOrder>((cp, d, o) => d.OrderId == o.Id)
.Where((cp, d, o) =>
o.OrderNo == orderNo &&
- o.WarehouseId == warehouse.WarehouseId &&
- serialNumbers.Contains(cp.BoxCode)
+ o.WarehouseId == warehouse.WarehouseId
)
.Select((cp, d, o) => cp)
.ToList();
@@ -621,28 +626,25 @@
//float totalQty = CPinboundOrderDetails.Sum(x => x.QtyOfpcs);
- // 楠岃瘉鏌ヨ鍒扮殑鏁版嵁鏁伴噺鏄惁鍖归厤
- if (CPinboundOrderDetails.Count < serialNumbers.Count)
- {
- return WebResponseContent.Instance.Error($"鏈壘鍒版墍鏈夊搴旂殑绠卞彿淇℃伅锛屾壘鍒皗CPinboundOrderDetails.Count}鏉★紝鏈熸湜{serialNumbers.Count}鏉�");
- }
-
// 鎸夌収绠卞彿鍒嗙粍锛岀敤浜庡悗缁鐞�
- var cpDetailsByBoxCode = CPinboundOrderDetails
- .GroupBy(x => x.BoxCode)
- .ToDictionary(g => g.Key, g => g.ToList());
+ var boxCodesToCheck = CPinboundOrderDetails
+ .Select(x => x.BoxCode)
+ .Where(bc => !string.IsNullOrEmpty(bc))
+ .Distinct()
+ .ToList();
+ // 3. 鏌ヨ杩欎簺绠卞彿鏄惁宸插瓨鍦ㄤ簬搴撳瓨涓�
var existingStockBoxCodes = _stockRepository.StockInfoRepository.Db
- .Queryable<Dt_StockInfo>()
- .LeftJoin<Dt_StockInfoDetail>((s, d) => s.Id == d.StockId)
- .LeftJoin<Dt_StockInfoDetailCP>((s, d, cp) => d.Id == cp.StockDetailId)
- .Where((s, d, cp) =>
- serialNumbers.Contains(cp.BoxCode))
- .Select((s, d, cp) => cp.BoxCode)
- .Distinct()
- .ToList();
+ .Queryable<Dt_StockInfo>()
+ .LeftJoin<Dt_StockInfoDetail>((s, d) => s.Id == d.StockId)
+ .LeftJoin<Dt_StockInfoDetailCP>((s, d, cp) => d.Id == cp.StockDetailId)
+ .Where((s, d, cp) => boxCodesToCheck.Contains(cp.BoxCode) && !string.IsNullOrEmpty(cp.BoxCode))
+ .Select((s, d, cp) => cp.BoxCode)
+ .Distinct()
+ .ToList();
+ // 4. 妫�鏌ユ槸鍚︽湁閲嶅
if (existingStockBoxCodes.Any())
{
return WebResponseContent.Instance.Error($"浠ヤ笅绠卞彿宸插湪搴撳瓨涓細{string.Join(",", existingStockBoxCodes)}");
@@ -855,7 +857,7 @@
}
#endregion
-
+ #region 寮冪敤
public WebResponseContent CP1MaterielGroup(SaveModel saveModel)
{
WebResponseContent content = new WebResponseContent();
@@ -868,6 +870,29 @@
var quantities = new List<decimal>();
var lotNos = new List<string>();
var materielCodes = new List<string>();
+
+ foreach (var item in saveModel.DelKeys)
+ {
+ var delKeyDict = item as IDictionary<string, object>;
+ if (delKeyDict == null)
+ {
+ string json = JsonConvert.SerializeObject(item);
+ delKeyDict = JsonConvert.DeserializeObject<Dictionary<string, object>>(json);
+ }
+
+ // 澶勭悊搴忓垪鍙�
+ if (!delKeyDict.TryGetValue("serialNumber", out object serialNumberObj) || serialNumberObj == null)
+ {
+ return WebResponseContent.Instance.Error("缂哄皯serialNumber瀛楁鎴栧�间负绌�");
+ }
+
+ string serialNumber = serialNumberObj.ToString();
+ if (string.IsNullOrWhiteSpace(serialNumber))
+ {
+ return WebResponseContent.Instance.Error("serialNumber鐨勫�间负绌�");
+ }
+ serialNumbers.Add(serialNumber);
+ }
// 鑾峰彇浠撳簱淇℃伅
Dt_Warehouse warehouse = _warehouseService.Repository.QueryFirst(x => x.WarehouseId == warehouseId);
if (warehouse == null)
@@ -892,7 +917,8 @@
.LeftJoin<Dt_InboundOrder>((cp, d, o) => d.OrderId == o.Id)
.Where((cp, d, o) =>
o.OrderNo == orderNo &&
- o.WarehouseId == warehouse.WarehouseId
+ o.WarehouseId == warehouse.WarehouseId &&
+ serialNumbers.Contains(cp.BoxCode)
)
.Select((cp, d, o) => cp)
.ToList();
@@ -900,25 +926,28 @@
//float totalQty = CPinboundOrderDetails.Sum(x => x.QtyOfpcs);
+ // 楠岃瘉鏌ヨ鍒扮殑鏁版嵁鏁伴噺鏄惁鍖归厤
+ if (CPinboundOrderDetails.Count < serialNumbers.Count)
+ {
+ return WebResponseContent.Instance.Error($"鏈壘鍒版墍鏈夊搴旂殑绠卞彿淇℃伅锛屾壘鍒皗CPinboundOrderDetails.Count}鏉★紝鏈熸湜{serialNumbers.Count}鏉�");
+ }
+
// 鎸夌収绠卞彿鍒嗙粍锛岀敤浜庡悗缁鐞�
- var boxCodesToCheck = CPinboundOrderDetails
- .Select(x => x.BoxCode)
- .Where(bc => !string.IsNullOrEmpty(bc))
- .Distinct()
- .ToList();
+ var cpDetailsByBoxCode = CPinboundOrderDetails
+ .GroupBy(x => x.BoxCode)
+ .ToDictionary(g => g.Key, g => g.ToList());
- // 3. 鏌ヨ杩欎簺绠卞彿鏄惁宸插瓨鍦ㄤ簬搴撳瓨涓�
var existingStockBoxCodes = _stockRepository.StockInfoRepository.Db
- .Queryable<Dt_StockInfo>()
- .LeftJoin<Dt_StockInfoDetail>((s, d) => s.Id == d.StockId)
- .LeftJoin<Dt_StockInfoDetailCP>((s, d, cp) => d.Id == cp.StockDetailId)
- .Where((s, d, cp) => boxCodesToCheck.Contains(cp.BoxCode) && !string.IsNullOrEmpty(cp.BoxCode))
- .Select((s, d, cp) => cp.BoxCode)
- .Distinct()
- .ToList();
+ .Queryable<Dt_StockInfo>()
+ .LeftJoin<Dt_StockInfoDetail>((s, d) => s.Id == d.StockId)
+ .LeftJoin<Dt_StockInfoDetailCP>((s, d, cp) => d.Id == cp.StockDetailId)
+ .Where((s, d, cp) =>
+ serialNumbers.Contains(cp.BoxCode))
+ .Select((s, d, cp) => cp.BoxCode)
+ .Distinct()
+ .ToList();
- // 4. 妫�鏌ユ槸鍚︽湁閲嶅
if (existingStockBoxCodes.Any())
{
return WebResponseContent.Instance.Error($"浠ヤ笅绠卞彿宸插湪搴撳瓨涓細{string.Join(",", existingStockBoxCodes)}");
@@ -1127,6 +1156,7 @@
return content;
}
+ #endregion
public string ReceiveWMSTaskin = WIDESEA_Core.Helper.AppSettings.Configuration["ReceiveWMSTaskin"];
@@ -1289,17 +1319,7 @@
public int GetPalletType(Dt_Warehouse warehouse, string palletCode)
{
-
- if (warehouse.WarehouseCode == WarehouseEnum.SC01_DW.ObjToString())
- {
- Dt_PalletTypeInfo palletTypeInfo = _palletTypeInfoRepository.QueryFirst(x => x.CodeStartStr == palletCode.Substring(0, 2));
- if (palletTypeInfo == null)
- {
- throw new Exception($"鎵樼洏鍙烽敊璇�");
- }
- return palletTypeInfo.PalletType;
- }
- 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)
@@ -1308,35 +1328,16 @@
}
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;
+ else
+ {
+ Dt_PalletTypeInfo palletTypeInfo = _palletTypeInfoRepository.QueryFirst(x => x.CodeStartStr == palletCode.Substring(0, 2));
+ if (palletTypeInfo == null)
+ {
+ throw new Exception($"鎵樼洏鍙烽敊璇�");
+ }
+ return palletTypeInfo.PalletType;
+ }
+ return 0;
}
/// <summary>
/// 鍒ゆ柇姝ｇ‘鏃堕棿鏍煎紡
@@ -1573,6 +1574,7 @@
{
OrderId = orderDetail1.OrderId,
MaterielCode = item.MaterielCode,
+ MaterielType = item.MaterielType,
BatchNo = item.BatchNo,
OrderQuantity = item.OrderQuantity,
ReceiptQuantity = 0,
@@ -1592,6 +1594,7 @@
{
Dt_InboundOrderDetail orderDetail = new Dt_InboundOrderDetail()
{
+ MaterielType = item.MaterielType,
MaterielCode = item.MaterielCode,
BatchNo = item.BatchNo,
OrderQuantity = item.OrderQuantity,
@@ -1622,46 +1625,12 @@
System = model.System,
Details = new List<Dt_InboundOrderDetail> { orderDetail }
};
- //switch (model.OrderType)//鍗曟嵁绫诲瀷
- //{
- // case 1:
- // inboundOrder.OrderType = InOrderTypeEnum.Allocat.ObjToInt();
- // break;
- // case 3:
- // inboundOrder.OrderType = InOrderTypeEnum.CustomerRecovery.ObjToInt();
- // break;
- // case 6:
- // inboundOrder.OrderType = InOrderTypeEnum.SaleReturn.ObjToInt();
- // break;
- // default:
- // break;
- //};
Db.InsertNav(inboundOrder).Include(x => x.Details).ExecuteCommand();
-
}
}
}
_unitOfWorkManage.CommitTran();
content = WebResponseContent.Instance.OK();
- //InboundOrderAddDTO orderAddDTO1 = new InboundOrderAddDTO();
- //orderAddDTO1.OrderNo = orderAddDTO.AsnNo;
- //orderAddDTO1.UpperOrderNo = orderAddDTO.AsnNo;
- //orderAddDTO1.OutWareHouse = orderAddDTO.InWarehouse;
- //orderAddDTO1.TransactionCode = orderAddDTO.TransactionCode;
- //orderAddDTO1.InoutType = orderAddDTO.OrderType;
- //orderAddDTO1.OrderType = orderAddDTO.InoutType.ObjToInt();
- //orderAddDTO1.Details = orderAddDTO.DetailList.DicToIEnumerable<InboundOrderDetailAddDTO>();
- //#region 楠岃瘉鏁版嵁
- //(bool, string, object?) result = CheckInboundOrderAddData(orderAddDTO1);
- //if (!result.Item1) return content = WebResponseContent.Instance.Error(result.Item2);
- //#endregion
-
- //Dt_InboundOrder inboundOrder = _mapper.Map<Dt_InboundOrder>(orderAddDTO1);
- //inboundOrder.OrderStatus = InboundStatusEnum.鏈紑濮�.ObjToInt();
- //inboundOrder.Creater = "WMS";
- //inboundOrder.CreateDate = DateTime.Now;
- //bool a = BaseDal.Db.InsertNav(inboundOrder).Include(x => x.Details).ExecuteCommand();
-
}
catch (Exception ex)
{
@@ -1801,11 +1770,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);
@@ -1976,119 +1945,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