From f780704a804361561bb09758f58233ecb620cb82 Mon Sep 17 00:00:00 2001
From: zrg <z1873@LAPTOP-EAVL132E>
Date: 星期四, 30 四月 2026 14:53:44 +0800
Subject: [PATCH] 修复模具编辑没有存入代码 增加设备产量接口
---
WebAPI/Controllers/BaseSet/Gy_MaterialController.cs | 104 ++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 93 insertions(+), 11 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
index 43b9ae1..9548076 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锛�
@@ -2709,6 +2709,8 @@
string HGaugeDesignSize = mainList[0].HGaugeDesignSize; // 妫�鍏疯璁″昂瀵�
int HProductQTY = mainList[0].HProductQTY; // 浜у搧鏁伴噺
int HManagerID = mainList[0].HManagerID; // 璐熻矗浜�
+ double HPackV = mainList[0].HPackV; //鎵樹綋绉�
+ double HStandardQtyForMouldInPack = mainList[0].HStandardQtyForMouldInPack; //鎵樻爣鍑嗗鍣ㄦ暟閲�
//淇濆瓨鍓嶆帶鍒�=========================================
string HBillNote = "";
@@ -2737,7 +2739,7 @@
oCN.RunProc("Insert Into Gy_MouldFileMain " +
"(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
",HYear,HPeriod,HRemark,HMaker,HMakeDate" +
- ",HMouldNo,HName,HModel,HModel2,HDiameter" +
+ ",HMouldNo,HNumber,HName,HModel,HModel2,HDiameter" +
",HSubjoin,HSubjoin2,HPICNo,HWorkMaterModel" +
",HMaterID,HMaterNumber,HMouldType,HUnitID" +
",HOutComDate,HOutComNo,HDeptID,HSupID,HSupNumber" +
@@ -2746,11 +2748,11 @@
",HUseLife,HLeaveLife,HProdQty,HProdWeight,HMouldOWNER,HSaveLife,HMouldDotCheckRuleInterID,HMouldMaintainRuleInterID,HBarCode,HMadeSupID" +
",HMouldClass,HNowWHID,HNowSPID,HInitLife,HMouldUseStatus,HCREATEORGID,HUSEORGID " +
",HMouldLength,HMouldWidth,HMouldHeight,HMouldFoldHeight,HTransPackFlag,HSendPackFlag," +
- "HUserID,HBrand,HCalibrationType,HLocation,HCalibrationDate,HCalibrationCycle,HProductDesignSize,HGaugeDesignSize,HProductQTY,HManagerID) " +
+ "HUserID,HBrand,HCalibrationType,HLocation,HCalibrationDate,HCalibrationCycle,HProductDesignSize,HGaugeDesignSize,HProductQTY,HManagerID,HPackV,HStandardQtyForMouldInPack) " +
" values('" + BillType + "','" + BillType + "'," + HInterID + ",'" + HBillNo + "','" + HDate + "'" +
"," + HYear + "," + HPeriod + ",'" + HRemark + "','" + HMaker + "',getdate()" +
- ",'" + HMouldNo + "','" + HName + "','" + HModel + "','" + HModel2 + "','" + HDiameter + "'" +
+ ",'" + HMouldNo + "','" + HMouldNo + "','" + HName + "','" + HModel + "','" + HModel2 + "','" + HDiameter + "'" +
",'" + HSubjoin + "','" + HSubjoin2 + "','" + HPICNo + "','" + HWorkMaterModel + "'" +
"," + HMaterID + ",'" + HMaterNumber + "'," + HMouleTypeID + "," + HUnitID +
",'" + HOutComDate + "','" + HOutComNo + "'," + HDeptID + "," + HSupID + ",'" + HSupNumber + "'" +
@@ -2759,7 +2761,7 @@
",'" + 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) + "," +
- "'" + HUserID + "','" + HBrand + "','" + HCalibrationType + "','" + HLocation + "','" + HCalibrationDate + "','" + HCalibrationCycle + "','" + HProductDesignSize + "','" + HGaugeDesignSize + "','" + HProductQTY + "','" + HManagerID + "') ");
+ "'" + HUserID + "','" + HBrand + "','" + HCalibrationType + "','" + HLocation + "','" + HCalibrationDate + "','" + HCalibrationCycle + "','" + HProductDesignSize + "','" + HGaugeDesignSize + "','" + HProductQTY + "','" + HManagerID + "','" + HPackV + "','" + HStandardQtyForMouldInPack + "') ");
//瀛愯〃
oCN.RunProc("Insert into Gy_MouldFileSub " +
@@ -2908,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; //鎶樺彔楂樺害
@@ -2918,12 +2920,14 @@
string HBrand = mainList[0].HBrand; // 鍝佺墝
string HCalibrationType = mainList[0].HCalibrationType; // 鏍″噯绫诲瀷 (鍐�/澶栨牎)
string HLocation = mainList[0].HLocation; // 浣嶇疆
- DateTime HCalibrationDate = mainList[0].HCalibrationDate; // 鏍″噯鏃ユ湡
+ DateTime HCalibrationDate = mainList[0].HCalibrationDate != null ? mainList[0].HCalibrationDate: DateTime.Now; // 鏍″噯鏃ユ湡
string HCalibrationCycle = mainList[0].HCalibrationCycle; // 鏍″噯鍛ㄦ湡
string HProductDesignSize = mainList[0].HProductDesignSize; // 浜у搧璁捐灏哄
string HGaugeDesignSize = mainList[0].HGaugeDesignSize; // 妫�鍏疯璁″昂瀵�
int HProductQTY = mainList[0].HProductQTY; // 浜у搧鏁伴噺
int HManagerID = mainList[0].HManagerID; // 璐熻矗浜�
+ double HPackV = mainList[0].HPackV; //鎵樹綋绉�
+ double HStandardQtyForMouldInPack = mainList[0].HStandardQtyForMouldInPack; //鎵樻爣鍑嗗鍣ㄦ暟閲�
//鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
oCN.BeginTran();
@@ -2949,6 +2953,82 @@
return objJsonResult;
}
//=========================================================
+ string sql= "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 + "'" +
+ ",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 +
+ "',HUserID='" + HUserID +
+ "',HBrand='" + HBrand +
+ "',HCalibrationType='" + HCalibrationType +
+ "',HLocation='" + HLocation +
+ "',HCalibrationDate='" + HCalibrationDate +
+ "',HCalibrationCycle='" + HCalibrationCycle +
+ "',HProductDesignSize='" + HProductDesignSize +
+ "',HGaugeDesignSize='" + HGaugeDesignSize +
+ "',HProductQTY='" + HProductQTY +
+ "',HManagerID='" + HManagerID +
+ "',HPackV='" + HPackV +
+ "',HStandardQtyForMouldInPack='" + HStandardQtyForMouldInPack +
+ "' where HInterID=" + HInterID.ToString();
+
+ LogService.Write(sql);
//涓昏〃
oCN.RunProc("UpDate Gy_MouldFileMain set " +
@@ -3022,6 +3102,8 @@
"',HGaugeDesignSize='" + HGaugeDesignSize +
"',HProductQTY='" + HProductQTY +
"',HManagerID='" + HManagerID +
+ "',HPackV='" + HPackV +
+ "',HStandardQtyForMouldInPack='" + HStandardQtyForMouldInPack +
"' where HInterID=" + HInterID.ToString());
oCN.RunProc("delete from Gy_MouldFileSub_SubMater where HInterID='" + HInterID + "'");
--
Gitblit v1.9.1