From d0868a4dfc05e0ff9120981d77c03d0e0aa2d49e Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期日, 08 十月 2023 09:49:35 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

---
 WebAPI/Models/ClsGy_Material_Model.cs |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/WebAPI/Models/ClsGy_Material_Model.cs b/WebAPI/Models/ClsGy_Material_Model.cs
index 1daed48..359bdbe 100644
--- a/WebAPI/Models/ClsGy_Material_Model.cs
+++ b/WebAPI/Models/ClsGy_Material_Model.cs
@@ -46,6 +46,7 @@
         public string HOldMaterNumber;
         public double HWidth; //骞呭
         public double HWeight; //鍏嬮噸
+        public string HColorRemark; //鏌撹壊瑕佹眰
 
         public int HSALEUNITID; //閿�鍞閲忓崟浣�(gy_unit)
         public int HSALEPRICEUNITID; //閿�鍞浠疯閲忓崟浣�(gy_unit)
@@ -56,5 +57,10 @@
         public double HPERUNITSTANDHOUR; //鏍囧噯宸ユ椂
         public double HSTDLABORPREPARETIME; //鏍囧噯浜哄憳鍑嗗宸ユ椂
         public double HSTDMACHINEPREPARETIME; //鏍囧噯鏈哄櫒鍑嗗宸ユ椂
+        public string HMaterRuleType; //鐗╂枡鍏紡
+
+        public int HQCSchemeID_Fst;
+        public int HQCSchemeID_Proc;
+        public int HQCSchemeID_Patrol;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.1