From e31ca4e3e1774b7ddb832e8ec498b5ada24b2608 Mon Sep 17 00:00:00 2001
From: pan <antony1029@163.com>
Date: 星期日, 16 十一月 2025 19:13:58 +0800
Subject: [PATCH] 提交
---
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_OutboundService/SplitPackageService.cs | 140 ++++++++++++++++++++++++++++++++++++----------
1 files changed, 110 insertions(+), 30 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_OutboundService/SplitPackageService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_OutboundService/SplitPackageService.cs"
index ddc6e54..8d496b8 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_OutboundService/SplitPackageService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_OutboundService/SplitPackageService.cs"
@@ -1,4 +1,5 @@
-锘縰sing System;
+锘縰sing Microsoft.AspNetCore.Http;
+using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
@@ -8,6 +9,7 @@
using WIDESEA_Core.BaseRepository;
using WIDESEA_Core.BaseServices;
using WIDESEA_DTO.Outbound;
+using WIDESEA_IBasicService;
using WIDESEA_IOutboundService;
using WIDESEA_IStockService;
using WIDESEA_Model.Models;
@@ -22,59 +24,54 @@
private readonly IStockInfoService _stockInfoService;
private readonly IStockInfoDetailService _stockInfoDetailService;
private readonly IOutStockLockInfoService _outStockLockInfoService;
+ private readonly IDailySequenceService _dailySequenceService;
- public SplitPackageService(IRepository<Dt_SplitPackageRecord> BaseDal, IUnitOfWorkManage unitOfWorkManage, IStockInfoService stockInfoService, IOutStockLockInfoService outStockLockInfoService, IStockInfoDetailService stockInfoDetailService) : base(BaseDal)
+ public SplitPackageService(IRepository<Dt_SplitPackageRecord> BaseDal, IUnitOfWorkManage unitOfWorkManage, IStockInfoService stockInfoService, IOutStockLockInfoService outStockLockInfoService, IStockInfoDetailService stockInfoDetailService, IDailySequenceService dailySequenceService) : base(BaseDal)
{
_unitOfWorkManage = unitOfWorkManage;
_stockInfoService = stockInfoService;
_outStockLockInfoService = outStockLockInfoService;
_stockInfoDetailService = stockInfoDetailService;
+ _dailySequenceService = dailySequenceService;
}
/// <summary>
/// 鎷嗗寘鎷嗙鎿嶄綔
/// </summary>
- public async Task<WebResponseContent> SplitPackage(SplitPackageRequest request)
+ public async Task<WebResponseContent> SplitPackage(SplitPackageDto request)
{
try
{
_unitOfWorkManage.BeginTran();
// 1. 楠岃瘉鍑哄簱閿佸畾淇℃伅
- var lockInfo = await Db.Queryable<Dt_OutStockLockInfo>()
- .Where(x => x.Id == request.OutStockLockInfoId &&
- x.Status == (int)OutLockStockStatusEnum.鍑哄簱涓�)
+ var lockInfo = await _outStockLockInfoService.Db.Queryable<Dt_OutStockLockInfo>()
+ .Where(x => x.OrderNo == request.OrderNo &&
+ x.PalletCode == request.PalletCode &&
+ x.CurrentBarcode == request.OriginalBarcode &&
+ x.Status == 1)
.FirstAsync();
if (lockInfo == null)
return WebResponseContent.Instance.Error("鏈壘鍒版湁鏁堢殑鍑哄簱閿佸畾淇℃伅");
-
- //// 2. 楠岃瘉褰撳墠鏉＄爜鐨勫彲鐢ㄦ暟閲�
- //var currentStockDetail = await _stockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
- // .Where(x => x.Barcode == lockInfo.CurrentBarcode &&
- // x.MaterielCode == request.MaterielCode &&
- // x.StockId == lockInfo.StockId)
- // .FirstAsync();
-
- //if (currentStockDetail == null)
- // return WebResponseContent.Instance.Error("褰撳墠鏉＄爜鍦ㄥ簱瀛樹腑涓嶅瓨鍦�");
-
- //// 3. 妫�鏌ュ彲鐢ㄦ暟閲�
- //decimal availableQuantity = currentStockDetail.StockQuantity - currentStockDetail.OutboundQuantity;
- //if (request.SplitQuantity > availableQuantity)
- // return WebResponseContent.Instance.Error($"鎷嗗寘鏁伴噺涓嶈兘澶т簬鍙敤鏁伴噺锛屽彲鐢ㄦ暟閲忥細{availableQuantity}");
// 2. 妫�鏌ュ墿浣欓攣瀹氭暟閲�
decimal remainingLockQuantity = lockInfo.AssignQuantity - lockInfo.PickedQty;
if (request.SplitQuantity > remainingLockQuantity)
return WebResponseContent.Instance.Error($"鎷嗗寘鏁伴噺涓嶈兘澶т簬鍓╀綑閿佸畾鏁伴噺锛屽墿浣欙細{remainingLockQuantity}");
+ var stockDetail = await _stockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
+ .Where(x => x.Barcode == request.OriginalBarcode)
+ .FirstAsync();
+
+ var seq = await _dailySequenceService.GetNextSequenceAsync();
// 3. 鐢熸垚鏂版潯鐮�
- string newBarcode = "";
+ string newBarcode = "WSLOT" + DateTime.Now.ToString("yyyyMMdd") + seq.ToString()?.PadLeft(5, '0');
// 4. 鍒涘缓鏂扮殑鍑哄簱閿佸畾淇℃伅锛堟柊鏉＄爜锛�
var newLockInfo = new Dt_OutStockLockInfo
{
+
OrderNo = lockInfo.OrderNo,
OrderDetailId = lockInfo.OrderDetailId,
BatchNo = lockInfo.BatchNo,
@@ -90,36 +87,44 @@
TaskNum = lockInfo.TaskNum,
Status = (int)OutLockStockStatusEnum.鍑哄簱涓�,
Unit = lockInfo.Unit,
-
+ SupplyCode = lockInfo.SupplyCode,
+ OrderType=lockInfo.OrderType,
CurrentBarcode = newBarcode, // 鏂版潯鐮�
OriginalLockQuantity = request.SplitQuantity,
IsSplitted = 1,
ParentLockId = lockInfo.Id // 璁板綍鐖剁骇閿佸畾ID
};
- await Db.Insertable(newLockInfo).ExecuteCommandAsync();
+ await _outStockLockInfoService.Db.Insertable(newLockInfo).ExecuteCommandAsync();
// 5. 鏇存柊鍘熼攣瀹氫俊鎭殑鍒嗛厤鏁伴噺锛堝噺灏戞媶鍖呮暟閲忥級
lockInfo.AssignQuantity -= request.SplitQuantity;
- await Db.Updateable(lockInfo).ExecuteCommandAsync();
+ await _outStockLockInfoService.Db.Updateable(lockInfo).ExecuteCommandAsync();
// 6. 璁板綍鎷嗗寘鍘嗗彶锛堢敤浜庤拷韪級
var splitHistory = new Dt_SplitPackageRecord
{
+ FactoryArea = lockInfo.FactoryArea,
+ TaskNum=lockInfo.TaskNum,
OutStockLockInfoId = lockInfo.Id,
+ StockId = stockDetail?.StockId ?? 0,
+ Operator = App.User.UserName,
+ IsReverted = false,
OriginalBarcode = lockInfo.CurrentBarcode,
NewBarcode = newBarcode,
SplitQty = request.SplitQuantity,
- MaterielCode = request.MaterielCode,
+ RemainQuantity = lockInfo.RemainQuantity - request.SplitQuantity,
+ MaterielCode = lockInfo.MaterielCode,
SplitTime = DateTime.Now,
- Operator = request.Operator,
+ OrderNo = request.OrderNo,
+ PalletCode = request.PalletCode,
Status = (int)SplitPackageStatusEnum.宸叉媶鍖�
};
await Db.Insertable(splitHistory).ExecuteCommandAsync();
- Db.Ado.CommitTran();
+ _unitOfWorkManage.CommitTran();
// 7. 鍥炰紶鏂版潯鐮佺粰MES
- // await SendBarcodeToMES(newBarcode, request.MaterielCode, request.SplitQuantity);
+ // await SendBarcodeToMES(newBarcode, request.MaterielCode, request.SplitQuantity);
return WebResponseContent.Instance.OK("鎷嗗寘鎴愬姛", new
{
@@ -129,11 +134,86 @@
}
catch (Exception ex)
{
- Db.Ado.RollbackTran();
+ _unitOfWorkManage.RollbackTran();
return WebResponseContent.Instance.Error($"鎷嗗寘澶辫触: {ex.Message}");
}
}
+ // 鎾ら攢鎷嗗寘
+ public async Task<WebResponseContent> RevertSplitPackage(string originalBarcode)
+ {
+ try
+ {
+ _unitOfWorkManage.BeginTran();
+ // 鏌ユ壘鏈�杩戠殑鏈挙閿�鎷嗗寘璁板綍
+ var splitPackage = await Db.Queryable<Dt_SplitPackageRecord>()
+ .Where(x => x.OriginalBarcode == originalBarcode && !x.IsReverted)
+ .OrderByDescending(x => x.CreateDate)
+ .FirstAsync();
+
+ if (splitPackage == null)
+ return WebResponseContent.Instance.Error("鏈壘鍒版媶鍖呰褰�");
+
+ // 妫�鏌ユ柊鏉＄爜鏄惁宸叉嫞閫�
+ var newOutStockInfo = await _outStockLockInfoService.Db.Queryable<Dt_OutStockLockInfo>()
+ .Where(x => x.CurrentBarcode == splitPackage.NewBarcode)
+ .FirstAsync();
+
+ if (newOutStockInfo.Status == 2)
+ return WebResponseContent.Instance.Error("鏂版潯鐮佸凡鎷ｉ�夛紝鏃犳硶鎾ら攢鎷嗗寘");
+
+ // 杩樺師鍘熷嚭搴撹鎯呮暟閲�
+ var originalOutStockInfo = await _outStockLockInfoService.Db.Queryable<Dt_OutStockLockInfo>()
+ .Where(x => x.CurrentBarcode == originalBarcode)
+ .FirstAsync();
+
+ originalOutStockInfo.AssignQuantity += splitPackage.SplitQty;
+ await _outStockLockInfoService.Db.Updateable(originalOutStockInfo).ExecuteCommandAsync();
+
+ // 鍒犻櫎鏂板嚭搴撹鎯呰褰�
+ await _outStockLockInfoService.Db.Deleteable<Dt_OutStockLockInfo>()
+ .Where(x => x.CurrentBarcode == splitPackage.NewBarcode)
+ .ExecuteCommandAsync();
+
+ // 鏍囪鎷嗗寘璁板綍涓哄凡鎾ら攢
+ splitPackage.IsReverted = true;
+ await Db.Updateable(splitPackage).ExecuteCommandAsync();
+
+ _unitOfWorkManage.CommitTran();
+ return WebResponseContent.Instance.OK("鎾ら攢鎷嗗寘鎴愬姛");
+
+ }
+ catch (Exception ex)
+ {
+ _unitOfWorkManage.RollbackTran();
+ return WebResponseContent.Instance.Error($"鎾ら攢鎷嗗寘澶辫触锛歿ex.Message}");
+ }
+ }
+
+ // 鑾峰彇鎷嗗寘淇℃伅
+ public async Task<WebResponseContent> GetSplitPackageInfo(string orderNo, string palletCode, string barcode)
+ {
+ var outStockInfo = await _outStockLockInfoService.Db.Queryable<Dt_OutStockLockInfo>()
+ .Where(x => x.OrderNo == orderNo &&
+ x.PalletCode == palletCode &&
+ x.CurrentBarcode == barcode &&
+ x.Status == 1)
+ .FirstAsync();
+
+ if (outStockInfo == null)
+ return WebResponseContent.Instance.Error("鏈壘鍒板搴旂殑鍑哄簱淇℃伅");
+
+ //var stockDetail = await _stockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
+ // .Where(x => x.Barcode == barcode)
+ // .FirstAsync();
+
+ return WebResponseContent.Instance.OK("", new
+ {
+ MaterielCode = outStockInfo.MaterielCode,
+ RemainQuantity = outStockInfo.RemainQuantity,
+ Unit = outStockInfo.Unit
+ });
+ }
/// <summary>
/// 鑾峰彇鍙媶鍖呯殑鍑哄簱閿佸畾淇℃伅
/// </summary>
--
Gitblit v1.9.3