From e481bc706eeedfa7e4061b1c79ad4a5d3b440249 Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期五, 05 十二月 2025 09:15:27 +0800
Subject: [PATCH] 添康问题清单修复
---
WebAPI/Controllers/MateOutController.cs | 2 +-
WebAPI/Controllers/BaseSet/Gy_DriverController.cs | 4 ++--
WebAPI/Controllers/BaseSet/Gy_MaterialController.cs | 6 +++---
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_DriverController.cs b/WebAPI/Controllers/BaseSet/Gy_DriverController.cs
index 858a78f..5d74e62 100644
--- a/WebAPI/Controllers/BaseSet/Gy_DriverController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_DriverController.cs
@@ -492,7 +492,7 @@
msg2 = msg2.Replace("\n", "");
msg2 = "[" + msg2.ToString() + "]";
List<Driver> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Driver>>(msg2);
-
+ long HUSEORGID_1 = Convert.ToInt64(list[0].HUSEORGID);
long HItemID = list[0].HItemID;
string HNumber = list[0].HNumber;
string HName = list[0].HName;
@@ -503,7 +503,7 @@
string HMakeEmp = msg3;
bool HStopflag = list[0].HStopflag==null?false:true;
long HCREATEORGID = list[0].HCREATEORGID;
- long HUSEORGID = list[0].HUSEORGID;
+ long HUSEORGID = HUSEORGID_1;
long HCompID = list[0].HCompID;
//zidingyi
diff --git a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
index 5e293cd..6461537 100644
--- a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
@@ -3996,7 +3996,7 @@
#region [妯″叿妗ｆ鎵归噺鐢熸垚]
[Route("Gy_Mould/SaveBatchGen_MouldFile")]
[HttpGet]
- public object SaveBatchGen_MouldFile(long HInterID, string StarNum, string EndNum)
+ public object SaveBatchGen_MouldFile(long HInterID, string StarNum, string EndNum,string user)
{
int StarNum1 = int.Parse(StarNum);
int EndNum1 = int.Parse(EndNum);
@@ -4049,10 +4049,10 @@
",HUseLife,HLeaveLife,HProdQty,HProdWeight,HMouldOWNER,HSaveLife,HMouldDotCheckRuleInterID,HMouldMaintainRuleInterID" +
") " +
" values('3899','3899'," + HItemID + ",'" + Num1 + j + "',getdate()" +
- "," + dr["HYear"] + "," + dr["HPeriod"] + ",'" + dr["HRemark"] + "','" + dr["HMaker"] + "',getdate(),'" + Num1 + j +
+ "," + dr["HYear"] + "," + dr["HPeriod"] + ",'" + dr["HRemark"] + "','" + user + "',getdate(),'" + Num1 + j +
"','" + Num1 + j + "','" + dr["HName"] + "','" + dr["HModel"] + "','" + dr["HModel2"] + "','" + dr["HDiameter"] + "'" +
",'" + dr["HSubjoin"] + "','" + dr["HSubjoin2"] + "','" + dr["HPICNo"] + "','" + dr["HWorkMaterModel"] + "'" +
- "," + dr["HMaterID"] + ",'" + dr["HMaterNumber"] + "',0," + dr["HUnitID"] +
+ "," + dr["HMaterID"] + ",'" + dr["HMaterNumber"] + "',"+dr["HMouldType"]+"," + dr["HUnitID"] +
",'" + dr["HOutComDate"] + "','" + dr["HOutComNo"] + "'," + dr["HDeptID"] + "," + dr["HSupID"] + ",'" + dr["HSupNumber"] + "'" +
"," + dr["HPrintQty"] + ",'" + dr["HMouldStatus"] + "'," + dr["HWHID"] + "," + dr["HRoutingID"] + ",'" + dr["HCaveQty"] +
"'," + dr["HBOMID"] + ",'" + dr["HVersion"] + "'," + dr["HSPGroupID"] + "," + dr["HSPID"] + ",'" + dr["HDesignLife"] + "','" + dr["HNowSupID"] + "','" + dr["HNowSupTypeID"] + "'" +
diff --git a/WebAPI/Controllers/MateOutController.cs b/WebAPI/Controllers/MateOutController.cs
index cfbae7f..a6c7077 100644
--- a/WebAPI/Controllers/MateOutController.cs
+++ b/WebAPI/Controllers/MateOutController.cs
@@ -1332,7 +1332,7 @@
objJsonResult.code = "0";
objJsonResult.count = 0;
objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
- objJsonResult.data = null;
+ objJsonResult.data = ds.Tables[0];
return objJsonResult;
}
else
--
Gitblit v1.9.1