From 68628c6cc163cddfcc745c225a9f3f34767261ef Mon Sep 17 00:00:00 2001
From: 647556386 <647556386@qq.com>
Date: 星期六, 22 十一月 2025 20:44:40 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu
---
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_DTO/Outbound/OutboundOrderGetDTO.cs | 100 +++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 91 insertions(+), 9 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 88aa0f7..8381ea6 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"
@@ -1,9 +1,11 @@
锘縰sing Microsoft.AspNetCore.Components.Forms;
+using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
+using WIDESEA_Model.Models;
namespace WIDESEA_DTO.Outbound
{
@@ -13,7 +15,23 @@
public int pageNo { get; set; }
}
+ // 鎷嗗寘閾綝TO
+ public class SplitPackageChainDto
+ {
+ public int Id { get; set; }
+ public DateTime SplitTime { get; set; }
+ public string Operator { get; set; }
+ public string OriginalBarcode { get; set; }
+ public string NewBarcode { get; set; }
+ public decimal SplitQty { get; set; }
+ public decimal RemainQuantity { get; set; }
+ public bool IsReverted { get; set; }
+ public DateTime? RevertTime { get; set; }
+ public int? PreviousSplitRecordId { get; set; }
+ public int NewLockInfoId { get; set; }
+ public int Status { get; set; }
+ }
// 鎷嗗寘璇锋眰
public class SplitPackageRequest
{
@@ -22,8 +40,25 @@
public decimal SplitQuantity { get; set; }
public string Operator { get; set; }
}
+ public class ConfirmPickingDto
+ {
+ [JsonProperty("orderNo")]
+ public string OrderNo { get; set; }
+ [JsonProperty("palletCode")]
+ public string PalletCode { get; set; }
+ [JsonProperty("barcode")]
+ public string Barcode { get; set; }
+ }
+ public class SummaryPickingDto
+ {
+ public string PalletCode { get; set; }
+ public string MaterielCode { get; set; }
+ public int UnpickedCount { get; set; }
+ public decimal UnpickedQuantity { get; set; }
+ public int pickedCount { get; set; }
+ }
public class PickingConfirmRequest
{
public int OrderDetailId { get; set; }
@@ -39,6 +74,7 @@
public class DirectOutboundRequest
{
public string PalletCode { get; set; }
+ public string OrderNo { get; set; }
}
public class CancelPickingRequest
@@ -115,7 +151,11 @@
public string CurrentBarcode { get; set; } = string.Empty;
public decimal AssignQuantity { get; set; }
}
-
+ public class LockInfoDetailDto : Dt_OutStockLockInfo
+ {
+ public string MaterielName { get; set; }
+ public string Unit { get; set; }
+ }
public class MaterielBarcodeValidateOutput : OutputDto
{
public bool IsValid { get; set; }
@@ -140,7 +180,7 @@
public string OrderNo { get; set; } = string.Empty; // 鍑哄簱鍗曞彿
}
-
+
public class PickingConfirmReq
{
@@ -149,7 +189,7 @@
public string MaterielBarcode { get; set; } = string.Empty; // 鐗╂枡鏉＄爜
}
-
+
public class SplitPackageReq
{
@@ -158,7 +198,7 @@
public decimal SplitQty { get; set; } // 鏂版潯鐮佸垎閰嶆暟閲�
}
-
+
public class StockReturnReq
{
@@ -166,14 +206,14 @@
public string TaskNum { get; set; } = string.Empty; // 浠诲姟鍙凤紙鍙�夛級
}
-
+
public class OutStockLockDetailReq
{
public long OutStockLockId { get; set; } // 鍑哄簱璇︽儏ID
}
-
+
public class MaterielBarcodeValidateResp
{
@@ -182,7 +222,7 @@
public decimal PackageQty { get; set; } // 鏁村寘鏁伴噺锛堝垎閰嶆暟閲忥級
public string Message { get; set; } = string.Empty;
}
-
+
public class OutStockLockDetailResp
{
@@ -190,7 +230,7 @@
public decimal AssignQuantity { get; set; }
}
-
+
public class OutStockLockListResp
{
@@ -204,7 +244,7 @@
public bool IsSplitted { get; set; }
}
-
+
public class PickedRecordListResp
{
@@ -213,4 +253,46 @@
public decimal pickQuantity { get; set; }
public string pickTime { get; set; } = string.Empty;
}
+
+ public class CancelPickingDto
+ {
+ public string OrderNo { get; set; }
+ public string PalletCode { get; set; }
+ public string Barcode { get; set; }
+ }
+
+ public class SplitPackageDto
+ {
+ public string OrderNo { get; set; }
+ public string PalletCode { get; set; }
+ public string OriginalBarcode { get; set; }
+ public decimal SplitQuantity { get; set; }
+ public string MaterielCode { get; set; }
+ }
+
+ public class RevertSplitDto
+ {
+ public string OriginalBarcode { get; set; }
+ }
+
+ // 鎷嗗寘缁撴灉绫�
+ public class SplitResult
+ {
+ public string materialCode { get; set; }
+ public string supplierCode { get; set; }
+
+ public string quantityTotal { get; set; }
+
+ public string batchNumber { get; set; }
+
+ public string batch { get; set; }
+ public string factory { get; set; }
+
+ public string date { get; set; }
+
+ // public string OriginalBarcode { get; set; }
+ // public string NewBarcode { get; set; }
+ //public decimal SplitQuantity { get; set; }
+ //public decimal RemainQuantity { get; set; }
+ }
}
--
Gitblit v1.9.3