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_DTO/Outbound/OutboundOrderGetDTO.cs | 45 ++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 40 insertions(+), 5 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_DTO/Outbound/OutboundOrderGetDTO.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_DTO/Outbound/OutboundOrderGetDTO.cs"
index 8381ea6..bbb4ca0 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_DTO/Outbound/OutboundOrderGetDTO.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_DTO/Outbound/OutboundOrderGetDTO.cs"
@@ -2,6 +2,7 @@
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
@@ -37,8 +38,20 @@
{
public int OutStockLockInfoId { get; set; }
public string MaterielCode { get; set; }
- public decimal SplitQuantity { get; set; }
+
public string Operator { get; set; }
+
+ [Required(ErrorMessage = "璁㈠崟鍙蜂笉鑳戒负绌�")]
+ public string OrderNo { get; set; }
+
+ [Required(ErrorMessage = "鎵樼洏鍙蜂笉鑳戒负绌�")]
+ public string PalletCode { get; set; }
+
+ [Required(ErrorMessage = "鍘熸潯鐮佷笉鑳戒负绌�")]
+ public string OriginalBarcode { get; set; }
+
+ [Range(0.001, double.MaxValue, ErrorMessage = "鎷嗗寘鏁伴噺蹇呴』澶т簬0")]
+ public decimal SplitQuantity { get; set; }
}
public class ConfirmPickingDto
{
@@ -77,10 +90,7 @@
public string OrderNo { get; set; }
}
- public class CancelPickingRequest
- {
- public int PickingHistoryId { get; set; }
- }
+
public class BackToStockRequest
{
@@ -261,6 +271,29 @@
public string Barcode { get; set; }
}
+
+
+ public class CancelSplitChainDto
+ {
+ [Required(ErrorMessage = "璁㈠崟鍙蜂笉鑳戒负绌�")]
+ public string OrderNo { get; set; }
+
+ [Required(ErrorMessage = "鎵樼洏鍙蜂笉鑳戒负绌�")]
+ public string PalletCode { get; set; }
+
+ [Required(ErrorMessage = "璧峰鏉＄爜涓嶈兘涓虹┖")]
+ public string StartBarcode { get; set; }
+ }
+
+ public class SplitPackageChainInfoRequestDto
+ {
+ [Required(ErrorMessage = "璁㈠崟鍙蜂笉鑳戒负绌�")]
+ public string OrderNo { get; set; }
+
+ [Required(ErrorMessage = "鏉＄爜涓嶈兘涓虹┖")]
+ public string Barcode { get; set; }
+ }
+
public class SplitPackageDto
{
public string OrderNo { get; set; }
@@ -295,4 +328,6 @@
//public decimal SplitQuantity { get; set; }
//public decimal RemainQuantity { get; set; }
}
+
+
}
--
Gitblit v1.9.3