From 8e9a58616a164fa41e28ed6b7f90f97289371e24 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期三, 22 五月 2024 14:46:25 +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, 9 insertions(+), 4 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
index ff2c9d0..02ff4d3 100644
--- a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
@@ -1104,7 +1104,8 @@
int HNowSupTypeID = mainList[0].HNowSupTypeID;
int HMadeSupID = mainList[0].HMadeSupID;
string HMouldClass = mainList[0].HMouldClass;
-
+ int HNowWHID = mainList[0].HNowWHID;
+ int HNowSPID = mainList[0].HNowSPID;
//涓昏〃
oCN.RunProc("Insert Into Gy_MouldFileMain " +
@@ -1117,7 +1118,7 @@
",HPrintQty,HMouldStatus,HWhID,HRoutingID,HCaveQty" +
",HBomID,HVersion,HSPGroupID,HSPID,HDesignLife,HNowSupID,HNowSupTypeID" +
",HUseLife,HLeaveLife,HProdQty,HProdWeight,HMouldOWNER,HSaveLife,HMouldDotCheckRuleInterID,HMouldMaintainRuleInterID,HBarCode,HMadeSupID" +
- ",HMouldClass) " +
+ ",HMouldClass,HNowWHID,HNowSPID) " +
" values('" + BillType + "','" + BillType + "'," + HInterID + ",'" + HBillNo + "','" + HDate + "'" +
"," + HYear + "," + HPeriod + ",'" + HRemark + "','" + HMaker + "',getdate()" +
",'" + HMouldNo + "','" + HName + "','" + HModel + "','" + HModel2 + "','" + HDiameter + "'" +
@@ -1127,7 +1128,7 @@
"," + HPrintQty + ",'" + HMouldStatus + "'," + HWHID + "," + HRoutingID + "," + HCaveQty +
"," + HBOMID + ",'" + HVersion + "'," + HSPGroupID + "," + HSPID + ",'" + HDesignLife + "','" + HNowSupID + "','" + HNowSupTypeID + "'" +
",'" + HUseLife + "','" + HLeaveLife + "','" + HProdQty + "','" + HProdWeight + "','" + HMouldOWNER + "','" + HSaveLife + "','" + HMouldDotCheckRuleInterID + "','" + HMouldMaintainRuleInterID + "','" + HBarCode + "'," + HMadeSupID +
- ",'"+ HMouldClass + "') ");
+ ",'"+ HMouldClass + "'," + HNowWHID + "," + HNowSPID + ") ");
//瀛愯〃
@@ -1246,6 +1247,8 @@
int HNowSupTypeID = mainList[0].HNowSupTypeID;
int HMadeSupID = mainList[0].HMadeSupID;
string HMouldClass = mainList[0].HMouldClass;
+ int HNowWHID = mainList[0].HNowWHID;
+ int HNowSPID = mainList[0].HNowSPID;
//鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
oCN.BeginTran();
@@ -1300,6 +1303,8 @@
",HProdWeight=" + HProdWeight.ToString() +
",HBarCode='" + HBarCode.ToString() + "'" +
",HMadeSupID=" + HMadeSupID +
+ ",HNowWHID=" + HNowWHID +
+ ",HNowSPID=" + HNowSPID +
" where HInterID=" + HInterID.ToString());
//淇敼瀛愰」鐩唬鐮�
@@ -1372,7 +1377,7 @@
{
try
{
- ds = oCN.RunProcReturn("select * from h_v_Gy_MouldFileList where hmainid=" + HInterID, "h_v_Gy_MouldFileList");
+ ds = oCN.RunProcReturn("select * from h_v_Gy_MouldFile_Edit where hmainid=" + HInterID, "h_v_Gy_MouldFile_Edit");
objJsonResult.code = "1";
objJsonResult.count = 1;
--
Gitblit v1.9.1