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_IOutboundService/IOutboundPickingService.cs | 54 ++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 42 insertions(+), 12 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_IOutboundService/IOutboundPickingService.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_IOutboundService/IOutboundPickingService.cs"
index ceac439..cb38bdc 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_IOutboundService/IOutboundPickingService.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_IOutboundService/IOutboundPickingService.cs"
@@ -6,6 +6,7 @@
using WIDESEA_Core;
using WIDESEA_Core.BaseRepository;
using WIDESEA_Core.BaseServices;
+using WIDESEA_DTO.Inbound;
using WIDESEA_DTO.Outbound;
using WIDESEA_Model.Models;
@@ -15,18 +16,47 @@
{
IRepository<Dt_PickingRecord> Repository { get; }
- Task<WebResponseContent> CancelPicking(CancelPickingRequest request);
- Task<WebResponseContent> CancelPicking(string orderNo, string palletCode, string barcode);
- Task<WebResponseContent> ConfirmPicking(PickingConfirmRequest request);
- Task<WebResponseContent> ConfirmPicking(string orderNo, string palletCode, string barcode);
- Task<WebResponseContent> DirectOutbound(DirectOutboundRequest request);
- Task<List<OutStockLockListResp>> GetOutStockLockListAsync(string orderNo);
- Task<WebResponseContent> GetPalletOutboundStatus(string palletCode);
- Task GetPalletPickingSummary(string orderNo, string palletCode);
- Task<List<Dt_OutStockLockInfo>> GetPickedList(string orderNo, string palletCode);
- Task<List<Dt_PickingRecord>> GetPickingHistory(int orderId);
- Task<object> GetPickingSummary(string orderNo);
+ Task<object> GetPickingSummary(ConfirmPickingDto dto);
+
Task<List<Dt_OutStockLockInfo>> GetUnpickedList(string orderNo, string palletCode);
- Task<WebResponseContent> ValidateBarcode(string barcode);
+
+ Task<List<Dt_OutStockLockInfo>> GetPickedList(string orderNo, string palletCode);
+
+ Task<WebResponseContent> CancelPicking(string orderNo, string palletCode, string barcode);
+ Task<WebResponseContent> ConfirmPicking(string orderNo, string palletCode, string barcode);
+ Task<WebResponseContent> ReturnRemaining(string orderNo, string palletCode, string reason);
+
+ /// <summary>
+ /// 鍗曟嵁鏌ユ壘
+ /// </summary>
+ /// <returns></returns>
+ WebResponseContent GetAvailablePurchaseOrders();
+ WebResponseContent GetAvailablePickingOrders();
+
+ /// <summary>
+ /// 鎵爜楠岃瘉
+ /// </summary>
+ WebResponseContent BarcodeValidate(NoStockOutModel noStockOut);
+ /// <summary>
+ /// 鏉＄爜鍒犻櫎
+ /// </summary>
+ /// <param name="noStockOut"></param>
+ /// <returns></returns>
+ WebResponseContent DeleteBarcode(NoStockOutModel noStockOut);
+
+ Task<WebResponseContent> NoStockOutSubmit(NoStockOutSubmit noStockOutSubmit);
+
+ Task<WebResponseContent> RemoveEmptyPallet(string orderNo, string palletCode);
+
+
+ WebResponseContent UnPalletQuantity(string orderNo);
+ WebResponseContent BarcodeMaterielGroup(BarcodeMaterielGroupDTO materielGroupDTO);
+
+ /// <summary>
+ /// 鏉＄爜鏌ヨ鍏ュ簱鍗�
+ /// </summary>
+ /// <param name="barcode"></param>
+ /// <returns></returns>
+ public WebResponseContent GetPurchaseOrderByBarcode(string barcode);
}
}
--
Gitblit v1.9.3