From a296223898d61a9838bbd35ed75c87575e308a36 Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期五, 07 十一月 2025 17:19:38 +0800
Subject: [PATCH] 1
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Boxing/BoxingInfoService.cs | 237 +++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 191 insertions(+), 46 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Boxing/BoxingInfoService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Boxing/BoxingInfoService.cs"
index 3403592..ba26209 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Boxing/BoxingInfoService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Boxing/BoxingInfoService.cs"
@@ -1,12 +1,15 @@
锘縰sing Mapster;
using Masuit.Tools;
+using Masuit.Tools.Models;
using SqlSugar;
using System.ComponentModel.DataAnnotations;
using System.Linq.Expressions;
+using System.Threading.Tasks;
using WIDESEA_Common;
using WIDESEA_Core.BaseRepository;
using WIDESEA_DTO.Basic;
using WIDESEA_IOrderRepository;
+using WIDESEA_Model.Models;
using WIDESEA_OrderRepository;
namespace WIDESEA_StorageBasicService;
@@ -16,11 +19,13 @@
private readonly IUnitOfWorkManage _unitOfWorkManage;
private readonly ILocationStatusChangeRecordRepository _locationStatusChangeRecordRepository;
private readonly IDt_InboundOrderRepository _inboundOrderRepository;
- public BoxingInfoService(IBoxingInfoRepository BaseDal,IUnitOfWorkManage unitOfWorkManage, ILocationStatusChangeRecordRepository locationStatusChangeRecordRepository, IDt_InboundOrderRepository inboundOrderRepository) : base(BaseDal)
+ private readonly IBoxingInfoDetailRepository _boxingInfoDetailRepository;
+ public BoxingInfoService(IBoxingInfoRepository BaseDal,IUnitOfWorkManage unitOfWorkManage, ILocationStatusChangeRecordRepository locationStatusChangeRecordRepository, IDt_InboundOrderRepository inboundOrderRepository,IBoxingInfoDetailRepository boxingInfoDetailRepository) : base(BaseDal)
{
_unitOfWorkManage = unitOfWorkManage;
_locationStatusChangeRecordRepository = locationStatusChangeRecordRepository;
_inboundOrderRepository = inboundOrderRepository;
+ _boxingInfoDetailRepository = boxingInfoDetailRepository;
}
public override PageGridData<DtBoxingInfo> GetPageData(PageDataOptions options)
{
@@ -60,6 +65,38 @@
}
#region 缁勭洏
+
+ public async Task<WebResponseContent> GetPalletCodeInfo(string palletCode)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ var boxinginfo = await BaseDal.QueryFirstNavAsync(x => x.PalletCode == palletCode);
+ if(boxinginfo != null)
+ {
+ List<PalletCodeInfo> obj = new List<PalletCodeInfo>();
+ boxinginfo.BoxingInfoDetails.ForEach(x =>
+ {
+ obj.Add(new PalletCodeInfo
+ {
+ orderNo=x.OrderNo,
+ warehouseName=x.Warehouse,
+ materialNo = x.MaterielCode,
+ quantity = x.Quantity,
+ });
+ });
+
+ return content.OK(data: obj);
+ }
+ return content.Error();
+ }
+ catch (Exception ex)
+ {
+ return content.Error(ex.Message);
+ }
+ }
+
+
public async Task<WebResponseContent> AddGroupPlateAsync(GroupPlate groupPlate)
{
WebResponseContent content = new WebResponseContent();
@@ -69,60 +106,117 @@
{
return content.Error("鍙傛暟閿欒");
}
- var info = await BaseDal.QueryFirstAsync(x => x.PalletCode == groupPlate.palletCode);
- if (!info.IsNullOrEmpty())
+ var infos = await BaseDal.QueryFirstNavAsync(x => x.PalletCode == groupPlate.palletCode);
+ List<DtBoxingInfoDetail> details = new List<DtBoxingInfoDetail>();
+ if (infos != null)
{
- content.Error("璇ユ墭鐩樺凡瀛樺湪缁勭洏");
- }
- else
- {
- List<DtBoxingInfoDetail> details = new List<DtBoxingInfoDetail>();
foreach (var item in groupPlate.groups)
{
- var InboundOrder = _inboundOrderRepository.QueryFirst(x => x.OrderNo == item.orderNo);
-
- if (InboundOrder != null)
+ if (infos.BoxingInfoDetails.Count > 0)
{
- var x = details.Where(x => x.MaterielCode == InboundOrder.MaterialNo && x.Warehouse == InboundOrder.WarehouseName && x.DrawingNumber == InboundOrder.ProductDrawingNumber && x.DemandClassification == InboundOrder.DemandClassification).FirstOrDefault();
- if (x != null)
+ var detail = _boxingInfoDetailRepository.QueryFirst(x => x.OrderNo == item.orderNo);
+ if (detail != null)
{
- details.Remove(x);
- x.MaterielCode = InboundOrder.MaterialNo;
- x.MaterielName = InboundOrder.MaterialName;
- x.DemandClassification = InboundOrder.DemandClassification;
- x.Warehouse = InboundOrder.WarehouseName;
- x.OrderNo = InboundOrder.UpperOrderNo;
- x.Unit = InboundOrder.Unit;
- x.Specs = InboundOrder.Specs;
- x.Weight = InboundOrder.Weight;
- x.Quantity = x.Quantity + item.quantity;
- x.DrawingNumber = InboundOrder.ProductDrawingNumber;
- x.Date = InboundOrder.Datetime;
- details.Add(x);
+ DtBoxingInfoDetail boxdetail = new DtBoxingInfoDetail()
+ {
+ MaterielCode = detail.MaterielCode,
+ MaterielName = detail.MaterielName,
+ DemandClassification = detail.DemandClassification,
+ Warehouse = detail.Warehouse,
+ OrderNo = detail.OrderNo,
+ Unit = detail.Unit,
+ Specs = detail.Specs,
+ Weight = detail.Weight,
+ WareHouseId = detail.WareHouseId,
+ Quantity = item.quantity,
+ DrawingNumber = detail.DrawingNumber,
+ Date = detail.Date,
+ };
+ details.Add(boxdetail);
}
else
{
- DtBoxingInfoDetail detail = new DtBoxingInfoDetail()
- {
- MaterielCode = InboundOrder.MaterialNo,
- MaterielName = InboundOrder.MaterialName,
- DemandClassification = InboundOrder.DemandClassification,
- Warehouse = InboundOrder.WarehouseName,
- OrderNo = InboundOrder.UpperOrderNo,
- Unit = InboundOrder.Unit,
- Specs = InboundOrder.Specs,
- Weight = InboundOrder.Weight,
- Quantity = item.quantity,
- DrawingNumber = InboundOrder.ProductDrawingNumber,
- Date = InboundOrder.Datetime,
- };
- details.Add(detail);
+ details = GetDtBoxingInfoDetails(item, details);
}
}
else
{
- return content.Error("鏈壘鍒板叆搴撳崟鎹俊鎭�");
+ details = GetDtBoxingInfoDetails(item, details);
}
+ }
+ infos.StockStatus = (int)StockStateEmun.缁勭洏鎾ら攢;
+ DtBoxingInfo_Hty stockhty = infos.Adapt<DtBoxingInfo_Hty>();
+ stockhty.ModifyDate = DateTime.Now;
+ DtBoxingInfo boxing = new DtBoxingInfo()
+ {
+ PalletCode = groupPlate.palletCode,
+ StockStatus = (int)StockStateEmun.缁勭洏鏆傚瓨,
+ BoxingInfoDetails = details
+ };
+ await _unitOfWorkManage.UseTranAsync(async () =>
+ {
+ await BaseDal.Db.DeleteNav<DtBoxingInfo>(x => x.Id == infos.Id)
+ .Include(x => x.BoxingInfoDetails)
+ .ExecuteCommandAsync();
+ await AddStockHtyAsync(stockhty);
+
+ await BaseDal.AddDataNavAsync(boxing);
+ });
+ return content.OK("缁勭洏鎴愬姛");
+ }
+ else
+ {
+ foreach (var item in groupPlate.groups)
+ {
+ #region
+ //var InboundOrder = _inboundOrderRepository.QueryFirst(x => x.OrderNo == item.orderNo);
+
+ //if (InboundOrder != null)
+ //{
+ // var x = details.Where(x => x.MaterielCode == InboundOrder.MaterialNo && x.Warehouse == InboundOrder.WarehouseName && x.DrawingNumber == InboundOrder.ProductDrawingNumber && x.DemandClassification == InboundOrder.DemandClassification).FirstOrDefault();
+ // if (x != null)
+ // {
+ // details.Remove(x);
+ // x.MaterielCode = InboundOrder.MaterialNo;
+ // x.MaterielName = InboundOrder.MaterialName;
+ // x.DemandClassification = InboundOrder.DemandClassification;
+ // x.Warehouse = InboundOrder.WarehouseName;
+ // x.OrderNo = InboundOrder.OrderNo;
+ // x.Unit = InboundOrder.Unit;
+ // x.WareHouseId = InboundOrder.WareHouseId;
+ // x.Specs = InboundOrder.Specs;
+ // x.Weight = InboundOrder.Weight;
+ // x.Quantity = x.Quantity + item.quantity;
+ // x.DrawingNumber = InboundOrder.ProductDrawingNumber;
+ // x.Date = InboundOrder.Datetime;
+ // details.Add(x);
+ // }
+ // else
+ // {
+ // DtBoxingInfoDetail detail = new DtBoxingInfoDetail()
+ // {
+ // MaterielCode = InboundOrder.MaterialNo,
+ // MaterielName = InboundOrder.MaterialName,
+ // DemandClassification = InboundOrder.DemandClassification,
+ // Warehouse = InboundOrder.WarehouseName,
+ // OrderNo = InboundOrder.OrderNo,
+ // Unit = InboundOrder.Unit,
+ // Specs = InboundOrder.Specs,
+ // Weight = InboundOrder.Weight,
+ // WareHouseId = InboundOrder.WareHouseId,
+ // Quantity = item.quantity,
+ // DrawingNumber = InboundOrder.ProductDrawingNumber,
+ // Date = InboundOrder.Datetime,
+ // };
+ // details.Add(detail);
+ // }
+ //}
+ //else
+ //{
+ // return content.Error("鏈壘鍒板叆搴撳崟鎹俊鎭�");
+ //}
+ #endregion
+ details = GetDtBoxingInfoDetails(item,details);
}
DtBoxingInfo boxing = new DtBoxingInfo()
{
@@ -131,15 +225,66 @@
BoxingInfoDetails = details
};
await BaseDal.AddDataNavAsync(boxing);
- content.OK("缁勭洏鎴愬姛");
+ return content.OK("缁勭洏鎴愬姛");
}
- return content;
}
catch (Exception ex)
{
return content.Error(ex.Message);
}
}
+
+
+ public List<DtBoxingInfoDetail> GetDtBoxingInfoDetails(GroupPlateInfo info, List<DtBoxingInfoDetail> details)
+ {
+ var InboundOrder = _inboundOrderRepository.QueryFirst(x => x.OrderNo == info.orderNo);
+ if (InboundOrder != null)
+ {
+ var x = details.Where(x => x.MaterielCode == InboundOrder.MaterialNo && x.Warehouse == InboundOrder.WarehouseName && x.DrawingNumber == InboundOrder.ProductDrawingNumber && x.DemandClassification == InboundOrder.DemandClassification).FirstOrDefault();
+ if (x != null)
+ {
+ details.Remove(x);
+ x.MaterielCode = InboundOrder.MaterialNo;
+ x.MaterielName = InboundOrder.MaterialName;
+ x.DemandClassification = InboundOrder.DemandClassification;
+ x.Warehouse = InboundOrder.WarehouseName;
+ x.OrderNo = InboundOrder.OrderNo;
+ x.Unit = InboundOrder.Unit;
+ x.WareHouseId = InboundOrder.WareHouseId;
+ x.Specs = InboundOrder.Specs;
+ x.Weight = InboundOrder.Weight;
+ x.Quantity = x.Quantity + info.quantity;
+ x.DrawingNumber = InboundOrder.ProductDrawingNumber;
+ x.Date = InboundOrder.Datetime;
+ details.Add(x);
+ }
+ else
+ {
+ DtBoxingInfoDetail boxdetail = new DtBoxingInfoDetail()
+ {
+ MaterielCode = InboundOrder.MaterialNo,
+ MaterielName = InboundOrder.MaterialName,
+ DemandClassification = InboundOrder.DemandClassification,
+ Warehouse = InboundOrder.WarehouseName,
+ OrderNo = InboundOrder.OrderNo,
+ Unit = InboundOrder.Unit,
+ Specs = InboundOrder.Specs,
+ Weight = InboundOrder.Weight,
+ WareHouseId = InboundOrder.WareHouseId,
+ Quantity = info.quantity,
+ DrawingNumber = InboundOrder.ProductDrawingNumber,
+ Date = InboundOrder.Datetime,
+ };
+ details.Add(boxdetail);
+ }
+ return details;
+ }
+ else
+ {
+ throw new Exception($"鏈壘鍒板叆搴撳崟鎹畕info.orderNo}");
+ }
+ }
+
#endregion
#region 瑙ｇ洏
@@ -152,7 +297,7 @@
{
return content.Error("鍙傛暟閿欒");
}
- var boxingInfo = await BaseDal.QueryFirstNavAsync(x => x.PalletCode == groupPlate.palletCode && x.StockStatus == (int)StockStateEmun.缁勭洏鏆傚瓨);
+ var boxingInfo = await BaseDal.QueryFirstNavAsync(x => x.PalletCode == groupPlate.palletCode);
if (!boxingInfo.IsNullOrEmpty())
{
boxingInfo.StockStatus = (int)StockStateEmun.缁勭洏鎾ら攢;
@@ -180,7 +325,7 @@
}
private async Task AddStockHtyAsync(DtBoxingInfo_Hty stockhty)
{
- var isStockAdd = await SqlSugarHelper.DbWMS.InsertNav(stockhty).IncludesAllFirstLayer().ExecuteCommandAsync();
+ var isStockAdd = await SqlSugarHelper.DbWMS.InsertNav(stockhty).Include(x=>x.BoxingInfoDetails).ExecuteCommandAsync();
if (!isStockAdd)
{
throw new Exception("搴撳瓨鍘嗗彶淇℃伅娣诲姞澶辫触");
--
Gitblit v1.9.3