From edcd7574e709748c5d3ccc0bd54930414ddcfc9a Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期五, 30 五月 2025 21:00:08 +0800
Subject: [PATCH] 合并冲突
---
WebAPI/Models/ClsGy_Material_Model.cs | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/WebAPI/Models/ClsGy_Material_Model.cs b/WebAPI/Models/ClsGy_Material_Model.cs
index 7266fc6..7f2c508 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;
@@ -56,6 +56,7 @@
public int HSALEPRICEUNITID; //閿�鍞浠疯閲忓崟浣�(gy_unit)
public int HBASEUNITID; //鍩烘湰璁￠噺鍗曚綅(gy_unit)
public int HSTOREUNITID; //搴撳瓨璁￠噺鍗曚綅(gy_unit)
+ public int HPOUnitID; //閲囪喘璁￠噺鍗曚綅(gy_unit)
public int HCHECKINCOMING; //鏄惁鏉ユ枡妫�楠�
public int HAuxPropFlag;
public int HCHECKPRODUCT; //鏄惁浜у搧妫�楠�
@@ -94,6 +95,21 @@
public string HTela_M;//姣涚罕鍚嶇О鍙婅鏍�
public string HUnderTela_M;//搴曚笣
public string HSizing_M;//瀹氬瀷娴嗘枡
- public string HEXPUNIT;
+ 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; //浜嬩笟閮�
+
+ public int HCubicleQty; //宸ヤ綅鏁伴噺
}
}
\ No newline at end of file
--
Gitblit v1.9.1