From bbc55c38eb249c4eaba8b6346c00cce72406a28d Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期三, 17 十一月 2021 17:41:05 +0800
Subject: [PATCH] 基础资料：增加 故障原因列表 增加故障原因列表编辑
---
DBUtility/基础资料/ClsGy_Base_Model.cs | 2
WebAPI/ListModels.cs | 12 ++
WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user | 34 ++--
WebAPI/Controllers/WebAPIController.cs | 14 -
WebAPI/WebAPI.csproj | 1
WebAPI/Controllers/基础资料/基础资料/Gy_ConkReasonBillController.cs | 256 ++++++++++++++++++++++++++++++++++++++++++
Model/基础资料/基础资料/ClsGy_ConkReason_Model.cs | 10 +
7 files changed, 300 insertions(+), 29 deletions(-)
diff --git "a/DBUtility/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Base_Model.cs" "b/DBUtility/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Base_Model.cs"
index ee9b050..0e84930 100644
--- "a/DBUtility/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Base_Model.cs"
+++ "b/DBUtility/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Base_Model.cs"
@@ -15,7 +15,7 @@
public bool HStopflag;
public string HRemark;
public long HLevel;
- public long HParentID;
+ public long HParentID=0;
public string HModel;
public long HUnitID;
public string HUnitNumber;
diff --git "a/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_ConkReason_Model.cs" "b/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_ConkReason_Model.cs"
index 38e6e0a..319f784 100644
--- "a/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_ConkReason_Model.cs"
+++ "b/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_ConkReason_Model.cs"
@@ -8,5 +8,15 @@
{
//
public string HExplanation; //描述varchar(500)
+ public DateTime HMakeTime;
+ public string HMakeEmp;
+ public int HConkTypeID;
+ public string HCheckEmp;
+ public DateTime HCheckTime;
+ public string HModifyEmp;
+ public DateTime HModifyTime;
+ public string HStopEmp;
+ public DateTime HStopTime;
+
}
}
diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index 03fbe4b..ff11189 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -2144,21 +2144,13 @@
/// <returns></returns>
[Route("Sc_MouldDotCheckRuleInter/GetMouldDotCheckRuleInterList")]
[HttpGet]
- public object GetMouldDotCheckRuleInterList(int MouldProjectID)
+ public object GetMouldDotCheckRuleInterList(string sWhere)
{
- 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");
+ string sql = string.Format(@"select * from h_v_Sc_MouldDotCheckRuleBillList ");
+ ds = oCN.RunProcReturn(sql+sWhere, "h_v_Sc_MouldDotCheckRuleBillList");
if (ds == null || ds.Tables[0].Rows.Count <= 0)
{
objjson.code = "0";
diff --git "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ConkReasonBillController.cs" "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ConkReasonBillController.cs"
new file mode 100644
index 0000000..442ac6e
--- /dev/null
+++ "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ConkReasonBillController.cs"
@@ -0,0 +1,256 @@
+锘縰sing Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Web.Http;
+using WebAPI.Models;
+
+namespace WebAPI.Controllers.鍩虹璧勬枡.鍩虹璧勬枡
+{
+ public class Gy_ConkReasonBillController : ApiController
+ {
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus;//鍗曟嵁鐘舵�侊紙鏂板锛屼慨鏀癸紝娴忚锛屾洿鏂板崟浠凤紝鍙樻洿锛�
+ private json objJsonResult = new json();
+ public DataSet ds = new DataSet();
+ public SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ public Model.ClsGy_ConkReason_Model BillNew0 = new Model.ClsGy_ConkReason_Model();
+
+
+ #region 鏁呴殰鍘熷洜鍒楄〃
+ [Route("Gy_ConkReasonBill/Get_ConkReasonBillList")]
+ [HttpGet]
+ public object Get_ConkReasonBillList(string sWhere)
+ {
+ try
+ {
+ ds = Sc_GetConkReasonBill(sWhere);
+ if (ds == null)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏌ヨ鏁版嵁寮傚父锛岃涓庣鐞嗗憳鑱旂郴锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception ex)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏌ヨ鏁版嵁寮傚父锛岃涓庣鐞嗗憳鑱旂郴锛�" + ex.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ public static DataSet Sc_GetConkReasonBill(string sWhere)
+ {
+ string sql1 = string.Format(@"select * from h_v_Gy_ConkReasonList");
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ return new SQLHelper.ClsCN().RunProcReturn(sql1 + sWhere + " order by hitemid desc", "h_v_Gy_ConkReasonList");
+ }
+ else
+ {
+ string sql = sql1 + sWhere + "order by hitemid desc";
+ return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Gy_ConkReasonList");
+ }
+ }
+ #endregion
+
+ #region [鏁呴殰鍘熷洜鍒犻櫎鍔熻兘]
+ [Route("Gy_ConkReasonBill/set_DeleteBill")]
+ [HttpGet]
+ public object set_DeleteBill(string HItemID)
+ {
+ Int64 lngBillKey = 0;
+ lngBillKey = DBUtility.ClsPub.isLong(HItemID);
+ if (lngBillKey == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁ID涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ ds = oCn.RunProcReturn("select * from Gy_ConkReason where HItemID=" + lngBillKey, "Gy_ConkReason");
+ if (ds != null)
+ {
+ oCn.RunProc("Delete from Gy_ConkReason where HItemID=" + lngBillKey);
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹笉瀛樺湪锛岃鏌ョ湅鏄惁閲嶅鍒犻櫎";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ }
+
+ #endregion
+
+ #region [缂栬緫鏄剧ず琛ㄥご]
+ [Route("Gy_ConkReasonBill/GetConkReasonByID")]
+ [HttpGet]
+ public object GetConkReasonByID(string HID)
+ {
+ Int64 lngBillKey = 0;
+ lngBillKey = DBUtility.ClsPub.isLong(HID);
+ if (lngBillKey == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁ID涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ ds = oCn.RunProcReturn("select * from Gy_ConkReason where HItemID=" + lngBillKey, "Gy_ConkReason");
+ if (ds != null)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹笉瀛樺湪";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ }
+
+ #endregion
+
+ #region 淇濆瓨鏁呴殰鍘熷洜
+ [Route("Gy_ConkReasonBill/SaveGy_ConkReason")]
+ [HttpPost]
+ public object SaveGy_ConkReason([FromBody] JObject msg)
+ {
+ var _value = msg["msg"].ToString();
+ string msg2 = _value.ToString();
+ string[] sArray = msg2.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg1 = sArray[0].ToString();
+ string msg3 = sArray[1].ToString();//褰撳墠浜�
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ ListModels oListModels = new ListModels();
+ try
+ {
+ Model.ClsGy_ConkReason_Model oBill = new Model.ClsGy_ConkReason_Model();
+ List<Model.ClsGy_ConkReason_Model> lsmain = new List<Model.ClsGy_ConkReason_Model>();
+ msg1 = msg1.Replace("\\", "");
+ msg1 = msg1.Replace("\n", ""); //\n
+ lsmain = oListModels.getObjectByJson_Gy_ConkReason(msg1);
+ foreach (Model.ClsGy_ConkReason_Model oItem in lsmain)
+ {
+ if (oItem.HNumber.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佷唬鐮佷笉鑳戒负绌猴紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ if (oItem.HName.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佸悕绉颁笉鑳戒负绌猴紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+
+ //寰楀埌鐭唬鐮�
+ string sShortNumber;
+ sShortNumber = DBUtility.ClsPub.GetShortNumber(oItem.HNumber.Trim());
+ if (sShortNumber.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佺煭浠ｇ爜涓虹┖锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ oItem.HShortNumber = sShortNumber;//鐭唬鐮�
+ oItem.HEndFlag = true;//鏈骇鏍囧織
+ oItem.HLevel = DBUtility.ClsPub.GetLevel(oItem.HNumber.Trim()); //绛夌骇
+ oBill = oItem;
+ }
+
+ //淇濆瓨
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ if (oBill.HItemID == 0)
+ {
+ oCn.RunProc("Insert into Gy_ConkReason " +
+ " (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
+ ",HLevel,HEndFlag,HStopflag,HRemark,HUseFlag,HMakeTime,HMakeEmp,HExplanation,HConkTypeID) " +
+ " Values('" + oBill.HNumber + "','" + oBill.HName + "','" + oBill.HHelpCode + "','" + oBill.HShortNumber + "'," + oBill.HParentID.ToString() +
+ "," + oBill.HLevel.ToString() + "," + Convert.ToString(oBill.HEndFlag ? 1 : 0) + "," + Convert.ToString(oBill.HStopflag ? 1 : 0) + ",'" + oBill.HRemark +
+ "','" + oBill.HUseFlag + "',getdate(),'" + msg3 + "','" + oBill.HExplanation + "',0" +
+ ")", ref DBUtility.ClsPub.sExeReturnInfo);
+ //淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
+ oCn.RunProc("Update Gy_ConkReason set HEndflag=0 where HItemID=" + oBill.HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ //WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�");
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ else
+ {
+ oCN.RunProc("UpDate Gy_ConkReason set " +
+ " HNumber='" + oBill.HNumber + "'" + //鍥哄畾璧嬪��===============
+ ",HName='" + oBill.HName + "'" +
+ ",HShortNumber='" + oBill.HShortNumber + "'" +
+ ",HHelpCode='" + oBill.HHelpCode + "'" +
+ ",HUseFlag='" + oBill.HUseFlag + "'" +
+ ",HRemark='" + oBill.HRemark + "'" +
+ ",HExplanation='" + oBill.HExplanation + "'" +
+ ",HModifyTime=getdate()" +
+ ",HModifyEmp='" + msg3 + "'" +
+ ",HStopflag=" + Convert.ToString(oBill.HStopflag ? 1 : 0) +
+ " where HInterID=" + oBill.HItemID.ToString());
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇敼鎴愬姛锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ #endregion
+ }
+}
diff --git a/WebAPI/ListModels.cs b/WebAPI/ListModels.cs
index c8796ba..dfda82f 100644
--- a/WebAPI/ListModels.cs
+++ b/WebAPI/ListModels.cs
@@ -547,6 +547,18 @@
}
/// <summary>
+ /// 澶勭悊鏂板鏁呴殰鍘熷洜琛ㄧ殑json
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsGy_ConkReason_Model> getObjectByJson_Gy_ConkReason(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsGy_ConkReason_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_ConkReason_Model>>(jsonString);
+ return list;
+ }
+
+ /// <summary>
/// 澶勭悊鏂板妯″叿淇濆吇璁板綍琛ㄤ富琛ㄧ殑json
/// </summary>
/// <param name="jsonString"></param>
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
index 1e8a616..ce1778f 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/16/2021 18:46:35</publishTime>
+ <publishTime>11/17/2021 17:22:47</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>11/16/2021 18:46:35</publishTime>
+ <publishTime>11/17/2021 17:22:47</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>11/16/2021 18:46:33</publishTime>
+ <publishTime>11/17/2021 17:22:44</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>11/16/2021 18:46:33</publishTime>
+ <publishTime>11/17/2021 17:22:44</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 14:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>11/16/2021 18:46:29</publishTime>
+ <publishTime>11/17/2021 17:22:38</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>11/16/2021 18:46:29</publishTime>
+ <publishTime>11/17/2021 17:22:38</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/16/2021 18:46:30</publishTime>
+ <publishTime>11/17/2021 17:22:39</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>11/16/2021 18:46:30</publishTime>
+ <publishTime>11/17/2021 17:22:39</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/16/2021 18:46:28</publishTime>
+ <publishTime>11/17/2021 17:22:36</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>11/16/2021 18:46:28</publishTime>
+ <publishTime>11/17/2021 17:22:36</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>11/16/2021 18:46:28</publishTime>
+ <publishTime>11/17/2021 17:22:37</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>11/16/2021 18:46:28</publishTime>
+ <publishTime>11/17/2021 17:22:37</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>11/16/2021 18:46:29</publishTime>
+ <publishTime>11/17/2021 17:22:37</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>11/16/2021 18:46:29</publishTime>
+ <publishTime>11/17/2021 17:22:37</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/16/2021 18:46:38</publishTime>
+ <publishTime>11/17/2021 17:22:52</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>11/16/2021 18:46:38</publishTime>
+ <publishTime>11/17/2021 17:22:52</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/16/2021 18:46:49</publishTime>
+ <publishTime>11/17/2021 17:23:18</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 572e94a..3109401 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -387,6 +387,7 @@
<Compile Include="Controllers\XSGL\Xs_SeOrderBillController.cs" />
<Compile Include="Controllers\鍝佽川绠＄悊\宸ュ簭妫�楠屽崟\QC_ProcessCheckBillController.cs" />
<Compile Include="Controllers\鍝佽川绠＄悊\棣栦欢妫�楠屽崟\QC_FirstPieceCheckBillController.cs" />
+ <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_ConkReasonBillController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DotCheckBillController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_MaintainBillController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_RepairBillController.cs" />
--
Gitblit v1.9.1