From 7195016afc472307e4db0b415e45c9d4275bdb02 Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期四, 30 十月 2025 17:27:32 +0800
Subject: [PATCH] 1
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Boxing/BoxingInfoService.cs | 301 +++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 262 insertions(+), 39 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 bbbd858..3c9d543 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,38 +1,124 @@
-锘縰sing Masuit.Tools;
+锘縰sing Mapster;
+using Masuit.Tools;
+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;
public class BoxingInfoService : ServiceBase<DtBoxingInfo, IBoxingInfoRepository>, IBoxingInfoService
{
+ private readonly IUnitOfWorkManage _unitOfWorkManage;
+ private readonly ILocationStatusChangeRecordRepository _locationStatusChangeRecordRepository;
private readonly IDt_InboundOrderRepository _inboundOrderRepository;
- public BoxingInfoService(IBoxingInfoRepository BaseDal, IDt_InboundOrderRepository inboundOrderRepository) : base(BaseDal)
+ public BoxingInfoService(IBoxingInfoRepository BaseDal,IUnitOfWorkManage unitOfWorkManage, ILocationStatusChangeRecordRepository locationStatusChangeRecordRepository, IDt_InboundOrderRepository inboundOrderRepository) : base(BaseDal)
{
+ _unitOfWorkManage = unitOfWorkManage;
+ _locationStatusChangeRecordRepository = locationStatusChangeRecordRepository;
_inboundOrderRepository = inboundOrderRepository;
}
+ public override PageGridData<DtBoxingInfo> GetPageData(PageDataOptions options)
+ {
+ string wheres = ValidatePageOptions(options);
+ //鑾峰彇鎺掑簭瀛楁
+ Dictionary<string, 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);
+ }
- public async Task<WebResponseContent> AddBoxingInfoAsync(AddBoxingDto boxingInfo)
+
+ int totalCount = 0;
+ List<SearchParameters> searchParametersList = new List<SearchParameters>();
+ if (!string.IsNullOrEmpty(options.Wheres))
+ {
+ try
+ {
+ searchParametersList = options.Wheres.DeserializeObject<List<SearchParameters>>();
+ options.Filter = searchParametersList;
+ }
+ catch { }
+ }
+ var data = BaseDal.Db.Queryable<DtBoxingInfo>()
+ .Includes(x => x.BoxingInfoDetails)
+ .WhereIF(!wheres.IsNullOrEmpty(), wheres)
+ .OrderBy(orderByModels)
+ .ToPageList(options.Page, options.Rows, ref totalCount);
+ new PageGridData<DtBoxingInfo>(totalCount, data);
+ return new PageGridData<DtBoxingInfo>(totalCount, data);
+ }
+
+ #region 缁勭洏
+
+ public async Task<WebResponseContent> GetPalletCodeInfo(string palletCode)
{
WebResponseContent content = new WebResponseContent();
try
{
- var info = await BaseDal.QueryFirstAsync(x => x.PalletCode == boxingInfo.palletCode);
+ 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();
+ try
+ {
+ if (groupPlate == null || groupPlate.groups.IsNullOrEmpty() || groupPlate.palletCode.IsNullOrEmpty())
+ {
+ return content.Error("鍙傛暟閿欒");
+ }
+ var info = await BaseDal.QueryFirstAsync(x => x.PalletCode == groupPlate.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);
+ //content.Error("璇ユ墭鐩樺凡瀛樺湪缁勭洏");
+ info.StockStatus = (int)StockStateEmun.缁勭洏鎾ら攢;
+ DtBoxingInfo_Hty stockhty = info.Adapt<DtBoxingInfo_Hty>();
+ stockhty.ModifyDate = DateTime.Now;
- if(InboundOrder != null)
+ List<DtBoxingInfoDetail> details = new List<DtBoxingInfoDetail>();
+ foreach (var item in groupPlate.groups)
+ {
+ 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();
+ 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);
@@ -40,11 +126,12 @@
x.MaterielName = InboundOrder.MaterialName;
x.DemandClassification = InboundOrder.DemandClassification;
x.Warehouse = InboundOrder.WarehouseName;
- x.OrderNo = InboundOrder.OrderNo;
+ x.OrderNo = InboundOrder.UpperOrderNo;
x.Unit = InboundOrder.Unit;
+ x.WareHouseId = InboundOrder.WareHouseId;
x.Specs = InboundOrder.Specs;
x.Weight = InboundOrder.Weight;
- x.Quantity = x.Quantity + InboundOrder.Quantity;
+ x.Quantity = x.Quantity + item.quantity;
x.DrawingNumber = InboundOrder.ProductDrawingNumber;
x.Date = InboundOrder.Datetime;
details.Add(x);
@@ -57,11 +144,12 @@
MaterielName = InboundOrder.MaterialName,
DemandClassification = InboundOrder.DemandClassification,
Warehouse = InboundOrder.WarehouseName,
- OrderNo = InboundOrder.OrderNo,
+ OrderNo = InboundOrder.UpperOrderNo,
Unit = InboundOrder.Unit,
Specs = InboundOrder.Specs,
Weight = InboundOrder.Weight,
- Quantity = InboundOrder.Quantity,
+ WareHouseId = InboundOrder.WareHouseId,
+ Quantity = item.quantity,
DrawingNumber = InboundOrder.ProductDrawingNumber,
Date = InboundOrder.Datetime,
};
@@ -73,39 +161,174 @@
return content.Error("鏈壘鍒板叆搴撳崟鎹俊鎭�");
}
}
-
DtBoxingInfo boxing = new DtBoxingInfo()
{
- PalletCode=boxingInfo.palletCode,
- BoxingInfoDetails= details
+ PalletCode = groupPlate.palletCode,
+ StockStatus = (int)StockStateEmun.缁勭洏鏆傚瓨,
+ BoxingInfoDetails = details
+ };
+ await _unitOfWorkManage.UseTranAsync(async () =>
+ {
+ await BaseDal.Db.DeleteNav<DtBoxingInfo>(x => x.Id == info.Id)
+ .Include(x => x.BoxingInfoDetails)
+ .ExecuteCommandAsync();
+ await AddStockHtyAsync(stockhty);
+ await BaseDal.AddDataNavAsync(boxing);
+ });
+ content.OK("缁勭洏鎴愬姛");
+
+ }
+ 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)
+ {
+ 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 BaseDal.AddDataNavAsync(boxing);
+ content.OK("缁勭洏鎴愬姛");
}
return content;
}
catch (Exception ex)
{
- return content.OK();
+ return content.Error(ex.Message);
+ }
+ }
+ #endregion
+
+ #region 瑙ｇ洏
+ public async Task<WebResponseContent> DeleteGroupPlateAsync(GroupPlate groupPlate)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ if (groupPlate == null || groupPlate.palletCode.IsNullOrEmpty())
+ {
+ return content.Error("鍙傛暟閿欒");
+ }
+ var boxingInfo = await BaseDal.QueryFirstNavAsync(x => x.PalletCode == groupPlate.palletCode);
+ if (!boxingInfo.IsNullOrEmpty())
+ {
+ boxingInfo.StockStatus = (int)StockStateEmun.缁勭洏鎾ら攢;
+ DtBoxingInfo_Hty stockhty = boxingInfo.Adapt<DtBoxingInfo_Hty>();
+ stockhty.ModifyDate = DateTime.Now;
+ await _unitOfWorkManage.UseTranAsync(async () =>
+ {
+ await BaseDal.Db.DeleteNav<DtBoxingInfo>(x => x.Id == boxingInfo.Id)
+ .Include(x => x.BoxingInfoDetails)
+ .ExecuteCommandAsync();
+ await AddStockHtyAsync(stockhty);
+ });
+ content.OK("瑙ｇ洏鎴愬姛");
+ }
+ else
+ {
+ content.Error("鏈壘鍒扮粍鐩樻暟鎹�");
+ }
+ return content;
+ }
+ catch (Exception ex)
+ {
+ return content.Error(ex.Message);
+ }
+ }
+ private async Task AddStockHtyAsync(DtBoxingInfo_Hty stockhty)
+ {
+ var isStockAdd = await SqlSugarHelper.DbWMS.InsertNav(stockhty).Include(x=>x.BoxingInfoDetails).ExecuteCommandAsync();
+ if (!isStockAdd)
+ {
+ throw new Exception("搴撳瓨鍘嗗彶淇℃伅娣诲姞澶辫触");
}
}
- public override PageGridData<DtBoxingInfo> GetPageData(PageDataOptions options)
+ /// <summary>
+ /// 鎵归噺鍒犻櫎
+ /// </summary>
+ /// <param name="keys"></param>
+ /// <returns></returns>
+ public override WebResponseContent DeleteData(object[] keys)
{
- return base.GetPageData(options);
+ try
+ {
+ List<DtStockInfo_Hty> stockInfos = new List<DtStockInfo_Hty>();
+ List<DtLocationInfo> locationInfos = new List<DtLocationInfo>();
+
+ foreach (var item in keys)
+ {
+ var stock = BaseDal.QueryFirstNavAsync(x => x.Id == item.ObjToInt()).Result;
+ var stockHty = stock.Adapt<DtStockInfo_Hty>();
+ stockInfos.Add(stockHty);
+
+ var location = SqlSugarHelper.DbWMS.Queryable<DtLocationInfo>().FirstAsync(x => x.LocationCode == stock.LocationCode).Result;
+ var lastStatus = location.LocationStatus;
+ location.LocationStatus = (int)LocationEnum.Free;
+ locationInfos.Add(location);
+ _locationStatusChangeRecordRepository.AddLocationStatusChangeRecord(location, lastStatus, (int)StatusChangeTypeEnum.ManualOperation, 0);
+ }
+ //var hty = BaseDal.Db.InsertNav(stockInfos)
+ // .Include(x => x.StockInfoDetails)
+ // .ExecuteCommand();
+ var isStockAdd = SqlSugarHelper.DbWMS.InsertNav(stockInfos).IncludesAllFirstLayer().ExecuteCommandAsync();
+
+ var locationd = SqlSugarHelper.DbWMS.Updateable(locationInfos).ExecuteCommandHasChange();
+ return base.DeleteData(keys);
+ }
+ catch (Exception ex)
+ {
+ return WebResponseContent.Instance.Error(ex.Message);
+ }
}
-
- // 楠岃瘉妯″瀷
- 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;
- }
+ #endregion
}
\ No newline at end of file
--
Gitblit v1.9.3