From a116cc7c2508d804667589de7f5f2f471378d92e Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期一, 29 十二月 2025 14:12:25 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

---
 WebAPI/Models/ClsGy_Material_Model.cs |   25 +++++++++++++++++++++++--
 1 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/WebAPI/Models/ClsGy_Material_Model.cs b/WebAPI/Models/ClsGy_Material_Model.cs
index d404f2c..a4164c2 100644
--- a/WebAPI/Models/ClsGy_Material_Model.cs
+++ b/WebAPI/Models/ClsGy_Material_Model.cs
@@ -39,9 +39,9 @@
         public long HUnitGroupID;
         public long HMaterTypeID;
         public double HPlanPrice;
-        public int HUSEORGID;
+        //public int HUSEORGID;
         public int HERPItemID;
-        public int HCREATEORGID;
+       // public int HCREATEORGID;
         public int HPlanMode;
         public int HBatchManager;
         public string HOldMaterNumber;
@@ -50,12 +50,14 @@
         public double HHeight;  
         public double HJQty;  
         public double HWeight; //鍏嬮噸
+        public double HNetWeight; //鍏嬮噸
         public string HColorRemark; //鏌撹壊瑕佹眰
 
         public int HSALEUNITID; //閿�鍞閲忓崟浣�(gy_unit)
         public int HSALEPRICEUNITID; //閿�鍞浠疯閲忓崟浣�(gy_unit)
         public int HBASEUNITID; //鍩烘湰璁¢噺鍗曚綅(gy_unit)
         public int HSTOREUNITID; //搴撳瓨璁¢噺鍗曚綅(gy_unit)
+        public int HPOUnitID;       //閲囪喘璁¢噺鍗曚綅(gy_unit)
         public int HCHECKINCOMING; //鏄惁鏉ユ枡妫�楠�
         public int HAuxPropFlag;  
         public int HCHECKPRODUCT; //鏄惁浜у搧妫�楠�
@@ -72,6 +74,9 @@
         public int HQCSchemeID_Fst;
         public int HQCSchemeID_Proc;
         public int HQCSchemeID_Patrol;
+        public int HQCSchemeID_POStockIn;
+        public int HQCSchemeID_LastPiece;
+        public int HQCSchemeID_OutComp;
         public string HColorNo;//棰滆壊鑹插彿
         public double HPieceMaxQty; //鍗曚欢鏈�澶т笂闄�
 
@@ -107,5 +112,21 @@
         public int HProjectBillMainID; //椤圭洰鍙�
 
         public double HLotcardQty; //鍗曚釜娴佽浆鍗℃暟閲�
+        public int HDivisionID; //浜嬩笟閮�
+
+        public int HCubicleQty; //宸ヤ綅鏁伴噺
+
+        public string HBarCodePrintName;//鏉$爜榛樿鎵撳嵃妯℃澘鍚嶇О
+        public string HMaterRuleExternType; // 缇婃瘺鍏紡
+        public string HMaterRuleExternType1; // 姣涘皷鍏紡
+        public string HCircularKnittingMachineCode; //鍦嗘満浠g爜
+        //灏忓崼鑷畾涔�
+        public int HMinPOQty;//绠辫
+        public int HMaxPOQty;//鎵樿
+        public string HMaterColor;//鎵樿
+        public string HMidBoxSize;//鎵樿
+        public string HVolume;//鎵樿
+       
+
     }
 }
\ No newline at end of file

--
Gitblit v1.9.1