From 63dcb7fc55d32960f643f4040900ce9a0e33536d Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期一, 20 十月 2025 17:25:56 +0800
Subject: [PATCH] 1
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Boxing/BoxingInfoService.cs | 86 ++++++++++++++++++++++++++++++++++++------
1 files changed, 73 insertions(+), 13 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 79d8610..bbbd858 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,32 +1,92 @@
锘縰sing Masuit.Tools;
using System.ComponentModel.DataAnnotations;
+using WIDESEA_DTO.Basic;
+using WIDESEA_IOrderRepository;
namespace WIDESEA_StorageBasicService;
public class BoxingInfoService : ServiceBase<DtBoxingInfo, IBoxingInfoRepository>, IBoxingInfoService
{
- public BoxingInfoService(IBoxingInfoRepository BaseDal) : base(BaseDal)
+ private readonly IDt_InboundOrderRepository _inboundOrderRepository;
+ public BoxingInfoService(IBoxingInfoRepository BaseDal, IDt_InboundOrderRepository inboundOrderRepository) : base(BaseDal)
{
+ _inboundOrderRepository = inboundOrderRepository;
}
- public async Task<WebResponseContent> AddBoxingInfoAsync(DtBoxingInfo boxingInfo)
+ public async Task<WebResponseContent> AddBoxingInfoAsync(AddBoxingDto boxingInfo)
{
WebResponseContent content = new WebResponseContent();
- var info = await BaseDal.QueryFirstAsync(x => x.PalletCode == boxingInfo.PalletCode);
- if (!info.IsNullOrEmpty())
+ try
{
- content.Error("璇ユ墭鐩樺凡瀛樺湪缁勭洏");
- }
- else
- {
- // 娣诲姞缁勭洏淇℃伅
- var result = await BaseDal.AddDataNavAsync(boxingInfo);
- if (result)
+ var info = await BaseDal.QueryFirstAsync(x => x.PalletCode == boxingInfo.palletCode);
+ if (!info.IsNullOrEmpty())
{
- content.OK("娣诲姞鎴愬姛", boxingInfo);
+ content.Error("璇ユ墭鐩樺凡瀛樺湪缁勭洏");
}
+ else
+ {
+ List<DtBoxingInfoDetail> details = new List<DtBoxingInfoDetail>();
+ foreach (var item in boxingInfo.OrderNos)
+ {
+ var InboundOrder = _inboundOrderRepository.QueryFirst(x => x.PrintCode == item);
+
+ 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.Specs = InboundOrder.Specs;
+ x.Weight = InboundOrder.Weight;
+ x.Quantity = x.Quantity + InboundOrder.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,
+ Quantity = InboundOrder.Quantity,
+ DrawingNumber = InboundOrder.ProductDrawingNumber,
+ Date = InboundOrder.Datetime,
+ };
+ details.Add(detail);
+ }
+ }
+ else
+ {
+ return content.Error("鏈壘鍒板叆搴撳崟鎹俊鎭�");
+ }
+ }
+
+ DtBoxingInfo boxing = new DtBoxingInfo()
+ {
+ PalletCode=boxingInfo.palletCode,
+ BoxingInfoDetails= details
+ };
+ await BaseDal.AddDataNavAsync(boxing);
+ }
+ return content;
}
- return content;
+ catch (Exception ex)
+ {
+ return content.OK();
+ }
}
public override PageGridData<DtBoxingInfo> GetPageData(PageDataOptions options)
--
Gitblit v1.9.3