From 6d87a463845c02b82b110f0e601920d6ba7ce515 Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期五, 04 六月 2021 17:35:10 +0800
Subject: [PATCH] nothing
---
WebAPI/Controllers/SCGL/Sc_MESStopWorkBillController.cs | 75 ++
WebAPI/DLL/ClsSb_EquipRepairWorkBill.cs | 266 +++++++
WebAPI/ListModels.cs | 67 +
WebAPI/Controllers/Sc_CheckToolsRepairWorkBillController.cs | 4
WebAPI/Models/ClsSb_EquipRepairWorkBillMain.cs | 28
WebAPI/Models/ClsSb_EquipRepairWorkBillSub.cs | 20
WebAPI/DLL/ClsSb_EquipConkBookBill.cs | 219 ++++++
WebAPI/DLL/ClsSb_EquipRepairCheckBill.cs | 219 ++++++
WebAPI/Properties/PublishProfiles/API.pubxml.user | 150 ++--
WebAPI/WebAPI.csproj | 9
WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs | 75 ++
WebAPI/Controllers/Sb_CheckEqpRepairWorkBillController.cs | 981 +++++++++++++++++++++++++++
12 files changed, 2,027 insertions(+), 86 deletions(-)
diff --git a/WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs b/WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs
new file mode 100644
index 0000000..a048efc
--- /dev/null
+++ b/WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs
@@ -0,0 +1,75 @@
+锘縰sing Newtonsoft.Json.Linq;
+using Pub_Class;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Web.Http;
+using WebAPI.Models;
+
+namespace WebAPI.Controllers
+{
+ //鐢熶骇寮�宸ュ崟Controller
+ public class Sc_MESBeginWorkBillController : ApiController
+ {
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus;
+
+ private json objJsonResult = new json();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ DataSet ds;
+
+
+ /// <summary>
+ /// 杩斿洖鐢熶骇寮�宸ュ崟鍒楄〃
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Sc_MESBeginWorkBill/list")]
+ [HttpGet]
+ public object list(string sWhere)
+ {
+ try
+ {
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select * from h_v_Sc_MESBeginWorkBillList " + sWhere, "h_v_Sc_MESBeginWorkBillList");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_Sc_MESBeginWorkBillList where 1 = 1 ";
+ string sql = sql1 + sWhere;
+ ds = oCN.RunProcReturn(sql, "h_v_Sc_MESBeginWorkBillList");
+ }
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+
+
+ //
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/Controllers/SCGL/Sc_MESStopWorkBillController.cs b/WebAPI/Controllers/SCGL/Sc_MESStopWorkBillController.cs
new file mode 100644
index 0000000..b738b27
--- /dev/null
+++ b/WebAPI/Controllers/SCGL/Sc_MESStopWorkBillController.cs
@@ -0,0 +1,75 @@
+锘縰sing Newtonsoft.Json.Linq;
+using Pub_Class;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Web.Http;
+using WebAPI.Models;
+
+namespace WebAPI.Controllers
+{
+ //鐢熶骇鍋滃伐鍗旵ontroller
+ public class Sc_MESStopWorkBillController : ApiController
+ {
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus;
+
+ private json objJsonResult = new json();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ DataSet ds;
+
+
+ /// <summary>
+ /// 杩斿洖鐢熶骇鍋滃伐鍗曞垪琛�
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Sc_MESStopWorkBill/list")]
+ [HttpGet]
+ public object list(string sWhere)
+ {
+ try
+ {
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select * from h_v_Sc_MESStopWorkBillList " + sWhere, "h_v_Sc_MESStopWorkBillList");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_Sc_MESStopWorkBillList where 1 = 1 ";
+ string sql = sql1 + sWhere;
+ ds = oCN.RunProcReturn(sql, "h_v_Sc_MESStopWorkBillList");
+ }
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+
+
+ //
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/Controllers/Sb_CheckEqpRepairWorkBillController.cs b/WebAPI/Controllers/Sb_CheckEqpRepairWorkBillController.cs
new file mode 100644
index 0000000..65c6139
--- /dev/null
+++ b/WebAPI/Controllers/Sb_CheckEqpRepairWorkBillController.cs
@@ -0,0 +1,981 @@
+锘縰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 Sb_CheckEqpRepairWorkBillController : ApiController
+ {
+ private json objJsonResult = new json();
+ public DataSet ds = new DataSet();
+ public WebServer webserver = new WebServer();
+
+ #region 璁惧缁翠慨宸ュ崟鍒楄〃
+ /// <summary>
+ /// 璁惧缁翠慨宸ュ崟琛ㄥ垪琛�
+ /// </summary>
+ /// <returns></returns>
+ [Route("Sb_EqpRepairWorkBill/GetEqpRepairWorkBillList")]
+ [HttpGet]
+ public object GetEqpRepairWorkBillList(string sWhere)
+ {
+ try
+ {
+
+ ds = Sb_EquipRepairWorkBill_s(sWhere);
+
+
+
+ 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;
+ }
+ }
+ #endregion
+
+ #region 璁惧缁翠慨宸ュ崟鍒楄〃sql璇彞
+ public static DataSet Sb_EquipRepairWorkBill_s(string sWhere)
+ {
+ return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sb_EquipRepairWorkBillList ", "h_v_Sb_EquipRepairWorkBillList");
+ }
+ #endregion
+
+
+
+ #region 璁惧缁翠慨楠屾敹鍗曞垪琛�
+ /// <summary>
+ /// 璁惧缁翠慨楠屾敹鍗曞垪琛�
+ /// </summary>
+ /// <returns></returns>
+ [Route("Sb_EqpRepairWorkBill/GetEqpRepairCheckWorkBillList")]
+ [HttpGet]
+ public object GetEqpRepairCheckWorkBillList(string sWhere)
+ {
+ try
+ {
+
+ ds = Sb_EquipRepairCheckWorkBill_s(sWhere);
+ 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;
+ }
+ }
+ #endregion
+
+ #region 璁惧缁翠慨楠屾敹鍗曞垪琛╯ql璇彞
+ public static DataSet Sb_EquipRepairCheckWorkBill_s(string sWhere)
+ {
+ return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sb_EquipRepairCheckBillList", "h_v_Sb_EquipRepairCheckBillList");
+ }
+ #endregion
+
+
+
+ #region 璁惧鏁呴殰鐧昏鍗曞垪琛�
+ /// <summary>
+ /// 璁惧鏁呴殰鐧昏鍗曞垪琛�
+ /// </summary>
+ /// <returns></returns>
+ [Route("Sb_EqpRepairWorkBill/GetEqpConkBookBillList")]
+ [HttpGet]
+ public object GetEqpConkBookBillList(string sWhere)
+ {
+ try
+ {
+
+ ds = Sb_EqpConkBookBillList_s(sWhere);
+ 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;
+ }
+ }
+ #endregion
+
+ #region 璁惧鏁呴殰鐧昏鍗曞垪琛╯ql璇彞
+ public static DataSet Sb_EqpConkBookBillList_s(string sWhere)
+ {
+ return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sb_EquipConkBookBillList", "h_v_Sb_EquipConkBookBillList");
+ }
+ #endregion
+
+
+
+
+
+ #region 璁惧缁翠慨鍗曚繚瀛�/缂栬緫
+ /// <summary>
+ /// 淇濆瓨璁惧缁翠慨鍗�
+ /// </summary>
+ /// <param name="msg"></param>
+ /// <returns></returns>
+ [Route("Sb_EqpRepairWorkBill/SaveGetEqpRepairWorkBillList")]
+ [HttpPost]
+ public object SaveGetMouldRepairWorkBillList([FromBody] JObject msg)
+ {
+ var _value = msg["msg"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+ string msg3 = sArray[1].ToString();
+
+
+ //string UserName = "";
+ ListModels oListModels = new ListModels();
+ try
+ {
+ DLL.ClsSb_EquipRepairWorkBill oBill = new DLL.ClsSb_EquipRepairWorkBill();
+ List<Models.ClsSb_EquipRepairWorkBillMain> lsmain = new List<Models.ClsSb_EquipRepairWorkBillMain>();
+ msg2 = msg2.Replace("\\", "");
+ msg2 = msg2.Replace("\n", ""); //\n
+ lsmain = oListModels.getObjectByJson_Gy_EquipRepairWorkBillMain(msg2);
+ foreach (Models.ClsSb_EquipRepairWorkBillMain oItem in lsmain)
+ {
+ //oItem.HMaker = "";
+ //UserName = oItem.HMaker; //鍒跺崟浜�
+ oItem.HBillType = "3910";
+ oItem.HBillSubType = "3910";
+ //oItem.HBillNo = ""; //鍗曟嵁鍙�
+ //oItem.HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));// --鏃ユ湡
+ oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
+ oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
+ //oItem.HEquipID = 0; //璁惧ID(Gy_EquipMent)
+ //oItem.HPeriod = 0;
+ //oItem.HRepairBeginDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd")); // --缁翠慨寮�濮嬫棩鏈�
+ //oItem.HRepairEndDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));// --缁翠慨缁撴潫鏃ユ湡
+ //oItem.HRepairContent = ""; //缁翠慨鍐呭
+ //oItem.HCycleUnit = ""; //鏃堕棿鍗曚綅(灏忔椂锛屽ぉ)
+ //oItem.HPlanTimes = 0; //璁″垝缁翠慨宸ユ椂
+ //oItem.HTimes = 0; //瀹為檯缁翠慨宸ユ椂
+ //oItem.HEmpID = 0; //缁翠慨浜�(Gy_Employee)
+ //oItem.HManagerID = 0; //涓荤(Gy_Employee)
+ //oItem.HDeptID = 0; //缁翠慨閮ㄩ棬(Gy_Department)
+ //oItem.HExplanation = ""; //--缁翠慨瑕佹眰
+ //oItem.HInnerBillNo = ""; // --鍐呴儴鍗曟嵁鍙�
+ //oItem.HMouldID = 0; //鎴愬搧妯″叿ID
+ //oItem.HSupID = 0; //--渚涘簲鍟嗭紙Gy_Supplier锛�
+ //oItem.HRepairType = ""; //--缁翠慨绫诲瀷锛堝唴閮ㄧ淮淇紝濮斿缁翠慨锛� addnew
+ //oItem.HNewModel = ""; //缁翠慨鍚庢柊瑙勬牸
+ //oItem.HNewDesignLife = 0; //鏂拌璁″鍛�
+ //oItem.HRepairID = 0; //缁翠慨椤圭洰(Gy_Repair)
+ //oItem.HRemark = ""; //澶囨敞
+ //oItem.HMainSourceInterID = oItem.HInterID;
+
+ //oItem.HInterID = DBUtility.ClsPub.CreateBillID_SRMProd("1103", ref DBUtility.ClsPub.sExeReturnInfo);
+ if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佹病鏈夊崟鎹棩鏈燂紝鏃犳硶淇濆瓨锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ oBill.omodel = oItem;
+ }
+ //琛ㄤ綋鏁版嵁
+ //鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆�
+ msg3 = msg3.Substring(1, msg3.Length - 2);
+ msg3 = msg3.Replace("\\", "");
+ msg3 = msg3.Replace("\n", ""); //\n
+ //msg2 = msg2.Replace("'", "鈥�");
+ List<Models.ClsSb_EquipRepairWorkBillSub> ls = new List<Models.ClsSb_EquipRepairWorkBillSub>();
+ ls = oListModels.getObjectByJson_Gy_EquipRepairWorkBillSub(msg3);
+ int i = 0;
+ foreach (Models.ClsSb_EquipRepairWorkBillSub oItemSub in ls)
+ {
+
+ i++;
+ oItemSub.HEntryID = i;
+ //oItemSub.HCloseMan = ""; //琛屽叧闂�
+ oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
+ oItemSub.HCloseType = false; //鍏抽棴绫诲瀷
+ //oItemSub.HRemark = ""; //澶囨敞
+ oItemSub.HSourceInterID = 0; // 婧愬崟涓诲唴鐮�
+ oItemSub.HSourceEntryID = 0; //婧愬崟瀛愬唴鐮�
+ //oItemSub.HSourceBillNo = ""; //婧愬崟鍗曞彿
+ //oItemSub.HSourceBillType = ""; //婧愬崟绫诲瀷
+ oItemSub.HRelationQty = 0; //鍏宠仈鏁伴噺
+ //oItemSub.HRelationMoney = 0; //鍏宠仈閲戦
+ //oItemSub.HRepairID = 0; //缁翠慨椤圭洰
+ //oItemSub.HRepairExplanation =""; //缁翠慨瑕佹眰
+ //oItemSub.HManagerID = 0; //璐熻矗浜篒D
+ //oItemSub.HMoney = 0; //缁翠慨璐圭敤
+ oBill.DetailColl.Add(oItemSub);
+
+ }
+ //淇濆瓨
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ bool bResult;
+ if (oBill.omodel.HInterID == 0)
+ {
+ // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ else
+ {
+ bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ if (bResult)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ //WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�");
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region[璁惧缁翠慨鍒楄〃缂栬緫鏃惰幏鍙栬〃澶存暟鎹甝
+ [Route("Sb_EqpRepairWorkBill/Sb_EqpRepairWorkBillListCheckDetai")]
+ [HttpGet]
+ public ApiResult<DataSet> Sb_EqpRepairWorkBillListCheckDetai(string HID)
+ {
+ if (string.IsNullOrEmpty(HID))
+ return new ApiResult<DataSet> { code = -1, msg = "ID涓嶈兘涓虹┖" };
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ var dataSet = oCN.RunProcReturn("select top 1 * from h_v_Sb_EquipRepairWorkBillList where hmainid= " + HID + " ", "h_v_Sb_EquipRepairWorkBillList");
+ if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
+ return new ApiResult<DataSet> { code = -1, msg = "涓嶅瓨鍦ㄧ淮淇崟鍙�" };
+ return new ApiResult<DataSet> { code = 1, msg = "鏌ヨ鎴愬姛", data = dataSet };
+ }
+ #endregion
+
+ #region[璁惧缁翠慨鍒楄〃缂栬緫鏃惰幏鍙栬〃浣撴暟鎹甝
+ [Route("Sb_EqpRepairWorkBill/Sb_EqpRepairWorkBillListProjectDetai")]
+ [HttpGet]
+ public object Sb_EqpRepairWorkBillListProjectDetai(string sqlWhere)
+ {
+ DataSet ds;
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (sqlWhere == null || sqlWhere.Equals(""))
+ {
+ //ds = oCN.RunProcReturn("select HRepairID,HRepairExplanation,HManagerID,HMoney,HRemark from Sc_MouldRepairWorkBillSub", "Sc_MouldRepairWorkBillSub");
+ ds = oCN.RunProcReturn("select HManagerID1,琛ㄤ綋璐熻矗浜轰唬鐮� HManagerCode,琛ㄤ綋璐熻矗浜� HManagerName,HRepairID1, 琛ㄤ綋缁翠慨椤圭洰浠ｇ爜 HRepairCode,琛ㄤ綋缁翠慨椤圭洰 HRepairName,琛ㄤ綋缁翠慨瑕佹眰 HRepairExplanation,琛ㄤ綋澶囨敞 HRemark from h_v_Sc_EquipRepairWorkBillList_Edit", "h_v_Sc_EquipRepairWorkBillList_Edit");
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ }
+ else
+ {
+ //string sql1 = "select HRepairID,HRepairExplanation,HManagerID,HMoney,HRemark from Sc_MouldRepairWorkBillSub where 1 = 1 ";
+ string sql1 = "select HManagerID1,琛ㄤ綋璐熻矗浜轰唬鐮� HManagerCode,琛ㄤ綋璐熻矗浜� HManagerName,HRepairID1, 琛ㄤ綋缁翠慨椤圭洰浠ｇ爜 HRepairCode,琛ㄤ綋缁翠慨椤圭洰 HRepairName,琛ㄤ綋缁翠慨瑕佹眰 HRepairExplanation,琛ㄤ綋澶囨敞 HRemark from h_v_Sc_EquipRepairWorkBillList_Edit where 1 = 1 ";
+ string sql = sql1 + sqlWhere;
+ ds = oCN.RunProcReturn(sql, "h_v_Sc_EquipRepairWorkBillList_Edit");
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ }
+ return objJsonResult;
+ }
+ #endregion
+
+ #region [璁惧缁翠慨鍗曞垹闄ゅ姛鑳絔
+ /// <summary>
+ /// 妯″叿缁翠慨鍗曞垹闄ゅ姛鑳�
+ /// </summary>
+ /// <returns></returns>
+ [Route("Sb_EqpRepairWorkBill/DeltetEqpRepairWorkBill")]
+ [HttpGet]
+ public object DeltetEqpRepairWorkBill(string HInterID)
+ {
+ //缂栬緫鏉冮檺
+ //if (!DBUtility.ClsPub.Security_Log("Sb_MouldRepairWorkBill_Delete", 1, true, DBUtility.ClsPub.CurUserName))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+
+
+ Int64 lngBillKey = 0;
+ lngBillKey = DBUtility.ClsPub.isLong(HInterID);
+ if (lngBillKey == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁ID涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ DLL.ClsSb_EquipRepairWorkBill oBill = new DLL.ClsSb_EquipRepairWorkBill();
+ if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
+ {
+ if (oBill.omodel.HBillStatus > 1)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁褰撳墠澶勪簬涓嶈兘鍒犻櫎鐘舵��,涓嶈兘鍒犻櫎锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (oBill.omodel.HChecker != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸茬粡瀹℃牳,涓嶈兘鍒犻櫎锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ bool IsDete = oBill.DeleteBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+ if (IsDete)
+ {
+ objJsonResult.code = "0";
+ 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;
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈壘鍒�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+
+
+
+ #region 璁惧缁翠慨楠屾敹鍗曚繚瀛�/缂栬緫
+ /// <summary>
+ /// 淇濆瓨璁惧缁翠慨楠屾敹鍗�
+ /// </summary>
+ /// <param name="msg"></param>
+ /// <returns></returns>
+ [Route("Sb_EqpRepairWorkBill/SaveGetEqpRepairCheckBillList")]
+ [HttpPost]
+ public object SaveGetEqpRepairCheckBillList([FromBody] JObject msg)
+ {
+ var _value = msg["msg"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+ string msg3 = sArray[1].ToString();
+
+
+ //string UserName = "";
+ ListModels oListModels = new ListModels();
+ try
+ {
+ DLL.ClsSb_EquipRepairCheckBill oBill = new DLL.ClsSb_EquipRepairCheckBill();
+ List<Model.ClsSb_EquipRepairCheckBillMain> lsmain = new List<Model.ClsSb_EquipRepairCheckBillMain>();
+ msg2 = msg2.Replace("\\", "");
+ msg2 = msg2.Replace("\n", ""); //\n
+ lsmain = oListModels.getObjectByJson_Gy_EquipRepairCheckBillMain(msg2);
+ foreach (Model.ClsSb_EquipRepairCheckBillMain oItem in lsmain)
+ {
+ //oItem.HMaker = "";
+ //UserName = oItem.HMaker; //鍒跺崟浜�
+ oItem.HBillType = "3911";
+ oItem.HBillSubType = "3911";
+ //oItem.HBillNo = ""; //鍗曟嵁鍙�
+ //oItem.HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));// --鏃ユ湡
+ oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
+ oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
+ //oItem.HEquipID = 0; //璁惧ID(Gy_EquipMent)
+ //oItem.HPeriod = 0;
+ //oItem.HRepairBeginDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd")); // --缁翠慨寮�濮嬫棩鏈�
+ //oItem.HRepairEndDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));// --缁翠慨缁撴潫鏃ユ湡
+ //oItem.HRepairContent = ""; //缁翠慨鍐呭
+ //oItem.HCycleUnit = ""; //鏃堕棿鍗曚綅(灏忔椂锛屽ぉ)
+ //oItem.HPlanTimes = 0; //璁″垝缁翠慨宸ユ椂
+ //oItem.HTimes = 0; //瀹為檯缁翠慨宸ユ椂
+ //oItem.HEmpID = 0; //缁翠慨浜�(Gy_Employee)
+ //oItem.HManagerID = 0; //涓荤(Gy_Employee)
+ //oItem.HDeptID = 0; //缁翠慨閮ㄩ棬(Gy_Department)
+ //oItem.HExplanation = ""; //--缁翠慨瑕佹眰
+ //oItem.HInnerBillNo = ""; // --鍐呴儴鍗曟嵁鍙�
+ //oItem.HMouldID = 0; //鎴愬搧妯″叿ID
+ //oItem.HSupID = 0; //--渚涘簲鍟嗭紙Gy_Supplier锛�
+ //oItem.HRepairType = ""; //--缁翠慨绫诲瀷锛堝唴閮ㄧ淮淇紝濮斿缁翠慨锛� addnew
+ //oItem.HNewModel = ""; //缁翠慨鍚庢柊瑙勬牸
+ //oItem.HNewDesignLife = 0; //鏂拌璁″鍛�
+ //oItem.HRepairID = 0; //缁翠慨椤圭洰(Gy_Repair)
+ //oItem.HRemark = ""; //澶囨敞
+ //oItem.HMainSourceInterID = oItem.HInterID;
+
+ //oItem.HInterID = DBUtility.ClsPub.CreateBillID_SRMProd("1103", ref DBUtility.ClsPub.sExeReturnInfo);
+ if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佹病鏈夊崟鎹棩鏈燂紝鏃犳硶淇濆瓨锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ oBill.omodel = oItem;
+ }
+ //琛ㄤ綋鏁版嵁
+ //鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆�
+ msg3 = msg3.Substring(1, msg3.Length - 2);
+ msg3 = msg3.Replace("\\", "");
+ msg3 = msg3.Replace("\n", ""); //\n
+ //msg2 = msg2.Replace("'", "鈥�");
+ List<Model.ClsSb_EquipRepairCheckBillSub> ls = new List<Model.ClsSb_EquipRepairCheckBillSub>();
+ ls = oListModels.getObjectByJson_Gy_EquipRepairCheckBillSub(msg3);
+ int i = 0;
+ foreach (Model.ClsSb_EquipRepairCheckBillSub oItemSub in ls)
+ {
+
+ i++;
+ oItemSub.HEntryID = i;
+ //oItemSub.HCloseMan = ""; //琛屽叧闂�
+ oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
+ oItemSub.HCloseType = false; //鍏抽棴绫诲瀷
+ //oItemSub.HRemark = ""; //澶囨敞
+ oItemSub.HSourceInterID = 0; // 婧愬崟涓诲唴鐮�
+ oItemSub.HSourceEntryID = 0; //婧愬崟瀛愬唴鐮�
+ //oItemSub.HSourceBillNo = ""; //婧愬崟鍗曞彿
+ //oItemSub.HSourceBillType = ""; //婧愬崟绫诲瀷
+ oItemSub.HRelationQty = 0; //鍏宠仈鏁伴噺
+ //oItemSub.HRelationMoney = 0; //鍏宠仈閲戦
+ //oItemSub.HRepairID = 0; //缁翠慨椤圭洰
+ //oItemSub.HRepairExplanation =""; //缁翠慨瑕佹眰
+ //oItemSub.HManagerID = 0; //璐熻矗浜篒D
+ //oItemSub.HMoney = 0; //缁翠慨璐圭敤
+ oBill.DetailColl.Add(oItemSub);
+
+ }
+ //淇濆瓨
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ bool bResult;
+ if (oBill.omodel.HInterID == 0)
+ {
+ // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ else
+ {
+ bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ if (bResult)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ //WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�");
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region[璁惧缁翠慨楠屾敹鍒楄〃缂栬緫鏃惰幏鍙栬〃澶存暟鎹甝
+ [Route("Sb_EqpRepairWorkBill/Sb_EqpRepairCheckBillListCheckDetai")]
+ [HttpGet]
+ public ApiResult<DataSet> Sb_EqpRepairCheckBillListCheckDetai(string HID)
+ {
+ if (string.IsNullOrEmpty(HID))
+ return new ApiResult<DataSet> { code = -1, msg = "ID涓嶈兘涓虹┖" };
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ var dataSet = oCN.RunProcReturn("select top 1 * from h_v_Sb_EquipRepairCheckBillList_Edit where hmainid= " + HID + " ", "h_v_Sb_EquipRepairCheckBillList_Edit");
+ if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
+ return new ApiResult<DataSet> { code = -1, msg = "涓嶅瓨鍦ㄧ淮淇崟鍙�" };
+ return new ApiResult<DataSet> { code = 1, msg = "鏌ヨ鎴愬姛", data = dataSet };
+ }
+ #endregion
+
+ #region[璁惧缁翠慨鍒楄〃缂栬緫鏃惰幏鍙栬〃浣撴暟鎹甝
+ [Route("Sb_EqpRepairWorkBill/Sb_EqpRepairCheckBillListProjectDetai")]
+ [HttpGet]
+ public object Sb_EqpRepairCheckBillListProjectDetai(string sqlWhere)
+ {
+ DataSet ds;
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (sqlWhere == null || sqlWhere.Equals(""))
+ {
+ //ds = oCN.RunProcReturn("select HRepairID,HRepairExplanation,HManagerID,HMoney,HRemark from Sc_MouldRepairWorkBillSub", "Sc_MouldRepairWorkBillSub");
+ ds = oCN.RunProcReturn("select HRepairCheckID1 HRepairCheckID,楠屾敹椤圭洰浠ｇ爜 HRepairCheckCode,楠屾敹椤圭洰 HRepairCheckName, 楠屾敹鍐呭 HRepairCheckContent,HManagerID1 HManagerID,琛ㄤ綋璐熻矗浜轰唬鐮� HManagerCode,琛ㄤ綋璐熻矗浜� HManagerName,琛ㄤ綋澶囨敞 HRemark from h_v_Sb_EquipRepairCheckBillList_Edit", "h_v_Sb_EquipRepairCheckBillList_Edit");
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ }
+ else
+ {
+ //string sql1 = "select HRepairID,HRepairExplanation,HManagerID,HMoney,HRemark from Sc_MouldRepairWorkBillSub where 1 = 1 ";
+ string sql1 = "select HRepairCheckID1 HRepairCheckID,楠屾敹椤圭洰浠ｇ爜 HRepairCheckCode,楠屾敹椤圭洰 HRepairCheckName, 楠屾敹鍐呭 HRepairCheckContent,HManagerID1 HManagerID,琛ㄤ綋璐熻矗浜轰唬鐮� HManagerCode,琛ㄤ綋璐熻矗浜� HManagerName,琛ㄤ綋澶囨敞 HRemark from h_v_Sb_EquipRepairCheckBillList_Edit where 1 = 1 ";
+ string sql = sql1 + sqlWhere;
+ ds = oCN.RunProcReturn(sql, "h_v_Sb_EquipRepairCheckBillList_Edit");
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ }
+ return objJsonResult;
+ }
+ #endregion
+
+ #region [璁惧缁翠慨鍗曞垹闄ゅ姛鑳絔
+ /// <summary>
+ /// 妯″叿缁翠慨鍗曞垹闄ゅ姛鑳�
+ /// </summary>
+ /// <returns></returns>
+ [Route("Sb_EqpRepairWorkBill/DeltetEqpRepairCheckBill")]
+ [HttpGet]
+ public object DeltetEqpRepairCheckBill(string HInterID)
+ {
+ //缂栬緫鏉冮檺
+ //if (!DBUtility.ClsPub.Security_Log("Sb_EquipRepairCheckBill_Delete", 1, true, DBUtility.ClsPub.CurUserName))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+
+
+ Int64 lngBillKey = 0;
+ lngBillKey = DBUtility.ClsPub.isLong(HInterID);
+ if (lngBillKey == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁ID涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ DAL.ClsSb_EquipRepairCheckBill oBill = new DAL.ClsSb_EquipRepairCheckBill();
+ if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
+ {
+ if (oBill.omodel.HBillStatus > 1)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁褰撳墠澶勪簬涓嶈兘鍒犻櫎鐘舵��,涓嶈兘鍒犻櫎锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (oBill.omodel.HChecker != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸茬粡瀹℃牳,涓嶈兘鍒犻櫎锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ bool IsDete = oBill.DeleteBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+ if (IsDete)
+ {
+ objJsonResult.code = "0";
+ 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;
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈壘鍒�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+
+
+
+ #region 璁惧鏁呴殰鐧昏鍗曚繚瀛�/缂栬緫
+ /// <summary>
+ /// 淇濆瓨璁惧鏁呴殰鐧昏鍗�
+ /// </summary>
+ /// <param name="msg"></param>
+ /// <returns></returns>
+ [Route("Sb_EqpRepairWorkBill/SaveGetEqpConkBookBillList")]
+ [HttpPost]
+ public object SaveGetEqpConkBookBillList([FromBody] JObject msg)
+ {
+ var _value = msg["msg"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+ string msg3 = sArray[1].ToString();
+
+
+ //string UserName = "";
+ ListModels oListModels = new ListModels();
+ try
+ {
+ DLL.ClsSb_EquipConkBookBill oBill = new DLL.ClsSb_EquipConkBookBill();
+ List<Model.ClsSb_EquipConkBookBillMain> lsmain = new List<Model.ClsSb_EquipConkBookBillMain>();
+ msg2 = msg2.Replace("\\", "");
+ msg2 = msg2.Replace("\n", ""); //\n
+ lsmain = oListModels.getObjectByJson_Gy_EquipConkBookBillMain(msg2);
+ foreach (Model.ClsSb_EquipConkBookBillMain oItem in lsmain)
+ {
+ //oItem.HMaker = "";
+ //UserName = oItem.HMaker; //鍒跺崟浜�
+ oItem.HBillType = "3097";
+ oItem.HBillSubType = "3097";
+ //oItem.HBillNo = ""; //鍗曟嵁鍙�
+ //oItem.HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));// --鏃ユ湡
+ oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
+ oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
+ //oItem.HEquipID = 0; //璁惧ID(Gy_EquipMent)
+ //oItem.HPeriod = 0;
+ //oItem.HRepairBeginDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd")); // --缁翠慨寮�濮嬫棩鏈�
+ //oItem.HRepairEndDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));// --缁翠慨缁撴潫鏃ユ湡
+ //oItem.HRepairContent = ""; //缁翠慨鍐呭
+ //oItem.HCycleUnit = ""; //鏃堕棿鍗曚綅(灏忔椂锛屽ぉ)
+ //oItem.HPlanTimes = 0; //璁″垝缁翠慨宸ユ椂
+ //oItem.HTimes = 0; //瀹為檯缁翠慨宸ユ椂
+ //oItem.HEmpID = 0; //缁翠慨浜�(Gy_Employee)
+ //oItem.HManagerID = 0; //涓荤(Gy_Employee)
+ //oItem.HDeptID = 0; //缁翠慨閮ㄩ棬(Gy_Department)
+ //oItem.HExplanation = ""; //--缁翠慨瑕佹眰
+ //oItem.HInnerBillNo = ""; // --鍐呴儴鍗曟嵁鍙�
+ //oItem.HMouldID = 0; //鎴愬搧妯″叿ID
+ //oItem.HSupID = 0; //--渚涘簲鍟嗭紙Gy_Supplier锛�
+ //oItem.HRepairType = ""; //--缁翠慨绫诲瀷锛堝唴閮ㄧ淮淇紝濮斿缁翠慨锛� addnew
+ //oItem.HNewModel = ""; //缁翠慨鍚庢柊瑙勬牸
+ //oItem.HNewDesignLife = 0; //鏂拌璁″鍛�
+ //oItem.HRepairID = 0; //缁翠慨椤圭洰(Gy_Repair)
+ //oItem.HRemark = ""; //澶囨敞
+ //oItem.HMainSourceInterID = oItem.HInterID;
+
+ //oItem.HInterID = DBUtility.ClsPub.CreateBillID_SRMProd("1103", ref DBUtility.ClsPub.sExeReturnInfo);
+ if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佹病鏈夊崟鎹棩鏈燂紝鏃犳硶淇濆瓨锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ oBill.omodel = oItem;
+ }
+ //琛ㄤ綋鏁版嵁
+ //鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆�
+ msg3 = msg3.Substring(1, msg3.Length - 2);
+ msg3 = msg3.Replace("\\", "");
+ msg3 = msg3.Replace("\n", ""); //\n
+ //msg2 = msg2.Replace("'", "鈥�");
+ List<Model.ClsSb_EquipConkBookBillSub> ls = new List<Model.ClsSb_EquipConkBookBillSub>();
+ ls = oListModels.getObjectByJson_Gy_EquipConkBookBillSub(msg3);
+ int i = 0;
+ foreach (Model.ClsSb_EquipConkBookBillSub oItemSub in ls)
+ {
+
+ i++;
+ oItemSub.HEntryID = i;
+ //oItemSub.HCloseMan = ""; //琛屽叧闂�
+ oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
+ oItemSub.HCloseType = false; //鍏抽棴绫诲瀷
+ //oItemSub.HRemark = ""; //澶囨敞
+ oItemSub.HSourceInterID = 0; // 婧愬崟涓诲唴鐮�
+ oItemSub.HSourceEntryID = 0; //婧愬崟瀛愬唴鐮�
+ //oItemSub.HSourceBillNo = ""; //婧愬崟鍗曞彿
+ //oItemSub.HSourceBillType = ""; //婧愬崟绫诲瀷
+ oItemSub.HRelationQty = 0; //鍏宠仈鏁伴噺
+ //oItemSub.HRelationMoney = 0; //鍏宠仈閲戦
+ //oItemSub.HRepairID = 0; //缁翠慨椤圭洰
+ //oItemSub.HRepairExplanation =""; //缁翠慨瑕佹眰
+ //oItemSub.HManagerID = 0; //璐熻矗浜篒D
+ //oItemSub.HMoney = 0; //缁翠慨璐圭敤
+ oBill.DetailColl.Add(oItemSub);
+
+ }
+ //淇濆瓨
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ bool bResult;
+ if (oBill.omodel.HInterID == 0)
+ {
+ // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ else
+ {
+ bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ if (bResult)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ //WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�");
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region[璁惧缁翠慨楠屾敹鍒楄〃缂栬緫鏃惰幏鍙栬〃澶存暟鎹甝
+ [Route("Sb_EqpRepairWorkBill/Sb_EqpConkBookBillListCheckDetai")]
+ [HttpGet]
+ public ApiResult<DataSet> Sb_EqpConkBookBillListCheckDetai(string HID)
+ {
+ if (string.IsNullOrEmpty(HID))
+ return new ApiResult<DataSet> { code = -1, msg = "ID涓嶈兘涓虹┖" };
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ var dataSet = oCN.RunProcReturn("select top 1 * from h_v_Sb_EquipConkBookBillList_Edit where hmainid= " + HID + " ", "h_v_Sb_EquipConkBookBillList_Edit");
+ if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
+ return new ApiResult<DataSet> { code = -1, msg = "涓嶅瓨鍦ㄧ淮淇崟鍙�" };
+ return new ApiResult<DataSet> { code = 1, msg = "鏌ヨ鎴愬姛", data = dataSet };
+ }
+ #endregion
+
+ #region[璁惧缁翠慨鍒楄〃缂栬緫鏃惰幏鍙栬〃浣撴暟鎹甝
+ [Route("Sb_EqpRepairWorkBill/Sb_EqpConkBookBillListProjectDetai")]
+ [HttpGet]
+ public object Sb_EqpConkBookBillListProjectDetai(string sqlWhere)
+ {
+ DataSet ds;
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (sqlWhere == null || sqlWhere.Equals(""))
+ {
+ //ds = oCN.RunProcReturn("select HRepairID,HRepairExplanation,HManagerID,HMoney,HRemark from Sc_MouldRepairWorkBillSub", "Sc_MouldRepairWorkBillSub");
+ ds = oCN.RunProcReturn("select HConkReasonID,鏁呴殰鍘熷洜浠ｇ爜 HConkReasonCode,鏁呴殰鍘熷洜鍚嶇О HConkReasonName,鏁呴殰鍘熷洜鎻忚堪 HConkExplanation,HManagerID1 HManagerID,琛ㄤ綋璐熻矗浜轰唬鐮� HManagerCode,琛ㄤ綋璐熻矗浜� HManagerName,琛ㄤ綋澶囨敞 HRemark from h_v_Sb_EquipConkBookBillList_Edit", "h_v_Sb_EquipConkBookBillList_Edit");
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ }
+ else
+ {
+ //string sql1 = "select HRepairID,HRepairExplanation,HManagerID,HMoney,HRemark from Sc_MouldRepairWorkBillSub where 1 = 1 ";
+ string sql1 = "select HConkReasonID,鏁呴殰鍘熷洜浠ｇ爜 HConkReasonCode,鏁呴殰鍘熷洜鍚嶇О HConkReasonName,鏁呴殰鍘熷洜鎻忚堪 HConkExplanation,HManagerID1 HManagerID,琛ㄤ綋璐熻矗浜轰唬鐮� HManagerCode,琛ㄤ綋璐熻矗浜� HManagerName,琛ㄤ綋澶囨敞 HRemark from h_v_Sb_EquipConkBookBillList_Edit where 1 = 1 ";
+ string sql = sql1 + sqlWhere;
+ ds = oCN.RunProcReturn(sql, "h_v_Sb_EquipConkBookBillList_Edit");
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ }
+ return objJsonResult;
+ }
+ #endregion
+
+ #region [璁惧缁翠慨鍗曞垹闄ゅ姛鑳絔
+ /// <summary>
+ /// 妯″叿缁翠慨鍗曞垹闄ゅ姛鑳�
+ /// </summary>
+ /// <returns></returns>
+ [Route("Sb_EqpRepairWorkBill/DeltetEqpConkBookBill")]
+ [HttpGet]
+ public object DeltetEqpConkBookBill(string HInterID)
+ {
+ //缂栬緫鏉冮檺
+ //if (!DBUtility.ClsPub.Security_Log("Sb_EquipConkBookBill_Delete", 1, true, DBUtility.ClsPub.CurUserName))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+
+
+ Int64 lngBillKey = 0;
+ lngBillKey = DBUtility.ClsPub.isLong(HInterID);
+ if (lngBillKey == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁ID涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ DLL.ClsSb_EquipConkBookBill oBill = new DLL.ClsSb_EquipConkBookBill();
+ if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
+ {
+ if (oBill.omodel.HBillStatus > 1)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁褰撳墠澶勪簬涓嶈兘鍒犻櫎鐘舵��,涓嶈兘鍒犻櫎锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (oBill.omodel.HChecker != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸茬粡瀹℃牳,涓嶈兘鍒犻櫎锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ bool IsDete = oBill.DeleteBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+ if (IsDete)
+ {
+ objJsonResult.code = "0";
+ 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;
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈壘鍒�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+ }
+}
diff --git a/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillController.cs b/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillController.cs
index 3c42d49..bb6d466 100644
--- a/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillController.cs
+++ b/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillController.cs
@@ -1497,8 +1497,8 @@
{
//oItem.HMaker = "";
UserName = oItem.HMaker; //鍒跺崟浜�
- oItem.HBillType = "3815";
- oItem.HBillSubType = "3815";
+ oItem.HBillType = "3817";
+ oItem.HBillSubType = "3817";
//oItem.HBillNo = ""; //鍗曟嵁鍙�
//oItem.HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));// --鏃ユ湡
//oItem.HInnerBillNo = ""; // --鍐呴儴鍗曟嵁鍙�
diff --git a/WebAPI/DLL/ClsSb_EquipConkBookBill.cs b/WebAPI/DLL/ClsSb_EquipConkBookBill.cs
new file mode 100644
index 0000000..25880c7
--- /dev/null
+++ b/WebAPI/DLL/ClsSb_EquipConkBookBill.cs
@@ -0,0 +1,219 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+using System.Data;
+
+namespace WebAPI.DLL
+{
+ public class ClsSb_EquipConkBookBill : DBUtility.ClsXt_BaseBill
+ {
+ public Model.ClsSb_EquipConkBookBillMain omodel = new Model.ClsSb_EquipConkBookBillMain();
+ public List<Model.ClsSb_EquipConkBookBillSub> DetailColl = new List<Model.ClsSb_EquipConkBookBillSub>();
+
+ public ClsSb_EquipConkBookBill()
+ {
+ base.MvarItemKeySub = "Sb_EquipConkBookBillSub";
+ base.MvarItemKeySub2 = "";
+ base.MvarItemKeySub3 = "";
+ base.MvarItemKeySub4 = "";
+ base.MvarItemKey = "Sb_EquipConkBookBillMain";
+ base.MvarReportTitle = "璁惧浜嬫晠鐧昏琛�";
+ base.BillType = "3907";
+ }
+
+ #region 鍥哄畾浠ｇ爜
+
+ ~ClsSb_EquipConkBookBill()
+ {
+ DetailColl = null;
+ }
+
+ #endregion 鑷畾涔夋柟娉�
+ //淇敼鍗曟嵁
+ public override bool ModifyBill(Int64 lngBillKey, ref string sReturn)
+ {
+ try
+ {
+ //
+ oCn.BeginTran();
+ //鏇存柊涓昏〃
+ oCn.RunProc("UpDate Sb_EquipConkBookBillMain set " +
+ " HBillNo='" + omodel.HBillNo + "'" + //鍥哄畾璧嬪��===============
+ ",HDate='" + omodel.HDate + "'" +
+ ",HYear='" + omodel.HYear.ToString() + "'" +
+ ",HPeriod='" + omodel.HPeriod.ToString() + "'" +
+ ",HRemark='" + omodel.HRemark + "'" +
+ ",HUpDater='" + omodel.HMaker + "'" +
+ ",HUpDateDate=getdate()" +
+ //=========================================
+ ",HEquipID=" + omodel.HEquipID.ToString() +
+ ",HConkTypeID=" + omodel.HConkTypeID.ToString() +
+ ",HConkBeginDate='" + omodel.HConkBeginDate + "'" +
+ ",HEmpID=" + omodel.HEmpID.ToString() +
+ ",HManagerID=" + omodel.HManagerID.ToString() +
+ ",HDeptID=" + omodel.HDeptID.ToString() +
+ ",HExplanation='" + omodel.HExplanation + "'" +
+ ",HInnerBillNo='" + omodel.HInnerBillNo + "'" +
+ " where HInterID=" + lngBillKey.ToString());
+ //鍒犻櫎鍏宠仈
+ //DeleteRelation(ref sReturn, lngBillKey);
+ ////鍒犻櫎瀛愯〃
+ DeleteBillSub(lngBillKey);
+ ////鎻掑叆瀛愯〃
+ omodel.HInterID = lngBillKey;
+ foreach (Model.ClsSb_EquipConkBookBillSub oSub in DetailColl)
+ {
+ oCn.RunProc("Insert into Sb_EquipConkBookBillSub " +
+ " (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
+ ",HConkReasonID,HConkExplanation,HManagerID" +
+ ") values("
+ + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "'," + oSub.HEntryCloseDate.ToShortDateString() + "," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
+ "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
+ "," + oSub.HConkReasonID.ToString() + ",'" + oSub.HConkExplanation + "'," + oSub.HManagerID.ToString() +
+ ") ");
+ }
+ sReturn = "淇敼鍗曟嵁鎴愬姛锛�";
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+ //鏂板鍗曟嵁
+ public override bool AddBill(ref string sReturn)
+ {
+ try
+ {
+ //寰楀埌mainid
+ omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
+ //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
+ oCn.BeginTran();
+ //涓昏〃
+ oCn.RunProc("Insert Into Sb_EquipConkBookBillMain" +
+ "(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
+ ",HYear,HPeriod,HRemark,HMaker,HMakeDate" +
+ ",HEquipID,HExplanation,HInnerBillNo,HConkTypeID,HEmpID" +
+ ",HManagerID,HDeptID,HConkBeginDate" +
+ ") " +
+ " values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "'" +
+ ", " + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + omodel.HMaker + "',getdate()" +
+ ", " + omodel.HEquipID.ToString() + ",'" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "'," + omodel.HConkTypeID.ToString() + "," + omodel.HEmpID.ToString() +
+ "," + omodel.HManagerID.ToString() + "," + omodel.HDeptID.ToString() + ",'" + omodel.HConkBeginDate + "'" +
+ ") ");
+ ////鎻掑叆瀛愯〃
+ foreach (Model.ClsSb_EquipConkBookBillSub oSub in DetailColl)
+ {
+ oCn.RunProc("Insert into Sb_EquipConkBookBillSub " +
+ " (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
+ ",HConkReasonID,HManagerID,HConkExplanation" +
+ ") values("
+ + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "'," + oSub.HEntryCloseDate.ToShortDateString() + "," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
+ "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
+ "," + oSub.HConkReasonID.ToString() + "," + oSub.HManagerID.ToString() + ",'" + oSub.HConkExplanation + "'" +
+ ") ");
+ }
+ sReturn = "鏂板鍗曟嵁鎴愬姛锛�";
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+ //鏄剧ず鍗曟嵁
+ public override bool ShowBill(Int64 lngBillKey, ref string sReturn)
+ {
+ try
+ {
+ //鏌ヨ涓昏〃
+ DataSet Ds;
+ Ds = oCn.RunProcReturn("Select * from Sb_EquipConkBookBillMain Where HInterID=" + lngBillKey.ToString(), "Sb_EquipConkBookBillMain");
+ if (Ds.Tables[0].Rows.Count == 0)
+ {
+ sReturn = "鍗曟嵁鏈壘鍒帮紒";
+ return false;
+ }
+ //璧嬪��
+ omodel.HYear = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HYear"]);
+ omodel.HPeriod = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HPeriod"]);
+ omodel.HBillType = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBillType"]);
+ omodel.HBillSubType = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBillSubType"]);
+ omodel.HInterID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HInterID"]);
+ omodel.HDate = DBUtility.ClsPub.isDate(Ds.Tables[0].Rows[0]["HDate"]);
+ omodel.HBillNo = Ds.Tables[0].Rows[0]["HBillNo"].ToString().Trim();
+ omodel.HBillStatus = DBUtility.ClsPub.isInt(Ds.Tables[0].Rows[0]["HBillStatus"]);
+ omodel.HCheckItemNowID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCheckItemNowID"]);
+ omodel.HCheckItemNextID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCheckItemNextID"]);
+ omodel.HCheckFlowID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCheckFlowID"]);
+ omodel.HRemark = Ds.Tables[0].Rows[0]["HRemark"].ToString().Trim();
+ omodel.HBackDate = Ds.Tables[0].Rows[0]["HBackDate"].ToString().Trim();
+ omodel.HBacker = Ds.Tables[0].Rows[0]["HBacker"].ToString().Trim();
+ omodel.HCheckDate = Ds.Tables[0].Rows[0]["HCheckDate"].ToString().Trim();
+ omodel.HChecker = Ds.Tables[0].Rows[0]["HChecker"].ToString().Trim();
+ omodel.HMaker = Ds.Tables[0].Rows[0]["HMaker"].ToString().Trim();
+ omodel.HMakeDate = Ds.Tables[0].Rows[0]["HMakeDate"].ToString().Trim();
+ omodel.HUpDateDate = Ds.Tables[0].Rows[0]["HUpDateDate"].ToString().Trim();
+ omodel.HUpDater = Ds.Tables[0].Rows[0]["HUpDater"].ToString().Trim();
+ omodel.HCloseDate = Ds.Tables[0].Rows[0]["HCloseDate"].ToString().Trim();
+ omodel.HCloseMan = Ds.Tables[0].Rows[0]["HCloseMan"].ToString().Trim();
+ omodel.HCloseType = DBUtility.ClsPub.isBool(Ds.Tables[0].Rows[0]["HCloseType"]);
+ omodel.HDeleteDate = Ds.Tables[0].Rows[0]["HDeleteDate"].ToString().Trim();
+ omodel.HDeleteMan = Ds.Tables[0].Rows[0]["HDeleteMan"].ToString().Trim();
+ //=======================================
+ omodel.HEquipID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HEquipID"]);
+ omodel.HConkTypeID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HConkTypeID"]);
+ omodel.HEmpID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HEmpID"]);
+ omodel.HManagerID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HManagerID"]);
+ omodel.HConkBeginDate = DBUtility.ClsPub.isDate(Ds.Tables[0].Rows[0]["HConkBeginDate"]);
+ omodel.HDeptID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HDeptID"]);
+ omodel.HExplanation = Ds.Tables[0].Rows[0]["HExplanation"].ToString().Trim();
+ omodel.HInnerBillNo = Ds.Tables[0].Rows[0]["HInnerBillNo"].ToString().Trim();
+ //寰幆
+ DataSet DsSub;
+ DsSub = oCn.RunProcReturn("Select * from Sb_EquipConkBookBillSub Where HInterID=" + lngBillKey.ToString() + " order by HEntryID ", "Sb_EquipConkBookBillSub");
+ DetailColl.Clear();//娓呯┖
+ for (int i = 0; i < DsSub.Tables[0].Rows.Count; i++)
+ {
+ Model.ClsSb_EquipConkBookBillSub oSub = new Model.ClsSb_EquipConkBookBillSub();
+ // 鍥哄畾璧嬪��===============================================
+ oSub.HInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HInterID"]);
+ oSub.HEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HEntryID"]);
+ oSub.HSourceInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSourceInterID"]);
+ oSub.HSourceEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSourceEntryID"]);
+ oSub.HSourceBillType = DsSub.Tables[0].Rows[i]["HSourceBillType"].ToString().Trim();
+ oSub.HSourceBillNo = DsSub.Tables[0].Rows[i]["HSourceBillNo"].ToString().Trim();
+ oSub.HRelationQty = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HRelationQty"]);
+ oSub.HRelationMoney = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HRelationMoney"]);
+ oSub.HCloseMan = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HCloseMan"]);
+ oSub.HCloseType = DBUtility.ClsPub.isBool(DsSub.Tables[0].Rows[i]["HCloseType"]);
+ oSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DsSub.Tables[0].Rows[i]["HEntryCloseDate"]);
+ oSub.HRemark = DsSub.Tables[0].Rows[i]["HRemark"].ToString().Trim();
+ //===========================================
+ oSub.HConkReasonID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HConkReasonID"]);
+ oSub.HConkExplanation = DsSub.Tables[0].Rows[i]["HConkExplanation"].ToString().Trim();
+ oSub.HManagerID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HManagerID"]);
+
+ DetailColl.Add(oSub);
+ }
+ sReturn = "鏄剧ず鍗曟嵁鎴愬姛锛�";
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ throw (e);
+ }
+ }
+
+
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/DLL/ClsSb_EquipRepairCheckBill.cs b/WebAPI/DLL/ClsSb_EquipRepairCheckBill.cs
new file mode 100644
index 0000000..97d6272
--- /dev/null
+++ b/WebAPI/DLL/ClsSb_EquipRepairCheckBill.cs
@@ -0,0 +1,219 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+using System.Data;
+
+namespace WebAPI.DLL
+{
+ public class ClsSb_EquipRepairCheckBill : DBUtility.ClsXt_BaseBill
+ {
+ public Model.ClsSb_EquipRepairCheckBillMain omodel = new Model.ClsSb_EquipRepairCheckBillMain();
+ public List<Model.ClsSb_EquipRepairCheckBillSub> DetailColl = new List<Model.ClsSb_EquipRepairCheckBillSub>();
+
+ public ClsSb_EquipRepairCheckBill()
+ {
+ base.MvarItemKeySub = "Sb_EquipRepairCheckBillSub";
+ base.MvarItemKeySub2 = "";
+ base.MvarItemKeySub3 = "";
+ base.MvarItemKeySub4 = "";
+ base.MvarItemKey = "Sb_EquipRepairCheckBillMain";
+ base.MvarReportTitle = "璁惧缁翠慨楠屾敹鍗�";
+ base.BillType = "3911";
+ }
+
+ #region 鍥哄畾浠ｇ爜
+
+ ~ClsSb_EquipRepairCheckBill()
+ {
+ DetailColl = null;
+ }
+
+ #endregion 鑷畾涔夋柟娉�
+ //淇敼鍗曟嵁
+ public override bool ModifyBill(Int64 lngBillKey, ref string sReturn)
+ {
+ try
+ {
+ //
+ oCn.BeginTran();
+ //鏇存柊涓昏〃
+ oCn.RunProc("UpDate Sb_EquipRepairCheckBillMain set " +
+ " HBillNo='" + omodel.HBillNo + "'" + //鍥哄畾璧嬪��===============
+ ",HDate='" + omodel.HDate + "'" +
+ ",HYear='" + omodel.HYear.ToString() + "'" +
+ ",HPeriod='" + omodel.HPeriod.ToString() + "'" +
+ ",HRemark='" + omodel.HRemark + "'" +
+ ",HUpDater='" + omodel.HMaker + "'" +
+ ",HUpDateDate=getdate()" +
+ //=========================================
+ ",HEquipID=" + omodel.HEquipID.ToString() +
+ ",HEmpID=" + omodel.HEmpID.ToString() +
+ ",HManagerID=" + omodel.HManagerID.ToString() +
+ ",HDeptID=" + omodel.HDeptID.ToString() +
+ ",HCheckBeginDate='" + omodel.HCheckBeginDate + "'" +
+ ",HCheckResult='" + omodel.HCheckResult + "'" +
+ ",HExplanation='" + omodel.HExplanation + "'" +
+ ",HInnerBillNo='" + omodel.HInnerBillNo + "'" +
+ " where HInterID=" + lngBillKey.ToString());
+ //鍒犻櫎鍏宠仈
+ //DeleteRelation(ref sReturn, lngBillKey);
+ ////鍒犻櫎瀛愯〃
+ DeleteBillSub(lngBillKey);
+ ////鎻掑叆瀛愯〃
+ omodel.HInterID = lngBillKey;
+ foreach (Model.ClsSb_EquipRepairCheckBillSub oSub in DetailColl)
+ {
+ oCn.RunProc("Insert into Sb_EquipRepairCheckBillSub " +
+ " (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
+ ",HRepairCheckID,HManagerID,HRepairCheckContent" +
+ ") values("
+ + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "'," + oSub.HEntryCloseDate.ToShortDateString() + "," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
+ "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
+ "," + oSub.HRepairCheckID.ToString() + "," + oSub.HManagerID.ToString() + ",'" + oSub.HRepairCheckContent + "'" +
+ ") ");
+ }
+ sReturn = "淇敼鍗曟嵁鎴愬姛锛�";
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+ //鏂板鍗曟嵁
+ public override bool AddBill(ref string sReturn)
+ {
+ try
+ {
+ //寰楀埌mainid
+ omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
+ //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
+ oCn.BeginTran();
+ //涓昏〃
+ oCn.RunProc("Insert Into Sb_EquipRepairCheckBillMain" +
+ "(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
+ ",HYear,HPeriod,HRemark,HMaker,HMakeDate" +
+ ",HEquipID,HExplanation,HInnerBillNo,HEmpID" +
+ ",HManagerID,HDeptID,HCheckResult,HCheckBeginDate" +
+ ") " +
+ " values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "'" +
+ ", " + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + omodel.HMaker+ "',getdate()" +
+ ", " + omodel.HEquipID.ToString() + ",'" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "'," + omodel.HEmpID.ToString() +
+ "," + omodel.HManagerID.ToString() + "," + omodel.HDeptID.ToString() + ",'" + omodel.HCheckResult + "','" + omodel.HCheckBeginDate + "'" +
+ ") ");
+ ////鎻掑叆瀛愯〃
+ foreach (Model.ClsSb_EquipRepairCheckBillSub oSub in DetailColl)
+ {
+ oCn.RunProc("Insert into Sb_EquipRepairCheckBillSub " +
+ " (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
+ ",HRepairCheckID,HManagerID,HRepairCheckContent" +
+ ") values("
+ + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "'," + oSub.HEntryCloseDate.ToShortDateString() + "," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
+ "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
+ "," + oSub.HRepairCheckID.ToString() + "," + oSub.HManagerID.ToString() + ",'" + oSub.HRepairCheckContent + "'" +
+ ") ");
+ }
+ sReturn = "鏂板鍗曟嵁鎴愬姛锛�";
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+ //鏄剧ず鍗曟嵁
+ public override bool ShowBill(Int64 lngBillKey, ref string sReturn)
+ {
+ try
+ {
+ //鏌ヨ涓昏〃
+ DataSet Ds;
+ Ds = oCn.RunProcReturn("Select * from Sb_EquipRepairCheckBillMain Where HInterID=" + lngBillKey.ToString(), "Sb_EquipRepairCheckBillMain");
+ if (Ds.Tables[0].Rows.Count == 0)
+ {
+ sReturn = "鍗曟嵁鏈壘鍒帮紒";
+ return false;
+ }
+ //璧嬪��
+ omodel.HYear = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HYear"]);
+ omodel.HPeriod = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HPeriod"]);
+ omodel.HBillType = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBillType"]);
+ omodel.HBillSubType = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBillSubType"]);
+ omodel.HInterID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HInterID"]);
+ omodel.HDate = DBUtility.ClsPub.isDate(Ds.Tables[0].Rows[0]["HDate"]);
+ omodel.HBillNo = Ds.Tables[0].Rows[0]["HBillNo"].ToString().Trim();
+ omodel.HBillStatus = DBUtility.ClsPub.isInt(Ds.Tables[0].Rows[0]["HBillStatus"]);
+ omodel.HCheckItemNowID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCheckItemNowID"]);
+ omodel.HCheckItemNextID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCheckItemNextID"]);
+ omodel.HCheckFlowID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCheckFlowID"]);
+ omodel.HRemark = Ds.Tables[0].Rows[0]["HRemark"].ToString().Trim();
+ omodel.HBackDate = Ds.Tables[0].Rows[0]["HBackDate"].ToString().Trim();
+ omodel.HBacker = Ds.Tables[0].Rows[0]["HBacker"].ToString().Trim();
+ omodel.HCheckDate = Ds.Tables[0].Rows[0]["HCheckDate"].ToString().Trim();
+ omodel.HChecker = Ds.Tables[0].Rows[0]["HChecker"].ToString().Trim();
+ omodel.HMaker = Ds.Tables[0].Rows[0]["HMaker"].ToString().Trim();
+ omodel.HMakeDate = Ds.Tables[0].Rows[0]["HMakeDate"].ToString().Trim();
+ omodel.HUpDateDate = Ds.Tables[0].Rows[0]["HUpDateDate"].ToString().Trim();
+ omodel.HUpDater = Ds.Tables[0].Rows[0]["HUpDater"].ToString().Trim();
+ omodel.HCloseDate = Ds.Tables[0].Rows[0]["HCloseDate"].ToString().Trim();
+ omodel.HCloseMan = Ds.Tables[0].Rows[0]["HCloseMan"].ToString().Trim();
+ omodel.HCloseType = DBUtility.ClsPub.isBool(Ds.Tables[0].Rows[0]["HCloseType"]);
+ omodel.HDeleteDate = Ds.Tables[0].Rows[0]["HDeleteDate"].ToString().Trim();
+ omodel.HDeleteMan = Ds.Tables[0].Rows[0]["HDeleteMan"].ToString().Trim();
+ //=======================================
+ omodel.HEquipID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HEquipID"]);
+ omodel.HEmpID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HEmpID"]);
+ omodel.HManagerID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HManagerID"]);
+ omodel.HCheckBeginDate = DBUtility.ClsPub.isDate(Ds.Tables[0].Rows[0]["HCheckBeginDate"]);
+ omodel.HDeptID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HDeptID"]);
+ omodel.HCheckResult = Ds.Tables[0].Rows[0]["HCheckResult"].ToString().Trim();
+ omodel.HExplanation = Ds.Tables[0].Rows[0]["HExplanation"].ToString().Trim();
+ omodel.HInnerBillNo = Ds.Tables[0].Rows[0]["HInnerBillNo"].ToString().Trim();
+ //寰幆
+ DataSet DsSub;
+ DsSub = oCn.RunProcReturn("Select * from Sb_EquipRepairCheckBillSub Where HInterID=" + lngBillKey.ToString() + " order by HEntryID ", "Sb_EquipRepairCheckBillSub");
+ DetailColl.Clear();//娓呯┖
+ for (int i = 0; i < DsSub.Tables[0].Rows.Count; i++)
+ {
+ Model.ClsSb_EquipRepairCheckBillSub oSub = new Model.ClsSb_EquipRepairCheckBillSub();
+ // 鍥哄畾璧嬪��===============================================
+ oSub.HInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HInterID"]);
+ oSub.HEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HEntryID"]);
+ oSub.HSourceInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSourceInterID"]);
+ oSub.HSourceEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSourceEntryID"]);
+ oSub.HSourceBillType = DsSub.Tables[0].Rows[i]["HSourceBillType"].ToString().Trim();
+ oSub.HSourceBillNo = DsSub.Tables[0].Rows[i]["HSourceBillNo"].ToString().Trim();
+ oSub.HRelationQty = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HRelationQty"]);
+ oSub.HRelationMoney = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HRelationMoney"]);
+ oSub.HCloseMan = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HCloseMan"]);
+ oSub.HCloseType = DBUtility.ClsPub.isBool(DsSub.Tables[0].Rows[i]["HCloseType"]);
+ oSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DsSub.Tables[0].Rows[i]["HEntryCloseDate"]);
+ oSub.HRemark = DsSub.Tables[0].Rows[i]["HRemark"].ToString().Trim();
+ //===========================================
+ oSub.HRepairCheckID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HRepairCheckID"]);
+ oSub.HRepairCheckContent = DsSub.Tables[0].Rows[i]["HRepairCheckContent"].ToString().Trim();
+ oSub.HManagerID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HManagerID"]);
+
+ DetailColl.Add(oSub);
+ }
+ sReturn = "鏄剧ず鍗曟嵁鎴愬姛锛�";
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ throw (e);
+ }
+ }
+
+
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/DLL/ClsSb_EquipRepairWorkBill.cs b/WebAPI/DLL/ClsSb_EquipRepairWorkBill.cs
new file mode 100644
index 0000000..2cd4201
--- /dev/null
+++ b/WebAPI/DLL/ClsSb_EquipRepairWorkBill.cs
@@ -0,0 +1,266 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+using System.Data;
+
+namespace WebAPI.DLL
+{
+ public class ClsSb_EquipRepairWorkBill:DBUtility.ClsXt_BaseBill
+ {
+ public Models.ClsSb_EquipRepairWorkBillMain omodel = new Models.ClsSb_EquipRepairWorkBillMain();
+ public List<Models.ClsSb_EquipRepairWorkBillSub> DetailColl = new List<Models.ClsSb_EquipRepairWorkBillSub>();
+
+ public ClsSb_EquipRepairWorkBill()
+ {
+ base.MvarItemKeySub = "Sb_EquipRepairWorkBillSub";
+ base.MvarItemKeySub2 = "";
+ base.MvarItemKeySub3 = "";
+ base.MvarItemKeySub4 = "";
+ base.MvarItemKey="Sb_EquipRepairWorkBillMain";
+ base.MvarReportTitle = "璁惧缁翠慨鍗�";
+ base.BillType="3910";
+ base.HBillSubType = "3910";
+
+ }
+
+ #region 鍥哄畾浠ｇ爜
+
+ ~ClsSb_EquipRepairWorkBill()
+ {
+ DetailColl = null;
+ }
+
+ #endregion 鑷畾涔夋柟娉�
+ //淇敼鍗曟嵁
+ public override bool ModifyBill(Int64 lngBillKey, ref string sReturn)
+ {
+ try
+ {
+ //
+ oCn.BeginTran();
+ //鏇存柊涓昏〃
+ oCn.RunProc("UpDate Sb_EquipRepairWorkBillMain set " +
+ " HBillNo='" + omodel.HBillNo + "'" + //鍥哄畾璧嬪��===============
+ ",HDate='" + omodel.HDate + "'" +
+ ",HYear='" + omodel.HYear.ToString() + "'" +
+ ",HPeriod='" + omodel.HPeriod.ToString() + "'" +
+ ",HRemark='" + omodel.HRemark + "'" +
+ ",HUpDater='" + omodel.HMaker + "'" +
+ ",HUpDateDate=getdate()" +
+ //========================================
+ ",HEquipID=" + omodel.HEquipID.ToString() +
+ ",HRepairID=" + omodel.HRepairID.ToString() +
+ ",HRepairBeginDate='" + omodel.HRepairBeginDate + "'" +
+ ",HRepairEndDate='" + omodel.HRepairEndDate + "'" +
+
+ ",HManagerID=" + omodel.HManagerID.ToString() +
+ ",HEmpID=" + omodel.HEmpID.ToString() +
+ ",HTimes=" + omodel.HTimes.ToString() +
+ ",HPlanTimes=" + omodel.HPlanTimes.ToString() +
+ ",HDeptID=" + omodel.HDeptID.ToString() +
+ ",HExplanation='" + omodel.HExplanation + "'" +
+ ",HInnerBillNo='" + omodel.HInnerBillNo + "'" +
+ ",HRepairContent='" + omodel.HRepairContent + "'" +
+ ",HCycleUnit='" + omodel.HCycleUnit + "'" +
+
+ " where HInterID=" + lngBillKey.ToString());
+ //鍒犻櫎鍏宠仈
+ DeleteRelation(ref sReturn, lngBillKey);
+ //鍒犻櫎瀛愯〃
+ DeleteBillSub(lngBillKey);
+ //鎻掑叆瀛愯〃
+ omodel.HInterID = lngBillKey;
+ foreach (Models.ClsSb_EquipRepairWorkBillSub oSub in DetailColl)
+ {
+ oCn.RunProc("Insert into Sb_EquipRepairWorkBillSub " +
+ " (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
+ ",HRepairID,HManagerID,HRepairExplanation,HEmpID" +
+ ") values("
+ + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "','" + oSub.HEntryCloseDate.ToShortDateString() + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
+ "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
+ "," + oSub.HRepairID1.ToString() + ",'"+ oSub.HManagerID1.ToString() + "','" + oSub.HRepairExplanation + "'," + oSub.HEmpID.ToString() +
+ ") ");
+ }
+ //
+ //foreach (Model.ClsSb_EquipRepairWorkBillSub oSub in DetailColl)
+ //{
+ // Ds = oCn.RunProcReturn("exec h_p_Sb_EquipRepairWorkBill_Qty " + oSub.HICMOInterID, "");
+ // if (Ds.Tables[0].Rows.Count == 0)
+ // return;
+ // if (DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBool"]) == "Y")
+ // {
+ // sReturn = "姹囨姤鏁伴噺瓒呰繃璁″垝鏁伴噺锛佷笉鍏佽淇濆瓨";
+ // return false;
+ // }
+ //}
+ sReturn = "淇敼鍗曟嵁鎴愬姛锛�";
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+ //鏂板鍗曟嵁
+ public override bool AddBill(ref string sReturn)
+ {
+ try
+ {
+ //寰楀埌mainid
+ omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
+ //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
+ oCn.BeginTran();
+ //涓昏〃
+ oCn.RunProc("Insert Into Sb_EquipRepairWorkBillMain " +
+ "(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
+ ",HYear,HPeriod,HRemark,HMaker,HMakeDate" +
+ ",HEquipID,HRepairID,HPlanTimes,HEmpID,HManagerID,HTimes" +
+ ",HDeptID,HExplanation,HInnerBillNo,HRepairBeginDate,HRepairEndDate,HRepairContent,HCycleUnit" +
+ ") " +
+ " values('" + this.BillType + "','" + this.HBillSubType + "'," +omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "'" +
+ ", " + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + omodel.HMaker + "',getdate()" +
+ ", " + omodel.HEquipID.ToString() + "," + omodel.HRepairID.ToString() + "," + omodel.HPlanTimes.ToString() + "," + omodel.HEmpID.ToString() + "," + omodel.HManagerID.ToString() + "," + omodel.HTimes.ToString() +
+ ", " + omodel.HDeptID.ToString() + ",'" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "','" + omodel.HRepairBeginDate.ToShortDateString() + "','" + omodel.HRepairEndDate.ToShortDateString() + "','" + omodel.HRepairContent + "','" + omodel.HCycleUnit + "'" +
+ ") ");
+ //鎻掑叆瀛愯〃
+ foreach (Models.ClsSb_EquipRepairWorkBillSub oSub in DetailColl)
+ {
+ oCn.RunProc("Insert into Sb_EquipRepairWorkBillSub " +
+ " (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
+ ",HRepairID,HManagerID,HRepairExplanation,HEmpID" +
+ ") values("
+ + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "','" + oSub.HEntryCloseDate.ToShortDateString() + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
+ "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
+ "," + oSub.HRepairID1.ToString() + ",'"+ oSub.HManagerID1.ToString() + "','" + oSub.HRepairExplanation + "'," + oSub.HEmpID.ToString() +
+ ") ");
+ }
+ //
+ //foreach (Model.ClsSb_EquipRepairWorkBillSub oSub in DetailColl)
+ //{
+ // Ds = oCn.RunProcReturn("exec h_p_Sb_EquipRepairWorkBill_Qty " + oSub.HICMOInterID, "");
+ // if (Ds.Tables[0].Rows.Count == 0)
+ // return;
+ // if (DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBool"]) == "Y")
+ // {
+ // sReturn = "姹囨姤鏁伴噺瓒呰繃璁″垝鏁伴噺锛佷笉鍏佽淇濆瓨";
+ // return false;
+ // }
+ //}
+ //
+ sReturn = "鏂板鍗曟嵁鎴愬姛锛�";
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+ //鏄剧ず鍗曟嵁
+ public override bool ShowBill(Int64 lngBillKey, ref string sReturn)
+ {
+ try
+ {
+ //鏌ヨ涓昏〃
+ DataSet Ds ;
+ Ds = oCn.RunProcReturn("Select * from Sb_EquipRepairWorkBillMain Where HInterID=" + lngBillKey.ToString(), "Sb_EquipRepairWorkBillMain");
+ if(Ds.Tables[0].Rows.Count==0)
+ {
+ sReturn = "鍗曟嵁鏈壘鍒帮紒";
+ return false;
+ }
+ //鍥哄畾璧嬪��===========================================
+ omodel.HYear = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HYear"]);
+ omodel.HPeriod = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HPeriod"]);
+ omodel.HBillType = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBillType"]);
+ omodel.HBillSubType = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBillSubType"]);
+ omodel.HInterID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HInterID"]);
+ omodel.HDate = DBUtility.ClsPub.isDate(Ds.Tables[0].Rows[0]["HDate"]);
+ omodel.HBillNo = Ds.Tables[0].Rows[0]["HBillNo"].ToString().Trim();
+ omodel.HBillStatus = DBUtility.ClsPub.isInt(Ds.Tables[0].Rows[0]["HBillStatus"]);
+ omodel.HCheckItemNowID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCheckItemNowID"]);
+ omodel.HCheckItemNextID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCheckItemNextID"]);
+ omodel.HCheckFlowID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCheckFlowID"]);
+ omodel.HRemark = Ds.Tables[0].Rows[0]["HRemark"].ToString().Trim();
+ omodel.HBackDate = Ds.Tables[0].Rows[0]["HBackDate"].ToString().Trim();
+ omodel.HBacker = Ds.Tables[0].Rows[0]["HBacker"].ToString().Trim();
+ omodel.HCheckDate = Ds.Tables[0].Rows[0]["HCheckDate"].ToString().Trim();
+ omodel.HChecker = Ds.Tables[0].Rows[0]["HChecker"].ToString().Trim();
+ omodel.HMaker = Ds.Tables[0].Rows[0]["HMaker"].ToString().Trim();
+ omodel.HMakeDate = Ds.Tables[0].Rows[0]["HMakeDate"].ToString().Trim();
+ omodel.HUpDateDate = Ds.Tables[0].Rows[0]["HUpDateDate"].ToString().Trim();
+ omodel.HUpDater = Ds.Tables[0].Rows[0]["HUpDater"].ToString().Trim();
+ omodel.HCloseDate = Ds.Tables[0].Rows[0]["HCloseDate"].ToString().Trim();
+ omodel.HCloseMan = Ds.Tables[0].Rows[0]["HCloseMan"].ToString().Trim();
+ omodel.HCloseType = DBUtility.ClsPub.isBool(Ds.Tables[0].Rows[0]["HCloseType"]);
+ omodel.HDeleteDate = Ds.Tables[0].Rows[0]["HDeleteDate"].ToString().Trim();
+ omodel.HDeleteMan = Ds.Tables[0].Rows[0]["HDeleteMan"].ToString().Trim();
+ //========================================================
+ omodel.HEquipID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HEquipID"]);
+ omodel.HRepairID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HRepairID"]);
+ omodel.HManagerID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HManagerID"]);
+ omodel.HEmpID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HEmpID"]);
+ omodel.HRepairBeginDate = DBUtility.ClsPub.isDate(Ds.Tables[0].Rows[0]["HRepairBeginDate"]);
+ omodel.HRepairEndDate = DBUtility.ClsPub.isDate(Ds.Tables[0].Rows[0]["HRepairEndDate"]);
+ omodel.HRepairContent = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HRepairContent"]);
+ omodel.HCycleUnit = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HCycleUnit"]);
+ omodel.HPlanTimes = DBUtility.ClsPub.isSingle(Ds.Tables[0].Rows[0]["HPlanTimes"]);
+ omodel.HTimes = DBUtility.ClsPub.isSingle(Ds.Tables[0].Rows[0]["HTimes"]);
+ omodel.HDeptID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HDeptID"]);
+ omodel.HExplanation = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HExplanation"]);
+ omodel.HInnerBillNo = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HInnerBillNo"]);
+
+
+ //
+
+ //寰幆
+ DataSet DsSub ;
+ DsSub = oCn.RunProcReturn("Select * from Sb_EquipRepairWorkBillSub Where HInterID=" + lngBillKey.ToString() + " order by HEntryID ", "Sb_EquipRepairWorkBillSub");
+ DetailColl.Clear();//娓呯┖
+ for (int i = 0; i < DsSub.Tables[0].Rows.Count; i++)
+ {
+ Models.ClsSb_EquipRepairWorkBillSub oSub = new Models.ClsSb_EquipRepairWorkBillSub();
+ // 鍥哄畾璧嬪��===============================================
+ oSub.HInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HInterID"]);
+ oSub.HEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HEntryID"]);
+ oSub.HSourceInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSourceInterID"]);
+ oSub.HSourceEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSourceEntryID"]);
+ oSub.HSourceBillType = DsSub.Tables[0].Rows[i]["HSourceBillType"].ToString().Trim();
+ oSub.HSourceBillNo = DsSub.Tables[0].Rows[i]["HSourceBillNo"].ToString().Trim();
+ oSub.HRelationQty = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HRelationQty"]);
+ oSub.HRelationMoney = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HRelationMoney"]);
+ oSub.HCloseMan = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HCloseMan"]);
+ oSub.HCloseType = DBUtility.ClsPub.isBool(DsSub.Tables[0].Rows[i]["HCloseType"]);
+ oSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DsSub.Tables[0].Rows[i]["HEntryCloseDate"]);
+ oSub.HRemark = DsSub.Tables[0].Rows[i]["HRemark"].ToString().Trim();
+ //===================================================
+
+ oSub.HRepairExplanation = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HRepairExplanation"]);
+ oSub.HRepairID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HRepairID"]);
+ oSub.HEmpID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HEmpID"]);
+
+
+
+ DetailColl.Add(oSub);
+ }
+ sReturn = "鏄剧ず鍗曟嵁鎴愬姛锛�";
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ throw (e);
+ }
+ }
+
+
+ }
+
+}
diff --git a/WebAPI/ListModels.cs b/WebAPI/ListModels.cs
index 9f1f72b..bb1db91 100644
--- a/WebAPI/ListModels.cs
+++ b/WebAPI/ListModels.cs
@@ -669,27 +669,78 @@
}
/// <summary>
- /// 璁惧鐐规璁″垝 涓昏〃
+ /// 澶勭悊鏂板璁惧缁翠慨涓昏〃鐨刯son
/// </summary>
/// <param name="jsonString"></param>
/// <returns></returns>
- // ClsSb_EquipDotCheckPlanBillMain
- public List<Model.ClsSb_EquipDotCheckPlanBillMain> getObjectByJson_Sb_EquipDotCheckPlanBillMain(string jsonString)
+ public List<Models.ClsSb_EquipRepairWorkBillMain> getObjectByJson_Gy_EquipRepairWorkBillMain(string jsonString)
{
jsonString = "[" + jsonString.ToString() + "]";
- List<Model.ClsSb_EquipDotCheckPlanBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSb_EquipDotCheckPlanBillMain>>(jsonString);
+ List<Models.ClsSb_EquipRepairWorkBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsSb_EquipRepairWorkBillMain>>(jsonString);
return list;
}
+
+
/// <summary>
- /// 璁惧鐐规璁″垝 瀛愯〃
+ /// 澶勭悊鏂板璁惧缁翠慨瀛愯〃鐨刯son
/// </summary>
/// <param name="jsonString"></param>
/// <returns></returns>
- // ClsSb_EquipDotCheckPlanBillSub
- public List<Model.ClsSb_EquipDotCheckPlanBillSub> getObjectByJson_Sb_EquipDotCheckPlanBillSub(string jsonString)
+ public List<Models.ClsSb_EquipRepairWorkBillSub> getObjectByJson_Gy_EquipRepairWorkBillSub(string jsonString)
{
jsonString = "[" + jsonString.ToString() + "]";
- List<Model.ClsSb_EquipDotCheckPlanBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSb_EquipDotCheckPlanBillSub>>(jsonString);
+ List<Models.ClsSb_EquipRepairWorkBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsSb_EquipRepairWorkBillSub>>(jsonString);
+ return list;
+ }
+
+ /// <summary>
+ /// 澶勭悊鏂板璁惧缁翠慨楠屾敹鍗曚富琛ㄧ殑json
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsSb_EquipRepairCheckBillMain> getObjectByJson_Gy_EquipRepairCheckBillMain(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsSb_EquipRepairCheckBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSb_EquipRepairCheckBillMain>>(jsonString);
+ return list;
+ }
+
+
+ /// <summary>
+ /// 澶勭悊鏂板璁惧缁翠慨楠屾敹鍗曞瓙琛ㄧ殑json
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsSb_EquipRepairCheckBillSub> getObjectByJson_Gy_EquipRepairCheckBillSub(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsSb_EquipRepairCheckBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSb_EquipRepairCheckBillSub>>(jsonString);
+ return list;
+ }
+
+
+ /// <summary>
+ /// 澶勭悊鏂板璁惧鏁呴殰鐧昏鍗曚富琛ㄧ殑json
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsSb_EquipConkBookBillMain> getObjectByJson_Gy_EquipConkBookBillMain(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsSb_EquipConkBookBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSb_EquipConkBookBillMain>>(jsonString);
+ return list;
+ }
+
+
+ /// <summary>
+ /// 澶勭悊鏂板璁惧鏁呴殰鐧昏鍗曞瓙琛ㄧ殑json
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsSb_EquipConkBookBillSub> getObjectByJson_Gy_EquipConkBookBillSub(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsSb_EquipConkBookBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSb_EquipConkBookBillSub>>(jsonString);
return list;
}
diff --git a/WebAPI/Models/ClsSb_EquipRepairWorkBillMain.cs b/WebAPI/Models/ClsSb_EquipRepairWorkBillMain.cs
new file mode 100644
index 0000000..9e4fc2f
--- /dev/null
+++ b/WebAPI/Models/ClsSb_EquipRepairWorkBillMain.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace WebAPI.Models
+{
+ public class ClsSb_EquipRepairWorkBillMain : DBUtility.ClsXt_BaseBillMain
+ {
+
+ public Int64 HEmpID;// int --维修人
+ public Int64 HManagerID;// int --负责人
+ public Int64 HSecManagerID;// int --验收
+ public Int64 HDeptID;// int --维修部门
+ public string HExplanation;// varchar(200) --维修要求
+ public string HInnerBillNo;// varchar(50) --内部单据号
+ public string HRemark; //加工要求
+
+ public Int64 HEquipID;// int --设备ID(Gy_EquipMent)
+ public Int64 HRepairID;//int --维修项目(Gy_Repair)
+ public DateTime HRepairBeginDate;// datetime --维修开始日期
+ public DateTime HRepairEndDate;//datetime --维修结束日期
+ public string HRepairContent;//varchar(500) --维修内容
+ public string HCycleUnit;//varchar(10) --时间单位(小时，天)
+ public Single HPlanTimes;// money --计划维修工时
+ public Single HTimes;// money --实际维修工时
+
+ }
+}
diff --git a/WebAPI/Models/ClsSb_EquipRepairWorkBillSub.cs b/WebAPI/Models/ClsSb_EquipRepairWorkBillSub.cs
new file mode 100644
index 0000000..cc4855e
--- /dev/null
+++ b/WebAPI/Models/ClsSb_EquipRepairWorkBillSub.cs
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace WebAPI.Models
+{
+ public class ClsSb_EquipRepairWorkBillSub : DBUtility.ClsXt_BaseBillSub
+ {
+ public DateTime HEntryCloseDate;// datetime --行关闭 (默认为'') new
+ public string HRemark;// varchar(200) --备注
+
+
+ public Int64 HRepairID; // int --维修项目
+ public Int64 HEmpID; // int --负责人
+ public string HRepairExplanation; // varchar(500)维修要求
+
+ public Int64 HManagerID1; // int --表体负责人ID
+ public Int64 HRepairID1; // int --表体维修项目ID
+ }
+}
diff --git a/WebAPI/Properties/PublishProfiles/API.pubxml.user b/WebAPI/Properties/PublishProfiles/API.pubxml.user
index 8caa7ab..089f0a9 100644
--- a/WebAPI/Properties/PublishProfiles/API.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/API.pubxml.user
@@ -7,18 +7,18 @@
<PropertyGroup>
<TimeStampOfAssociatedLegacyPublishXmlFile />
<_PublishTargetUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</_PublishTargetUrl>
- <History>True|2021-06-01T13:40:14.5889898Z;True|2021-06-01T10:45:03.3856917+08:00;True|2021-05-31T19:02:46.8042092+08:00;True|2021-05-31T18:47:52.0278748+08:00;True|2021-05-31T18:42:39.2743903+08:00;True|2021-05-31T17:42:32.1696215+08:00;True|2021-05-31T17:34:46.2817423+08:00;True|2021-05-31T17:24:43.0246592+08:00;True|2021-05-31T16:46:12.3040179+08:00;True|2021-05-31T14:53:09.9410043+08:00;True|2021-05-31T13:02:37.5818554+08:00;True|2021-05-31T12:50:26.7987391+08:00;True|2021-05-28T13:57:14.1993693+08:00;True|2021-05-28T09:42:13.2716745+08:00;True|2021-05-28T09:21:21.7815722+08:00;True|2021-05-28T09:17:59.1409780+08:00;True|2021-05-27T17:47:56.2640274+08:00;True|2021-05-27T14:41:19.9808548+08:00;True|2021-05-27T14:11:40.1924193+08:00;True|2021-05-27T13:37:42.5025517+08:00;True|2021-05-26T16:52:34.3234026+08:00;True|2021-05-26T15:14:15.9395791+08:00;True|2021-05-26T15:04:11.7364402+08:00;True|2021-05-26T14:26:20.5541211+08:00;True|2021-05-26T14:01:41.5357885+08:00;True|2021-05-25T17:51:07.3024087+08:00;True|2021-05-25T17:35:35.9642868+08:00;True|2021-05-25T17:06:01.1192559+08:00;True|2021-05-25T16:52:15.2304370+08:00;True|2021-05-25T16:12:13.5664530+08:00;True|2021-05-25T16:08:27.7007589+08:00;True|2021-05-25T15:58:36.5187538+08:00;True|2021-05-25T15:58:01.0527811+08:00;True|2021-05-25T15:54:45.0576223+08:00;True|2021-05-25T14:18:51.3134586+08:00;True|2021-05-25T11:28:15.6460627+08:00;True|2021-05-25T11:27:17.4884199+08:00;True|2021-05-25T11:26:04.5332872+08:00;True|2021-05-25T09:39:11.8882456+08:00;True|2021-05-23T23:05:37.3855541+08:00;True|2021-05-22T05:45:13.7439233+08:00;True|2021-05-22T05:42:35.4852011+08:00;True|2021-05-22T05:25:16.8821260+08:00;True|2021-05-21T15:58:20.5625475+08:00;True|2021-05-21T15:55:21.1943961+08:00;True|2021-05-21T15:53:35.6852027+08:00;True|2021-05-21T15:46:56.7370418+08:00;True|2021-05-21T15:32:49.2494690+08:00;True|2021-05-21T15:19:19.8145510+08:00;True|2021-05-21T10:16:44.9563480+08:00;True|2021-05-20T19:21:19.8572280+08:00;True|2021-05-20T19:15:57.2506092+08:00;True|2021-05-20T15:58:09.0123323+08:00;True|2021-05-20T15:54:54.6251445+08:00;True|2021-05-20T15:32:04.9783034+08:00;True|2021-05-20T15:31:58.9418248+08:00;True|2021-05-20T15:31:53.2904235+08:00;True|2021-05-20T15:31:48.5385850+08:00;True|2021-05-20T13:31:35.5777988+08:00;True|2021-05-20T10:46:01.6559203+08:00;True|2021-05-20T10:40:53.2131788+08:00;True|2021-05-20T08:58:49.3511837+08:00;True|2021-05-19T16:15:22.7730518+08:00;True|2021-05-19T16:13:03.2756422+08:00;True|2021-05-19T16:11:16.3163692+08:00;True|2021-05-19T15:31:19.7575868+08:00;True|2021-05-19T14:49:47.6104541+08:00;True|2021-05-19T10:46:17.6515193+08:00;True|2021-05-19T10:45:23.6466498+08:00;True|2021-05-18T17:19:36.9591198+08:00;True|2021-05-18T17:16:38.1513255+08:00;True|2021-05-18T10:31:35.2246444+08:00;True|2021-05-17T16:36:00.1226059+08:00;True|2021-05-17T16:31:05.1414358+08:00;True|2021-05-17T16:22:57.4215158+08:00;True|2021-05-17T16:22:52.6941933+08:00;True|2021-05-17T16:22:49.0033372+08:00;True|2021-05-17T16:18:03.8629751+08:00;True|2021-05-17T15:50:27.6196340+08:00;True|2021-05-17T13:22:15.7308548+08:00;True|2021-05-12T09:19:36.0666124+08:00;True|2021-05-12T09:17:40.0887602+08:00;True|2021-05-12T09:06:24.5508601+08:00;True|2021-05-12T08:39:56.6657894+08:00;True|2021-05-11T17:42:28.6508833+08:00;True|2021-05-11T15:22:03.4937062+08:00;True|2021-05-10T16:45:56.1282466+08:00;True|2021-05-08T19:04:07.1084339+08:00;True|2021-05-08T18:04:40.2166839+08:00;True|2021-05-08T18:04:32.5635574+08:00;True|2021-05-08T18:01:24.5206432+08:00;True|2021-05-08T17:38:05.5582200+08:00;True|2021-05-08T15:26:55.2861241+08:00;True|2021-05-08T14:52:13.1682476+08:00;True|2021-05-08T14:50:30.5356438+08:00;True|2021-05-08T14:38:40.3445313+08:00;True|2021-05-08T14:38:37.9504757+08:00;True|2021-05-08T14:30:31.9762236+08:00;True|2021-05-08T14:21:37.4496495+08:00;True|2021-05-07T20:47:46.1401919+08:00;True|2021-05-07T20:31:45.7777162+08:00;True|2021-05-07T20:31:35.2882424+08:00;True|2021-05-07T20:31:21.5616729+08:00;False|2021-05-07T20:29:33.8855457+08:00;False|2021-05-07T20:28:43.1845420+08:00;False|2021-05-07T20:28:13.1335411+08:00;True|2021-05-07T20:10:01.7346568+08:00;True|2021-05-07T20:03:17.0005596+08:00;True|2021-05-07T09:05:04.3102029+08:00;True|2021-05-06T18:11:36.9078607+08:00;True|2021-05-06T18:08:40.5403791+08:00;True|2021-05-06T18:07:04.1929681+08:00;True|2021-05-06T18:06:54.5987264+08:00;True|2021-05-06T18:05:46.1791578+08:00;True|2021-05-06T17:18:58.8131464+08:00;True|2021-05-06T17:18:37.9969968+08:00;True|2021-05-06T14:47:33.5704679+08:00;True|2021-05-06T10:03:28.7226576+08:00;True|2021-04-28T10:18:54.1336497+08:00;True|2021-04-27T16:34:19.0789205+08:00;True|2021-04-27T14:48:28.8138232+08:00;True|2021-04-27T10:34:03.6370089+08:00;True|2021-04-26T16:18:32.0260755+08:00;True|2021-04-26T15:00:58.6773071+08:00;True|2021-04-26T13:23:50.3968646+08:00;True|2021-04-16T08:50:41.5499248+08:00;True|2021-04-16T08:32:59.1701708+08:00;True|2021-04-16T08:27:36.9176335+08:00;True|2021-04-15T15:56:26.8485667+08:00;True|2021-04-15T15:21:23.2875671+08:00;True|2021-04-15T14:41:16.9980034+08:00;True|2021-04-15T14:36:34.8570017+08:00;True|2021-04-13T16:15:00.7668503+08:00;</History>
+ <History>True|2021-06-03T06:45:45.5738204Z;True|2021-06-01T21:40:14.5889898+08:00;True|2021-06-01T10:45:03.3856917+08:00;True|2021-05-31T19:02:46.8042092+08:00;True|2021-05-31T18:47:52.0278748+08:00;True|2021-05-31T18:42:39.2743903+08:00;True|2021-05-31T17:42:32.1696215+08:00;True|2021-05-31T17:34:46.2817423+08:00;True|2021-05-31T17:24:43.0246592+08:00;True|2021-05-31T16:46:12.3040179+08:00;True|2021-05-31T14:53:09.9410043+08:00;True|2021-05-31T13:02:37.5818554+08:00;True|2021-05-31T12:50:26.7987391+08:00;True|2021-05-28T13:57:14.1993693+08:00;True|2021-05-28T09:42:13.2716745+08:00;True|2021-05-28T09:21:21.7815722+08:00;True|2021-05-28T09:17:59.1409780+08:00;True|2021-05-27T17:47:56.2640274+08:00;True|2021-05-27T14:41:19.9808548+08:00;True|2021-05-27T14:11:40.1924193+08:00;True|2021-05-27T13:37:42.5025517+08:00;True|2021-05-26T16:52:34.3234026+08:00;True|2021-05-26T15:14:15.9395791+08:00;True|2021-05-26T15:04:11.7364402+08:00;True|2021-05-26T14:26:20.5541211+08:00;True|2021-05-26T14:01:41.5357885+08:00;True|2021-05-25T17:51:07.3024087+08:00;True|2021-05-25T17:35:35.9642868+08:00;True|2021-05-25T17:06:01.1192559+08:00;True|2021-05-25T16:52:15.2304370+08:00;True|2021-05-25T16:12:13.5664530+08:00;True|2021-05-25T16:08:27.7007589+08:00;True|2021-05-25T15:58:36.5187538+08:00;True|2021-05-25T15:58:01.0527811+08:00;True|2021-05-25T15:54:45.0576223+08:00;True|2021-05-25T14:18:51.3134586+08:00;True|2021-05-25T11:28:15.6460627+08:00;True|2021-05-25T11:27:17.4884199+08:00;True|2021-05-25T11:26:04.5332872+08:00;True|2021-05-25T09:39:11.8882456+08:00;True|2021-05-23T23:05:37.3855541+08:00;True|2021-05-22T05:45:13.7439233+08:00;True|2021-05-22T05:42:35.4852011+08:00;True|2021-05-22T05:25:16.8821260+08:00;True|2021-05-21T15:58:20.5625475+08:00;True|2021-05-21T15:55:21.1943961+08:00;True|2021-05-21T15:53:35.6852027+08:00;True|2021-05-21T15:46:56.7370418+08:00;True|2021-05-21T15:32:49.2494690+08:00;True|2021-05-21T15:19:19.8145510+08:00;True|2021-05-21T10:16:44.9563480+08:00;True|2021-05-20T19:21:19.8572280+08:00;True|2021-05-20T19:15:57.2506092+08:00;True|2021-05-20T15:58:09.0123323+08:00;True|2021-05-20T15:54:54.6251445+08:00;True|2021-05-20T15:32:04.9783034+08:00;True|2021-05-20T15:31:58.9418248+08:00;True|2021-05-20T15:31:53.2904235+08:00;True|2021-05-20T15:31:48.5385850+08:00;True|2021-05-20T13:31:35.5777988+08:00;True|2021-05-20T10:46:01.6559203+08:00;True|2021-05-20T10:40:53.2131788+08:00;True|2021-05-20T08:58:49.3511837+08:00;True|2021-05-19T16:15:22.7730518+08:00;True|2021-05-19T16:13:03.2756422+08:00;True|2021-05-19T16:11:16.3163692+08:00;True|2021-05-19T15:31:19.7575868+08:00;True|2021-05-19T14:49:47.6104541+08:00;True|2021-05-19T10:46:17.6515193+08:00;True|2021-05-19T10:45:23.6466498+08:00;True|2021-05-18T17:19:36.9591198+08:00;True|2021-05-18T17:16:38.1513255+08:00;True|2021-05-18T10:31:35.2246444+08:00;True|2021-05-17T16:36:00.1226059+08:00;True|2021-05-17T16:31:05.1414358+08:00;True|2021-05-17T16:22:57.4215158+08:00;True|2021-05-17T16:22:52.6941933+08:00;True|2021-05-17T16:22:49.0033372+08:00;True|2021-05-17T16:18:03.8629751+08:00;True|2021-05-17T15:50:27.6196340+08:00;True|2021-05-17T13:22:15.7308548+08:00;True|2021-05-12T09:19:36.0666124+08:00;True|2021-05-12T09:17:40.0887602+08:00;True|2021-05-12T09:06:24.5508601+08:00;True|2021-05-12T08:39:56.6657894+08:00;True|2021-05-11T17:42:28.6508833+08:00;True|2021-05-11T15:22:03.4937062+08:00;True|2021-05-10T16:45:56.1282466+08:00;True|2021-05-08T19:04:07.1084339+08:00;True|2021-05-08T18:04:40.2166839+08:00;True|2021-05-08T18:04:32.5635574+08:00;True|2021-05-08T18:01:24.5206432+08:00;True|2021-05-08T17:38:05.5582200+08:00;True|2021-05-08T15:26:55.2861241+08:00;True|2021-05-08T14:52:13.1682476+08:00;True|2021-05-08T14:50:30.5356438+08:00;True|2021-05-08T14:38:40.3445313+08:00;True|2021-05-08T14:38:37.9504757+08:00;True|2021-05-08T14:30:31.9762236+08:00;True|2021-05-08T14:21:37.4496495+08:00;True|2021-05-07T20:47:46.1401919+08:00;True|2021-05-07T20:31:45.7777162+08:00;True|2021-05-07T20:31:35.2882424+08:00;True|2021-05-07T20:31:21.5616729+08:00;False|2021-05-07T20:29:33.8855457+08:00;False|2021-05-07T20:28:43.1845420+08:00;False|2021-05-07T20:28:13.1335411+08:00;True|2021-05-07T20:10:01.7346568+08:00;True|2021-05-07T20:03:17.0005596+08:00;True|2021-05-07T09:05:04.3102029+08:00;True|2021-05-06T18:11:36.9078607+08:00;True|2021-05-06T18:08:40.5403791+08:00;True|2021-05-06T18:07:04.1929681+08:00;True|2021-05-06T18:06:54.5987264+08:00;True|2021-05-06T18:05:46.1791578+08:00;True|2021-05-06T17:18:58.8131464+08:00;True|2021-05-06T17:18:37.9969968+08:00;True|2021-05-06T14:47:33.5704679+08:00;True|2021-05-06T10:03:28.7226576+08:00;True|2021-04-28T10:18:54.1336497+08:00;True|2021-04-27T16:34:19.0789205+08:00;True|2021-04-27T14:48:28.8138232+08:00;True|2021-04-27T10:34:03.6370089+08:00;True|2021-04-26T16:18:32.0260755+08:00;True|2021-04-26T15:00:58.6773071+08:00;True|2021-04-26T13:23:50.3968646+08:00;True|2021-04-16T08:50:41.5499248+08:00;True|2021-04-16T08:32:59.1701708+08:00;True|2021-04-16T08:27:36.9176335+08:00;True|2021-04-15T15:56:26.8485667+08:00;True|2021-04-15T15:21:23.2875671+08:00;True|2021-04-15T14:41:16.9980034+08:00;True|2021-04-15T14:36:34.8570017+08:00;True|2021-04-13T16:15:00.7668503+08:00;</History>
</PropertyGroup>
<ItemGroup>
<File Include="apiapp.json">
<publishTime>04/12/2021 11:33:15</publishTime>
- <publishTime>05/25/2021 14:18:16</publishTime>
+ <publishTime>04/13/2021 10:11:33</publishTime>
</File>
<File Include="bin/Antlr3.Runtime.dll">
- <publishTime>02/22/2013 08:43:40</publishTime>
+ <publishTime>04/13/2021 13:28:28</publishTime>
</File>
<File Include="bin/Antlr3.Runtime.pdb">
- <publishTime>02/22/2013 08:43:40</publishTime>
+ <publishTime>04/13/2021 13:28:28</publishTime>
</File>
<File Include="bin/App_global.asax.compiled">
<publishTime>05/07/2021 20:31:20</publishTime>
@@ -27,25 +27,25 @@
<publishTime>05/07/2021 20:31:20</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>05/25/2021 14:18:15</publishTime>
+ <publishTime>04/13/2021 10:11:33</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>05/25/2021 14:18:15</publishTime>
+ <publishTime>04/13/2021 10:11:33</publishTime>
</File>
<File Include="bin/Dapper.dll">
- <publishTime>07/22/2016 14:52:40</publishTime>
+ <publishTime>04/13/2021 13:30:11</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>05/25/2021 14:18:15</publishTime>
+ <publishTime>04/13/2021 10:11:33</publishTime>
</File>
<File Include="bin/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>05/25/2021 14:18:15</publishTime>
+ <publishTime>04/13/2021 10:11:33</publishTime>
</File>
<File Include="bin/Kingdee.BOS.WebApi.FormService.dll">
- <publishTime>09/20/2018 19:23:20</publishTime>
+ <publishTime>04/26/2020 09:57:16</publishTime>
</File>
<File Include="bin/Kingdee.BOS.WebApi.ServicesStub.dll">
- <publishTime>09/20/2018 19:28:34</publishTime>
+ <publishTime>04/26/2020 09:57:16</publishTime>
</File>
<File Include="bin/Microsoft.Azure.AppService.ApiApps.Service.dll">
<publishTime>03/18/2015 17:02:50</publishTime>
@@ -57,7 +57,7 @@
<publishTime>07/25/2012 11:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
- <publishTime>05/31/2021 08:55:04</publishTime>
+ <publishTime>06/03/2021 10:37:21</publishTime>
</File>
<File Include="bin/Newtonsoft.Json.dll">
<publishTime>08/03/2014 20:33:56</publishTime>
@@ -66,13 +66,13 @@
<publishTime>01/04/2011 13:48:18</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>05/25/2021 14:18:15</publishTime>
+ <publishTime>04/13/2021 10:11:33</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>05/25/2021 14:18:15</publishTime>
+ <publishTime>04/13/2021 10:11:33</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>05/25/2021 14:18:15</publishTime>
+ <publishTime>04/13/2021 10:11:33</publishTime>
</File>
<File Include="bin/Swashbuckle.Core.dll">
<publishTime>02/15/2015 17:57:08</publishTime>
@@ -114,7 +114,7 @@
<publishTime>09/26/2012 03:16:08</publishTime>
</File>
<File Include="bin/System.Web.Cors.dll">
- <publishTime>11/28/2018 12:58:44</publishTime>
+ <publishTime>04/13/2021 13:30:39</publishTime>
</File>
<File Include="bin/System.Web.dll">
<publishTime>09/26/2012 03:16:08</publishTime>
@@ -138,16 +138,16 @@
<publishTime>11/28/2018 13:01:00</publishTime>
</File>
<File Include="bin/System.Web.Http.WebHost.dll">
- <publishTime>05/25/2021 14:18:15</publishTime>
+ <publishTime>04/13/2021 10:11:33</publishTime>
</File>
<File Include="bin/System.Web.Mvc.dll">
- <publishTime>01/28/2015 04:02:18</publishTime>
+ <publishTime>04/13/2021 13:31:08</publishTime>
</File>
<File Include="bin/System.Web.Optimization.dll">
- <publishTime>02/11/2014 15:26:04</publishTime>
+ <publishTime>04/13/2021 13:31:24</publishTime>
</File>
<File Include="bin/System.Web.Razor.dll">
- <publishTime>01/28/2015 04:02:32</publishTime>
+ <publishTime>04/13/2021 13:31:12</publishTime>
</File>
<File Include="bin/System.Web.Services.dll">
<publishTime>09/26/2012 03:16:08</publishTime>
@@ -171,10 +171,10 @@
<publishTime>11/24/2014 11:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>06/02/2021 01:11:21</publishTime>
+ <publishTime>06/02/2021 20:00:43</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>06/02/2021 01:11:21</publishTime>
+ <publishTime>06/02/2021 20:00:43</publishTime>
</File>
<File Include="bin/WebAPI.XmlSerializers.dll">
<publishTime>02/04/2021 21:35:21</publishTime>
@@ -192,166 +192,166 @@
<publishTime>03/26/2019 14:23:20</publishTime>
</File>
<File Include="Content/bootstrap.css">
- <publishTime>05/25/2021 14:18:15</publishTime>
+ <publishTime>04/13/2021 10:11:33</publishTime>
</File>
<File Include="Content/bootstrap.min.css">
- <publishTime>05/25/2021 14:18:15</publishTime>
+ <publishTime>04/13/2021 10:11:33</publishTime>
</File>
<File Include="Content/Site.css">
- <publishTime>05/25/2021 14:18:15</publishTime>
+ <publishTime>04/13/2021 10:11:33</publishTime>
</File>
<File Include="DLL/BLL.dll">
- <publishTime>05/25/2021 14:18:15</publishTime>
+ <publishTime>04/13/2021 10:11:33</publishTime>
</File>
<File Include="DLL/DAL.dll">
- <publishTime>05/25/2021 14:18:15</publishTime>
+ <publishTime>04/13/2021 10:11:33</publishTime>
</File>
<File Include="DLL/DBUtility.dll">
- <publishTime>05/25/2021 14:18:15</publishTime>
+ <publishTime>04/13/2021 10:11:33</publishTime>
</File>
<File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>05/25/2021 14:18:15</publishTime>
+ <publishTime>04/13/2021 10:11:33</publishTime>
</File>
<File Include="DLL/Model.dll">
- <publishTime>05/31/2021 08:55:04</publishTime>
+ <publishTime>06/03/2021 10:37:21</publishTime>
</File>
<File Include="DLL/Newtonsoft.Json.Net35.dll">
- <publishTime>05/25/2021 14:18:15</publishTime>
+ <publishTime>04/13/2021 10:11:33</publishTime>
</File>
<File Include="DLL/Pub_Class.dll">
- <publishTime>05/25/2021 14:18:15</publishTime>
+ <publishTime>04/13/2021 10:11:33</publishTime>
</File>
<File Include="DLL/Pub_Control.dll">
- <publishTime>05/25/2021 14:18:15</publishTime>
+ <publishTime>04/13/2021 10:11:33</publishTime>
</File>
<File Include="DLL/SQLHelper.dll">
- <publishTime>05/25/2021 14:18:15</publishTime>
+ <publishTime>04/13/2021 10:11:33</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.eot">
- <publishTime>05/25/2021 14:18:16</publishTime>
+ <publishTime>04/13/2021 10:11:33</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.svg">
- <publishTime>05/25/2021 14:18:16</publishTime>
+ <publishTime>04/13/2021 10:11:33</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.ttf">
- <publishTime>05/25/2021 14:18:16</publishTime>
+ <publishTime>04/13/2021 10:11:33</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.woff">
- <publishTime>05/25/2021 14:18:16</publishTime>
+ <publishTime>04/13/2021 10:11:33</publishTime>
</File>
<File Include="Global.asax">
- <publishTime>05/25/2021 14:18:15</publishTime>
+ <publishTime>04/13/2021 10:11:33</publishTime>
</File>
<File Include="Index.html">
- <publishTime>05/25/2021 14:18:15</publishTime>
+ <publishTime>04/13/2021 10:11:33</publishTime>
</File>
<File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
- <publishTime>05/25/2021 14:18:15</publishTime>
+ <publishTime>04/13/2021 10:11:33</publishTime>
</File>
<File Include="packages.config">
- <publishTime>05/25/2021 14:18:16</publishTime>
+ <publishTime>04/13/2021 13:27:57</publishTime>
</File>
<File Include="PrecompiledApp.config">
<publishTime>05/07/2021 20:31:19</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.js">
- <publishTime>05/25/2021 14:18:16</publishTime>
+ <publishTime>04/13/2021 10:11:34</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.min.js">
- <publishTime>05/25/2021 14:18:16</publishTime>
+ <publishTime>04/13/2021 10:11:34</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.js">
- <publishTime>05/25/2021 14:18:16</publishTime>
+ <publishTime>04/13/2021 10:11:34</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.js">
- <publishTime>05/25/2021 14:18:16</publishTime>
+ <publishTime>04/13/2021 10:11:34</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.map">
- <publishTime>05/25/2021 14:18:16</publishTime>
+ <publishTime>04/13/2021 10:11:34</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.js">
- <publishTime>05/25/2021 14:18:16</publishTime>
+ <publishTime>04/13/2021 10:11:34</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.min.js">
- <publishTime>05/25/2021 14:18:16</publishTime>
+ <publishTime>04/13/2021 10:11:34</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.js">
- <publishTime>05/25/2021 14:18:16</publishTime>
+ <publishTime>04/13/2021 10:11:34</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
- <publishTime>05/25/2021 14:18:16</publishTime>
+ <publishTime>04/13/2021 10:11:34</publishTime>
</File>
<File Include="Views/Scripts/modernizr-2.6.2.js">
- <publishTime>05/25/2021 14:18:16</publishTime>
+ <publishTime>04/13/2021 10:11:34</publishTime>
</File>
<File Include="Views/Shared/Error.cshtml">
- <publishTime>05/25/2021 14:18:16</publishTime>
+ <publishTime>04/13/2021 10:11:34</publishTime>
</File>
<File Include="Views/Shared/_Layout.cshtml">
- <publishTime>05/25/2021 14:18:16</publishTime>
+ <publishTime>04/13/2021 10:11:34</publishTime>
</File>
<File Include="Views/web.config">
- <publishTime>05/25/2021 14:18:16</publishTime>
+ <publishTime>04/13/2021 10:11:34</publishTime>
</File>
<File Include="Views/_ViewStart.cshtml">
- <publishTime>05/25/2021 14:18:16</publishTime>
+ <publishTime>04/13/2021 10:11:34</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
- <publishTime>05/25/2021 14:18:16</publishTime>
+ <publishTime>04/13/2021 10:11:34</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
- <publishTime>05/25/2021 14:18:16</publishTime>
+ <publishTime>04/13/2021 10:11:34</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
- <publishTime>05/25/2021 14:18:16</publishTime>
+ <publishTime>04/13/2021 10:11:34</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
- <publishTime>05/25/2021 14:18:16</publishTime>
+ <publishTime>04/13/2021 10:11:34</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
- <publishTime>05/25/2021 14:18:16</publishTime>
+ <publishTime>04/13/2021 10:11:34</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
- <publishTime>05/25/2021 14:18:16</publishTime>
+ <publishTime>04/13/2021 10:11:34</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
- <publishTime>05/25/2021 14:18:16</publishTime>
+ <publishTime>04/13/2021 10:11:34</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
- <publishTime>05/25/2021 14:18:16</publishTime>
+ <publishTime>04/13/2021 10:11:34</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
- <publishTime>05/25/2021 14:18:16</publishTime>
+ <publishTime>04/13/2021 10:11:34</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Department_Model.datasource">
- <publishTime>05/25/2021 14:18:16</publishTime>
+ <publishTime>04/13/2021 10:11:34</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
- <publishTime>05/25/2021 14:18:16</publishTime>
+ <publishTime>04/13/2021 10:11:34</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Group_Model.datasource">
- <publishTime>05/25/2021 14:18:16</publishTime>
+ <publishTime>04/13/2021 10:11:34</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
- <publishTime>05/25/2021 14:18:16</publishTime>
+ <publishTime>04/13/2021 10:11:34</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Source_Model.datasource">
- <publishTime>05/25/2021 14:18:16</publishTime>
+ <publishTime>04/13/2021 10:11:34</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
- <publishTime>05/25/2021 14:18:16</publishTime>
+ <publishTime>04/13/2021 10:11:34</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
- <publishTime>05/25/2021 14:18:16</publishTime>
+ <publishTime>04/13/2021 10:11:34</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
- <publishTime>05/25/2021 14:18:16</publishTime>
+ <publishTime>04/13/2021 10:11:34</publishTime>
</File>
<File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
- <publishTime>05/25/2021 14:18:16</publishTime>
+ <publishTime>04/13/2021 10:11:34</publishTime>
</File>
<File Include="Web.config">
- <publishTime>06/02/2021 01:11:28</publishTime>
+ <publishTime>06/02/2021 20:00:48</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 79bb312..649d2b8 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -349,7 +349,9 @@
<Compile Include="Controllers\CJGL\Cj_StationEntrustOutBillController.cs" />
<Compile Include="Controllers\JHGL\Gy_RoutingBillController.cs" />
<Compile Include="Controllers\QC_ManagementController.cs" />
- <Compile Include="Controllers\SBGL\Sb_EquipDotCheckPlanBillController.cs" />
+ <Compile Include="Controllers\Sb_CheckEqpRepairWorkBillController.cs" />
+ <Compile Include="Controllers\SCGL\Sc_MESStopWorkBillController.cs" />
+ <Compile Include="Controllers\SCGL\Sc_MESBeginWorkBillController.cs" />
<Compile Include="Controllers\SCGL\QC_LastPieceCheckBillController.cs" />
<Compile Include="Controllers\SCGL\QC_OutCompCheckBillController.cs" />
<Compile Include="Controllers\SCGL\QC_ProcessCheckBillController.cs" />
@@ -370,6 +372,9 @@
<Compile Include="DLL\ClsGy_BadReason_Ctl.cs" />
<Compile Include="DLL\ClsQC_NoPassProdCheckBill.cs" />
<Compile Include="DLL\ClsQC_PatrolProcCheckBill.cs" />
+ <Compile Include="DLL\ClsSb_EquipConkBookBill.cs" />
+ <Compile Include="DLL\ClsSb_EquipRepairCheckBill.cs" />
+ <Compile Include="DLL\ClsSb_EquipRepairWorkBill.cs" />
<Compile Include="DLL\ClsSc_ProcessReport.cs" />
<Compile Include="DLL\ClsSc_ProcessSendWork.cs" />
<Compile Include="DLL\ClsWW_EntrustProcessReportBill.cs" />
@@ -377,6 +382,8 @@
<Compile Include="DLL\ClsWW_EntrustWorkOrderBill.cs" />
<Compile Include="Models\ApiConfig.cs" />
<Compile Include="Models\ApiResult.cs" />
+ <Compile Include="Models\ClsSb_EquipRepairWorkBillMain.cs" />
+ <Compile Include="Models\ClsSb_EquipRepairWorkBillSub.cs" />
<Compile Include="Models\ClsSc_ProcessSendWorkMain.cs" />
<Compile Include="Models\ClsWW_EntrustProcessReportBillMain.cs" />
<Compile Include="Models\ClsWW_EntrustProcessReportBillSub.cs" />
--
Gitblit v1.9.1