From b76803783b4c5df1f9c540926896c4b319fff249 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期一, 13 四月 2026 10:10:50 +0800
Subject: [PATCH] 合并分支
---
WebAPI/Controllers/BaseSet/Gy_MaterialController.cs | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
index 07a63aa..10cb7c5 100644
--- a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
@@ -2694,9 +2694,9 @@
int HUSEORGID = mainList[0].HUSEORGID;
bool HTransPackFlag = mainList[0].HTransPackFlag; //鍛ㄨ浆瀹瑰櫒鏍囪
bool HSendPackFlag = mainList[0].HSendPackFlag; //鍙戣揣瀹瑰櫒鏍囪
- int HMouldLength = mainList[0].HMouldLength; //闀�
- int HMouldWidth = mainList[0].HMouldWidth; //瀹�
- int HMouldHeight = mainList[0].HMouldHeight; //楂�
+ double HMouldLength = mainList[0].HMouldLength; //闀�
+ double HMouldWidth = mainList[0].HMouldWidth; //瀹�
+ double HMouldHeight = mainList[0].HMouldHeight; //楂�
int HMouldFoldHeight = mainList[0].HMouldFoldHeight; //鎶樺彔楂樺害
int HUserID = mainList[0].HUserID; // 浣跨敤浜猴紙Gy_Employee锛�
@@ -2910,9 +2910,9 @@
DateTime HNextMainDate = mainList[0].HNextMainDate;
bool HTransPackFlag = mainList[0].HTransPackFlag; //鍛ㄨ浆瀹瑰櫒鏍囪
bool HSendPackFlag = mainList[0].HSendPackFlag; //鍙戣揣瀹瑰櫒鏍囪
- int HMouldLength = mainList[0].HMouldLength; //闀�
- int HMouldWidth = mainList[0].HMouldWidth; //瀹�
- int HMouldHeight = mainList[0].HMouldHeight; //楂�
+ double HMouldLength = mainList[0].HMouldLength; //闀�
+ double HMouldWidth = mainList[0].HMouldWidth; //瀹�
+ double HMouldHeight = mainList[0].HMouldHeight; //楂�
int HMouldFoldHeight = mainList[0].HMouldFoldHeight; //鎶樺彔楂樺害
--
Gitblit v1.9.1