From 5a15fa73d5f6a39917013871a65eb11a8c013391 Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期三, 05 十一月 2025 17:30:56 +0800
Subject: [PATCH] 1
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Boxing/BoxingInfoService.cs | 161 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 156 insertions(+), 5 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..737dc85 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"
@@ -3,10 +3,12 @@
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;
@@ -60,6 +62,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,10 +103,125 @@
{
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);
+ if (!infos.IsNullOrEmpty())
{
- content.Error("璇ユ墭鐩樺凡瀛樺湪缁勭洏");
+ infos.StockStatus = (int)StockStateEmun.缁勭洏鎾ら攢;
+ DtBoxingInfo_Hty stockhty = infos.Adapt<DtBoxingInfo_Hty>();
+ stockhty.ModifyDate = DateTime.Now;
+
+ List<DtBoxingInfoDetail> details = new List<DtBoxingInfoDetail>();
+ foreach (var item in groupPlate.groups)
+ {
+ foreach (var info in infos.BoxingInfoDetails)
+ {
+ if (item.orderNo == info.OrderNo)
+ {
+ var x = details.Where(x => x.MaterielCode == info.MaterielCode && x.Warehouse == info.Warehouse && x.DrawingNumber == info.DrawingNumber && x.DemandClassification == info.DemandClassification && x.Quantity != info.Quantity).FirstOrDefault();
+ if(x != null)
+ {
+ details.Remove(x);
+ x.MaterielCode = info.MaterielCode;
+ x.MaterielName = info.MaterielName;
+ x.DemandClassification = info.DemandClassification;
+ x.Warehouse = info.Warehouse;
+ x.OrderNo = info.OrderNo;
+ x.Unit = info.Unit;
+ x.WareHouseId = info.WareHouseId;
+ x.Specs = info.Specs;
+ x.Weight = info.Weight;
+ x.Quantity = x.Quantity + item.quantity;
+ x.DrawingNumber = info.DrawingNumber;
+ x.Date = info.Date;
+ details.Add(x);
+ }
+ else
+ {
+ DtBoxingInfoDetail detail = new DtBoxingInfoDetail()
+ {
+ MaterielCode = info.MaterielCode,
+ MaterielName = info.MaterielName,
+ DemandClassification = info.DemandClassification,
+ Warehouse = info.Warehouse,
+ OrderNo = info.OrderNo,
+ Unit = info.Unit,
+ Specs = info.Specs,
+ Weight = info.Weight,
+ WareHouseId = info.WareHouseId,
+ Quantity = item.quantity,
+ DrawingNumber = info.DrawingNumber,
+ Date = info.Date,
+ };
+ details.Add(detail);
+ }
+ }
+ else
+ {
+ 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.UpperOrderNo;
+ 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.UpperOrderNo,
+ 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("鏈壘鍒板叆搴撳崟鎹俊鎭�");
+ }
+ }
+ }
+ }
+ 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);
+ });
+ content.OK("缁勭洏鎴愬姛");
+
}
else
{
@@ -93,6 +242,7 @@
x.Warehouse = InboundOrder.WarehouseName;
x.OrderNo = InboundOrder.UpperOrderNo;
x.Unit = InboundOrder.Unit;
+ x.WareHouseId = InboundOrder.WareHouseId;
x.Specs = InboundOrder.Specs;
x.Weight = InboundOrder.Weight;
x.Quantity = x.Quantity + item.quantity;
@@ -112,6 +262,7 @@
Unit = InboundOrder.Unit,
Specs = InboundOrder.Specs,
Weight = InboundOrder.Weight,
+ WareHouseId = InboundOrder.WareHouseId,
Quantity = item.quantity,
DrawingNumber = InboundOrder.ProductDrawingNumber,
Date = InboundOrder.Datetime,
@@ -152,7 +303,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 +331,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