From 595770fb0359d0425a103fb6e2106cecffe2c90b Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期一, 30 十二月 2024 11:32:45 +0800
Subject: [PATCH] PDA添加组盘入库WMS系统，不上传上游系统
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/InboundOrderService.cs | 82 +++++++++++------------------------------
1 files changed, 22 insertions(+), 60 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/InboundOrderService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/InboundOrderService.cs"
index 319ec37..6b37125 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/InboundOrderService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/InboundOrderService.cs"
@@ -1,5 +1,6 @@
锘縰sing AutoMapper;
using HslCommunication.WebSocket;
+using Microsoft.AspNetCore.Mvc.RazorPages;
using Newtonsoft.Json;
using SqlSugar;
using System;
@@ -415,31 +416,16 @@
return content;
}
- public WebResponseContent MaterielGroup(int inboundOrderId, string palletCode, List<string> serNums)
+ public WebResponseContent MaterielGroup(string palletCode, int Initiallife, int warehouseId, List<string> serNums)
{
+ WebResponseContent content = new WebResponseContent();
try
{
- Dt_InboundOrder inboundOrder = BaseDal.Db.Queryable<Dt_InboundOrder>().Where(x => x.Id == inboundOrderId).Includes(x => x.Details).First();
- if (inboundOrder == null)
+ Dt_Warehouse warehouse = _warehouseService.Repository.QueryFirst(x => x.WarehouseId == warehouseId);
+ if (warehouse == null)
{
- return WebResponseContent.Instance.Error($"鏈壘鍒板叆搴撳崟淇℃伅");
+ return WebResponseContent.Instance.Error($"鏈壘鍒拌浠撳簱淇℃伅");
}
- if (inboundOrder.Details == null || inboundOrder.Details.Count <= 0)
- {
- return WebResponseContent.Instance.Error($"鏈壘鍒板叆搴撳崟鏄庣粏淇℃伅");
- }
-
- Dt_ReceiveOrder receiveOrder = _inboundRepository.ReceiveOrderRepository.Db.Queryable<Dt_ReceiveOrder>().Where(x => x.ReceiveOrderNo == inboundOrder.UpperOrderNo).Includes(x => x.Details).First();
- if (receiveOrder == null)
- {
- return WebResponseContent.Instance.Error($"鏈壘鍒板搴旂殑鏀惰揣鍗�");
- }
- if (receiveOrder.Details == null || receiveOrder.Details.Count <= 0)
- {
- return WebResponseContent.Instance.Error($"鏈壘鍒板搴旂殑鏀惰揣鍗曟槑缁�");
- }
-
- List<string> purchaseOrderNos = receiveOrder.Details.Select(x => x.PurchaseOrderNo).ToList();
List<MatSerNumAnalysisModel> models = CodeAnalysisHelper.CodeAnalysis<MatSerNumAnalysisModel>(AnalysisCodeEnum.MatSerNumAnalysis, serNums);
@@ -455,17 +441,6 @@
return WebResponseContent.Instance.Error($"鏈壘鍒拌鐗╂枡鐨勪俊鎭�");
}
- List<Dt_InboundOrderDetail> inboundOrderDetails = inboundOrder.Details.Where(x => x.MaterielCode == materielCode).ToList();
-
- if (inboundOrderDetails == null || inboundOrderDetails.Count <= 0)
- {
- return WebResponseContent.Instance.Error($"鏈湪鍏ュ簱鍗曟槑缁嗕腑鎵惧埌璇ョ墿鏂欎俊鎭�");
- }
- if (receiveOrder.Details.FirstOrDefault(x => x.MaterielCode == materielCode) == null)
- {
- return WebResponseContent.Instance.Error($"鏈湪鏀惰揣鍗曟槑缁嗕腑鎵惧埌璇ョ墿鏂欎俊鎭�");
- }
-
float beforeQuantity = 0;
Dt_StockInfo stockInfo = _stockRepository.StockInfoRepository.Db.Queryable<Dt_StockInfo>().Where(x => x.PalletCode == palletCode).Includes(x => x.Details).First();
@@ -474,50 +449,43 @@
stockInfo = new Dt_StockInfo()
{
PalletCode = palletCode,
- StockStatus = StockStatusEmun.缁勭洏鏆傚瓨.ObjToInt(),
- WarehouseId = inboundOrder.WarehouseId,
+ StockStatus = StockStatusEmun.鎵嬪姩缁勭洏鏆傚瓨.ObjToInt(),
+ WarehouseId = warehouse.WarehouseId,
PalletType = PalletTypeEnum.SmallPallet.ObjToInt(),
Details = new List<Dt_StockInfoDetail>()
};
}
else
{
- if (stockInfo.StockStatus != StockStatusEmun.缁勭洏鏆傚瓨.ObjToInt())
+ if (stockInfo.StockStatus != StockStatusEmun.缁勭洏鏆傚瓨.ObjToInt() && stockInfo.StockStatus != StockStatusEmun.鎵嬪姩缁勭洏鏆傚瓨.ObjToInt())
{
return WebResponseContent.Instance.Error($"鎵樼洏鍙烽噸澶�");
}
beforeQuantity = stockInfo.Details.Sum(x => x.StockQuantity);
}
+ if (warehouse.WarehouseCode == WarehouseEnum.HA64.ToString())
+ {
+ stockInfo.Remark = Initiallife.ToString();
+ }
+
List<Dt_StockInfoDetail> stockInfoDetails = new List<Dt_StockInfoDetail>();
List<int> detailKeys = new List<int>();
foreach (var model in models)
{
- if (purchaseOrderNos.FirstOrDefault(x => x == model.PurchaseOrderNo) == null)
- {
- return WebResponseContent.Instance.Error($"鏈湪鏀惰揣鍗曟槑缁嗕腑鎵惧埌璇ラ噰璐崟");
- }
-
- Dt_InboundOrderDetail? notGroupDetail = inboundOrderDetails.Where(x => x.OrderDetailStatus == OrderDetailStatusEnum.New.ObjToInt() && x.OrderQuantity == model.Quantity && !detailKeys.Contains(x.Id) && x.OrderQuantity > x.ReceiptQuantity).FirstOrDefault();
-
- if (notGroupDetail == null)
- {
- return WebResponseContent.Instance.Error($"璇ョ墿鏂欏湪璇ュ叆搴撳崟涓凡鍏ㄩ儴缁勭洏瀹屾垚");
- }
- detailKeys.Add(notGroupDetail.Id);
Dt_StockInfoDetail stockInfoDetail = new Dt_StockInfoDetail()
{
BatchNo = model.LotNo,
MaterielCode = materielInfo.MaterielCode,
MaterielName = materielInfo.MaterielName,
- OrderNo = inboundOrder.InboundOrderNo,
+ OrderNo = "",
SerialNumber = model.SerialNumber,
StockQuantity = model.Quantity,
OutboundQuantity = 0,
Status = StockStatusEmun.缁勭洏鏆傚瓨.ObjToInt(),
ProductionDate = model.ProductionDate,
EffectiveDate = model.EffectiveDate,
- InboundOrderRowNo = notGroupDetail.RowNo,
+ InboundOrderRowNo = 0,
};
if (stockInfo.Id > 0)
@@ -527,14 +495,9 @@
stockInfo.Details.Add(stockInfoDetail);
stockInfoDetails.Add(stockInfoDetail);
-
- notGroupDetail.ReceiptQuantity = model.Quantity;
- notGroupDetail.OrderDetailStatus = OrderDetailStatusEnum.GroupAndInbound.ObjToInt();
}
float totalQuantity = stockInfo.Details.Sum(x => x.StockQuantity);
-
- inboundOrder.OrderStatus = InOrderStatusEnum.鍏ュ簱涓�.ObjToInt();
_unitOfWorkManage.BeginTran();
if (stockInfo.Id == 0)
@@ -545,19 +508,18 @@
{
_stockRepository.StockInfoRepository.Db.UpdateNav(stockInfo).Include(x => x.Details, new UpdateNavOptions() { OneToManyInsertOrUpdate = true }).ExecuteCommand();
}
- _inboundRepository.InboundOrderDetailRepository.UpdateData(inboundOrderDetails);
- _inboundRepository.InboundOrderRepository.UpdateData(inboundOrder);
_recordService.StockQuantityChangeRecordService.AddStockChangeRecord(stockInfo, stockInfoDetails, beforeQuantity, totalQuantity, StockChangeTypeEnum.MaterielGroup);
_unitOfWorkManage.CommitTran();
-
- return WebResponseContent.Instance.OK();
+ content.OK();
}
catch (Exception ex)
{
_unitOfWorkManage.RollbackTran();
- return WebResponseContent.Instance.Error(ex.Message);
+ content.Error(ex.Message);
}
+ return content;
}
+
/// <summary>
/// 鍏ュ簱瀹屾垚涓婃姤ERP
/// </summary>
@@ -575,13 +537,13 @@
{
return WebResponseContent.Instance.Error($"鍏ュ簱鍗曟嵁宸插畬鎴�");
}
-
+
Dt_Warehouse warehouse = _warehouseService.Repository.QueryFirst(x => x.WarehouseId == stockInfo.WarehouseId);
if (warehouse == null)
{
return WebResponseContent.Instance.Error($"鏈壘鍒颁粨搴撲俊鎭�");
}
-
+
ERPInboundModel model = new ERPInboundModel()
{
Code = inboundOrder.InboundOrderNo,
--
Gitblit v1.9.3