From d4b0b578752a1478f6c11b352fbb8d2bad1f9e1d Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期三, 22 十月 2025 17:18:49 +0800
Subject: [PATCH] 1
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Boxing/BoxingInfoService.cs | 143 -----------------------------------------------
1 files changed, 1 insertions(+), 142 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 87df8eb..61e8777 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"
@@ -11,11 +11,9 @@
public class BoxingInfoService : ServiceBase<DtBoxingInfo, IBoxingInfoRepository>, IBoxingInfoService
{
- private readonly IDt_InboundOrderRepository _inboundOrderRepository;
private readonly IUnitOfWorkManage _unitOfWorkManage;
- public BoxingInfoService(IBoxingInfoRepository BaseDal, IDt_InboundOrderRepository inboundOrderRepository, IUnitOfWorkManage unitOfWorkManage) : base(BaseDal)
+ public BoxingInfoService(IBoxingInfoRepository BaseDal,IUnitOfWorkManage unitOfWorkManage) : base(BaseDal)
{
- _inboundOrderRepository = inboundOrderRepository;
_unitOfWorkManage = unitOfWorkManage;
}
public override PageGridData<DtBoxingInfo> GetPageData(PageDataOptions options)
@@ -53,144 +51,5 @@
.ToPageList(options.Page, options.Rows, ref totalCount);
new PageGridData<DtBoxingInfo>(totalCount, data);
return new PageGridData<DtBoxingInfo>(totalCount, data);
- }
-
- public async Task<WebResponseContent> AddBoxingInfoAsync(AddBoxingDto boxingInfo)
- {
- WebResponseContent content = new WebResponseContent();
- try
- {
- if(boxingInfo == null || boxingInfo.OrderNos.IsNullOrEmpty() || boxingInfo.palletCode.IsNullOrEmpty())
- {
- return content.Error("鍙傛暟閿欒");
- }
- var info = await BaseDal.QueryFirstAsync(x => x.PalletCode == boxingInfo.palletCode);
- if (!info.IsNullOrEmpty())
- {
- 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);
- content.OK("缁勭洏鎴愬姛");
- }
- return content;
- }
- catch (Exception ex)
- {
- return content.Error(ex.Message);
- }
- }
-
- public async Task<WebResponseContent> DeleteBoxingInfoAsync(AddBoxingDto boxingInfo)
- {
- WebResponseContent content = new WebResponseContent();
- try
- {
- if (boxingInfo == null || boxingInfo.palletCode.IsNullOrEmpty())
- {
- return content.Error("鍙傛暟閿欒");
- }
- var boxing = await BaseDal.QueryFirstNavAsync(x => x.PalletCode == boxingInfo.palletCode);
- if (!boxing.IsNullOrEmpty())
- {
- DtBoxingInfo_Hty boxingInfo_Hty = boxing.Adapt<DtBoxingInfo_Hty>();
- boxingInfo_Hty.ModifyDate = DateTime.Now;
- await _unitOfWorkManage.UseTranAsync(async () =>
- {
- await BaseDal.Db.DeleteNav<DtBoxingInfo>(x => x.Id == boxing.Id)
- .Include(x => x.BoxingInfoDetails)
- .ExecuteCommandAsync();
- await AddBoxingHtyAsync(boxingInfo_Hty);
- });
- content.OK("瑙ｇ洏鎴愬姛");
- }
- else
- {
- content.Error("鏈壘鍒扮粍鐩樻暟鎹�");
- }
- return content;
- }
- catch (Exception ex)
- {
- return content.Error(ex.Message);
- }
- }
- private async Task AddBoxingHtyAsync(DtBoxingInfo_Hty boxingInfo)
- {
- var isStockAdd = await SqlSugarHelper.DbWMS.InsertNav(boxingInfo).IncludesAllFirstLayer().ExecuteCommandAsync();
- if (!isStockAdd)
- {
- throw new Exception("缁勭洏鍘嗗彶淇℃伅娣诲姞澶辫触");
- }
- }
-
- // 楠岃瘉妯″瀷
- public static List<ValidationResult> ValidateModel(object model)
- {
- // 鍒涘缓涓�涓獙璇佺粨鏋滃垪琛�
- var validationResults = new List<ValidationResult>();
- // 鍒涘缓涓�涓獙璇佷笂涓嬫枃
- var validationContext = new ValidationContext(model, serviceProvider: null, items: null);
-
- // 浣跨敤楠岃瘉鍣ㄥ皾璇曢獙璇佹ā鍨嬶紝骞跺皢楠岃瘉缁撴灉娣诲姞鍒伴獙璇佺粨鏋滃垪琛ㄤ腑
- Validator.TryValidateObject(model, validationContext, validationResults, validateAllProperties: true);
-
- // 杩斿洖楠岃瘉缁撴灉鍒楄〃
- return validationResults;
}
}
\ No newline at end of file
--
Gitblit v1.9.3