From 5286b614c84f8f82f81772cdb32c2dc5a0d26e0f Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期五, 28 十一月 2025 16:59:20 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/BaseSet/Gy_MaterialController.cs | 163 ++++++++++++++++++++++++++++++-----------------------
1 files changed, 92 insertions(+), 71 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
index 157fc52..b493f57 100644
--- a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
@@ -2695,6 +2695,12 @@
string HMouldUseStatus = mainList[0].HMouldUseStatus;
int HCREATEORGID = mainList[0].HCREATEORGID;
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; //楂�
+ int HMouldFoldHeight = mainList[0].HMouldFoldHeight; //鎶樺彔楂樺害
//淇濆瓨鍓嶆帶鍒�=========================================
string HBillNote = "";
@@ -2730,17 +2736,20 @@
",HPrintQty,HMouldStatus,HWhID,HRoutingID,HCaveQty" +
",HBomID,HVersion,HSPGroupID,HSPID,HDesignLife,HNowSupID,HNowSupTypeID" +
",HUseLife,HLeaveLife,HProdQty,HProdWeight,HMouldOWNER,HSaveLife,HMouldDotCheckRuleInterID,HMouldMaintainRuleInterID,HBarCode,HMadeSupID" +
- ",HMouldClass,HNowWHID,HNowSPID,HInitLife,HMouldUseStatus,HCREATEORGID,HUSEORGID) " +
- " values('" + BillType + "','" + BillType + "'," + HInterID + ",'" + HBillNo + "','" + HDate + "'" +
- "," + HYear + "," + HPeriod + ",'" + HRemark + "','" + HMaker + "',getdate()" +
- ",'" + HMouldNo + "','" + HName + "','" + HModel + "','" + HModel2 + "','" + HDiameter + "'" +
- ",'" + HSubjoin + "','" + HSubjoin2 + "','" + HPICNo + "','" + HWorkMaterModel + "'" +
- "," + HMaterID + ",'" + HMaterNumber + "'," + HMouleTypeID + "," + HUnitID +
- ",'" + HOutComDate + "','" + HOutComNo + "'," + HDeptID + "," + HSupID + ",'" + HSupNumber + "'" +
- "," + HPrintQty + ",'" + HMouldStatus + "'," + HWHID + "," + HRoutingID + "," + HCaveQty +
- "," + HBOMID + ",'" + HVersion + "'," + HSPGroupID + "," + HSPID + ",'" + HDesignLife + "','" + HNowSupID + "','" + HNowSupTypeID + "'" +
- ",'" + HUseLife + "','" + HLeaveLife + "','" + HProdQty + "','" + HProdWeight + "','" + HMouldOWNER + "','" + HSaveLife + "','" + HMouldDotCheckRuleInterID + "','" + HMouldMaintainRuleInterID + "','" + HBarCode + "'," + HMadeSupID +
- ",'"+ HMouldClass + "'," + HNowWHID + "," + HNowSPID + ",'" + HInitLife + "','" + HMouldUseStatus + "',"+ HCREATEORGID + ","+ HUSEORGID + ") ");
+ ",HMouldClass,HNowWHID,HNowSPID,HInitLife,HMouldUseStatus,HCREATEORGID,HUSEORGID " +
+ ",HMouldLength,HMouldWidth,HMouldHeight,HMouldFoldHeight,HTransPackFlag,HSendPackFlag ) " +
+
+ " values('" + BillType + "','" + BillType + "'," + HInterID + ",'" + HBillNo + "','" + HDate + "'" +
+ "," + HYear + "," + HPeriod + ",'" + HRemark + "','" + HMaker + "',getdate()" +
+ ",'" + HMouldNo + "','" + HName + "','" + HModel + "','" + HModel2 + "','" + HDiameter + "'" +
+ ",'" + HSubjoin + "','" + HSubjoin2 + "','" + HPICNo + "','" + HWorkMaterModel + "'" +
+ "," + HMaterID + ",'" + HMaterNumber + "'," + HMouleTypeID + "," + HUnitID +
+ ",'" + HOutComDate + "','" + HOutComNo + "'," + HDeptID + "," + HSupID + ",'" + HSupNumber + "'" +
+ "," + HPrintQty + ",'" + HMouldStatus + "'," + HWHID + "," + HRoutingID + "," + HCaveQty +
+ "," + HBOMID + ",'" + HVersion + "'," + HSPGroupID + "," + HSPID + ",'" + HDesignLife + "','" + HNowSupID + "','" + HNowSupTypeID + "'" +
+ ",'" + HUseLife + "','" + HLeaveLife + "','" + HProdQty + "','" + HProdWeight + "','" + HMouldOWNER + "','" + HSaveLife + "','" + HMouldDotCheckRuleInterID + "','" + HMouldMaintainRuleInterID + "','" + HBarCode + "'," + HMadeSupID +
+ ",'" + HMouldClass + "'," + HNowWHID + "," + HNowSPID + ",'" + HInitLife + "','" + HMouldUseStatus + "'," + HCREATEORGID + "," + HUSEORGID +
+ "," + HMouldLength + "," + HMouldWidth + "," + HMouldHeight + "," + HMouldFoldHeight + "," + Convert.ToString(HTransPackFlag ? 1 : 0) + "," + Convert.ToString(HSendPackFlag ? 1 : 0) + ") ");
//瀛愯〃
oCN.RunProc("Insert into Gy_MouldFileSub " +
@@ -2893,6 +2902,12 @@
string HMouldUseStatus = mainList[0].HMouldUseStatus;
int HUSEORGID = mainList[0].HUSEORGID;
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; //楂�
+ int HMouldFoldHeight = mainList[0].HMouldFoldHeight; //鎶樺彔楂樺害
//鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
oCN.BeginTran();
@@ -2918,64 +2933,70 @@
}
//=========================================================
- //涓昏〃
+ //涓昏〃
oCN.RunProc("UpDate Gy_MouldFileMain set " +
- " HBillNo='" + HBillNo + "'" + //鍥哄畾璧嬪��===============
- ",HDate='" + HDate + "'" +
- ",HYear='" + HYear.ToString() + "'" +
- ",HPeriod='" + HPeriod.ToString() + "'" +
- ",HRemark='" + HRemark + "'" +
- ",HUpDater='" + HUpDater + "'" +
- ",HUpDateDate=getdate()" +
- //========================================
- ",HMouldNo='" + HMouldNo + "'" +
- ",HName='" + HName + "'" +
- ",HModel='" + HModel + "'" +
- ",HModel2='" + HModel2 + "'" +
- ",HDiameter='" + HDiameter + "'" +
- ",HSubjoin='" + HSubjoin + "'" +
- ",HSubjoin2='" + HSubjoin2 + "'" +
- ",HPICNo='" + HPICNo + "'" +
- ",HWorkMaterModel='" + HWorkMaterModel + "'" +
- ",HMaterID=" + HMaterID.ToString() +
- ",HUSEORGID=" + HUSEORGID.ToString() +
- ",HMaterNumber='" + HMaterNumber + "'" +
- ",HMouldClass='" + HMouldClass + "'" +
- ",HMouldType=" + HMouleTypeID.ToString() +
- ",HUnitID=" + HUnitID.ToString() +
- ",HOutComDate='" + HOutComDate + "'" +
- ",HOutComNo='" + HOutComNo + "'" +
- ",HDeptID=" + HDeptID.ToString() +
- ",HSupID=" + HSupID.ToString() +
- ",HSupNumber='" + HSupNumber + "'" +
- ",HPrintQty=" + HPrintQty.ToString() +
- ",HMouldStatus='" + HMouldStatus + "'" +
- ",HSaveLife='" + HSaveLife + "'" +
- ",HWhID=" + HWHID.ToString() +
- ",HRoutingID=" + HRoutingID.ToString() +
- ",HBomID=" + HBOMID.ToString() +
- ",HVersion='" + HVersion + "'" +
- ",HSPGroupID=" + HSPGroupID.ToString() +
- ",HSPID=" + HSPID.ToString() +
- ",HDesignLife=" + HDesignLife.ToString() +
- ",HCaveQty=" + HCaveQty.ToString() +
- ",HUseLife=" + HUseLife.ToString() +
- ",HLeaveLife=" + HLeaveLife.ToString() +
- ",HProdQty=" + HProdQty.ToString() +
- ",HMouldDotCheckRuleInterID=" + HMouldDotCheckRuleInterID.ToString() +
- ",HMouldMaintainRuleInterID=" + HMouldMaintainRuleInterID.ToString() +
- ",HMouldOWNER='" + HMouldOWNER + "'" +
- ",HNowSupID=" + HNowSupID.ToString() +
- ",HNowSupTypeID=" + HNowSupTypeID.ToString() +
- ",HProdWeight=" + HProdWeight.ToString() +
- ",HBarCode='" + HBarCode.ToString() + "'" +
- ",HMadeSupID=" + HMadeSupID +
- ",HNowWHID=" + HNowWHID +
- ",HNowSPID=" + HNowSPID +
- ",HInitLife='" + HInitLife +
- "',HNextMainDate='" + HNextMainDate +
- "',HMouldUseStatus='" + HMouldUseStatus +
- "' where HInterID=" + HInterID.ToString());
+ " HBillNo='" + HBillNo + "'" + //鍥哄畾璧嬪��===============
+ ",HDate='" + HDate + "'" +
+ ",HYear='" + HYear.ToString() + "'" +
+ ",HPeriod='" + HPeriod.ToString() + "'" +
+ ",HRemark='" + HRemark + "'" +
+ ",HUpDater='" + HUpDater + "'" +
+ ",HUpDateDate=getdate()" +
+ //========================================
+ ",HMouldNo='" + HMouldNo + "'" +
+ ",HName='" + HName + "'" +
+ ",HModel='" + HModel + "'" +
+ ",HModel2='" + HModel2 + "'" +
+ ",HDiameter='" + HDiameter + "'" +
+ ",HSubjoin='" + HSubjoin + "'" +
+ ",HSubjoin2='" + HSubjoin2 + "'" +
+ ",HPICNo='" + HPICNo + "'" +
+ ",HWorkMaterModel='" + HWorkMaterModel + "'" +
+ ",HMaterID=" + HMaterID.ToString() +
+ ",HUSEORGID=" + HUSEORGID.ToString() +
+ ",HMaterNumber='" + HMaterNumber + "'" +
+ ",HMouldClass='" + HMouldClass + "'" +
+ ",HMouldType=" + HMouleTypeID.ToString() +
+ ",HUnitID=" + HUnitID.ToString() +
+ ",HOutComDate='" + HOutComDate + "'" +
+ ",HOutComNo='" + HOutComNo + "'" +
+ ",HDeptID=" + HDeptID.ToString() +
+ ",HSupID=" + HSupID.ToString() +
+ ",HSupNumber='" + HSupNumber + "'" +
+ ",HPrintQty=" + HPrintQty.ToString() +
+ ",HMouldStatus='" + HMouldStatus + "'" +
+ ",HSaveLife='" + HSaveLife + "'" +
+ ",HWhID=" + HWHID.ToString() +
+ ",HRoutingID=" + HRoutingID.ToString() +
+ ",HBomID=" + HBOMID.ToString() +
+ ",HVersion='" + HVersion + "'" +
+ ",HSPGroupID=" + HSPGroupID.ToString() +
+ ",HSPID=" + HSPID.ToString() +
+ ",HDesignLife=" + HDesignLife.ToString() +
+ ",HCaveQty=" + HCaveQty.ToString() +
+ ",HUseLife=" + HUseLife.ToString() +
+ ",HLeaveLife=" + HLeaveLife.ToString() +
+ ",HProdQty=" + HProdQty.ToString() +
+ ",HMouldDotCheckRuleInterID=" + HMouldDotCheckRuleInterID.ToString() +
+ ",HMouldMaintainRuleInterID=" + HMouldMaintainRuleInterID.ToString() +
+ ",HMouldOWNER='" + HMouldOWNER + "'" +
+ ",HNowSupID=" + HNowSupID.ToString() +
+ ",HNowSupTypeID=" + HNowSupTypeID.ToString() +
+ ",HProdWeight=" + HProdWeight.ToString() +
+ ",HBarCode='" + HBarCode.ToString() + "'" +
+ ",HMadeSupID=" + HMadeSupID +
+ ",HNowWHID=" + HNowWHID +
+ ",HNowSPID=" + HNowSPID +
+ ",HTransPackFlag=" + Convert.ToString(HTransPackFlag ? 1 : 0) +
+ ",HSendPackFlag=" + Convert.ToString(HSendPackFlag ? 1 : 0) +
+ ",HMouldLength=" + HMouldLength +
+ ",HMouldWidth=" + HMouldWidth +
+ ",HMouldHeight=" + HMouldHeight +
+ ",HMouldFoldHeight=" + HMouldFoldHeight +
+ ",HInitLife='" + HInitLife +
+ "',HNextMainDate='" + HNextMainDate +
+ "',HMouldUseStatus='" + HMouldUseStatus +
+ "' where HInterID=" + HInterID.ToString());
//淇敼瀛愰」鐩唬鐮�
//oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_Department,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
@@ -4442,8 +4463,8 @@
HMaterName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["瀵瑰簲ERP鐗╂枡"].ToString());
HUnitName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["璁￠噺鍗曚綅"].ToString());
HDeptName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["浣跨敤閮ㄩ棬"].ToString());
- HWHName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["榛樿浠撳簱"].ToString());
- HSPName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["榛樿浠撲綅"].ToString());
+ HWHName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["榛樿浠撳簱"].ToString());
+ HSPName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["榛樿浠撲綅"].ToString());
HSupName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["渚涘簲鍟�"].ToString());
HSupNumber = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["渚涘簲鍟嗕唬鐮�"].ToString());
HMadeSupName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["鍒堕�犲晢"].ToString());
@@ -4791,7 +4812,7 @@
"," + HPrintQty + ",'" + HMouldStatus + "'," + HWHID + "," + HRoutingID + "," + HCaveQty +
"," + HBOMID + ",'" + HVersion + "'," + HSPGroupID + "," + HSPID + ",'" + HDesignLife + "','" + HNowSupID + "','" + HNowSupTypeID + "'" +
",'" + HUseLife + "','" + HLeaveLife + "','" + HProdQty + "','" + HProdWeight + "','" + HMouldOWNER + "','" + HSaveLife + "','" + HMouldDotCheckRuleInterID + "','" + HMouldMaintainRuleInterID + "','" + HBarCode + "'," + HMadeSupID +
- ",'" + HMouldClass + "'," + HNowWHID + "," + HNowSPID + ",'" + HInitLife + "') ");
+ ",'" + HMouldClass + "'," + HNowWHID + "," + HNowSPID + ",'" + HInitLife + " ) ");
}
else
{
--
Gitblit v1.9.1