From 5b4a35e3fe0e5faa08233d23cd5efddebb5dd220 Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期四, 09 四月 2026 15:07:20 +0800
Subject: [PATCH] 器具长宽高修复
---
WebAPI/Controllers/BaseSet/Gy_UnitController.cs | 5 +++++
WebAPI/Models/Gy_Mould.cs | 6 +++---
WebAPI/Controllers/BaseSet/Gy_MaterialController.cs | 12 ++++++------
3 files changed, 14 insertions(+), 9 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; //鎶樺彔楂樺害
diff --git a/WebAPI/Controllers/BaseSet/Gy_UnitController.cs b/WebAPI/Controllers/BaseSet/Gy_UnitController.cs
index f0ac05c..93d1113 100644
--- a/WebAPI/Controllers/BaseSet/Gy_UnitController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_UnitController.cs
@@ -49,6 +49,11 @@
}
string sql1 = string.Format(@"select * from h_v_Gy_UnitList where 缁勭粐鍚嶇О='" + Organization + "'");
+ if (oSystemParameter.omodel.WMS_CampanyName.Contains("鍥涚淮灏�"))
+ {
+ sql1 = string.Format(@"select * from h_v_Gy_UnitList where 1=1 ");
+
+ }
if (sWhere == null || sWhere.Equals(""))
{
ds = oCN.RunProcReturn(sql1 + sWhere + "order by 璁￠噺鍗曚綅浠ｇ爜 ", "h_v_Gy_UnitList");
diff --git a/WebAPI/Models/Gy_Mould.cs b/WebAPI/Models/Gy_Mould.cs
index 500cf39..f9ff66a 100644
--- a/WebAPI/Models/Gy_Mould.cs
+++ b/WebAPI/Models/Gy_Mould.cs
@@ -69,9 +69,9 @@
public int HNowSPID { get; set; }
public int HCREATEORGID { get; set; }
public int HUSEORGID { get; set; }
- public int HMouldLength { get; set; }
- public int HMouldWidth { get; set; }
- public int HMouldHeight { get; set; }
+ public double HMouldLength { get; set; }
+ public double HMouldWidth { get; set; }
+ public double HMouldHeight { get; set; }
public bool HTransPackFlag { get; set; }
public bool HSendPackFlag { get; set; }
--
Gitblit v1.9.1