From 0ce56b76c7674d85aece15274348af14710be95d Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期六, 13 九月 2025 17:30:19 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

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

diff --git a/WebAPI/Models/ClsGy_Material_Model.cs b/WebAPI/Models/ClsGy_Material_Model.cs
index 341573b..eff743f 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;
@@ -111,5 +111,10 @@
         public int HDivisionID; //浜嬩笟閮�
 
         public int HCubicleQty; //宸ヤ綅鏁伴噺
+
+        public string HBarCodePrintName;//鏉$爜榛樿鎵撳嵃妯℃澘鍚嶇О
+        public string HMaterRuleExternType; // 缇婃瘺鍏紡
+        public string HMaterRuleExternType1; // 姣涘皷鍏紡
+        public string HCircularKnittingMachineCode; //鍦嗘満浠g爜
     }
 }
\ No newline at end of file

--
Gitblit v1.9.1