From 2ec46c24c2f4adf1d431e356a7ca4ade0a9ed52c Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期三, 08 五月 2024 14:21:26 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

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

diff --git a/WebAPI/Models/ClsGy_Material_Model.cs b/WebAPI/Models/ClsGy_Material_Model.cs
index ebf90b3..77107ef 100644
--- a/WebAPI/Models/ClsGy_Material_Model.cs
+++ b/WebAPI/Models/ClsGy_Material_Model.cs
@@ -44,7 +44,10 @@
         public int HCREATEORGID;
         public int HBatchManager;
         public string HOldMaterNumber;
-        
+        public double HWidth; //骞呭
+        public double HWeight; //鍏嬮噸
+        public string HColorRemark; //鏌撹壊瑕佹眰
+
         public int HSALEUNITID; //閿�鍞閲忓崟浣�(gy_unit)
         public int HSALEPRICEUNITID; //閿�鍞浠疯閲忓崟浣�(gy_unit)
         public int HBASEUNITID; //鍩烘湰璁¢噺鍗曚綅(gy_unit)
@@ -54,5 +57,24 @@
         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; //涓�娆″悎鏍肩巼鏍囧噯鍊�
     }
 }
\ No newline at end of file

--
Gitblit v1.9.1