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/Allocate/AllocateDto.cs |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 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/Allocate/AllocateDto.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/Allocate/AllocateDto.cs"
index 69ac035..e823023 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/Allocate/AllocateDto.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/Allocate/AllocateDto.cs"
@@ -25,7 +25,7 @@
         /// 璇锋眰鏃堕棿
         /// </summary>
         [JsonProperty("reqTime")]
-        public DateTime ReqTime { get; set; }
+        public string ReqTime { get; set; }
 
         /// <summary>
         /// 璁㈠崟缂栧彿
@@ -39,17 +39,24 @@
         [JsonProperty("business_type")]
         public string BusinessType { get; set; }
 
+        public string fromWarehouse { get; set; }
+
+        public string toWarehouse { get; set; }
+
         /// <summary>
         /// 鏄惁鍒嗘壒
         /// </summary>
         [JsonProperty("isBatch")]
-        public bool IsBatch { get; set; }
+        public int IsBatch { get; set; }
 
         /// <summary>
         /// 鍘傚尯浠g爜
         /// </summary>
         [JsonProperty("factoryArea")]
         public string FactoryArea { get; set; }
+
+        [JsonProperty("operator")]
+        public string Operator { get; set; }
 
         /// <summary>
         /// 鎿嶄綔绫诲瀷
@@ -125,6 +132,9 @@
         [JsonProperty("batchNo")]
         public string BatchNo { get; set; }
 
+        [JsonProperty("supplyCode")]
+        public string SupplyCode { get; set; }
+
         /// <summary>
         /// 鏁伴噺
         /// </summary>

--
Gitblit v1.9.3