From 2327f09e9c01319f7de2ecb38987b62a15e09048 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期五, 13 九月 2024 15:43:35 +0800
Subject: [PATCH] 1
---
WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user | 42 ++++----
WebAPI/Controllers/品质管理/质量报表/QC_QualityReportsController.cs | 4
WebAPI/WebAPI.csproj.user | 1
DAL/生产管理/模具管理/ClsSc_MouldDotCheckPlanBill.cs | 48 ++++-----
WebAPI/Controllers/Sc_MouldRepairInBillListController.cs | 63 +-----------
WebAPI/Controllers/WebAPIController.cs | 25 ++++
WebAPI/Properties/PublishProfiles/FolderProfile10.pubxml.user | 64 ++++--------
7 files changed, 95 insertions(+), 152 deletions(-)
diff --git "a/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldDotCheckPlanBill.cs" "b/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldDotCheckPlanBill.cs"
index ea1696f..0494001 100644
--- "a/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldDotCheckPlanBill.cs"
+++ "b/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldDotCheckPlanBill.cs"
@@ -74,20 +74,16 @@
omodel.HInterID = lngBillKey;
foreach (Model.ClsSc_MouldDotCheckPlanBillSub oSub in DetailColl)
{
- oCn.RunProc("Insert into Sc_MouldDotCheckPlanBillSub " +
- " (HInterID,HEntryID" +
- ",HManagerID" +
- ",HDotCheckItem,HDotCheckPart,HClaim" +
- ",HCloseMan,HCloseType,HRemark" +
- ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
- ",HDotCheckItemClassID,HDotCheckItemMethodID" +
- ") values("
- + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() +
- "," + oSub.HManagerID.ToString() +
- ",'" + oSub.HDotCheckItem + "','" + oSub.HDotCheckPart + "','" + oSub.HClaim + "'" +
- ",'" + oSub.HCloseMan + "'," + 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.HDotCheckItemClassID + "," + oSub.HDotCheckItemMethodID +
- ") ");
+ oCn.RunProc("INSERT INTO Sc_MouldDotCheckPlanBillSub " +
+ " (HInterID, HEntryID, HSourceInterID, HSourceEntryID, HSourceBillNo, HSourceBillType, HRelationQty, HRelationMoney, " +
+ " HCloseMan, HCloseType, HRemark, " +
+ "HManagerID, HDotCheckItem, HDotCheckPart, HClaim, " +
+ " HDotCheckItemClassID, HDotCheckItemMethodID, HDotCheckItemID) " +
+ "VALUES (" + omodel.HInterID.ToString() + ", " + oSub.HEntryID.ToString() + ", " + oSub.HSourceInterID.ToString() + ", " + oSub.HSourceEntryID.ToString() + ", " + "'" + oSub.HSourceBillNo.Replace("'", "''") + "', " + "'" + oSub.HSourceBillType.Replace("'", "''") + "', " + oSub.HRelationQty.ToString() + ", " + oSub.HRelationMoney.ToString() + ", " +
+ "'" + oSub.HCloseMan.Replace("'", "''") + "', " + Convert.ToString(oSub.HCloseType ? 1 : 0) + ", " + "'" + oSub.HRemark.Replace("'", "''") + "'," +
+ " " + oSub.HManagerID.ToString() + ", " + "'" + oSub.HDotCheckItem.Replace("'", "''") + "', " + "'" + oSub.HDotCheckPart.Replace("'", "''") + "', " + "'" + oSub.HClaim.Replace("'", "''") + "', " +
+ oSub.HDotCheckItemClassID.ToString() + ", " + oSub.HDotCheckItemMethodID.ToString() + ", " + oSub.HDotCheckItemID.ToString() +
+ ")");
}
////閰嶄欢椤圭洰
@@ -156,20 +152,16 @@
//鎻掑叆瀛愯〃 //鐐规椤圭洰
foreach (Model.ClsSc_MouldDotCheckPlanBillSub oSub in DetailColl)
{
- oCn.RunProc("Insert into Sc_MouldDotCheckPlanBillSub " +
- " (HInterID,HEntryID" +
- ",HManagerID" +
- ",HDotCheckItem,HDotCheckPart,HClaim" +
- ",HCloseMan,HCloseType,HRemark" +
- ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
- ",HDotCheckItemClassID,HDotCheckItemMethodID" +
- ") values("
- + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() +
- "," + oSub.HManagerID.ToString() +
- ",'" + oSub.HDotCheckItem + "','" + oSub.HDotCheckPart + "','" + oSub.HClaim + "'" +
- ",'" + oSub.HCloseMan + "'," + 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.HDotCheckItemClassID + "," + oSub.HDotCheckItemMethodID +
- ") ");
+ oCn.RunProc("INSERT INTO Sc_MouldDotCheckPlanBillSub " +
+ " (HInterID, HEntryID, HSourceInterID, HSourceEntryID, HSourceBillNo, HSourceBillType, HRelationQty, HRelationMoney, " +
+ " HCloseMan, HCloseType, HRemark, " +
+ "HManagerID, HDotCheckItem, HDotCheckPart, HClaim, " +
+ " HDotCheckItemClassID, HDotCheckItemMethodID, HDotCheckItemID) " +
+ "VALUES (" +omodel.HInterID.ToString() + ", " +oSub.HEntryID.ToString() + ", " +oSub.HSourceInterID.ToString() + ", " +oSub.HSourceEntryID.ToString() + ", " +"'" + oSub.HSourceBillNo+ "', " +"'" + oSub.HSourceBillType + "', " +oSub.HRelationQty.ToString() + ", " +oSub.HRelationMoney.ToString() + ", " +
+ "'" + oSub.HCloseMan + "', " +Convert.ToString(oSub.HCloseType ? 1 : 0) + ", " +"'" + oSub.HRemark + "'," +
+ " " +oSub.HManagerID.ToString() + ", " +"'" + oSub.HDotCheckItem + "', " +"'" + oSub.HDotCheckPart + "', " +"'" + oSub.HClaim + "', " +
+ oSub.HDotCheckItemClassID.ToString() + ", " +oSub.HDotCheckItemMethodID.ToString() + ", " +oSub.HDotCheckItemID.ToString() +
+ ")");
}
////閰嶄欢椤圭洰
diff --git a/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs b/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
index a5f4767..b19e5ea 100644
--- a/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
+++ b/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
@@ -6533,8 +6533,6 @@
string msg2 = sArray[0].ToString();
string msg3 = sArray[1].ToString();
string msg4 = sArray[2].ToString();
- //string msg5 = sArray[3].ToString();
-
string UserName = "";
ListModels oListModels = new ListModels();
@@ -6555,28 +6553,14 @@
msg2 = msg2.Replace("\n", ""); //\n
lsmain = oListModels.getObjectByJson_Sc_MouldDotCheckPlanBillMain(msg2);
foreach (Model.ClsSc_MouldDotCheckPlanBillMain oItem in lsmain)
- {
- //oItem.HMaker = "";
+ {
UserName = oItem.HMaker; //鍒跺崟浜�
oItem.HBillType = "3820";
oItem.HBillSubType = "3820";
-
- //oItem.HInterID =0;
- //oItem.HBillNo = "";
+
oItem.HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));// --鏃ユ湡
- oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
- //oItem.HMakeDate = "";
- //oItem.HYear = "";
- //oItem.HPeriod = "";
- //oItem.HRemark = "";
- //oItem.HCycleUnit = "";
- //oItem.HCheckCycle = "";
- //oItem.HBeginDate = "";
- //oItem.HEndDate = "";
- //oItem.HInnerBillNo = "";
- //oItem.HExplanation = "";
-
- //oItem.HInterID = DBUtility.ClsPub.CreateBillID_SRMProd("1103", ref DBUtility.ClsPub.sExeReturnInfo);
+ oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
+
if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
{
objJsonResult.code = "0";
@@ -6601,7 +6585,7 @@
i++;
oItemSub.HEntryID = i;
- //oItemSub.HCloseMan = ""; //琛屽叧闂�
+
oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
oItemSub.HCloseType = false; //鍏抽棴绫诲瀷
//oItemSub.HRemark = ""; //澶囨敞
@@ -6609,43 +6593,10 @@
oItemSub.HSourceEntryID = 0; //婧愬崟瀛愬唴鐮�
//oItemSub.HSourceBillNo = ""; //婧愬崟鍗曞彿
//oItemSub.HSourceBillType = ""; //婧愬崟绫诲瀷
- oItemSub.HRelationQty = 0; //鍏宠仈鏁伴噺
- //oItemSub.HRelationMoney = 0; //鍏宠仈閲戦
- //HMaterID = "";//閰嶄欢浠ｇ爜
- //HUnitID = "";//鍗曚綅浠ｇ爜
- //HQty = "";//瀹為檯鐢ㄩ噺
- //HQtyMust = "";//鍗曚綅鐢ㄩ噺
- //HRemark = "";//澶囨敞
+ oItemSub.HRelationQty = 0; //鍏宠仈鏁伴噺
oBill.DetailColl.Add(oItemSub);
-
- }
-
- ////閰嶄欢椤硅〃浣撴暟鎹�
- ////鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆�
- //msg5 = msg5.Substring(1, msg5.Length - 2);
- //msg5 = msg5.Replace("\\", "");
- //msg5 = msg5.Replace("\n", ""); //\n
- // //msg2 = msg2.Replace("'", "鈥�");
- //List<Model.ClsSc_MouldDotCheckPlanBillSub_Item> ls1 = new List<Model.ClsSc_MouldDotCheckPlanBillSub_Item>();
- //ls1 = oListModels.getObjectByJson_Sc_MouldDotCheckPlanBillSub_Item(msg5);
- //int j = 0;
- //foreach (Model.ClsSc_MouldDotCheckPlanBillSub_Item oItemSub in ls1)
- //{
-
- // j++;
- // oItemSub.HEntryID = j;
- // //oItemSub.HCloseMan = ""; //琛屽叧闂�
- // oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
- // oItemSub.HCloseType = false; //鍏抽棴绫诲瀷
-
- // oItemSub.HSourceInterID = 0; // 婧愬崟涓诲唴鐮�
- // oItemSub.HSourceEntryID = 0; //婧愬崟瀛愬唴鐮�
-
- // oItemSub.HRelationQty = 0; //鍏宠仈鏁伴噺
- // oBill.DetailCol.Add(oItemSub);
- //}
-
+ }
//淇濆瓨
//淇濆瓨瀹屾瘯鍚庡鐞�
bool bResult;
diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index 1ad140f..63e201a 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -12968,6 +12968,14 @@
objjson.data = null;
return objjson;
}
+ if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
+ {
+ objjson.code = "0";
+ objjson.count = 1;
+ objjson.Message = "璇ヨ澶囨湁澶氫釜璁″垝鍗�,鎵嬪姩閫夌潃" ;
+ objjson.data = null;
+ return objjson;
+ }
else
{
objjson.code = "1";
@@ -13009,19 +13017,22 @@
switch (Type)
{
case "DJ":
- HView = "h_v_QJ_GetDotCheckItemList";
+ HView = "h_v_Sc_MouldDotCheckPlanBillList";
+ break;
+ case "BY":
+ HView = "h_v_Sc_MouldMaintainPlanBillList";
break;
default:
objjson.code = "0";
objjson.count = 0;
- objjson.Message = "璁惧妯″潡绫诲瀷閿欒锛�";
+ objjson.Message = "妯″叿妯″潡绫诲瀷閿欒锛�";
objjson.data = null;
return objjson;
}
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
//string sql = string.Format(@"select * from " + HView + " where HInterID = " + EquipProjectID);
- string sql = string.Format(@"Exec h_p_Sb_GetCheckItem_PDA '" + MouldProjectID + "','" + Type + "','" + HDate + "'");
+ string sql = string.Format(@"Exec h_p_Sb_GetCheckItemMouldFile_PDA '" + MouldProjectID + "','" + Type + "','" + HDate + "'");
ds = oCN.RunProcReturn(sql, HView);
if (ds == null || ds.Tables[0].Rows.Count <= 0)
{
@@ -13031,6 +13042,14 @@
objjson.data = null;
return objjson;
}
+ if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
+ {
+ objjson.code = "0";
+ objjson.count = 1;
+ objjson.Message = "璇ユā鍏锋湁澶氫釜璁″垝鍗�,鎵嬪姩閫夌潃";
+ objjson.data = null;
+ return objjson;
+ }
else
{
objjson.code = "1";
diff --git "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_QualityReportsController.cs" "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_QualityReportsController.cs"
index 7cf7201..242e17d 100644
--- "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_QualityReportsController.cs"
+++ "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_QualityReportsController.cs"
@@ -723,7 +723,7 @@
[Route("QC_CustomerAppealReport/SB_EquipICMOTechParamList")]
[HttpGet]
- public object SB_EquipICMOTechParamList(string sWhere, string user)
+ public object SB_EquipICMOTechParamList(string sWhere, string user,string Type)
{
try
{
@@ -745,7 +745,7 @@
return objJsonResult;
}
- ds = oCN.RunProcReturn("exec h_p_SB_EquipICMOTechParamBillList '" + HProcExchBillNo + "','" + HProcName + "','" + HTechParamName + "','"+HEquipName+"'", "h_p_SB_EquipICMOTechParamBillList");
+ ds = oCN.RunProcReturn("exec h_p_SB_EquipICMOTechParamBillList '" + HProcExchBillNo + "','" + HProcName + "','" + HTechParamName + "','"+HEquipName+"','"+Type+"'", "h_p_SB_EquipICMOTechParamBillList");
//娣诲姞鍒楀悕
foreach (DataColumn col in ds.Tables[0].Columns)
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile10.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile10.pubxml.user
index 1024d25..688d11b 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile10.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile10.pubxml.user
@@ -4,8 +4,7 @@
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <History>True|2024-09-11T05:44:02.1565679Z;False|2024-09-11T13:43:34.1335672+08:00;True|2024-09-10T14:57:00.4557261+08:00;True|2024-09-10T10:30:28.1344265+08:00;False|2024-09-10T10:29:59.2239150+08:00;True|2024-09-09T14:32:59.6183288+08:00;True|2024-09-09T14:08:01.6074290+08:00;True|2024-09-09T13:54:27.4220669+08:00;True|2024-09-09T13:45:55.2546949+08:00;True|2024-09-09T13:37:40.5854460+08:00;False|2024-09-09T13:37:17.6050041+08:00;True|2024-09-09T11:25:16.9437875+08:00;True|2024-09-09T11:00:21.4309667+08:00;False|2024-09-09T11:00:03.7538487+08:00;True|2024-09-06T16:03:20.5336832+08:00;True|2024-09-06T15:56:58.0813460+08:00;True|2024-09-06T15:51:03.8776434+08:00;True|2024-09-06T15:48:03.3439216+08:00;True|2024-09-06T15:42:33.9935396+08:00;True|2024-09-06T15:39:30.6273014+08:00;True|2024-09-06T13:09:39.8344141+08:00;False|2024-09-06T13:09:21.9582097+08:00;True|2024-09-06T11:29:27.1262524+08:00;False|2024-09-06T11:28:55.9593146+08:00;True|2024-09-05T11:19:46.2265051+08:00;True|2024-09-05T10:18:44.1188785+08:00;True|2024-09-05T10:14:40.0505783+08:00;False|2024-09-05T10:14:13.7760616+08:00;True|2024-09-04T14:57:38.8862572+08:00;True|2024-09-04T14:36:47.2514960+08:00;True|2024-09-04T14:36:13.9753492+08:00;True|2024-09-04T13:35:39.0678735+08:00;True|2024-09-04T13:18:03.5880629+08:00;True|2024-09-04T10:22:05.9546376+08:00;False|2024-09-04T10:21:36.0127685+08:00;True|2024-09-04T10:08:32.0259963+08:00;False|2024-09-04T10:08:09.9323713+08:00;True|2024-08-29T16:18:43.7085548+08:00;True|2024-08-29T14:43:01.6752088+08:00;False|2024-08-29T14:42:40.1350706+08:00;True|2024-08-28T21:59:53.4221652+08:00;True|2024-08-28T21:22:29.9693901+08:00;True|2024-08-28T20:03:40.6232218+08:00;False|2024-08-28T20:03:22.6322413+08:00;True|2024-08-28T13:06:07.4432568+08:00;False|2024-08-28T13:04:04.1198464+08:00;True|2024-08-21T16:09:41.0487181+08:00;True|2024-08-21T15:42:13.7474317+08:00;True|2024-08-21T15:10:24.6912112+08:00;True|2024-08-21T14:56:51.3255866+08:00;True|2024-08-21T14:50:12.3359730+08:00;True|2024-08-19T15:43:16.1549663+08:00;True|2024-08-19T15:27:26.4219971+08:00;True|2024-08-19T09:41:45.7449029+08:00;True|2024-06-08T12:38:30.4153773+08:00;True|2024-06-07T21:22:19.4545597+08:00;True|2024-06-07T21:05:53.1963741+08:00;True|2024-06-07T21:00:57.2568708+08:00;True|2024-06-07T14:39:19.6618679+08:00;True|2024-06-07T14:21:51.5169962+08:00;True|2024-06-07T11:29:08.0690999+08:00;True|2024-06-07T11:26:29.1494329+08:00;True|2024-06-07T11:20:41.2024309+08:00;True|2024-06-07T10:12:26.5905597+08:00;False|2024-06-07T10:11:35.3679434+08:00;</History>
- <History>True|2024-09-12T10:47:25.2530040Z;True|2024-09-12T16:26:19.7282007+08:00;True|2024-09-12T14:58:28.6455426+08:00;True|2024-09-12T14:51:12.2054128+08:00;False|2024-09-12T14:50:11.9714522+08:00;True|2024-09-12T11:27:38.4295534+08:00;True|2024-09-11T20:20:57.7845361+08:00;False|2024-09-11T20:20:38.9732855+08:00;True|2024-09-10T15:15:04.6204983+08:00;True|2024-09-10T11:33:55.3963324+08:00;True|2024-09-10T11:10:10.3836571+08:00;True|2024-09-10T10:39:06.5850395+08:00;True|2024-09-10T10:27:33.2463582+08:00;False|2024-09-10T10:26:05.4608008+08:00;True|2024-09-09T19:14:08.0718627+08:00;True|2024-09-09T19:08:42.5709780+08:00;False|2024-09-09T19:08:33.7817129+08:00;True|2024-09-06T17:00:13.2484828+08:00;False|2024-09-06T17:00:06.1281061+08:00;True|2024-09-05T11:39:53.4537518+08:00;False|2024-09-05T11:39:04.6111418+08:00;True|2024-09-04T12:39:24.8111127+08:00;True|2024-09-04T12:12:57.9411095+08:00;False|2024-09-04T12:12:28.6748628+08:00;True|2024-09-03T14:45:30.8259459+08:00;False|2024-09-03T14:45:19.1997455+08:00;True|2024-08-30T16:08:31.2415230+08:00;True|2024-08-30T15:18:36.6727666+08:00;True|2024-08-28T09:49:18.1543721+08:00;False|2024-08-28T09:49:11.7260337+08:00;True|2024-08-27T13:18:40.6234335+08:00;False|2024-08-27T13:18:33.9730040+08:00;True|2024-08-26T17:40:29.9158973+08:00;True|2024-08-26T17:21:30.8800173+08:00;True|2024-08-26T17:19:23.9260010+08:00;True|2024-08-26T14:27:20.8154004+08:00;True|2024-08-26T14:16:14.4482284+08:00;True|2024-08-26T13:12:42.9574127+08:00;True|2024-08-26T12:48:31.2107630+08:00;True|2024-08-26T11:07:15.1181342+08:00;False|2024-08-26T11:07:09.9429791+08:00;True|2024-08-26T10:49:20.8494484+08:00;True|2024-08-26T10:13:11.5222607+08:00;False|2024-08-26T10:12:59.1146882+08:00;True|2024-08-23T15:39:39.9842990+08:00;False|2024-08-23T15:39:33.9824708+08:00;True|2024-08-22T16:55:46.4689463+08:00;True|2024-08-22T16:44:25.0981764+08:00;True|2024-08-22T16:19:29.9801909+08:00;True|2024-08-22T14:25:13.5120259+08:00;True|2024-08-22T09:48:50.0760398+08:00;True|2024-08-21T16:09:41.0487181+08:00;True|2024-08-21T15:42:13.7474317+08:00;True|2024-08-21T15:10:24.6912112+08:00;True|2024-08-21T14:56:51.3255866+08:00;True|2024-08-21T14:50:12.3359730+08:00;True|2024-08-19T15:43:16.1549663+08:00;True|2024-08-19T15:27:26.4219971+08:00;True|2024-08-19T09:41:45.7449029+08:00;True|2024-06-08T12:38:30.4153773+08:00;True|2024-06-07T21:22:19.4545597+08:00;True|2024-06-07T21:05:53.1963741+08:00;True|2024-06-07T21:00:57.2568708+08:00;True|2024-06-07T14:39:19.6618679+08:00;True|2024-06-07T14:21:51.5169962+08:00;True|2024-06-07T11:29:08.0690999+08:00;True|2024-06-07T11:26:29.1494329+08:00;True|2024-06-07T11:20:41.2024309+08:00;True|2024-06-07T10:12:26.5905597+08:00;False|2024-06-07T10:11:35.3679434+08:00;</History>
+ <History>True|2024-09-13T02:20:53.2644847Z;False|2024-09-13T10:19:33.7686753+08:00;True|2024-09-12T19:15:21.9135805+08:00;False|2024-09-12T19:15:07.2717017+08:00;True|2024-09-12T17:25:26.5527019+08:00;True|2024-09-12T17:20:42.2498355+08:00;True|2024-09-12T17:16:44.8817635+08:00;True|2024-09-12T17:16:02.4132675+08:00;True|2024-09-12T17:08:14.2819047+08:00;True|2024-09-12T16:07:15.3675281+08:00;True|2024-09-12T16:06:23.8568906+08:00;True|2024-09-12T15:48:45.1455315+08:00;True|2024-09-12T14:59:30.0679595+08:00;True|2024-09-12T14:18:21.9534092+08:00;True|2024-09-12T14:07:35.2885035+08:00;False|2024-09-12T14:06:30.5732168+08:00;False|2024-09-12T14:06:17.1404767+08:00;True|2024-09-12T14:03:12.8150228+08:00;True|2024-09-12T13:53:20.7537798+08:00;True|2024-09-12T13:48:43.2408012+08:00;False|2024-09-12T13:48:36.5217018+08:00;True|2024-09-11T20:20:57.7845361+08:00;False|2024-09-11T20:20:38.9732855+08:00;True|2024-09-10T15:15:04.6204983+08:00;True|2024-09-10T11:33:55.3963324+08:00;True|2024-09-10T11:10:10.3836571+08:00;True|2024-09-10T10:39:06.5850395+08:00;True|2024-09-10T10:27:33.2463582+08:00;False|2024-09-10T10:26:05.4608008+08:00;True|2024-09-09T19:14:08.0718627+08:00;True|2024-09-09T19:08:42.5709780+08:00;False|2024-09-09T19:08:33.7817129+08:00;True|2024-09-06T17:00:13.2484828+08:00;False|2024-09-06T17:00:06.1281061+08:00;True|2024-09-05T11:39:53.4537518+08:00;False|2024-09-05T11:39:04.6111418+08:00;True|2024-09-04T12:39:24.8111127+08:00;True|2024-09-04T12:12:57.9411095+08:00;False|2024-09-04T12:12:28.6748628+08:00;True|2024-09-03T14:45:30.8259459+08:00;False|2024-09-03T14:45:19.1997455+08:00;True|2024-08-30T16:08:31.2415230+08:00;True|2024-08-30T15:18:36.6727666+08:00;True|2024-08-28T09:49:18.1543721+08:00;False|2024-08-28T09:49:11.7260337+08:00;True|2024-08-27T13:18:40.6234335+08:00;False|2024-08-27T13:18:33.9730040+08:00;True|2024-08-26T17:40:29.9158973+08:00;True|2024-08-26T17:21:30.8800173+08:00;True|2024-08-26T17:19:23.9260010+08:00;True|2024-08-26T14:27:20.8154004+08:00;True|2024-08-26T14:16:14.4482284+08:00;True|2024-08-26T13:12:42.9574127+08:00;True|2024-08-26T12:48:31.2107630+08:00;True|2024-08-26T11:07:15.1181342+08:00;False|2024-08-26T11:07:09.9429791+08:00;True|2024-08-26T10:49:20.8494484+08:00;True|2024-08-26T10:13:11.5222607+08:00;False|2024-08-26T10:12:59.1146882+08:00;True|2024-08-23T15:39:39.9842990+08:00;False|2024-08-23T15:39:33.9824708+08:00;True|2024-08-22T16:55:46.4689463+08:00;True|2024-08-22T16:44:25.0981764+08:00;True|2024-08-22T16:19:29.9801909+08:00;True|2024-08-22T14:25:13.5120259+08:00;True|2024-08-22T09:48:50.0760398+08:00;True|2024-08-21T16:09:41.0487181+08:00;True|2024-08-21T15:42:13.7474317+08:00;True|2024-08-21T15:10:24.6912112+08:00;True|2024-08-21T14:56:51.3255866+08:00;True|2024-08-21T14:50:12.3359730+08:00;True|2024-08-19T15:43:16.1549663+08:00;True|2024-08-19T15:27:26.4219971+08:00;True|2024-08-19T09:41:45.7449029+08:00;True|2024-06-08T12:38:30.4153773+08:00;True|2024-06-07T21:22:19.4545597+08:00;True|2024-06-07T21:05:53.1963741+08:00;True|2024-06-07T21:00:57.2568708+08:00;True|2024-06-07T14:39:19.6618679+08:00;True|2024-06-07T14:21:51.5169962+08:00;True|2024-06-07T11:29:08.0690999+08:00;True|2024-06-07T11:26:29.1494329+08:00;True|2024-06-07T11:20:41.2024309+08:00;True|2024-06-07T10:12:26.5905597+08:00;False|2024-06-07T10:11:35.3679434+08:00;</History>
<_PublishTargetUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</_PublishTargetUrl>
</PropertyGroup>
<ItemGroup>
@@ -46,34 +45,28 @@
<publishTime>02/22/2013 16:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>09/11/2024 13:43:49</publishTime>
- <publishTime>09/12/2024 18:46:57</publishTime>
+ <publishTime>09/13/2024 10:18:38</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>09/11/2024 13:43:49</publishTime>
- <publishTime>09/12/2024 18:46:57</publishTime>
+ <publishTime>09/13/2024 10:18:38</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>09/11/2024 13:43:46</publishTime>
- <publishTime>09/12/2024 18:46:55</publishTime>
+ <publishTime>09/13/2024 10:18:37</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>09/11/2024 13:43:46</publishTime>
- <publishTime>09/12/2024 18:46:55</publishTime>
+ <publishTime>09/13/2024 10:18:37</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 22:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>08/29/2024 14:42:47</publishTime>
- <publishTime>09/12/2024 18:46:50</publishTime>
+ <publishTime>09/13/2024 10:18:34</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>08/29/2024 14:42:47</publishTime>
- <publishTime>09/12/2024 18:46:50</publishTime>
+ <publishTime>09/13/2024 10:18:34</publishTime>
</File>
<File Include="bin/Grpc.Core.Api.dll">
<publishTime>03/22/2022 13:17:26</publishTime>
@@ -118,12 +111,10 @@
<publishTime>07/25/2012 19:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
- <publishTime>09/06/2024 15:39:09</publishTime>
- <publishTime>09/12/2024 18:46:51</publishTime>
+ <publishTime>09/13/2024 10:18:35</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>09/06/2024 15:39:09</publishTime>
- <publishTime>09/12/2024 18:46:51</publishTime>
+ <publishTime>09/13/2024 10:18:35</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
<publishTime>04/06/2023 15:57:02</publishTime>
@@ -156,40 +147,34 @@
<publishTime>10/23/2021 17:07:54</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>08/29/2024 14:42:46</publishTime>
- <publishTime>09/12/2024 18:46:48</publishTime>
+ <publishTime>09/13/2024 10:18:31</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>08/29/2024 14:42:46</publishTime>
- <publishTime>09/12/2024 18:46:48</publishTime>
+ <publishTime>09/13/2024 10:18:31</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>08/29/2024 14:42:46</publishTime>
- <publishTime>09/12/2024 18:46:49</publishTime>
+ <publishTime>09/13/2024 10:18:32</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>08/29/2024 14:42:46</publishTime>
- <publishTime>09/12/2024 18:46:49</publishTime>
+ <publishTime>09/13/2024 10:18:32</publishTime>
</File>
<File Include="bin/RestSharp.dll">
<publishTime>08/31/2012 06:22:50</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>08/29/2024 14:42:46</publishTime>
- <publishTime>09/12/2024 18:46:49</publishTime>
+ <publishTime>09/13/2024 10:18:34</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>08/29/2024 14:42:46</publishTime>
- <publishTime>09/12/2024 18:46:49</publishTime>
+ <publishTime>09/13/2024 10:18:34</publishTime>
</File>
<File Include="bin/Swashbuckle.Core.dll">
<publishTime>02/16/2015 01:57:08</publishTime>
</File>
<File Include="bin/SyntacticSugar.dll">
- <publishTime>09/12/2024 18:45:01</publishTime>
+ <publishTime>09/13/2024 10:15:38</publishTime>
</File>
<File Include="bin/SyntacticSugar.pdb">
- <publishTime>09/12/2024 18:45:01</publishTime>
+ <publishTime>09/13/2024 10:15:38</publishTime>
</File>
<File Include="bin/System.Buffers.dll">
<publishTime>07/19/2017 18:01:28</publishTime>
@@ -300,23 +285,19 @@
<publishTime>05/09/2023 10:43:40</publishTime>
</File>
<File Include="bin/TopSdk.dll">
- <publishTime>09/11/2024 13:41:55</publishTime>
- <publishTime>09/12/2024 18:45:05</publishTime>
+ <publishTime>09/13/2024 10:18:34</publishTime>
</File>
<File Include="bin/TopSdk.pdb">
- <publishTime>09/11/2024 13:41:55</publishTime>
- <publishTime>09/12/2024 18:45:05</publishTime>
+ <publishTime>09/13/2024 10:18:34</publishTime>
</File>
<File Include="bin/WebActivatorEx.dll">
<publishTime>11/24/2014 19:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>09/11/2024 13:43:59</publishTime>
- <publishTime>09/12/2024 18:47:23</publishTime>
+ <publishTime>09/13/2024 10:18:58</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>09/11/2024 13:43:59</publishTime>
- <publishTime>09/12/2024 18:47:23</publishTime>
+ <publishTime>09/13/2024 10:18:58</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>07/18/2013 01:03:52</publishTime>
@@ -511,8 +492,7 @@
<publishTime>05/06/2024 13:47:57</publishTime>
</File>
<File Include="Web.config">
- <publishTime>08/28/2024 13:06:06</publishTime>
- <publishTime>09/12/2024 11:27:36</publishTime>
+ <publishTime>09/13/2024 10:20:52</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user
index 95e2e93..c75ef2a 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user
@@ -4,7 +4,7 @@
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <History>True|2024-09-10T07:26:48.7055081Z;True|2024-09-10T09:26:36.8509916+08:00;True|2024-09-09T19:51:32.6059511+08:00;True|2024-09-09T19:05:47.5349922+08:00;True|2024-09-09T09:26:23.2022383+08:00;False|2024-09-09T09:25:27.3736749+08:00;True|2024-09-06T15:32:52.1865278+08:00;True|2024-09-06T15:16:01.1405794+08:00;True|2024-09-06T14:21:05.7482343+08:00;True|2024-09-06T14:09:17.1494566+08:00;True|2024-09-06T13:49:56.4128481+08:00;True|2024-09-06T13:11:53.0863947+08:00;True|2024-09-06T09:34:54.5934463+08:00;True|2024-09-06T08:47:19.9744092+08:00;True|2024-09-05T15:01:38.6968629+08:00;True|2024-09-05T14:56:09.3505818+08:00;True|2024-09-05T14:49:56.8774757+08:00;True|2024-09-05T08:14:13.2359921+08:00;False|2024-09-05T08:13:11.8797534+08:00;True|2024-09-03T16:52:02.8227375+08:00;False|2024-09-03T16:51:32.4250926+08:00;True|2024-09-03T16:33:05.7269609+08:00;True|2024-09-03T16:00:15.0288548+08:00;True|2024-08-29T08:06:32.4732067+08:00;False|2024-08-29T08:06:02.4801886+08:00;True|2024-08-26T10:17:08.7733750+08:00;False|2024-08-26T10:11:05.1864217+08:00;False|2024-08-26T09:50:31.1539306+08:00;False|2024-08-26T09:47:37.4351309+08:00;True|2024-08-16T16:55:32.0918962+08:00;True|2024-08-16T16:53:23.3505641+08:00;False|2024-08-16T16:49:30.4579212+08:00;False|2024-08-16T16:47:01.9799743+08:00;</History>
+ <History>False|2024-09-11T13:06:15.4423786Z;True|2024-09-10T15:26:48.7055081+08:00;True|2024-09-10T09:26:36.8509916+08:00;True|2024-09-09T19:51:32.6059511+08:00;True|2024-09-09T19:05:47.5349922+08:00;True|2024-09-09T09:26:23.2022383+08:00;False|2024-09-09T09:25:27.3736749+08:00;True|2024-09-06T15:32:52.1865278+08:00;True|2024-09-06T15:16:01.1405794+08:00;True|2024-09-06T14:21:05.7482343+08:00;True|2024-09-06T14:09:17.1494566+08:00;True|2024-09-06T13:49:56.4128481+08:00;True|2024-09-06T13:11:53.0863947+08:00;True|2024-09-06T09:34:54.5934463+08:00;True|2024-09-06T08:47:19.9744092+08:00;True|2024-09-05T15:01:38.6968629+08:00;True|2024-09-05T14:56:09.3505818+08:00;True|2024-09-05T14:49:56.8774757+08:00;True|2024-09-05T08:14:13.2359921+08:00;False|2024-09-05T08:13:11.8797534+08:00;True|2024-09-03T16:52:02.8227375+08:00;False|2024-09-03T16:51:32.4250926+08:00;True|2024-09-03T16:33:05.7269609+08:00;True|2024-09-03T16:00:15.0288548+08:00;True|2024-08-29T08:06:32.4732067+08:00;False|2024-08-29T08:06:02.4801886+08:00;True|2024-08-26T10:17:08.7733750+08:00;False|2024-08-26T10:11:05.1864217+08:00;False|2024-08-26T09:50:31.1539306+08:00;False|2024-08-26T09:47:37.4351309+08:00;True|2024-08-16T16:55:32.0918962+08:00;True|2024-08-16T16:53:23.3505641+08:00;False|2024-08-16T16:49:30.4579212+08:00;False|2024-08-16T16:47:01.9799743+08:00;</History>
<_PublishTargetUrl>G:\issWeb\缃戠珯鍙戝竷\API</_PublishTargetUrl>
</PropertyGroup>
<ItemGroup>
@@ -45,28 +45,28 @@
<publishTime>02/22/2013 16:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>09/11/2024 10:37:44</publishTime>
+ <publishTime>09/11/2024 21:06:39</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>09/11/2024 10:37:44</publishTime>
+ <publishTime>09/11/2024 21:06:39</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>09/11/2024 10:37:40</publishTime>
+ <publishTime>09/11/2024 21:06:35</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>09/11/2024 10:37:40</publishTime>
+ <publishTime>09/11/2024 21:06:35</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 22:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>09/11/2024 10:37:33</publishTime>
+ <publishTime>09/11/2024 21:06:25</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>09/11/2024 10:37:33</publishTime>
+ <publishTime>09/11/2024 21:06:25</publishTime>
</File>
<File Include="bin/Grpc.Core.Api.dll">
<publishTime>03/22/2022 13:17:26</publishTime>
@@ -111,10 +111,10 @@
<publishTime>07/25/2012 19:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
- <publishTime>09/11/2024 10:37:34</publishTime>
+ <publishTime>09/11/2024 21:06:28</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>09/11/2024 10:37:34</publishTime>
+ <publishTime>09/11/2024 21:06:28</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
<publishTime>04/15/2024 12:55:45</publishTime>
@@ -147,34 +147,34 @@
<publishTime>10/23/2021 17:07:54</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>09/11/2024 10:37:31</publishTime>
+ <publishTime>09/11/2024 21:06:23</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>09/11/2024 10:37:31</publishTime>
+ <publishTime>09/11/2024 21:06:23</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>09/11/2024 10:37:32</publishTime>
+ <publishTime>09/11/2024 21:06:24</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>09/11/2024 10:37:32</publishTime>
+ <publishTime>09/11/2024 21:06:24</publishTime>
</File>
<File Include="bin/RestSharp.dll">
<publishTime>08/31/2012 06:22:50</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>09/11/2024 10:37:32</publishTime>
+ <publishTime>09/11/2024 21:06:24</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>09/11/2024 10:37:32</publishTime>
+ <publishTime>09/11/2024 21:06:24</publishTime>
</File>
<File Include="bin/Swashbuckle.Core.dll">
<publishTime>02/16/2015 01:57:08</publishTime>
</File>
<File Include="bin/SyntacticSugar.dll">
- <publishTime>09/11/2024 10:20:46</publishTime>
+ <publishTime>09/11/2024 21:04:14</publishTime>
</File>
<File Include="bin/SyntacticSugar.pdb">
- <publishTime>09/11/2024 10:20:46</publishTime>
+ <publishTime>09/11/2024 21:04:14</publishTime>
</File>
<File Include="bin/System.Buffers.dll">
<publishTime>07/19/2017 18:01:28</publishTime>
@@ -285,19 +285,19 @@
<publishTime>05/09/2023 10:43:40</publishTime>
</File>
<File Include="bin/TopSdk.dll">
- <publishTime>09/11/2024 10:20:53</publishTime>
+ <publishTime>09/11/2024 21:04:23</publishTime>
</File>
<File Include="bin/TopSdk.pdb">
- <publishTime>09/11/2024 10:20:53</publishTime>
+ <publishTime>09/11/2024 21:04:23</publishTime>
</File>
<File Include="bin/WebActivatorEx.dll">
<publishTime>11/24/2014 19:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>09/11/2024 10:38:26</publishTime>
+ <publishTime>09/11/2024 21:07:20</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>09/11/2024 10:38:26</publishTime>
+ <publishTime>09/11/2024 21:07:20</publishTime>
</File>
<File Include="bin/WebAPI.XmlSerializers.dll">
<publishTime>08/16/2024 16:55:28</publishTime>
diff --git a/WebAPI/WebAPI.csproj.user b/WebAPI/WebAPI.csproj.user
index f043589..fedea3e 100644
--- a/WebAPI/WebAPI.csproj.user
+++ b/WebAPI/WebAPI.csproj.user
@@ -9,6 +9,7 @@
<WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected>
<NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
<NameOfLastUsedPublishProfile>D:\Git\houduan\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile>
<NameOfLastUsedPublishProfile>D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile10.pubxml</NameOfLastUsedPublishProfile>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
--
Gitblit v1.9.1