From 91fc6f65c712505f0b13e45d66e917e2645ae1c3 Mon Sep 17 00:00:00 2001
From: pulg <plg@Haninfo>
Date: 星期四, 10 七月 2025 18:17:27 +0800
Subject: [PATCH] Merge branch 'master' of http://121.37.118.194:8000/r/WMSPrjInstance/HH-0014_NongFu_QingXi

---
 HH.WCS.QingXiNongfu/wms/WCSModel.cs |   58 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 57 insertions(+), 1 deletions(-)

diff --git a/HH.WCS.QingXiNongfu/wms/WCSModel.cs b/HH.WCS.QingXiNongfu/wms/WCSModel.cs
index 7ab6f7a..d91d58b 100644
--- a/HH.WCS.QingXiNongfu/wms/WCSModel.cs
+++ b/HH.WCS.QingXiNongfu/wms/WCSModel.cs
@@ -271,13 +271,57 @@
         /// </summary>
         public int WorkType { get; internal set; } = 0;
         public string MidArea { get; internal set; }
-        public string TagOver { get; internal set; }
+
+        /// <summary>
+        /// 寮冪敤锛�鏀逛负璁板綍涓婃搴撳尯-  
+        /// </summary>
+        public string TagOver { get; internal set; } = "";
+
         public DateTime? TagOverTime { get; internal set; }
         public string S_BQ_TRAY_TYPE { get; internal set; } = "";
         /// <summary>
         /// 鍘傚
         /// </summary>
         public string S_CJ_NAME { get; set; }
+    }
+
+    [SuGG("鍗婃垚鍝佸尯鍩熻〃")]
+    public class BcpQyOrder : BaseModel
+    {
+        /// <summary>
+        /// 浜х嚎鍙�+        /// </summary>
+        public string SQL_PLineNo { get; set; }
+
+        /// <summary>
+        /// 搴撳尯
+        /// </summary>
+        public string S_AREA_CODE { get; set; }
+
+        /// <summary>
+        /// 鎺�+        /// </summary>
+        public int N_ROW { get; set; }
+
+        /// <summary>
+        /// 鍗充骇鍗崇敤 N Y --鐜板湪鍙樻垚鏄惁鏄嚜鍔ㄨВ缁�+        /// </summary>
+        public string SQL_UsingNow { get; set; }
+
+        /// <summary>
+        /// 鏄惁鍚敤  N Y
+        /// </summary>
+        public string C_ENABLE { get; set; }
+
+        /// <summary>
+        /// 浼樺厛绾�+        /// </summary>
+        public int N_PRI { get; set; }
+
+        /// <summary>
+        /// 鎵樼洏绫诲瀷 绌烘/婊℃
+        /// </summary>
+        public string S_CNTR_TYPE { get; set; }
     }
 
     [SuGG("鍘傚鏃堕棿琛�)]
@@ -499,12 +543,24 @@
     [SuGG("搴撳簱杞繍")]
     public class YWLZXtake : BaseModel
     {
+        public string SQL_WorkNo { get; set; }
         public string S_START_AREA { get; set; }
         public int N_START_ROW { get; set; }
+        public int N_END_ROW { get; set; }
         public string S_ZZ_AREA { get; set; }
         public string S_END_AREA { get; set; }
         public string S_ZX_STATE { get; set; }
 
+        /// <summary>
+        /// 缂栫爜 鍚嶇О 鍘傚锛�鏈潵涓嶉渶瑕侊紝  涓轰簡ab鍖轰笉瓒虫椂锛岃Е鍙戣浆杩愩� 闃叉閲嶅鐗╂枡鍗曟嵁
+        /// </summary>
+        public string S_ITEM_CODE { get; set; }
+        public string S_ITEM_NAME { get; set; }
+        /// <summary>
+        /// 鍘傚
+        /// </summary>
+        public string S_CJ_NAME { get; set; }
+
     }
 
     [SuGG("绉诲簱宸ュ崟琛�)]

--
Gitblit v1.9.1