From ba30538b12f66d8483b925e44f38b9ec486b4999 Mon Sep 17 00:00:00 2001
From: heshaofeng <heshaofeng@hnkhzn.com>
Date: 星期二, 09 十二月 2025 10:46:13 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu
---
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_InboundService/InboundOrderService.cs | 288 ++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 243 insertions(+), 45 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_InboundService/InboundOrderService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_InboundService/InboundOrderService.cs"
index c89c12a..ccbb4de 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_InboundService/InboundOrderService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_InboundService/InboundOrderService.cs"
@@ -1,5 +1,7 @@
锘縰sing AutoMapper;
using SqlSugar;
+using System.Dynamic;
+using System.Text.RegularExpressions;
using System.Threading.Tasks;
using WIDESEA_Common.CommonEnum;
using WIDESEA_Common.OrderEnum;
@@ -37,10 +39,11 @@
private readonly IRepository<Dt_StockInfoDetail> _stockDetailRepository;
private readonly IRepository<Dt_InboundOrder> _inboundOrderRepository;
private readonly IRepository<Dt_WarehouseArea> _warehouseAreaRepository;
+ private readonly IRepository<Dt_LocationType> _locationTypeRepository;
private readonly IRepository<Dt_StockInfo> _stockRepository;
public IRepository<Dt_InboundOrder> Repository => BaseDal;
- public InboundOrderService(IRepository<Dt_InboundOrder> BaseDal, IMapper mapper, IUnitOfWorkManage unitOfWorkManage, IRepository<Dt_InboundOrderDetail> inboundOrderDetailRepository, IRepository<Dt_Task> taskRepository, IStockService stockService, IInboundOrderDetailService inboundOrderDetailService, IMaterialUnitService materialUnitService, IRepository<Dt_StockInfoDetail> stockDetailRepository, IRepository<Dt_InboundOrder> inboundOrderRepository, IRepository<Dt_WarehouseArea> warehouseAreaRepository,IRepository<Dt_StockInfo> stockRepository) : base(BaseDal)
+ public InboundOrderService(IRepository<Dt_InboundOrder> BaseDal, IMapper mapper, IUnitOfWorkManage unitOfWorkManage, IRepository<Dt_InboundOrderDetail> inboundOrderDetailRepository, IRepository<Dt_Task> taskRepository, IStockService stockService, IInboundOrderDetailService inboundOrderDetailService, IMaterialUnitService materialUnitService, IRepository<Dt_StockInfoDetail> stockDetailRepository, IRepository<Dt_InboundOrder> inboundOrderRepository, IRepository<Dt_WarehouseArea> warehouseAreaRepository, IRepository<Dt_StockInfo> stockRepository, IRepository<Dt_LocationType> locationTypeRepository) : base(BaseDal)
{
_mapper = mapper;
_unitOfWorkManage = unitOfWorkManage;
@@ -53,6 +56,7 @@
_inboundOrderRepository = inboundOrderRepository;
_warehouseAreaRepository = warehouseAreaRepository;
_stockRepository = stockRepository;
+ _locationTypeRepository = locationTypeRepository;
}
public async Task<WebResponseContent> ReceiveInboundOrder(List<Dt_InboundOrder> models, int operateType)
@@ -94,8 +98,11 @@
item.Unit = purchaseToStockResult.Unit;
item.OrderQuantity = purchaseToStockResult.Quantity;
}
+ if (model.OrderType != InOrderTypeEnum.AllocatInbound.ObjToInt())
+ {
+ model.InboundOrderNo = CreateCodeByRule(nameof(RuleCodeEnum.InboundOrderRule));
+ }
- model.InboundOrderNo = CreateCodeByRule(nameof(RuleCodeEnum.InboundOrderRule));
Db.InsertNav(model).Include(x => x.Details).ExecuteCommand();
}
return WebResponseContent.Instance.OK();
@@ -119,6 +126,10 @@
if (inboundOrder.Details == null || inboundOrder.Details.Count == 0)
{
return WebResponseContent.Instance.Error($"鏈壘鍒板叆搴撳崟鏄庣粏淇℃伅");
+ }
+ if (inboundOrder.OrderStatus != InOrderStatusEnum.鏈紑濮�.ObjToInt())
+ {
+ return WebResponseContent.Instance.Error($"璇ヨ鍗曠姸鎬佷笉鍏佽淇敼");
}
List<Dt_InboundOrderDetail> inboundOrderDetails = new List<Dt_InboundOrderDetail>();
List<Dt_InboundOrderDetail> updateInboundOrderDetails = new List<Dt_InboundOrderDetail>();
@@ -224,6 +235,10 @@
{
return WebResponseContent.Instance.Error($"鏈壘鍒板叆搴撳崟鏄庣粏淇℃伅");
}
+ if (inboundOrder.OrderStatus != InOrderStatusEnum.鏈紑濮�.ObjToInt())
+ {
+ return WebResponseContent.Instance.Error($"璇ヨ鍗曠姸鎬佷笉鍏佽鍒犻櫎");
+ }
//Db.DeleteNav(inboundOrder).Include(x => x.Details).ExecuteCommand();
_unitOfWorkManage.BeginTran();
//BaseDal.DeleteAndMoveIntoHty(inboundOrder, OperateTypeEnum.鑷姩鍒犻櫎);
@@ -328,12 +343,12 @@
if (!result2.Item1) return content = WebResponseContent.Instance.Error(result2.Item2);
// materielGroupDTO.WarehouseCode
- var code = _warehouseAreaRepository.Db.Queryable<Dt_WarehouseArea>().Where(x => x.Code == materielGroupDTO.WarehouseType).Select(x=>x.Code).First();
- if(string.IsNullOrEmpty(code))
+ var code = _warehouseAreaRepository.Db.Queryable<Dt_WarehouseArea>().Where(x => x.Code == materielGroupDTO.WarehouseType).Select(x => x.Code).First();
+ if (string.IsNullOrEmpty(code))
{
return content = WebResponseContent.Instance.Error($"浠撳簱涓病鏈夎{materielGroupDTO.WarehouseType}缂栧彿銆�");
}
-
+
Dt_InboundOrder inboundOrder = GetInboundOrder(materielGroupDTO.OrderNo);
@@ -355,10 +370,10 @@
if (stockInfo == null)
{
- stockInfo = new Dt_StockInfo() { PalletType = (int)PalletTypeEnum.None,LocationType=materielGroupDTO.locationType.ObjToInt() };
+ stockInfo = new Dt_StockInfo() { PalletType = (int)PalletTypeEnum.None, LocationType = materielGroupDTO.locationType.ObjToInt() };
stockInfo.Details = new List<Dt_StockInfoDetail>();
}
-
+
foreach (var item in dbinboundOrderDetails)
{
stockInfo.Details.Add(new Dt_StockInfoDetail
@@ -372,15 +387,15 @@
SupplyCode = item.SupplyCode,
WarehouseCode = materielGroupDTO.WarehouseType,
StockQuantity = item.OrderQuantity,
- BarcodeQty=item.BarcodeQty,
- BarcodeUnit=item.BarcodeUnit,
- FactoryArea= inboundOrder.FactoryArea,
- Status = 0,
+ BarcodeQty = item.BarcodeQty,
+ BarcodeUnit = item.BarcodeUnit,
+ FactoryArea = inboundOrder.FactoryArea,
+ Status = 0,
OrderNo = inboundOrder.InboundOrderNo,
BusinessType = inboundOrder.BusinessType,
-
+
});
-
+
item.ReceiptQuantity = item.BarcodeQty;
item.OrderDetailStatus = OrderDetailStatusEnum.Over.ObjToInt();
item.WarehouseCode = materielGroupDTO.WarehouseType;
@@ -427,17 +442,18 @@
WebResponseContent content = new WebResponseContent();
try
- {
+ {
(bool, string, object?) result2 = ModelValidate.ValidateModelData(materielGroupDTO);
if (!result2.Item1) return content = WebResponseContent.Instance.Error(result2.Item2);
- bool code = _warehouseAreaRepository.Db.Queryable<Dt_WarehouseArea>().Where(x => x.Id == materielGroupDTO.WarehouseCode).Any();
+ bool code = _locationTypeRepository.Db.Queryable<Dt_LocationType>().Where(x => x.LocationType == materielGroupDTO.WarehouseCode).Any();
if (!code)
{
- return content = WebResponseContent.Instance.Error($"浠撳簱涓病鏈夎{materielGroupDTO.WarehouseCode}缂栧彿銆�");
+ return content = WebResponseContent.Instance.Error($"鍖哄煙涓病鏈夎{materielGroupDTO.WarehouseCode}缂栧彿銆�");
}
- if(_stockRepository.QueryFirst(x=>x.PalletCode == materielGroupDTO.PalletCode)!=null){
+ if (_stockRepository.QueryFirst(x => x.PalletCode == materielGroupDTO.PalletCode) != null)
+ {
return WebResponseContent.Instance.Error("璇ユ墭鐩樺凡缁忕粍杩囩洏");
}
@@ -456,7 +472,7 @@
{
if (stockInfo == null)
{
- stockInfo = new Dt_StockInfo() { PalletType = PalletTypeEnum.Empty.ObjToInt(), StockStatus = StockStatusEmun.缁勭洏鏆傚瓨.ObjToInt(), PalletCode = materielGroupDTO.PalletCode,LocationType= materielGroupDTO.WarehouseCode.ObjToInt() };
+ stockInfo = new Dt_StockInfo() { PalletType = PalletTypeEnum.Empty.ObjToInt(), StockStatus = StockStatusEmun.缁勭洏鏆傚瓨.ObjToInt(), PalletCode = materielGroupDTO.PalletCode, LocationType = materielGroupDTO.WarehouseCode.ObjToInt() };
stockInfo.Details = new List<Dt_StockInfoDetail>();
}
else
@@ -631,42 +647,224 @@
}
}
- public WebResponseContent UndoPalletGroup(string palletCode)
+ public WebResponseContent UndoPalletGroup(string palletCode, string barcode = "")
{
+
if (string.IsNullOrWhiteSpace(palletCode))
{
return WebResponseContent.Instance.Error("鎵樼洏鍙蜂笉鑳戒负绌�");
}
- var stock= _stockRepository.Db.Queryable<Dt_StockInfo>().Includes(o=>o.Details).First(x => x.PalletCode == palletCode && x.StockStatus==3);
- if (stock == null)
- {
- return WebResponseContent.Instance.Error($"鏈壘鍒版墭鐩樺彿{palletCode}瀵瑰簲鐨勫簱瀛樿褰�");
- }
- // 鑾峰彇搴撳瓨璇︽儏鍏宠仈鐨勬墍鏈夊叆搴撳崟鍙�
- var relatedOrderNos = stock.Details.Select(d => d.OrderNo).First();
- // 鏌ヨ鎵�鏈夊叧鑱旂殑鍏ュ簱鍗曪紙鍚鎯咃級
- var inboundOrders = _inboundOrderRepository.Db.Queryable<Dt_InboundOrder>()
- .Includes(x => x.Details)
- .Where(x => relatedOrderNos==x.InboundOrderNo)
- .First();
-
- var barcodes = stock.Details.Select(d => d.Barcode).ToList();
- // 鍖归厤搴撳瓨鏉＄爜瀵瑰簲鐨勫叆搴撳崟鏄庣粏
- var matchedInboundDetails = inboundOrders.Details
- ?.Where(d => barcodes.Contains(d.Barcode))
- .ToList();
- foreach (var detail in matchedInboundDetails)
+ try
{
- detail.ReceiptQuantity = 0;
- detail.OrderDetailStatus = 0;
- _inboundOrderDetailRepository.UpdateData(detail);
- }
- _stockDetailRepository.DeleteData(stock.Details);
- _stockRepository.DeleteData(stock);
+ _unitOfWorkManage.BeginTran();
- return WebResponseContent.Instance.OK();
+ // 2. 鏌ヨ鎵樼洏搴撳瓨涓昏褰曪紙閬垮厤鏃犳暟鎹姏寮傚父锛�
+ var stock = _stockRepository.Db.Queryable<Dt_StockInfo>()
+ .Includes(o => o.Details)
+ .First(x => x.PalletCode == palletCode
+ && (x.StockStatus == (int)StockStatusEmun.缁勭洏鏆傚瓨
+ || x.StockStatus == StockStatusEmun.鍏ュ簱纭.ObjToInt()));
+
+ if (stock == null)
+ {
+ return WebResponseContent.Instance.Error($"鏈壘鍒版墭鐩樺彿{palletCode}瀵瑰簲鐨勫簱瀛樿褰�");
+ }
+
+ // 3. 鍦烘櫙1锛氬垹闄ゆ寚瀹氭潯鐮�
+ if (!string.IsNullOrWhiteSpace(barcode))
+ {
+ var targetDetail = stock.Details?.FirstOrDefault(x => x.Barcode == barcode);
+ if (targetDetail == null)
+ {
+ _unitOfWorkManage.RollbackTran();
+ return WebResponseContent.Instance.Error($"鎵樼洏{palletCode}涓嬫湭鎵惧埌鏉＄爜{barcode}鐨勬槑缁嗚褰�");
+ }
+
+ ResetInboundOrderStatus(new List<string> { targetDetail.OrderNo},new List<string> { targetDetail.Barcode});
+ // 鍒犻櫎鎸囧畾鏄庣粏
+ _stockDetailRepository.DeleteData(targetDetail);
+
+
+ // 閲嶆柊鏌ヨ鍓╀綑鏄庣粏锛堜繚璇佹暟鎹噯纭�э級
+ var remainingDetails = _stockDetailRepository.Db.Queryable<Dt_StockInfoDetail>()
+ .Where(x => x.StockId == stock.Id)
+ .ToList();
+
+ // 鍓╀綑鏄庣粏涓虹┖ 鈫� 鍒犻櫎涓昏〃 + 閲嶇疆鍏ュ簱鍗曞強鏄庣粏鐘舵��
+ if (!remainingDetails.Any())
+ {
+ // 閲嶇疆鍏ュ簱鍗曞強鏄庣粏鐘舵��
+ ResetInboundOrderStatus(stock.Details.Select(d => d.OrderNo).Distinct().ToList());
+
+ _stockRepository.DeleteData(stock);
+ _unitOfWorkManage.CommitTran();
+ return WebResponseContent.Instance.OK($"鏉＄爜{barcode}鎾ら攢鎴愬姛锛屾墭鐩樻棤鍓╀綑鏄庣粏锛屽凡鍒犻櫎鎵樼洏骞堕噸缃叧鑱斿叆搴撳崟鐘舵��");
+ }
+
+ _unitOfWorkManage.CommitTran();
+ return WebResponseContent.Instance.OK($"鏉＄爜{barcode}鎾ら攢鎴愬姛锛屾墭鐩樹粛鏈夊墿浣欐槑缁�");
+ }
+
+ // 鍒犻櫎鏁存墭鐩橈紙鏃犳潯鐮佷紶鍏ワ級
+ if (stock.Details == null || !stock.Details.Any())
+ {
+ _stockRepository.DeleteData(stock);
+ _unitOfWorkManage.CommitTran();
+ return WebResponseContent.Instance.OK("鎵樼洏鏃犳槑缁嗚褰曪紝宸茬洿鎺ュ垹闄ゆ墭鐩樹富鏁版嵁");
+ }
+
+ // 鏈夋槑缁� 鈫� 閲嶇疆鍏ュ簱鍗曞強鏄庣粏鐘舵�� + 鍒犻櫎搴撳瓨
+ var relatedOrderNos = stock.Details.Select(d => d.OrderNo).Distinct().ToList();
+ if (!relatedOrderNos.Any())
+ {
+ _unitOfWorkManage.RollbackTran();
+ return WebResponseContent.Instance.Error("搴撳瓨鏄庣粏鏈叧鑱斾换浣曞叆搴撳崟鍙凤紝鏃犳硶瀹屾垚鎾ら攢");
+ }
+
+ // 閲嶇疆鍏ュ簱鍗曚富鐘舵�� + 鏄庣粏鐘舵��
+ ResetInboundOrderStatus(relatedOrderNos, stock.Details.Select(d => d.Barcode).ToList());
+
+ // 4.3 鍒犻櫎搴撳瓨鏄庣粏鍜屼富琛�
+ _stockDetailRepository.DeleteData(stock.Details);
+ _stockRepository.DeleteData(stock);
+
+ _unitOfWorkManage.CommitTran();
+ return WebResponseContent.Instance.OK("鎵樼洏鎾ら攢鎴愬姛锛屽凡閲嶇疆鍏宠仈鍏ュ簱鍗曞強鏄庣粏鐘舵��");
+ }
+ catch (Exception ex)
+ {
+ _unitOfWorkManage.RollbackTran();
+ return WebResponseContent.Instance.Error($"鎵樼洏鎾ら攢澶辫触锛歿ex.Message}");
+ }
}
+
+
+ private void ResetInboundOrderStatus(List<string> orderNos, List<string> barcodes = null)
+ {
+ foreach (var orderNo in orderNos)
+ {
+ var inboundOrder = _inboundOrderRepository.Db.Queryable<Dt_InboundOrder>()
+ .Includes(x => x.Details)
+ .First(x => x.InboundOrderNo == orderNo);
+
+ if (inboundOrder == null) continue;
+
+ bool isSingleBarcode = barcodes != null && barcodes.Count == 1;
+ if (!isSingleBarcode)
+ {
+ // 闈炲崟涓潯鐮侊紙鏁村崟/澶氫釜鏉＄爜锛夛細閲嶇疆涓昏〃鐘舵�佷负0
+ inboundOrder.OrderStatus = 0;
+ _inboundOrderRepository.UpdateData(inboundOrder);
+ }
+
+ // 閲嶇疆鍏ュ簱鍗曟槑缁嗙姸鎬�
+ if (inboundOrder.Details == null || !inboundOrder.Details.Any()) continue;
+
+ var targetDetails = barcodes == null
+ ? inboundOrder.Details.ToList() // 涓嶄紶鏉＄爜鍒欓噸缃暣鍗曟槑缁�
+ : inboundOrder.Details.Where(d => barcodes.Contains(d.Barcode)).ToList();
+
+ foreach (var detail in targetDetails)
+ {
+ detail.ReceiptQuantity = 0;
+ detail.OrderDetailStatus = 0;
+ _inboundOrderDetailRepository.UpdateData(detail);
+ }
+ }
+ }
+
+ public override PageGridData<Dt_InboundOrder> GetPageData(PageDataOptions options)
+ {
+ string wheres = ValidatePageOptions(options);
+
+ string pattern = @"inboundOrderNo like '[^']+'\s*and\s*";
+ wheres = Regex.Replace(wheres, pattern, "", RegexOptions.IgnoreCase);
+
+ //鑾峰彇鎺掑簭瀛楁
+ Dictionary<string, SqlSugar.OrderByType> orderbyDic = GetPageDataSort(options, TProperties);
+ List<OrderByModel> orderByModels = new List<OrderByModel>();
+ foreach (var item in orderbyDic)
+ {
+ OrderByModel orderByModel = new()
+ {
+ FieldName = item.Key,
+ OrderByType = item.Value
+ };
+ orderByModels.Add(orderByModel);
+ }
+ ISugarQueryable<Dt_InboundOrder> sugarQueryable1 = BaseDal.Db.Queryable<Dt_InboundOrder>();
+
+ int totalCount = 0;
+ List<SearchParameters> searchParametersList = new List<SearchParameters>();
+ if (!string.IsNullOrEmpty(options.Wheres))
+ {
+ try
+ {
+ searchParametersList = options.Wheres.DeserializeObject<List<SearchParameters>>();
+ if (searchParametersList.Count > 0)
+ {
+
+ SearchParameters? searchParameters = searchParametersList.FirstOrDefault(x => x.Name == nameof(Dt_InboundOrder.InboundOrderNo).FirstLetterToLower());
+ if (searchParameters != null)
+ {
+ sugarQueryable1 = sugarQueryable1.Where(x => x.InboundOrderNo.Contains(searchParameters.Value.ToString())
+ || x.UpperOrderNo.Contains(searchParameters.Value.ToString()) ||
+ x.Details.Any(d => d.Barcode == searchParameters.Value.ToString()));
+ }
+ searchParameters = searchParametersList.FirstOrDefault(x => x.Name == nameof(Dt_InboundOrder.OrderType).FirstLetterToLower());
+ if (searchParameters != null)
+ {
+ sugarQueryable1 = sugarQueryable1.Where(x => x.OrderType.Equals(searchParameters.Value.ToString()));
+ }
+ //var dataList = sugarQueryable1.ToPageList(options.Page, options.Rows, ref totalCount);
+ //return new PageGridData<Dt_InboundOrder>(totalCount, dataList);
+ }
+ options.Filter = searchParametersList;
+ }
+ catch { }
+ }
+ var data = sugarQueryable1
+ .WhereIF(!wheres.IsNullOrEmpty(), wheres)
+ .Where(x => x.OrderType == 0)
+ .OrderBy(orderByModels).Includes(x => x.Details)
+ .ToPageList(options.Page, options.Rows, ref totalCount);
+
+ return new PageGridData<Dt_InboundOrder>(totalCount, data);
+ }
+
+ //public override PageGridData<Dt_InboundOrder> GetPageData(PageDataOptions options)
+ //{
+ // //var pageGridData = base.GetPageData(options);
+
+ // ISugarQueryable<Dt_InboundOrder> sugarQueryable1 = BaseDal.Db.Queryable<Dt_InboundOrder>();
+ // if (!string.IsNullOrEmpty(options.Wheres))
+ // {
+
+ // List<SearchParameters> searchParametersList = options.Wheres.DeserializeObject<List<SearchParameters>>();
+ // int totalCount = 0;
+ // if (searchParametersList.Count > 0)
+ // {
+
+ // SearchParameters? searchParameters = searchParametersList.FirstOrDefault(x => x.Name == nameof(Dt_InboundOrder.InboundOrderNo).FirstLetterToLower());
+ // if (searchParameters != null)
+ // {
+ // sugarQueryable1 = sugarQueryable1.Where(x => x.InboundOrderNo.Contains(searchParameters.Value.ToString())
+ // || x.UpperOrderNo.Contains(searchParameters.Value.ToString()) ||
+ // x.Details.Any(d => d.Barcode == searchParameters.Value.ToString()));
+ // }
+ // searchParameters = searchParametersList.FirstOrDefault(x => x.Name == nameof(Dt_InboundOrder.OrderType).FirstLetterToLower());
+ // if (searchParameters != null)
+ // {
+ // sugarQueryable1 = sugarQueryable1.Where(x => x.OrderType.Equals(searchParameters.Value.ToString()));
+ // }
+ // var dataList = sugarQueryable1.ToPageList(options.Page, options.Rows, ref totalCount);
+ // return new PageGridData<Dt_InboundOrder>(totalCount, dataList);
+ // }
+ // }
+ // return new PageGridData<Dt_InboundOrder>();
+ //}
+
}
}
--
Gitblit v1.9.3