From 55142f3214485c7ec12c5e414a56519f66a1eb1d Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期五, 17 十月 2025 19:54:47 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhiHuiQiCe/FangCangZhiNeng

---
 新建文件夹/WIDESEA_WMSServer/WIDESEA_DTO/SquareCabin/OrderDto.cs |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_DTO/SquareCabin/OrderDto.cs" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_DTO/SquareCabin/OrderDto.cs"
index 1963213..a23dddc 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_DTO/SquareCabin/OrderDto.cs"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_DTO/SquareCabin/OrderDto.cs"
@@ -106,7 +106,7 @@
             public string goods_no { get; set; }
 
             /// <summary>
-            /// 鍏ュ簱鏁伴噺锛堥��璐т负璐熸暟锛�
+            /// 鍏ュ簱鏁伴噺锛堥��璐т负璐熸暟锛夛紱瀵逛簬WMS鏉ヨ閮戒负鍏ュ簱涓烘鏁�
             /// </summary>
             public decimal order_qty { get; set; }
 
@@ -164,7 +164,10 @@
         public class UpstreamOutOrderDetail
         {
             public string goods_no { get; set; }
-            public decimal out_qty { get; set; }
+            /// <summary>
+            /// 鍑哄簱鏁伴噺
+            /// </summary>
+            public decimal order_qty { get; set; }
             public string batch_num { get; set; }
             public string exp_date { get; set; }
         }
@@ -195,7 +198,7 @@
             /// <summary>
             /// 鍌ㄥ瓨鏉′欢
             /// </summary>
-            public string storage_cond { get; set; }
+            public string storage_confition { get; set; }
             public string remark { get; set; }
             public DateTime modify_date { get; set; }
 

--
Gitblit v1.9.3