From 92793ecc13458aef467ed9d59eb54657f8426bf0 Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期二, 16 十一月 2021 18:47:38 +0800
Subject: [PATCH] 器具保养记录单上，选择完 器具后 带出默认 保养规程+器具档案保存默认保养规程和点检规程
---
WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user | 34 +++++-----
WebAPI/Models/Gy_Mould.cs | 2
WebAPI/Controllers/BaseSet/Gy_MaterialController.cs | 13 +++-
WebAPI/Controllers/WebAPIController.cs | 102 ++++++++++++++++++++++++++++++++++
4 files changed, 131 insertions(+), 20 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
index 2507047..e15478b 100644
--- a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
@@ -591,6 +591,10 @@
long HPrintQty = mainList[0].HPrintQty;
string HMouldOWNER = mainList[0].HMouldOWNER;
string HSaveLife = mainList[0].HSaveLife;
+ int HMouldDotCheckRuleInterID= mainList[0].HMouldDotCheckRuleInterID;
+ int HMouldMaintainRuleInterID= mainList[0].HMouldMaintainRuleInterID;
+
+
//涓昏〃
oCN.RunProc("Insert Into Gy_MouldFileMain " +
@@ -602,7 +606,7 @@
",HOutComDate,HOutComNo,HDeptID,HSupID,HSupNumber" +
",HPrintQty,HMouldStatus,HWhID,HRoutingID" +
",HBomID,HVersion,HSPGroupID,HSPID,HDesignLife" +
- ",HUseLife,HLeaveLife,HProdQty,HProdWeight,HMouldOWNER,HSaveLife" +
+ ",HUseLife,HLeaveLife,HProdQty,HProdWeight,HMouldOWNER,HSaveLife,HMouldDotCheckRuleInterID,HMouldMaintainRuleInterID" +
") " +
" values('" + BillType + "','" + BillType + "'," + HInterID + ",'" + HBillNo + "','" + HDate + "'" +
"," + HYear + "," + HPeriod + ",'" + HRemark + "','" + HMaker + "',getdate()" +
@@ -612,7 +616,7 @@
",'" + HOutComDate + "','" + HOutComNo + "'," + HDeptID + "," + HSupID + ",'" + HSupNumber + "'" +
"," + HPrintQty + ",'" + HMouldStatus + "'," + HWHID + "," + HRoutingID +
"," + HBOMID + ",'" + HVersion + "'," + HSPGroupID + "," + HSPID + ",'" + HDesignLife + "'" +
- ",'" + HUseLife + "','" + HLeaveLife + "','" + HProdQty + "','" + HProdWeight + "','" + HMouldOWNER + "','" + HSaveLife + "'" +
+ ",'" + HUseLife + "','" + HLeaveLife + "','" + HProdQty + "','" + HProdWeight + "','" + HMouldOWNER + "','" + HSaveLife + "','" + HMouldDotCheckRuleInterID+"','"+ HMouldMaintainRuleInterID+"'"+
") ");
@@ -724,7 +728,8 @@
long HPrintQty = mainList[0].HPrintQty;
string HMouldOWNER = mainList[0].HMouldOWNER;
string HSaveLife = mainList[0].HSaveLife;
-
+ int HMouldDotCheckRuleInterID = mainList[0].HMouldDotCheckRuleInterID;
+ int HMouldMaintainRuleInterID = mainList[0].HMouldMaintainRuleInterID;
//鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
@@ -770,6 +775,8 @@
",HUseLife=" + HUseLife.ToString() +
",HLeaveLife=" + HLeaveLife.ToString() +
",HProdQty=" + HProdQty.ToString() +
+ ",HMouldDotCheckRuleInterID="+ HMouldDotCheckRuleInterID.ToString()+
+ ",HMouldMaintainRuleInterID=" + HMouldMaintainRuleInterID.ToString() +
",HMouldOWNER='" + HMouldOWNER + "'" +
",HProdWeight=" + HProdWeight.ToString() +
" where HInterID=" + HInterID.ToString());
diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index 37c0a4a..03fbe4b 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -2086,6 +2086,108 @@
}
/// <summary>
+ /// 鏍规嵁鍣ㄥ叿涓诲唴鐮佽幏鍙栧櫒鍏蜂繚鍏绘楠岄」鐩�
+ /// </summary>
+ /// <returns></returns>
+ [Route("Web/GetMaintainItemtemByMouldProjectID")]
+ [HttpGet]
+ public object GetMaintainItemtemByMouldProjectID(int MouldProjectID)
+ {
+ if (MouldProjectID <= 0)
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "浜у搧鍣ㄥ叿鏈�夋嫨";
+ objjson.data = null;
+ return objjson;
+ }
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ string sql = string.Format(@"select t.HMaintainItemID HMaintainItemID,m.HNumber HMaintainItemNumber,t.HMaintainItem HMaintainItem,t.HMaintainPart HMaintainPart,t.HClaim HClaim,t.HManagerID HManagerID,e.HNumber HManagerNumber,e.HName HManagerName,a.HRemark
+ from Sc_MouldMaintainRuleBillMain a left join Sc_MouldMaintainRuleBillSub_Item t on a.HInterID=t.HInterID
+ left join Gy_Maintain m on m.HItemID=t.HMaintainItemID
+ left join Gy_Employee e on e.HItemID=t.HManagerID
+ where a.HInterID=(select HMouldMaintainRuleInterID from Gy_MouldFileMain where HInterID=" + MouldProjectID + ") ");
+ ds = oCN.RunProcReturn(sql, "Sc_MouldMaintainRuleBillMain");
+ if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触" + DBUtility.ClsPub.sErrInfo;
+ objjson.data = null;
+ return objjson;
+ }
+ else
+ {
+ objjson.code = "1";
+ objjson.count = 1;
+ objjson.Message = "鑾峰彇鎴愬姛!";
+ objjson.data = ds.Tables[0];
+ return objjson;
+ }
+ }
+ catch (Exception ex)
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触" + ex.ToString();
+ objjson.data = null;
+ return objjson;
+ }
+ }
+
+
+ /// <summary>
+ /// 鍣ㄥ叿鐐规瑙勭▼鍗曞垪琛�
+ /// </summary>
+ /// <returns></returns>
+ [Route("Sc_MouldDotCheckRuleInter/GetMouldDotCheckRuleInterList")]
+ [HttpGet]
+ public object GetMouldDotCheckRuleInterList(int MouldProjectID)
+ {
+ if (MouldProjectID <= 0)
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "浜у搧鍣ㄥ叿鏈�夋嫨";
+ objjson.data = null;
+ return objjson;
+ }
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ string sql = string.Format(@"select * from h_v_Sc_MouldDotCheckRuleBillList");
+ ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldDotCheckRuleBillList");
+ if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触" + DBUtility.ClsPub.sErrInfo;
+ objjson.data = null;
+ return objjson;
+ }
+ else
+ {
+ objjson.code = "1";
+ objjson.count = 1;
+ objjson.Message = "鑾峰彇鎴愬姛!";
+ objjson.data = ds.Tables[0];
+ return objjson;
+ }
+ }
+ catch (Exception ex)
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触" + ex.ToString();
+ objjson.data = null;
+ return objjson;
+ }
+ }
+
+
+ /// <summary>
/// 鑾峰彇缁翠慨椤圭洰鍒楄〃
/// </summary>
/// <returns></returns>
diff --git a/WebAPI/Models/Gy_Mould.cs b/WebAPI/Models/Gy_Mould.cs
index 357dc0e..33e5ad1 100644
--- a/WebAPI/Models/Gy_Mould.cs
+++ b/WebAPI/Models/Gy_Mould.cs
@@ -58,6 +58,8 @@
public string HSaveLife { get; set; }
public long HPrintQty { get; set; }
public string HMouldOWNER { get; set; }
+ public int HMouldMaintainRuleInterID { get; set; }
+ public int HMouldDotCheckRuleInterID { get; set; }
}
}
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
index 2648eef..1e8a616 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -18,25 +18,25 @@
<publishTime>02/22/2013 08:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>11/15/2021 17:07:15</publishTime>
+ <publishTime>11/16/2021 18:46:35</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>11/15/2021 17:07:15</publishTime>
+ <publishTime>11/16/2021 18:46:35</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>11/15/2021 17:07:13</publishTime>
+ <publishTime>11/16/2021 18:46:33</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>11/15/2021 17:07:13</publishTime>
+ <publishTime>11/16/2021 18:46:33</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 14:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>11/15/2021 17:07:09</publishTime>
+ <publishTime>11/16/2021 18:46:29</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>11/15/2021 17:07:09</publishTime>
+ <publishTime>11/16/2021 18:46:29</publishTime>
</File>
<File Include="bin/Interop.gregn6Lib.dll">
<publishTime>08/25/2021 10:28:25</publishTime>
@@ -60,10 +60,10 @@
<publishTime>07/25/2012 11:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
- <publishTime>11/15/2021 17:07:10</publishTime>
+ <publishTime>11/16/2021 18:46:30</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>11/15/2021 17:07:10</publishTime>
+ <publishTime>11/16/2021 18:46:30</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
<publishTime>08/16/2021 17:23:15</publishTime>
@@ -72,22 +72,22 @@
<publishTime>08/03/2014 20:33:56</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>11/15/2021 17:07:07</publishTime>
+ <publishTime>11/16/2021 18:46:28</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>11/15/2021 17:07:07</publishTime>
+ <publishTime>11/16/2021 18:46:28</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>11/15/2021 17:07:08</publishTime>
+ <publishTime>11/16/2021 18:46:28</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>11/15/2021 17:07:08</publishTime>
+ <publishTime>11/16/2021 18:46:28</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>11/15/2021 17:07:08</publishTime>
+ <publishTime>11/16/2021 18:46:29</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>11/15/2021 17:07:08</publishTime>
+ <publishTime>11/16/2021 18:46:29</publishTime>
</File>
<File Include="bin/stdole.dll">
<publishTime>05/09/2021 13:35:37</publishTime>
@@ -189,10 +189,10 @@
<publishTime>11/24/2014 11:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>11/15/2021 17:07:19</publishTime>
+ <publishTime>11/16/2021 18:46:38</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>11/15/2021 17:07:19</publishTime>
+ <publishTime>11/16/2021 18:46:38</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>07/17/2013 17:03:52</publishTime>
@@ -363,7 +363,7 @@
<publishTime>08/06/2021 22:57:28</publishTime>
</File>
<File Include="Web.config">
- <publishTime>11/15/2021 17:07:31</publishTime>
+ <publishTime>11/16/2021 18:46:49</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
--
Gitblit v1.9.1