From 38b01cb446b0725ded3ae8867353925e67da3ac1 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期二, 18 六月 2024 19:41:25 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

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

diff --git a/WebAPI/Models/ClsGy_Material_Model.cs b/WebAPI/Models/ClsGy_Material_Model.cs
index 1daed48..b9ee92f 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,32 @@
         public double HPERUNITSTANDHOUR; //鏍囧噯宸ユ椂
         public double HSTDLABORPREPARETIME; //鏍囧噯浜哄憳鍑嗗宸ユ椂
         public double HSTDMACHINEPREPARETIME; //鏍囧噯鏈哄櫒鍑嗗宸ユ椂
+        public string HMaterRuleType; //鐗╂枡鍏紡
+
+        public int HQCSchemeID_Fst;
+        public int HQCSchemeID_Proc;
+        public int HQCSchemeID_Patrol;
+        public string HColorNo;//棰滆壊鑹插彿
+        public double HPieceMaxQty; //鍗曚欢鏈�澶т笂闄�
+
+        public int HCommonUseFlag; // 鏄惁涓嶅父鐢ㄦ潗鏂�
+
+        public double HAvgStockPrice; // 鍔犳潈骞冲潎浠�
+
+        public double HFootPrice; // 缁撶畻浠�
+
+        public double HTaxCost; // 鍚◣鎴愭湰浠�
+
+        public double HNoTaxCost; // 涓嶅惈绋庢垚鏈环
+
+        public double HOnceRightRate; //涓�娆″悎鏍肩巼鏍囧噯鍊�
+
+        public string HHeight_M;//姣涢珮
+        public string HInches_M;//瀵告暟缁勭粐
+        public string HAl1Long_M;//鍏ㄦ瘺闀�
+        public string HDensity_M;//鍧忓竷瀵嗗害
+        public string HTela_M;//姣涚罕鍚嶇О鍙婅鏍�
+        public string HUnderTela_M;//搴曚笣
+        public string HSizing_M;//瀹氬瀷娴嗘枡
     }
 }
\ No newline at end of file

--
Gitblit v1.9.1