From 0dc38a2e38568bdf42f8385dd9355c8f3de4c025 Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期三, 05 一月 2022 17:34:00 +0800
Subject: [PATCH] 委外发料单+设备器具点检保养规程完善
---
WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs | 91 ++++++++++++++++++++++++---------------------
1 files changed, 48 insertions(+), 43 deletions(-)
diff --git a/WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs b/WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs
index 30db31b..44ddf03 100644
--- a/WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs
+++ b/WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs
@@ -93,23 +93,12 @@
DLL.ClsGy_EquipFileMain oBill = new DLL.ClsGy_EquipFileMain();
if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
{
- bool IsDete = oBill.DeleteBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo);
- if (IsDete)
- {
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
- objJsonResult.data = null;
- return objJsonResult;
- }
- else
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
- objJsonResult.data = null;
- return objJsonResult;
- }
+ oCN.RunProc("Delete From Gy_EquipFileBillMain where HInterID=" + lngBillKey);
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎鎴愬姛";
+ objJsonResult.data = null;
+ return objJsonResult;
}
else
{
@@ -165,6 +154,8 @@
string msg1 = _value.ToString();
string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
string msg2 = sArray[0].ToString();
+ string msg3 = sArray[1].ToString();
+ string msg4 = sArray[2].ToString();
//鍙嶅簭鍒楀寲
msg2 = "[" + msg2.ToString() + "]";
@@ -172,6 +163,7 @@
List<Models.ClsGy_EquipFileMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsGy_EquipFileMain>>(msg2);
string hbillno= list[0].HBillNo;
+ string HYear = DateTime.Now.Year.ToString();
DateTime HDate = list[0].HDate;
long HInterID = list[0].HInterID;
string HEquipFileNumber = list[0].HEquipFileNumber;
@@ -181,14 +173,14 @@
string HModel2 = list[0].HModel2; // 鈭� varchar(100) //璁惧鍨嬪彿
int HMaterID = list[0].HMaterID; // 鈭� int //瀵瑰簲鐗╂枡
int HUnitID = list[0].HUnitID; // 鈭� int //鍗曚綅
- DateTime HOutComDate = list[0].HOutComDate; // 鈭� datetime //璁惧鍑哄巶鏃ユ湡
+ string HOutComDate = list[0].HOutComDate; // 鈭� datetime //璁惧鍑哄巶鏃ユ湡
string HOutComNo = list[0].HOutComNo; // 鈭� varchar(100) //璁惧鍑哄巶缂栧彿
int HDeptID = list[0].HDeptID; // 鈭� int //浣跨敤閮ㄩ棬锛坓y_Department锛�
int HUseEmpID = list[0].HUseEmpID; //鈭� int //浣跨敤璐熻矗浜猴紙gy_Employee锛�
int HRepairEmpID = list[0].HRepairEmpID; //鈭� int //缁存姢璐熻矗浜猴紙gy_Employee锛�
string HAddress = list[0].HAddress; // 鈭� varchar(500) //瀹夎鍦扮偣
- DateTime HSetupDate = list[0].HSetupDate; //鈭� datetime //瀹夎鏃ユ湡
- DateTime HStartupDate = list[0].HStartupDate; //鈭� datetime //杩愯寮�濮嬫棩鏈�
+ string HSetupDate = list[0].HSetupDate; //鈭� datetime //瀹夎鏃ユ湡
+ string HStartupDate = list[0].HStartupDate; //鈭� datetime //杩愯寮�濮嬫棩鏈�
string HStatus = list[0].HStatus; // 鈭� varchar(20) //褰撳墠鐘舵�侊紙绌洪棽銆佸崰鐢ㄣ�佸姞宸ャ�佸叧鏈恒�佸紓甯稿仠鏈猴級
int HEquipFileTypeID = list[0].HEquipFileTypeID; //鈭� int //璁惧绫诲埆锛圙y_EquipFileType)
string HProNum = list[0].HProNum; // 鈭� varchar(100) //宸ョ▼缂栫爜
@@ -197,6 +189,10 @@
string HLogo = list[0].HLogo; //鈭� varchar(50) //鍝佺墝
int HSellSupID = list[0].HSellSupID; // 鈭� int //渚涘簲鍟�(Gy_Supplier)
int HMakeSupID = list[0].HMakeSupID; // int //鍒堕�犲晢 (Gy_Supplier)
+ string HMaker = msg4;
+ string HMakeDate = DateTime.Now.Date.ToString();
+ int HEquipDotCheckRuleInterID = list[0].HEquipDotCheckRuleInterID;
+ int HEquipMaintainRuleInterID = list[0].HEquipMaintainRuleInterID;
if (!DBUtility.ClsPub.AllowNumber(HEquipFileNumber))
{
@@ -212,11 +208,11 @@
oCN.RunProc("Insert into Gy_EquipFileBillMain " +
" (hbillno,HEquipFileNumber,HEquipFileNo,HName,HModel,HModel2,HMaterID,HUnitID,HOutComDate" +
",HOutComNo,HDeptID,HUseEmpID,HRepairEmpID,HAddress,HSetupDate,HStartupDate,HStatus," +
- "HEquipFileTypeID,HProNum,HBarCode,HWorkArea,HLogo,HSellSupID,HMakeSupID,hbilltype,HDate) " +
+ "HEquipFileTypeID,HProNum,HBarCode,HWorkArea,HLogo,HSellSupID,HMakeSupID,hbilltype,HDate,HYear,HMaker,HMakeDate,HEquipMaintainRuleInterID,HEquipDotCheckRuleInterID) " +
" Values('" + hbillno + "','" + HEquipFileNumber + "','" + HEquipFileNo + "','" + HName + "','" + HModel + "','" + HModel2 + "'," + HMaterID + "," + HUnitID +
",'" + HOutComDate + "','" + HOutComNo + "'," + HDeptID + "," + HUseEmpID + "," + HRepairEmpID + ",'" + HAddress +
"','" + HSetupDate + "','" + HStartupDate + "','" + HStatus + "'," + HEquipFileTypeID + ",'" + HProNum +
- "','" + HBarCode + "','" + HWorkArea + "','" + HLogo + "'," + HSellSupID + "," + HMakeSupID +",'3308','" + HDate +
+ "','" + HBarCode + "','" + HWorkArea + "','" + HLogo + "'," + HSellSupID + "," + HMakeSupID +",'3308','" + HDate +"','"+ HYear+ "','" + HMaker + "','" + HMakeDate +"','"+ HEquipMaintainRuleInterID+"','"+ HEquipDotCheckRuleInterID+
"')", ref DBUtility.ClsPub.sExeReturnInfo);
//淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
oCN.Commit();
@@ -252,6 +248,7 @@
string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
string msg2 = sArray[0].ToString();
string msg3 = sArray[1].ToString();
+ string msg4 = sArray[2].ToString();
//鍙嶅簭鍒楀寲
msg2 = "[" + msg2.ToString() + "]";
@@ -265,14 +262,14 @@
string HModel2 = list[0].HModel2; // 鈭� varchar(100) //璁惧鍨嬪彿
int HMaterID = list[0].HMaterID; // 鈭� int //瀵瑰簲鐗╂枡
int HUnitID = list[0].HUnitID; // 鈭� int //鍗曚綅
- DateTime HOutComDate = list[0].HOutComDate; // 鈭� datetime //璁惧鍑哄巶鏃ユ湡
+ string HOutComDate = list[0].HOutComDate; // 鈭� datetime //璁惧鍑哄巶鏃ユ湡
string HOutComNo = list[0].HOutComNo; // 鈭� varchar(100) //璁惧鍑哄巶缂栧彿
int HDeptID = list[0].HDeptID; // 鈭� int //浣跨敤閮ㄩ棬锛坓y_Department锛�
int HUseEmpID = list[0].HUseEmpID; //鈭� int //浣跨敤璐熻矗浜猴紙gy_Employee锛�
int HRepairEmpID = list[0].HRepairEmpID; //鈭� int //缁存姢璐熻矗浜猴紙gy_Employee锛�
string HAddress = list[0].HAddress; // 鈭� varchar(500) //瀹夎鍦扮偣
- DateTime HSetupDate = list[0].HSetupDate; //鈭� datetime //瀹夎鏃ユ湡
- DateTime HStartupDate = list[0].HStartupDate; //鈭� datetime //杩愯寮�濮嬫棩鏈�
+ string HSetupDate = list[0].HSetupDate; //鈭� datetime //瀹夎鏃ユ湡
+ string HStartupDate = list[0].HStartupDate; //鈭� datetime //杩愯寮�濮嬫棩鏈�
string HStatus = list[0].HStatus; // 鈭� varchar(20) //褰撳墠鐘舵�侊紙绌洪棽銆佸崰鐢ㄣ�佸姞宸ャ�佸叧鏈恒�佸紓甯稿仠鏈猴級
int HEquipFileTypeID = list[0].HEquipFileTypeID; //鈭� int //璁惧绫诲埆锛圙y_EquipFileType)
string HProNum = list[0].HProNum; // 鈭� varchar(100) //宸ョ▼缂栫爜
@@ -280,7 +277,11 @@
string HWorkArea = list[0].HWorkArea; //鈭� varchar(50) //浜у湴
string HLogo = list[0].HLogo; //鈭� varchar(50) //鍝佺墝
int HSellSupID = list[0].HSellSupID; // 鈭� int //渚涘簲鍟�(Gy_Supplier)
- int HMakeSupID = list[0].HMakeSupID; // int //鍒堕�犲晢 (Gy_Supplier)
+ int HMakeSupID = list[0].HMakeSupID; // int //鍒堕�犲晢 (Gy_Supplier)
+ string HUpDater = msg4;
+ string HUpDateDate = DateTime.Now.Date.ToString();
+ int HEquipDotCheckRuleInterID = list[0].HEquipDotCheckRuleInterID;
+ int HEquipMaintainRuleInterID = list[0].HEquipMaintainRuleInterID;
if (!DBUtility.ClsPub.AllowNumber(HEquipFileNumber))
{
@@ -308,28 +309,32 @@
//涓昏〃
oCN.RunProc("Update Gy_EquipFileBillMain set " +
" HEquipFileNumber='" + HEquipFileNumber + "'" +
- " HEquipFileNo='" + HEquipFileNo + "'" +
- " HName='" + HName + "'" +
- " HModel='" + HModel + "'" +
- " HModel2='" + HModel2 + "'" +
- " HMaterID=" + HMaterID +
- " HUnitID=" + HUnitID +
- " HOutComDate='" + HOutComDate + "'" +
- " HOutComNo='" + HOutComNo + "'" +
- " HDeptID=" + HDeptID +
- " HUseEmpID=" + HUseEmpID +
- " HRepairEmpID=" + HRepairEmpID +
- " HAddress='" + HAddress + "'" +
- " HSetupDate='" + HSetupDate + "'" +
- " HStartupDate='" + HStartupDate + "'" +
- " HStatus='" + HStatus + "'" +
- " HEquipFileTypeID=" + HEquipFileTypeID +
+ ",HEquipFileNo='" + HEquipFileNo + "'" +
+ ",HName='" + HName + "'" +
+ ",HModel='" + HModel + "'" +
+ ",HModel2='" + HModel2 + "'" +
+ ",HMaterID=" + HMaterID +
+ ",HUnitID=" + HUnitID +
+ ",HOutComDate='" + HOutComDate + "'" +
+ ",HOutComNo='" + HOutComNo + "'" +
+ ",HDeptID=" + HDeptID +
+ ",HUseEmpID=" + HUseEmpID +
+ ",HRepairEmpID=" + HRepairEmpID +
+ ",HAddress='" + HAddress + "'" +
+ ",HSetupDate='" + HSetupDate + "'" +
+ ",HStartupDate='" + HStartupDate + "'" +
+ ",HStatus='" + HStatus + "'" +
+ ",HEquipFileTypeID=" + HEquipFileTypeID +
",HProNum='" + HProNum + "'" +
",HBarCode='" + HBarCode + "'" +
",HWorkArea='" + HWorkArea + "'" +
- ",HLogo=" + HLogo +
+ ",HLogo='" + HLogo + "'" +
",HSellSupID=" + HSellSupID +
",HMakeSupID= " + HMakeSupID +
+ ",HUpDater= '" + HUpDater + "'" +
+ ",HUpDateDate= '" + HUpDateDate + "'" +
+ ",HEquipDotCheckRuleInterID='"+ HEquipDotCheckRuleInterID+"'"+
+ ",HEquipMaintainRuleInterID='"+ HEquipMaintainRuleInterID+"'"+
" Where HInterID=" + HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
//淇敼瀛愰」鐩唬鐮�
//oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_RepairCheck,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
--
Gitblit v1.9.1