From d342d178aea2a3dcb1ea54b0fcc78decb2f657b5 Mon Sep 17 00:00:00 2001 From: wtt <1985833171@qq.com> Date: 星期二, 10 九月 2024 19:50:07 +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, 24 insertions(+), 0 deletions(-) diff --git a/WebAPI/Models/ClsGy_Material_Model.cs b/WebAPI/Models/ClsGy_Material_Model.cs index b9ee92f..74094c4 100644 --- a/WebAPI/Models/ClsGy_Material_Model.cs +++ b/WebAPI/Models/ClsGy_Material_Model.cs @@ -42,9 +42,13 @@ public int HUSEORGID; public int HERPItemID; public int HCREATEORGID; + public int HPlanMode; public int HBatchManager; public string HOldMaterNumber; public double HWidth; //骞呭 + public double HLength; + public double HHeight; + public double HJQty; public double HWeight; //鍏嬮噸 public string HColorRemark; //鏌撹壊瑕佹眰 @@ -53,12 +57,18 @@ public int HBASEUNITID; //鍩烘湰璁¢噺鍗曚綅(gy_unit) public int HSTOREUNITID; //搴撳瓨璁¢噺鍗曚綅(gy_unit) public int HCHECKINCOMING; //鏄惁鏉ユ枡妫�楠� + public int HAuxPropFlag; public int HCHECKPRODUCT; //鏄惁浜у搧妫�楠� public double HPERUNITSTANDHOUR; //鏍囧噯宸ユ椂 public double HSTDLABORPREPARETIME; //鏍囧噯浜哄憳鍑嗗宸ユ椂 public double HSTDMACHINEPREPARETIME; //鏍囧噯鏈哄櫒鍑嗗宸ユ椂 public string HMaterRuleType; //鐗╂枡鍏紡 + public int HSNUnitID; + public int HMASTERID; + public int HISKFPERIOD; + public int HAuxUnitID; + public double HEXPPERIOD; public int HQCSchemeID_Fst; public int HQCSchemeID_Proc; public int HQCSchemeID_Patrol; @@ -84,5 +94,19 @@ public string HTela_M;//姣涚罕鍚嶇О鍙婅鏍� public string HUnderTela_M;//搴曚笣 public string HSizing_M;//瀹氬瀷娴嗘枡 + public string HEXPUNIT; + + public double HQtyDec; // -鏁伴噺绮惧害锛堥粯璁�4锛� + + public double HPriceDec; // 鍗曚环绮惧害锛堥粯璁�4锛� + + public double HMoneyDec; // 閲戦绮惧害锛堥粯璁�2锛� + public double HTaxRate; // 榛樿绋庣巼锛堥粯璁�13锛� + + public double HProfitRate; // 榛樿鍒╂鼎鐜囷紙榛樿0锛� + public int HProjectBillMainID; //椤圭洰鍙� + + public double HLotcardQty; //鍗曚釜娴佽浆鍗℃暟閲� + public int HDivisionID; //浜嬩笟閮� } } \ No newline at end of file -- Gitblit v1.9.1