From 272483c2ad7aaf288316ff08ace8f2e97440b880 Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期四, 11 十一月 2021 21:41:00 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/BaseSet/Gy_MaterialController.cs | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
index f7ab835..e2877bc 100644
--- a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
@@ -589,7 +589,8 @@
string HMaterNumber = mainList[0].HMaterNumber;
string HSupNumber = mainList[0].HSupNumber;
long HPrintQty = mainList[0].HPrintQty;
-
+ string HMouldOWNER = mainList[0].HMouldOWNER;
+ string HSaveLife = mainList[0].HSaveLife;
//涓昏〃
oCN.RunProc("Insert Into Gy_MouldFileMain " +
@@ -601,7 +602,7 @@
",HOutComDate,HOutComNo,HDeptID,HSupID,HSupNumber" +
",HPrintQty,HMouldStatus,HWhID,HRoutingID" +
",HBomID,HVersion,HSPGroupID,HSPID,HDesignLife" +
- ",HUseLife,HLeaveLife,HProdQty,HProdWeight" +
+ ",HUseLife,HLeaveLife,HProdQty,HProdWeight,HMouldOWNER,HSaveLife" +
") " +
" values('" + BillType + "','" + BillType + "'," + HInterID + ",'" + HBillNo + "','" + HDate + "'" +
"," + HYear + "," + HPeriod + ",'" + HRemark + "','" + HMaker + "',getdate()" +
@@ -611,7 +612,7 @@
",'" + HOutComDate + "','" + HOutComNo + "'," + HDeptID + "," + HSupID + ",'" + HSupNumber + "'" +
"," + HPrintQty + ",'" + HMouldStatus + "'," + HWHID + "," + HRoutingID +
"," + HBOMID + ",'" + HVersion + "'," + HSPGroupID + "," + HSPID + ",'" + HDesignLife + "'" +
- ",'" + HUseLife + "','" + HLeaveLife + "','" + HProdQty + "','" + HProdWeight + "'" +
+ ",'" + HUseLife + "','" + HLeaveLife + "','" + HProdQty + "','" + HProdWeight + "','" + HMouldOWNER +"',"+ "','" + HSaveLife + "'," +
") ");
@@ -721,8 +722,8 @@
string HMaterNumber = mainList[0].HMaterNumber;
string HSupNumber = mainList[0].HSupNumber;
long HPrintQty = mainList[0].HPrintQty;
-
-
+ string HMouldOWNER = mainList[0].HMouldOWNER;
+ string HSaveLife = mainList[0].HSaveLife;
@@ -758,6 +759,7 @@
",HSupNumber='" + HSupNumber + "'" +
",HPrintQty=" + HPrintQty.ToString() +
",HMouldStatus='" + HMouldStatus + "'" +
+ ",HSaveLife='"+ HSaveLife+"'"+
",HWhID=" + HWHID.ToString() +
",HRoutingID=" + HRoutingID.ToString() +
",HBomID=" + HBOMID.ToString() +
@@ -768,6 +770,7 @@
",HUseLife=" + HUseLife.ToString() +
",HLeaveLife=" + HLeaveLife.ToString() +
",HProdQty=" + HProdQty.ToString() +
+ ",HMouldOWNER='"+ HMouldOWNER+"'"+
",HProdWeight=" + HProdWeight.ToString() +
" where HInterID=" + HInterID.ToString());
--
Gitblit v1.9.1