From b47a2f210d940eff8c7de4185305bc4e0184c590 Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期三, 17 十二月 2025 23:26:10 +0800
Subject: [PATCH] 新增空箱与回库功能，优化打印样式与逻辑printView1.vue**: 修复数据绑定拼写错误，优化打印逻辑与样式，调整二维码布局与大小。outboundOrder.js移除无用代码，清理gridBody` 和 `rowId`。 - **outPicking.vue**: 引入 `stationManager`，在 API 参数中增加 `station` 字段，优化样式。 - **ReturnToWarehouseDTO.cs**: 新增 DTO，支持 `palletCode`、`orderNo` 和 `station`。 - **IOutboundService.cs**: 定义 `EmptyBox` 和 `ReturnToWarehouse` 接口。 - **Dt_StockInfo_Hty.cs**: 修改继承关系，新增字段与导航属性。 - **OutboundService.cs**: 实现 `EmptyBox` 和 `ReturnToWarehouse` 方法，使用 `Mapster` 进行实体转换。 - **WIDESEA_OutboundService.csproj**: 引入 `Mapster` 依赖。 - **OutboundController.cs**: 新增 `EmptyBox` 和 `ReturnToWarehouse` 的 API 路由。
---
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_OutboundService/OutStockLockInfoService.cs | 42 +++++++++++++++++++++++-------------------
1 files changed, 23 insertions(+), 19 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/OutStockLockInfoService.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/OutStockLockInfoService.cs"
index b259d4d..a24c5a0 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/OutStockLockInfoService.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/OutStockLockInfoService.cs"
@@ -43,7 +43,7 @@
Dt_OutboundOrderDetail outboundOrderDetail,
Dt_StockInfo outStock,
decimal assignQuantity,
- string barcode = null)
+ string barcode = null,string outboundBatchNo = "")
{
// 鑾峰彇搴撳瓨鏄庣粏淇℃伅
var stockDetails = outStock.Details
@@ -57,22 +57,24 @@
// 纭畾鏉＄爜
string targetBarcode;
+ var firstAvailableDetail=new Dt_StockInfoDetail();
if (!string.IsNullOrEmpty(barcode))
{
// 楠岃瘉鎸囧畾鐨勬潯鐮佹槸鍚﹀瓨鍦�
- var specifiedBarcodeDetail = stockDetails.FirstOrDefault(x => x.Barcode == barcode);
- if (specifiedBarcodeDetail == null)
+ firstAvailableDetail = stockDetails.FirstOrDefault(x => x.Barcode == barcode);
+ if (firstAvailableDetail == null)
{
throw new Exception($"鎸囧畾鐨勬潯鐮乕{barcode}]鍦ㄥ簱瀛樹腑涓嶅瓨鍦�");
}
+
targetBarcode = barcode;
}
else
{
// 浣跨敤绗竴涓彲鐢ㄦ潯鐮�
- var firstAvailableDetail = stockDetails
+ firstAvailableDetail = stockDetails
.Where(x => x.StockQuantity > x.OutboundQuantity)
- .OrderBy(x => x.CreateDate)
+ .OrderByDescending(x => x.CreateDate)
.FirstOrDefault();
if (firstAvailableDetail == null)
@@ -83,13 +85,9 @@
}
return new Dt_OutStockLockInfo()
- {
- lineNo= outboundOrderDetail.lineNo,
-
+ {
PalletCode = outStock.PalletCode,
- AssignQuantity = assignQuantity,
- MaterielCode = outboundOrderDetail.MaterielCode,
- BatchNo = outboundOrderDetail.BatchNo ?? outStock.Details.FirstOrDefault()?.BatchNo,
+ AssignQuantity = assignQuantity,
LocationCode = outStock.LocationCode,
MaterielName = outboundOrderDetail.MaterielName,
OrderDetailId = outboundOrderDetail.Id,
@@ -99,16 +97,22 @@
.Where(x => x.MaterielCode == outboundOrderDetail.MaterielCode)
.Sum(x => x.StockQuantity),
Status = (int)OutLockStockStatusEnum.宸插垎閰�,
- StockId = outStock.Id,
- Unit = outboundOrderDetail.Unit,
- FactoryArea = outboundOrder.FactoryArea,
+ StockId = outStock.Id,
OrderType=outboundOrder.OrderType,
- SupplyCode = outboundOrderDetail.SupplyCode,
- WarehouseCode = outboundOrderDetail.WarehouseCode,
+ SupplyCode = firstAvailableDetail.SupplyCode,
+ WarehouseCode = firstAvailableDetail.WarehouseCode,
// 鏂板瀛楁
CurrentBarcode = targetBarcode,
OriginalLockQuantity = assignQuantity,
- IsSplitted = 0
+ IsSplitted = 0,
+ MaterielCode = outboundOrderDetail.MaterielCode,
+ BatchNo = firstAvailableDetail.BatchNo,
+ Unit = firstAvailableDetail.Unit,
+ BarcodeQty = firstAvailableDetail.BarcodeQty,
+ BarcodeUnit = firstAvailableDetail.BarcodeUnit,
+ FactoryArea = firstAvailableDetail.FactoryArea,
+ lineNo = outboundOrderDetail.lineNo,
+ OutboundBatchNo= outboundBatchNo
};
}
@@ -149,7 +153,7 @@
public async Task<List<Dt_OutStockLockInfo>> GetByOrderDetailId(int orderDetailId)
{
return await Db.Queryable<Dt_OutStockLockInfo>()
- .Where(x => x.OrderDetailId == orderDetailId)
+ .Where(x => x.OrderDetailIds.Contains(orderDetailId.ToString()))
.OrderBy(x => x.Id)
.ToListAsync();
}
@@ -251,7 +255,7 @@
public List<Dt_OutStockLockInfo> GetByOrderDetailId(int orderDetailId, OutLockStockStatusEnum? outStockStatus)
{
- return BaseDal.QueryData(x => x.OrderDetailId == orderDetailId && outStockStatus == null ? true : x.Status == outStockStatus.ObjToInt());
+ return BaseDal.QueryData(x => x.OrderDetailIds.Contains(orderDetailId.ToString()));
}
}
--
Gitblit v1.9.3