From 675d712b82ff244b5b05934cc54d7d389dc032c7 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期五, 16 八月 2024 17:19:44 +0800
Subject: [PATCH] 增加PDA设备签到单保存方法
---
WebAPI/Models/ClsSb_EquipRepairSignBillMain.cs | 17 ++
WebAPI/ListModels.cs | 12 +
WebAPI/Properties/PublishProfiles/FolderProfile19.pubxml.user | 75 ++++++--
WebAPI/Models/ClsSb_EquipRepairSignBillSub.cs | 11 +
WebAPI/WebAPI.csproj.user | 2
WebAPI/Controllers/WebAPIController.cs | 3
WebAPI/WebAPI.csproj | 3
WebAPI/Controllers/Sb_CheckEqpRepairWorkBillController.cs | 89 +++++++++++
WebAPI/DLL/ClsSb_EquipRepairSignBill.cs | 252 +++++++++++++++++++++++++++++++
9 files changed, 442 insertions(+), 22 deletions(-)
diff --git a/WebAPI/Controllers/Sb_CheckEqpRepairWorkBillController.cs b/WebAPI/Controllers/Sb_CheckEqpRepairWorkBillController.cs
index 5e2bf01..9a4780c 100644
--- a/WebAPI/Controllers/Sb_CheckEqpRepairWorkBillController.cs
+++ b/WebAPI/Controllers/Sb_CheckEqpRepairWorkBillController.cs
@@ -2956,8 +2956,97 @@
}
}
#endregion
+
+ #region 璁惧绛惧埌鍗曟彁浜DA
+ [Route("Sb_CheckEqpRepairWorkBill/SaveSb_EquipRepairSignBill_PDA")]
+ [HttpPost]
+ public object SaveSb_EquipRepairSignBill_PDA([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_EquipRepairSignBill oBill = new DLL.ClsSb_EquipRepairSignBill();
+ List<Models.ClsSb_EquipRepairSignBillMain> lsmain = new List<Models.ClsSb_EquipRepairSignBillMain>();
+ msg2 = msg2.Replace("\\", "");
+ msg2 = msg2.Replace("\n", "");
+ lsmain = oListModels.getObjectByJson_Sb_EquipRepairSignBill_PDA(msg2);
+ foreach (Models.ClsSb_EquipRepairSignBillMain oItem in lsmain)
+ {
+ //鍗曟嵁鍙锋槸鍚﹂噸澶�
+ if (BillNew.IsExistBillNo(ref ClsPub.sExeReturnInfo, oItem.HBillNo, BillStatus, BillOld.omodel.HInterID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鍙烽噸澶嶏紒涓嶅厑璁镐繚瀛橈紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+
+ UserName = oItem.HMaker; //鍒跺崟浜�
+ oItem.HBillType = "3920";
+ oItem.HBillSubType = "3920";
+ oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
+ oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
+
+ if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佹病鏈夊崟鎹棩鏈燂紝鏃犳硶淇濆瓨锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ oBill.omodel = oItem;
+ }
+ //淇濆瓨
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ bool bResult;
+ if (oBill.omodel.HInterID == 0)
+ {
+ 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 璁惧鏁呴殰 鐧昏/璁板綍/楠屾敹 鍙戦�佹秷鎭�
/// <summary>
/// 寮傚父鍙嶉 鎺ユ敹,澶勭悊,楠屾敹鍗曚繚瀛樺彂閫佹秷鎭�
diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index 618f380..20913e0 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -13093,6 +13093,9 @@
case "YS":
HView = "h_v_Sb_EquipRepairCheckBillList";
break;
+ case "QD":
+ HView = "h_v_Sb_EquipRepairSignBillList";
+ break;
default:
objjson.code = "0";
objjson.count = 0;
diff --git a/WebAPI/DLL/ClsSb_EquipRepairSignBill.cs b/WebAPI/DLL/ClsSb_EquipRepairSignBill.cs
new file mode 100644
index 0000000..4f6a3c2
--- /dev/null
+++ b/WebAPI/DLL/ClsSb_EquipRepairSignBill.cs
@@ -0,0 +1,252 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+using System.Data;
+
+namespace WebAPI.DLL
+{
+ public class ClsSb_EquipRepairSignBill : DBUtility.ClsXt_BaseBill
+ {
+ public Models.ClsSb_EquipRepairSignBillMain omodel = new Models.ClsSb_EquipRepairSignBillMain();
+ public List<Models.ClsSb_EquipRepairSignBillSub> DetailColl = new List<Models.ClsSb_EquipRepairSignBillSub>();
+
+ public ClsSb_EquipRepairSignBill()
+ {
+ base.MvarItemKeySub = "Sb_EquipRepairSignBillSub";
+ base.MvarItemKeySub2 = "";
+ base.MvarItemKeySub3 = "";
+ base.MvarItemKeySub4 = "";
+ base.MvarItemKey = "Sb_EquipRepairSignBillMain";
+ base.MvarReportTitle = "璁惧缁翠慨绛惧埌鍗�";
+ base.BillType = "3920";
+ base.HBillSubType = "3920";
+
+ }
+
+ #region 鍥哄畾浠ｇ爜
+
+ ~ClsSb_EquipRepairSignBill()
+ {
+ DetailColl = null;
+ }
+
+ #endregion 鑷畾涔夋柟娉�
+ //淇敼鍗曟嵁
+ public override bool ModifyBill(Int64 lngBillKey, ref string sReturn)
+ {
+ try
+ {
+
+ //淇濆瓨鍓嶆帶鍒�=========================================
+ string HBillNote = "";
+ DataSet ds = oCn.RunProcReturn("Exec h_p_Sb_EquipRepairSignBill_BeforeSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "','" + HBillNote + "',1 ", "h_p_Sb_EquipRepairSignBill_BeforeSaveCtrl");
+ if (ds == null)
+ {
+ sReturn = "淇濆瓨鍓嶅垽鏂け璐ワ紒";
+ return false;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ sReturn = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
+ return false;
+ }
+ //=========================================================
+
+ oCn.BeginTran();
+ //鏇存柊涓昏〃
+ oCn.RunProc("UpDate Sb_EquipRepairSignBillMain set " +
+ " HBillNo='" + omodel.HBillNo + "'" + //鍥哄畾璧嬪��===============
+ //",HDate='" + omodel.HDate + "'" +
+ ",HYear='" + omodel.HYear.ToString() + "'" +
+ ",HPeriod='" + omodel.HPeriod.ToString() + "'" +
+ ",HRemark='" + omodel.HRemark + "'" +
+ ",HUpDater='" + DBUtility.ClsPub.CurUserName + "'" +
+ ",HMainSourceBillNo='" + omodel.HMainSourceBillNo + "'" +
+ ",HMainSourceBillType=" + omodel.HMainSourceBillType +
+ ",HMainSourceEntryID='" + omodel.HMainSourceEntryID.ToString() + "'" +
+ ",HMainSourceInterID=" + omodel.HMainSourceInterID.ToString() +
+ ",HUpDateDate=getdate()" +
+ //========================================
+ ",HDeptID='" + omodel.HDeptID + "'" +
+ ",HEquipID=" + omodel.HEquipID.ToString() +
+ ",HSignEmpID='" + omodel.HSignEmpID + "'" +
+ ",HSignNote='" + omodel.HSignNote + "'" +
+ ",HSignDate='" + omodel.HSignDate + "'" +
+ ",HEquipConkBookBillNo='" + omodel.HEquipConkBookBillNo + "'" +
+ ",HEquipConkBookInterID=" + omodel.HEquipConkBookInterID +
+ " where HInterID=" + lngBillKey.ToString());
+ //鍒犻櫎鍏宠仈
+ DeleteRelation(ref sReturn, lngBillKey);
+ //鍒犻櫎瀛愯〃
+ DeleteBillSub(lngBillKey);
+
+ //=========================淇濆瓨鍚庢帶鍒�
+ DataSet ds2 = oCn.RunProcReturn("Exec h_p_Sb_EquipRepairSignBill_AfterSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',1 ", "h_p_Sb_EquipRepairSignBill_AfterSaveCtrl");
+ if (ds2 == null)
+ {
+ sReturn = "淇濆瓨鍚庢帶鍒跺垽鏂け璐ワ紒";
+ oCn.RollBack();
+ return false;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ sReturn = "淇濆瓨澶辫触2锛�" + DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBackRemark"]);
+ oCn.RollBack();
+ 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);
+
+ //淇濆瓨鍓嶆帶鍒�=========================================
+ string HBillNote = "";
+ DataSet ds = oCn.RunProcReturn("Exec h_p_Sb_EquipRepairSignBill_BeforeSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "','" + HBillNote + "',1 ", "h_p_Sb_EquipRepairSignBill_BeforeSaveCtrl");
+ if (ds == null)
+ {
+ sReturn = "淇濆瓨鍓嶅垽鏂け璐ワ紒";
+ return false;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ sReturn = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
+ return false;
+ }
+ //=========================================================
+
+
+ //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
+ oCn.BeginTran();
+ //涓昏〃
+ oCn.RunProc("Insert Into Sb_EquipRepairSignBillMain " +
+ "(HBillType,HBillSubType,HInterID,HBillNo,HBillStatus,HDate,HMaker,HMakeDate" +
+ ",HYear,HPeriod,HRemark,HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo,HMainSourceBillType" +
+ ",HDeptID,HEquipID,HSignEmpID,HSignNote,HSignDate,HEquipConkBookBillNo,HEquipConkBookInterID" +
+ ") " +
+ " values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "'," + omodel.HBillStatus.ToString() + ",getdate(),'" + DBUtility.ClsPub.CurUserName + "',getdate()" +
+ "," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "'" +
+ ",'" + omodel.HMainSourceInterID.ToString() + "','" + omodel.HMainSourceEntryID.ToString() + "','" + omodel.HMainSourceBillNo.ToString() + "','" + omodel.HMainSourceBillType.ToString() + "','" + omodel.HDeptID.ToString() + "','" + omodel.HEquipID.ToString() + "','" + omodel.HSignEmpID.ToString() +
+ "','" + omodel.HSignNote + "',getdate(),'" + omodel.HEquipConkBookBillNo.ToString() + "','" + omodel.HEquipConkBookInterID.ToString() + "') ");
+
+ //=========================淇濆瓨鍚庢帶鍒�
+ DataSet ds2 = oCn.RunProcReturn("Exec h_p_Sb_EquipRepairSignBill_AfterSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',1 ", "h_p_Sb_EquipRepairSignBill_AfterSaveCtrl");
+ if (ds2 == null)
+ {
+ sReturn = "淇濆瓨鍚庢帶鍒跺垽鏂け璐ワ紒";
+ oCn.RollBack();
+ return false;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ sReturn = "淇濆瓨澶辫触2锛�" + DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBackRemark"]);
+ oCn.RollBack();
+ 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_EquipRepairSignBillMain Where HInterID=" + lngBillKey.ToString(), "Sb_EquipRepairSignBillMain");
+ if (Ds.Tables[0].Rows.Count == 0)
+ {
+ sReturn = "鍗曟嵁鏈壘鍒帮紒";
+ return false;
+ }
+ //鍥哄畾璧嬪��===========================================
+ omodel.HInterID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HInterID"]);
+ omodel.HBillNo = Ds.Tables[0].Rows[0]["HBillNo"].ToString().Trim();
+ omodel.HDate = DBUtility.ClsPub.isDate(Ds.Tables[0].Rows[0]["HDate"]);
+ omodel.HYear = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HYear"]);
+ omodel.HPeriod = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HPeriod"]);
+ 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.HBillStatus = DBUtility.ClsPub.isInt(Ds.Tables[0].Rows[0]["HBillStatus"]);
+ omodel.HBillType = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBillType"]);
+ omodel.HBillSubType = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBillSubType"]);
+ 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.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.HCloseDate = Ds.Tables[0].Rows[0]["HCloseDate"].ToString().Trim();
+ omodel.HCloseMan = Ds.Tables[0].Rows[0]["HCloseMan"].ToString().Trim();
+ omodel.HDeleteDate = Ds.Tables[0].Rows[0]["HDeleteDate"].ToString().Trim();
+ omodel.HDeleteMan = Ds.Tables[0].Rows[0]["HDeleteMan"].ToString().Trim();
+ //========================================================
+
+
+ //寰幆
+ DataSet DsSub;
+ DsSub = oCn.RunProcReturn("Select * from Sb_EquipRepairSignBillSub Where HInterID=" + lngBillKey.ToString() + " order by HEntryID ", "Sb_EquipRepairSignBillSub");
+ DetailColl.Clear();//娓呯┖
+ for (int i = 0; i < DsSub.Tables[0].Rows.Count; i++)
+ {
+ Models.ClsSb_EquipRepairSignBillSub oSub = new Models.ClsSb_EquipRepairSignBillSub();
+ // 鍥哄畾璧嬪��===============================================
+ 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();
+ //===================================================
+ 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 9650001..5bf82ee 100644
--- a/WebAPI/ListModels.cs
+++ b/WebAPI/ListModels.cs
@@ -1398,6 +1398,18 @@
return list;
}
+ /// <summary>
+ /// 澶勭悊璁惧缁翠慨绛惧埌鍗曚富琛ㄧ殑json
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Models.ClsSb_EquipRepairSignBillMain> getObjectByJson_Sb_EquipRepairSignBill_PDA(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Models.ClsSb_EquipRepairSignBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsSb_EquipRepairSignBillMain>>(jsonString);
+ return list;
+ }
+
/// <summary>
/// 澶勭悊鏂板憳宸ユ妧鑳芥竻鍗曚富琛ㄧ殑json
diff --git a/WebAPI/Models/ClsSb_EquipRepairSignBillMain.cs b/WebAPI/Models/ClsSb_EquipRepairSignBillMain.cs
new file mode 100644
index 0000000..5dd2722
--- /dev/null
+++ b/WebAPI/Models/ClsSb_EquipRepairSignBillMain.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace WebAPI.Models
+{
+ public class ClsSb_EquipRepairSignBillMain : DBUtility.ClsXt_BaseBillMain
+ {
+ public Int64 HDeptID; // int --部门(Gy_Department)
+ public Int64 HEquipID; //int --相关设备（Gy_EquipFileBillMain）
+ public Int64 HSignEmpID; // int --签到人（Gy_Employee）
+ public string HSignNote; // varchar(200) --签到确认
+ public DateTime HSignDate; //datetime --签到时间（年月日时分秒）
+ public string HEquipConkBookBillNo; //varchar(50) --设备故障登记单号
+ public int HEquipConkBookInterID; // int --设备故障登记单主内码
+ }
+}
diff --git a/WebAPI/Models/ClsSb_EquipRepairSignBillSub.cs b/WebAPI/Models/ClsSb_EquipRepairSignBillSub.cs
new file mode 100644
index 0000000..f5d4efc
--- /dev/null
+++ b/WebAPI/Models/ClsSb_EquipRepairSignBillSub.cs
@@ -0,0 +1,11 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace WebAPI.Models
+{
+ public class ClsSb_EquipRepairSignBillSub : DBUtility.ClsXt_BaseBillSub
+ {
+
+ }
+}
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile19.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile19.pubxml.user
index 799d670..5486cd4 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile19.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile19.pubxml.user
@@ -5,14 +5,38 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_PublishTargetUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</_PublishTargetUrl>
- <History>True|2024-08-15T07:59:59.2769975Z;True|2024-08-15T15:59:33.1518421+08:00;True|2024-08-15T13:42:21.6165189+08:00;True|2024-08-15T13:36:09.3131583+08:00;True|2024-08-15T13:19:16.2478692+08:00;True|2024-08-15T11:05:05.5377207+08:00;True|2024-08-15T10:51:59.8586373+08:00;True|2024-08-15T09:34:19.6954590+08:00;True|2024-08-15T09:27:30.4910263+08:00;True|2024-08-14T17:10:23.3978810+08:00;True|2024-08-14T17:03:22.1530532+08:00;True|2024-08-14T15:01:12.5015047+08:00;True|2024-08-14T10:54:40.0433008+08:00;True|2024-08-14T10:54:29.3944984+08:00;True|2024-08-14T09:39:23.8085209+08:00;True|2024-08-14T09:23:48.5190887+08:00;True|2024-08-13T14:04:05.8532501+08:00;True|2024-08-13T11:23:40.5242910+08:00;</History>
+ <History>True|2024-08-16T02:41:16.1464132Z;True|2024-08-16T09:10:31.5340428+08:00;True|2024-08-15T15:59:59.2769975+08:00;True|2024-08-15T15:59:33.1518421+08:00;True|2024-08-15T13:42:21.6165189+08:00;True|2024-08-15T13:36:09.3131583+08:00;True|2024-08-15T13:19:16.2478692+08:00;True|2024-08-15T11:05:05.5377207+08:00;True|2024-08-15T10:51:59.8586373+08:00;True|2024-08-15T09:34:19.6954590+08:00;True|2024-08-15T09:27:30.4910263+08:00;True|2024-08-14T17:10:23.3978810+08:00;True|2024-08-14T17:03:22.1530532+08:00;True|2024-08-14T15:01:12.5015047+08:00;True|2024-08-14T10:54:40.0433008+08:00;True|2024-08-14T10:54:29.3944984+08:00;True|2024-08-14T09:39:23.8085209+08:00;True|2024-08-14T09:23:48.5190887+08:00;True|2024-08-13T14:04:05.8532501+08:00;True|2024-08-13T11:23:40.5242910+08:00;</History>
</PropertyGroup>
<ItemGroup>
<File Include="apiapp.json">
<publishTime>05/25/2024 09:46:41</publishTime>
</File>
+ <File Include="bin/AlibabaCloud.EndpointUtil.dll">
+ <publishTime>04/07/2020 16:33:48</publishTime>
+ </File>
+ <File Include="bin/AlibabaCloud.GatewayDingTalk.dll">
+ <publishTime>04/25/2023 17:49:04</publishTime>
+ </File>
+ <File Include="bin/AlibabaCloud.GatewaySpi.dll">
+ <publishTime>07/31/2024 20:50:30</publishTime>
+ </File>
+ <File Include="bin/AlibabaCloud.OpenApiClient.dll">
+ <publishTime>08/06/2024 18:07:52</publishTime>
+ </File>
+ <File Include="bin/AlibabaCloud.OpenApiUtil.dll">
+ <publishTime>11/22/2022 11:24:18</publishTime>
+ </File>
+ <File Include="bin/AlibabaCloud.SDK.Dingtalk.dll">
+ <publishTime>08/08/2024 19:43:22</publishTime>
+ </File>
+ <File Include="bin/AlibabaCloud.TeaUtil.dll">
+ <publishTime>07/15/2024 20:25:56</publishTime>
+ </File>
+ <File Include="bin/AlibabaCloud.TeaXML.dll">
+ <publishTime>08/03/2022 21:46:08</publishTime>
+ </File>
<File Include="bin/Aliyun.Credentials.dll">
- <publishTime>12/05/2022 15:40:12</publishTime>
+ <publishTime>07/24/2024 10:36:58</publishTime>
</File>
<File Include="bin/Antlr3.Runtime.dll">
<publishTime>02/22/2013 16:43:40</publishTime>
@@ -21,28 +45,28 @@
<publishTime>02/22/2013 16:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>08/15/2024 15:59:08</publishTime>
+ <publishTime>08/16/2024 10:40:59</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>08/15/2024 15:59:08</publishTime>
+ <publishTime>08/16/2024 10:40:59</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>08/15/2024 15:59:07</publishTime>
+ <publishTime>08/16/2024 10:40:57</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>08/15/2024 15:59:07</publishTime>
+ <publishTime>08/16/2024 10:40:57</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 22:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>08/15/2024 15:59:04</publishTime>
+ <publishTime>08/16/2024 10:40:52</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>08/15/2024 15:59:04</publishTime>
+ <publishTime>08/16/2024 10:40:52</publishTime>
</File>
<File Include="bin/Grpc.Core.Api.dll">
<publishTime>03/22/2022 13:17:26</publishTime>
@@ -87,16 +111,16 @@
<publishTime>07/25/2012 19:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
- <publishTime>08/15/2024 15:59:05</publishTime>
+ <publishTime>08/16/2024 10:40:53</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>08/15/2024 15:59:05</publishTime>
+ <publishTime>08/16/2024 10:40:53</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
<publishTime>05/25/2024 09:46:41</publishTime>
</File>
<File Include="bin/Newtonsoft.Json.dll">
- <publishTime>09/07/2014 18:39:38</publishTime>
+ <publishTime>03/08/2023 15:09:56</publishTime>
</File>
<File Include="bin/NPOI.dll">
<publishTime>10/23/2021 09:07:54</publishTime>
@@ -123,25 +147,25 @@
<publishTime>10/23/2021 17:07:54</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>08/15/2024 15:59:02</publishTime>
+ <publishTime>08/16/2024 10:40:51</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>08/15/2024 15:59:02</publishTime>
+ <publishTime>08/16/2024 10:40:51</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>08/15/2024 15:59:03</publishTime>
+ <publishTime>08/16/2024 10:40:52</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>08/15/2024 15:59:03</publishTime>
+ <publishTime>08/16/2024 10:40:52</publishTime>
</File>
<File Include="bin/RestSharp.dll">
<publishTime>08/31/2012 06:22:50</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>08/15/2024 15:59:04</publishTime>
+ <publishTime>08/16/2024 10:40:52</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>08/15/2024 15:59:04</publishTime>
+ <publishTime>08/16/2024 10:40:52</publishTime>
</File>
<File Include="bin/Swashbuckle.Core.dll">
<publishTime>02/16/2015 01:57:08</publishTime>
@@ -251,14 +275,23 @@
<File Include="bin/System.Xml.Linq.dll">
<publishTime>09/26/2012 03:16:08</publishTime>
</File>
+ <File Include="bin/Tea.dll">
+ <publishTime>05/09/2023 10:43:40</publishTime>
+ </File>
+ <File Include="bin/TopSdk.dll">
+ <publishTime>08/16/2024 10:40:54</publishTime>
+ </File>
+ <File Include="bin/TopSdk.pdb">
+ <publishTime>08/16/2024 10:40:54</publishTime>
+ </File>
<File Include="bin/WebActivatorEx.dll">
<publishTime>11/24/2014 19:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>08/15/2024 15:59:13</publishTime>
+ <publishTime>08/16/2024 10:41:03</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>08/15/2024 15:59:13</publishTime>
+ <publishTime>08/16/2024 10:41:03</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>07/18/2013 01:03:52</publishTime>
@@ -345,7 +378,7 @@
<publishTime>05/25/2024 09:46:41</publishTime>
</File>
<File Include="packages.config">
- <publishTime>06/25/2024 09:50:21</publishTime>
+ <publishTime>08/16/2024 09:07:08</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.js">
<publishTime>05/25/2024 09:46:41</publishTime>
@@ -453,7 +486,7 @@
<publishTime>05/25/2024 09:46:41</publishTime>
</File>
<File Include="Web.config">
- <publishTime>08/15/2024 15:59:32</publishTime>
+ <publishTime>08/16/2024 10:41:14</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 952c7d6..c069965 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -761,6 +761,7 @@
<Compile Include="DLL\ClsSb_EquipMaintainRuleBill.cs" />
<Compile Include="DLL\ClsSb_EquipRepairCheckBill.cs" />
<Compile Include="DLL\ClsSb_EquipRepairSendWorkBill.cs" />
+ <Compile Include="DLL\ClsSb_EquipRepairSignBill.cs" />
<Compile Include="DLL\ClsSb_EquipRepairWorkBill.cs" />
<Compile Include="DLL\ClsSb_MouldRepairWorkBill.cs" />
<Compile Include="DLL\ClsSc_ICMOBillWorkQtyStatus_Tmp.cs" />
@@ -794,6 +795,8 @@
<Compile Include="Models\ClsGy_SupMaterial.cs" />
<Compile Include="Models\ClsGy_EquipFileBillSub_DotCheckRule.cs" />
<Compile Include="Models\ClsGy_EquipFileBillSub_MaintainRule.cs" />
+ <Compile Include="Models\ClsSb_EquipRepairSignBillMain.cs" />
+ <Compile Include="Models\ClsSb_EquipRepairSignBillSub.cs" />
<Compile Include="Models\ClsSc_AssemblyBillMain.cs" />
<Compile Include="Models\ClsSc_AssemblyBillSub.cs" />
<Compile Include="Models\ClsSc_MESBeginWorkBillSub_RelationBill.cs" />
diff --git a/WebAPI/WebAPI.csproj.user b/WebAPI/WebAPI.csproj.user
index da29ed4..5ab6969 100644
--- a/WebAPI/WebAPI.csproj.user
+++ b/WebAPI/WebAPI.csproj.user
@@ -18,7 +18,7 @@
<IISExpressWindowsAuthentication>disabled</IISExpressWindowsAuthentication>
<IISExpressUseClassicPipelineMode>false</IISExpressUseClassicPipelineMode>
<UseGlobalApplicationHostFile />
- <ProjectView>ShowAllFiles</ProjectView>
+ <ProjectView>ProjectFiles</ProjectView>
<Controller_SelectedScaffolderID>MvcControllerEmptyScaffolder</Controller_SelectedScaffolderID>
<Controller_SelectedScaffolderCategoryPath>root/Common/MVC/Controller</Controller_SelectedScaffolderCategoryPath>
</PropertyGroup>
--
Gitblit v1.9.1