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/WMSModel.cs |   66 +++++++++++++++++++++++++++++++--
 1 files changed, 62 insertions(+), 4 deletions(-)

diff --git a/HH.WCS.QingXiNongfu/wms/WMSModel.cs b/HH.WCS.QingXiNongfu/wms/WMSModel.cs
index ecec452..7c84f86 100644
--- a/HH.WCS.QingXiNongfu/wms/WMSModel.cs
+++ b/HH.WCS.QingXiNongfu/wms/WMSModel.cs
@@ -2,10 +2,6 @@
 using HH.WCS.QingXigongchang.util;
 using SqlSugar;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace HH.WCS.QingXigongchang.wms
 {
@@ -73,6 +69,10 @@
         public int N_LAYER { get; internal set; }
         public string S_ITEM_CODE { get; internal set; }
         public string S_ITEM_NAME { get; internal set; }
+
+        public string S_BATCH_NO { get; internal set; }
+
+        public string S_CJ_NAME { get; set; }
     }
 
 
@@ -137,6 +137,8 @@
         {
             get; set;
         }
+
+        public string C_ENABLE { get; set; }
         //public string S_DEEP { get; set; }
 
         [SugarColumn(IsIgnore = true)]
@@ -178,6 +180,7 @@
         public string S_TYPE { get; set; }
 
 
+
         [SugarColumn(IsIgnore = true)]
         [Navigate(NavigateType.OneToOne, nameof(S_CNTR_CODE))]
         public CntrItemRel CntrItemRel { get; set; }
@@ -215,6 +218,11 @@
         /// 鍗婃墭1 0.5 鍗婃墭2銆�0.75  婊℃墭 1 
         /// </summary>
         public double N_BQ_TRAY_TYPE { get; set; } = 1;
+
+        /// <summary>
+        /// 鍘傚
+        /// </summary>
+        public string S_CJ_NAME { get; set; }
 
         public int ItemLayer { get; set; }
         [SugarColumn(IsIgnore = true)]
@@ -285,6 +293,11 @@
         public string S_ITEM_CODE { get; set; }
         public string S_ITEM_NAME { get; set; }
         public int trayHeight { get; set; }
+
+        /// <summary>
+        /// 鍘熸枡pe鑶滀笁灞俆S楂樺害
+        /// </summary>
+        public int trayHeight1 { get; set; }
         public int ItemLayer { get; set; }
 
         //鐗╂枡鎵�湪鎵樼洏鐨勫彲鍫嗗彔灞傛暟銆�   銆娿�涓庤揣浣嶅閲忓彇 鏈�皬鍊笺� 
@@ -363,6 +376,50 @@
         public string S_CNTR_STATE { get; set; }
     }
 
+    [SuGG("搴撳琛�)]
+    public class KuRong : BaseModel
+    {
+        /// <summary>
+        /// 搴撲綅
+        /// </summary>
+        public string StorageLoc { get; set; }
+        /// <summary>
+        /// AGV鎬诲簱瀹�+        /// </summary>
+        public int MaxCapacity { get; set; }
+        /// <summary>
+        /// 宸插崰搴撳
+        /// </summary>
+        public int FilledCapacity { get; set; }
+        /// <summary>
+        /// 鍝佺浉
+        /// </summary>
+        public string ProductItem { get; set; }
+        /// <summary>
+        /// 鍓╀綑搴撳閲�+        /// </summary>
+        public int AvailableCapacity { get; set; }
+        /// <summary>
+        /// agv鎵�渶搴撳銆�+        /// </summary>
+        public int DesiredCapacity { get; set; }
+        /// <summary>
+        /// 浠撳簱鎬诲簱瀹广�
+        /// </summary>
+        public int CRC { get; set; }
+        /// <summary>
+        /// 鍓╀綑绌哄簱瀹广�
+        /// </summary>
+        public int RAC { get; set; }
+        /// <summary>
+        /// 宸插崰搴撳鐨勫拰銆�+        /// </summary>
+        public int DRC { get; set; }
+        /// <summary>
+        /// 浠撳簱鍓╀綑鎬诲簱瀹广�
+        /// </summary>
+        public int BAC { get; set; }
+    }
     //鍧囧窞鐜板満
     //[SugarTable("dbo.")]
 
@@ -378,6 +435,7 @@
         public string S_END_LAREA { get; set; }
         public string S_START_LOC { get; set; }
         public string S_END_LOC { get; set; }
+        public string S_TWO_END_LOC { get; set; }
         public string S_TYPE { get; set; }
         public string S_NOTE { get; set; }
         public string S_SRC_SYS { get; set; }

--
Gitblit v1.9.1