From a667d4159bb3f1ba909b94d5b5dd7c6eb28e7197 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期五, 07 四月 2023 09:48:30 +0800
Subject: [PATCH] 1.添加质检方案基础资料 2.采购到货接口调整 3.入厂检验扫描标签添加标签判断 4.ERP订单下达生成工单接口修改 5.编码规则接口修改 6.采购退货查询采购订单接口开发、订单查找物料接口开发
---
VueWebApi/obj/Release/VueWebApi.pdb | 0
VueWebApi/Logs/2023-04-04.TXT | 0
VueWebApi/DLL/DAL/AppPurchManagementDAL.cs | 329 ++++++++++++++++++++++++++++-
VueWebApi/Image/app_8_7.png | 0
VueWebApi/DLL/BLL/AppPurchManagementBLL.cs | 21 +
VueWebApi/Controllers/BaseDateController.cs | 10
.vs/VueWebApi/v16/.suo | 0
VueWebApi/DLL/DAL/AppQualityManagementDAL.cs | 38 ++-
VueWebApi/DLL/DAL/BaseDateDAL.cs | 24 ++
VueWebApi/Logs/2023-03-27.TXT | 0
VueWebApi/DLL/DAL/ProductionManagementDAL.cs | 33 ++
VueWebApi/Controllers/AppQualityManagementController.cs | 4
VueWebApi/obj/Release/Package/PackageTmp/Image/app_8_7.png | 0
VueWebApi/obj/Release/VueWebApi.csproj.AssemblyReference.cache | 0
VueWebApi/VueWebApi.csproj | 1
VueWebApi/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache | 0
VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb | 0
VueWebApi/Controllers/ProductionManagementController.cs | 14 +
VueWebApi/Logs/2023-04-06.TXT | 0
VueWebApi/Logs/2023-03-28.TXT | 0
VueWebApi/bin/VueWebApi.pdb | 0
VueWebApi/DLL/BLL/BaseDateBLL.cs | 7
VueWebApi/Controllers/AppPurchManagementController.cs | 42 +++
VueWebApi/Logs/2023-04-07.TXT | 25 ++
VueWebApi/DLL/DAL/SystemSettingDAL.cs | 14 +
VueWebApi/obj/Release/VueWebApi.csproj.FileListAbsolute.txt | 1
VueWebApi/Properties/PublishProfiles/FolderProfile.pubxml.user | 13
VueWebApi/Tools/SeachEncode.cs | 1
VueWebApi/DLL/BLL/ProductionManagementBLL.cs | 7
VueWebApi/bin/VueWebApi.xml | 22 ++
VueWebApi/DLL/DAL/PurchaseOrderDAL.cs | 3
VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml | 15 +
32 files changed, 578 insertions(+), 46 deletions(-)
diff --git a/.vs/VueWebApi/v16/.suo b/.vs/VueWebApi/v16/.suo
index cb1dcaf..a48d1df 100644
--- a/.vs/VueWebApi/v16/.suo
+++ b/.vs/VueWebApi/v16/.suo
Binary files differ
diff --git a/VueWebApi/Controllers/AppPurchManagementController.cs b/VueWebApi/Controllers/AppPurchManagementController.cs
index c75c79f..fdf6d6a 100644
--- a/VueWebApi/Controllers/AppPurchManagementController.cs
+++ b/VueWebApi/Controllers/AppPurchManagementController.cs
@@ -131,11 +131,49 @@
#endregion
#region[閲囪喘鍏ュ簱鎻愪氦]
+ /// <summary>
+ /// 閲囪喘鍏ュ簱鎻愪氦
+ /// </summary>
+ /// <param name="ordercode">閲囪喘璁㈠崟鍙�</param>
+ /// <param name="username">鎿嶄綔浜哄憳</param>
+ /// <param name="incontent">鎻愪氦鏁版嵁</param>
+ /// <returns></returns>
[Route(template: "MesAppPurchInStorSave")]
[HttpGet]
- public HttpResponseMessage MesAppPurchInStorSave()
+ public HttpResponseMessage MesAppPurchInStorSave(string ordercode,string username,string incontent)
{
- //mes = AppPurchManagementBLL.MesAppPurchInStorSave();
+ mes = AppPurchManagementBLL.MesAppPurchInStorSave(ordercode,username, incontent);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+
+ #region[閲囪喘閫�璐э細鑾峰彇閲囪喘璁㈠崟鍒楄〃(宸插埌璐х殑閲囪喘璁㈠崟)]
+ /// <summary>
+ /// 閲囪喘閫�璐э細鑾峰彇閲囪喘璁㈠崟鍒楄〃(宸插埌璐х殑閲囪喘璁㈠崟)
+ /// </summary>
+ /// <param name="purchordercode">閲囪喘璁㈠崟鍙�</param>
+ /// <returns></returns>
+ [Route(template: "MesAppPurchaseReturnOrderSearch")]
+ [HttpGet]
+ public HttpResponseMessage MesAppPurchaseReturnOrderSearch(string purchordercode = null)
+ {
+ mes = AppPurchManagementBLL.MesAppPurchaseReturnOrderSearch(purchordercode);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[閲囪喘閫�璐э細閫夋嫨閲囪喘璁㈠崟鑾峰彇鐗╂枡淇℃伅]
+ /// <summary>
+ /// 閲囪喘閫�璐э細閫夋嫨閲囪喘璁㈠崟鑾峰彇鐗╂枡淇℃伅
+ /// </summary>
+ /// <param name="purchordercode">閲囪喘璁㈠崟鍙�</param>
+ /// <returns></returns>
+ [Route(template: "MesAppPurchReturnOrderPartSearch")]
+ [HttpGet]
+ public HttpResponseMessage MesAppPurchReturnOrderPartSearch(string purchordercode)
+ {
+ mes = AppPurchManagementBLL.MesAppPurchReturnOrderPartSearch(purchordercode);
return TJson.toJson(mes);
}
#endregion
diff --git a/VueWebApi/Controllers/AppQualityManagementController.cs b/VueWebApi/Controllers/AppQualityManagementController.cs
index 2505b0e..a2a1601 100644
--- a/VueWebApi/Controllers/AppQualityManagementController.cs
+++ b/VueWebApi/Controllers/AppQualityManagementController.cs
@@ -56,7 +56,7 @@
/// </summary>
/// <returns></returns>
[Route(template: "InFactoryCheckSave")]
- [HttpGet]
+ [HttpPost]
public HttpResponseMessage InFactoryCheckSave()
{
string hbillno = HttpContext.Current.Request["hbillno"].ToString();//閲囪喘璁㈠崟鍙�
@@ -67,7 +67,7 @@
string partcode = HttpContext.Current.Request["partcode"].ToString();//鐗╂枡缂栫爜
string customercode = HttpContext.Current.Request["customercode"].ToString();//寰�鏉ュ崟浣�(澶栬喘渚涙柟缂栫爜)
string batchno = HttpContext.Current.Request["batchno"].ToString();//鎵规鍙�
- string qualitystatus = HttpContext.Current.Request["qualitystatus "].ToString(); //璐ㄩ噺鐘舵��(鍚堟牸銆佷笉鍚堟牸)
+ string qualitystatus = HttpContext.Current.Request["qualitystatus"].ToString(); //璐ㄩ噺鐘舵��(鍚堟牸銆佷笉鍚堟牸)
string labqty = HttpContext.Current.Request["labqty"].ToString();//鐗╂枡鏁伴噺(鏍囩鏁伴噺)
string sampleqty = HttpContext.Current.Request["sampleqty"].ToString();//鏍锋湰鏁伴噺
string goodqty = HttpContext.Current.Request["goodqty"].ToString();//鍚堟牸鏁伴噺
diff --git a/VueWebApi/Controllers/BaseDateController.cs b/VueWebApi/Controllers/BaseDateController.cs
index 4236706..6d31157 100644
--- a/VueWebApi/Controllers/BaseDateController.cs
+++ b/VueWebApi/Controllers/BaseDateController.cs
@@ -102,5 +102,15 @@
return TJson.toJson(mes);
}
#endregion
+
+ #region[璐ㄦ鏂规淇℃伅]
+ [Route(template: "QualityScheme")]
+ [HttpGet]
+ public HttpResponseMessage QualityScheme()
+ {
+ mes = BaseDateBLL.QualityScheme();
+ return TJson.toJson(mes);
+ }
+ #endregion
}
}
\ No newline at end of file
diff --git a/VueWebApi/Controllers/ProductionManagementController.cs b/VueWebApi/Controllers/ProductionManagementController.cs
index 84df0e4..5f2d3cf 100644
--- a/VueWebApi/Controllers/ProductionManagementController.cs
+++ b/VueWebApi/Controllers/ProductionManagementController.cs
@@ -248,6 +248,20 @@
}
#endregion
+ #region[MES宸ュ崟鏂板銆佽幏鍙栧伐鍗曞彿]
+ /// <summary>
+ /// MES宸ュ崟鏂板銆佽幏鍙栧伐鍗曞彿
+ /// </summary>
+ /// <returns></returns>
+ [Route(template: "AddMesOrderCodeSearch")]
+ [HttpPost]
+ public HttpResponseMessage AddMesOrderCodeSearch()
+ {
+ mes = ProductionManagementBLL.AddMesOrderCodeSearch();
+ return TJson.toJson(mes);
+ }
+ #endregion
+
#region[MES宸ュ崟鏂板銆佺紪杈戞彁浜
/// <summary>
/// MES宸ュ崟鏂板銆佺紪杈戞彁浜�
diff --git a/VueWebApi/DLL/BLL/AppPurchManagementBLL.cs b/VueWebApi/DLL/BLL/AppPurchManagementBLL.cs
index e50eb85..735a3ec 100644
--- a/VueWebApi/DLL/BLL/AppPurchManagementBLL.cs
+++ b/VueWebApi/DLL/BLL/AppPurchManagementBLL.cs
@@ -60,5 +60,26 @@
}
#endregion
+ #region[閲囪喘鍏ュ簱鎻愪氦]
+ public static ToMessage MesAppPurchInStorSave(string ordercode, string username, string incontent)
+ {
+ return AppPurchManagementDAL.MesAppPurchInStorSave(ordercode,username, incontent);
+ }
+ #endregion
+
+
+ #region[閲囪喘閫�璐э細鑾峰彇閲囪喘璁㈠崟鍒楄〃(宸插埌璐х殑閲囪喘璁㈠崟)]
+ public static ToMessage MesAppPurchaseReturnOrderSearch(string purchordercode)
+ {
+ return AppPurchManagementDAL.MesAppPurchaseReturnOrderSearch(purchordercode);
+ }
+ #endregion
+
+ #region[閲囪喘閫�璐э細閫夋嫨閲囪喘璁㈠崟鑾峰彇鐗╂枡淇℃伅]
+ public static ToMessage MesAppPurchReturnOrderPartSearch(string purchordercode)
+ {
+ return AppPurchManagementDAL.MesAppPurchReturnOrderPartSearch(purchordercode);
+ }
+ #endregion
}
}
\ No newline at end of file
diff --git a/VueWebApi/DLL/BLL/BaseDateBLL.cs b/VueWebApi/DLL/BLL/BaseDateBLL.cs
index 8bc2862..f516156 100644
--- a/VueWebApi/DLL/BLL/BaseDateBLL.cs
+++ b/VueWebApi/DLL/BLL/BaseDateBLL.cs
@@ -50,5 +50,12 @@
return BaseDateDAL.UnitSerch();
}
#endregion
+
+ #region[璐ㄦ鏂规淇℃伅]
+ public static ToMessage QualityScheme()
+ {
+ return BaseDateDAL.QualityScheme();
+ }
+ #endregion
}
}
\ No newline at end of file
diff --git a/VueWebApi/DLL/BLL/ProductionManagementBLL.cs b/VueWebApi/DLL/BLL/ProductionManagementBLL.cs
index 3c37535..74e81f0 100644
--- a/VueWebApi/DLL/BLL/ProductionManagementBLL.cs
+++ b/VueWebApi/DLL/BLL/ProductionManagementBLL.cs
@@ -83,6 +83,13 @@
}
#endregion
+ #region[MES宸ュ崟鏂板銆佽幏鍙栧伐鍗曞彿]
+ public static ToMessage AddMesOrderCodeSearch()
+ {
+ return ProductionManagementDAL.AddMesOrderCodeSearch();
+ }
+ #endregion
+
#region[MES宸ュ崟鏂板銆佺紪杈戞彁浜
public static ToMessage AddUpdateMesOrder(string mesorderstus, string mesordercode,string sourceorder,string ordertype, string partcode, string mesqty, string routecode, string wkshopcode, string planstartdate, string planenddate, string orderlev, string username, string opertype,string is_aps,string bom_id)
{
diff --git a/VueWebApi/DLL/DAL/AppPurchManagementDAL.cs b/VueWebApi/DLL/DAL/AppPurchManagementDAL.cs
index c3c3b74..5d684bd 100644
--- a/VueWebApi/DLL/DAL/AppPurchManagementDAL.cs
+++ b/VueWebApi/DLL/DAL/AppPurchManagementDAL.cs
@@ -1,4 +1,5 @@
锘縰sing Dapper;
+using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Data;
@@ -35,7 +36,7 @@
//鏌ヨ鏈叧闂笖鏈叏閮ㄥ埌璐х殑閲囪喘璁㈠崟
sql = @"select distinct A.ordercode from T_PurchaseOrder A
inner join T_PurchaseOrder_sub B on A.ordercode=B.purchaseorder_code
- where B.countarrivalquantity<quantity" + search;
+ where B.countarrivalquantity<quantity and A.status<>'CLOSED'" + search;
dynamicParams.Add("@purchordercode", purchordercode);
var data = DapperHelper.selectdata(sql, dynamicParams);
if (data.Rows.Count > 0)
@@ -109,7 +110,7 @@
#region[閲囪喘鍒拌揣锛氱敓鎴愮郴缁熸潯鐮乚
public static ToMessage MesAppPurchOrderLabelBarCode(string partcode, string arrivalqty, string onelableqty)
{
- mes = AppLableBarCode.EncodingSeach("2060", partcode, arrivalqty, onelableqty);
+ mes = AppLableBarCode.EncodingSeach("2018", partcode, arrivalqty, onelableqty);
return mes;
}
#endregion
@@ -157,7 +158,7 @@
{
hbillno = djwo,
hdate = DateTime.Now.ToString(),
- hacceptdate =hacceptdate==""?null:hacceptdate,
+ hacceptdate = hacceptdate == "" ? null : hacceptdate,
hbillstaus = orderstaus,
hdepartmentcode = dpartment,
hcustomercode = customercode,
@@ -178,7 +179,7 @@
parm = new
{
hbillno = djwo,
- rownumber=json[i].rownumber,
+ rownumber = json[i].rownumber,
hpartcode = json[i].hpartcode,
hplanqty = decimal.Parse(json[i].hplanqty),
hqty = decimal.Parse(json[i].hqty),
@@ -192,8 +193,8 @@
for (int j = 0; j < json[i].children.Count; j++)
{
//鍐欏叆鏉＄爜妗ｆ琛�
- sql = @"insert into T_BarCodeBill(rightcode,hbillno,hbilltype,hbarcode,hbarcodestatus,hbarcodetype,hmaterialcode,hqty,hbatchno,hcustomercode,hdeptcode,hsourcebillno,hsourcebilltype,barcodeposition,lm_user,lm_date)
- values(@rightcode,@hbillno,@hbilltype,@hbarcode,@hbarcodestatus,@hbarcodetype,@hmaterialcode,@hqty,@hbatchno,@hcustomercode,@hdeptcode,@hsourcebillno,@hsourcebilltype,@barcodeposition,@lm_user,@lm_date)";
+ sql = @"insert into T_BarCodeBill(rightcode,hbillno,hbilltype,hbarcode,qualitystatus,hbarcodestatus,hbarcodetype,hmaterialcode,hqty,hbatchno,hcustomercode,hdeptcode,hsourcebillno,hsourcebilltype,barcodeposition,lm_user,lm_date)
+ values(@rightcode,@hbillno,@hbilltype,@hbarcode,@qualitystatus,@hbarcodestatus,@hbarcodetype,@hmaterialcode,@hqty,@hbatchno,@hcustomercode,@hdeptcode,@hsourcebillno,@hsourcebilltype,@barcodeposition,@lm_user,@lm_date)";
list.Add(new
{
str = sql,
@@ -203,6 +204,7 @@
hbillno = djwo,
hbilltype = "1103", //閲囪喘鍒拌揣鍗曠被鍨�
hbarcode = json[i].children[j].labcode,
+ qualitystatus= json[i].hischeck=="Y"? "TS" : "CS",
hbarcodestatus = "Y",
hbarcodetype = "P",
hmaterialcode = json[i].children[j].partnumber,
@@ -212,7 +214,7 @@
hdeptcode = dpartment,
hsourcebillno = purordercode,
hsourcebilltype = "1102",
- barcodeposition="2060;閲囪喘鍒拌揣",
+ barcodeposition = "2060;閲囪喘鍒拌揣",
lm_user = username,
lm_date = DateTime.Now.ToString()
}
@@ -227,8 +229,8 @@
{
purordercode = purordercode,
materiel_code = json[i].hpartcode,
- rownumber=json[i].rownumber,
- hqty=decimal.Parse(json[i].hqty)
+ rownumber = json[i].rownumber,
+ hqty = decimal.Parse(json[i].hqty)
}
});
}
@@ -315,13 +317,13 @@
try
{
//閫夋嫨閲囪喘璁㈠崟甯﹀嚭璁㈠崟涓嬫湁鍒拌揣鐨勭墿鏂欎俊鎭�
- sql = @"select A.ordercode,M.partcode,M.partname,M.partspec,avg(S.hplanqty) as hplanqty,sum(S.hqty) as hqty
+ sql = @"select A.ordercode,M.partcode,M.partname,M.partspec,A.customercode,A.departmentcode,avg(S.hplanqty) as hplanqty,sum(S.hqty) as hqty
from T_PurchaseOrder A
inner join T_PurchaseArrivalOrder B on A.ordercode=B.hsourcebillno
inner join T_PurchaseArrivalOrder_sub S on B.hbillno=S.hbillno
left join TMateriel_Info M on S.hpartcode=M.partcode
where B.hbillstaus in('BINARIVE','INARIVE','BINSTOG') and A.ordercode=@ordercode
- group by A.ordercode,M.partcode,M.partname,M.partspec";
+ group by A.ordercode,M.partcode,M.partname,M.partspec,A.customercode,A.departmentcode";
dynamicParams.Add("@ordercode", ordercode);
var data = DapperHelper.selectdata(sql, dynamicParams);
if (data.Rows.Count > 0)
@@ -349,15 +351,15 @@
#endregion
#region[閲囪喘鍏ュ簱鎵弿鏍囩鏉＄爜甯﹀嚭鍒拌揣鍗曚俊鎭痌
- public static ToMessage MesAppPurchInStorScanLabCode(string labcode,string ordercode)
+ public static ToMessage MesAppPurchInStorScanLabCode(string labcode, string ordercode)
{
string sql = "";
var dynamicParams = new DynamicParameters();
try
{
//鍒ゆ柇鏉＄爜鐘舵��
- mes = LabCodeStatusMessage.LabCodeStatus("2060", "1103",labcode);//鍔熻兘缂栧彿銆佸崟鎹被鍨嬬紪鐮併�佹爣绛剧紪鐮�
- if (mes.code == "300")
+ mes = LabCodeStatusMessage.LabCodeStatus("2060", "1103", labcode);//鍔熻兘缂栧彿銆佸崟鎹被鍨嬬紪鐮併�佹爣绛剧紪鐮�
+ if (mes.code == "300")
{
return mes;
}
@@ -365,10 +367,10 @@
sql = @"select * from T_BarCodeBill where hsourcebillno=@ordercode";
dynamicParams.Add("@ordercode", ordercode);
var data0 = DapperHelper.selectdata(sql, dynamicParams);
- if (data0.Rows.Count < 0)
+ if (data0.Rows.Count < 0)
{
mes.code = "300";
- mes.Message = "褰撳墠鏉＄爜涓嶆槸閲囪喘璁㈠崟銆�"+ ordercode + "銆戠敓鎴愭潯鐮�!";
+ mes.Message = "褰撳墠鏉＄爜涓嶆槸閲囪喘璁㈠崟銆�" + ordercode + "銆戠敓鎴愭潯鐮�!";
mes.data = null;
return mes;
}
@@ -403,5 +405,300 @@
}
#endregion
+ #region[閲囪喘鍏ュ簱鎻愪氦]
+ public static ToMessage MesAppPurchInStorSave(string ordercode, string username, string incontent)
+ {
+ var sql = "";
+ string djwo = "", numvalue = "";
+ List<object> list = new List<object>();
+ List<ObjectData> obj = new List<ObjectData>();
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ string datetime = DateTime.Now.ToString(); //鑾峰彇绯荤粺鏃堕棿
+ mes = SeachEncode.EncodingSeach("2061"); //APP绔噰璐叆搴撶敓鎴愬崟鍙�
+ if (mes.code == "300")
+ {
+ return mes;
+ }
+ else
+ {
+ List<string> wo = (List<string>)mes.data;
+ djwo = wo[0].ToString(); //鑾峰彇鍗曞彿
+ numvalue = wo[1].ToString(); //鑾峰彇娴佹按鍙�
+ }
+ //鑾峰彇鎻愪氦淇℃伅
+ JArray arra = (JArray)Newtonsoft.Json.JsonConvert.DeserializeObject(incontent);
+ list.Clear();
+ //鍐欏叆鍏ュ簱璁板綍涓昏〃
+ sql = @"insert into TK_WMS_Inwh_Main(docu_typecode,hbillno,hsoucenillno,status,hcustomer,hdempart,lm_user,lm_date)
+ values(@docu_typecode,@hbillno,@hsoucenillno,@status,@hcustomer,@hdempart,@lm_user,@lm_date)";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ docu_typecode = "1201",
+ hbillno = djwo,
+ hsoucenillno = ordercode,
+ status = "NEW",
+ hcustomer = arra[0]["customercode"].ToString(),
+ hdempart = arra[0]["departmentcode"].ToString(),
+ lm_user = username,
+ lm_date = datetime
+ }
+ });
+ //鏍规嵁婧愬崟+鐗╂枡鏌ヨ閲囪喘璁㈠崟鍒拌揣鎬绘暟銆佸叆搴撴�绘暟
+ sql = @"select sum(B.quantity) as quantity,sum(B.countarrivalquantity) as countarrivalquantity,
+ sum(B.countInquantity) as countInquantity
+ from T_PurchaseOrder A
+ inner join T_PurchaseOrder_sub B on A.ordercode=B.purchaseorder_code
+ where ordercode=@ordercode";
+ dynamicParams.Add("@ordercode", ordercode);
+ var data0 = DapperHelper.selectdata(sql, dynamicParams);
+ decimal quantity = decimal.Parse(data0.Rows[0]["quantity"].ToString()); //閲囪喘璁㈠崟绱浠诲姟鏁伴噺
+ decimal countarrivalquantity = decimal.Parse(data0.Rows[0]["countarrivalquantity"].ToString()); //閲囪喘璁㈠崟绱鍒拌揣鏁伴噺
+ decimal countInquantity = decimal.Parse(data0.Rows[0]["countInquantity"].ToString()); //閲囪喘璁㈠崟绱鍏ュ簱鏁伴噺
+
+ string storg = "";//閲囪喘璁㈠崟鍏ュ簱鐘舵��
+ decimal partlabqty = 0; //褰撳墠鏍囩绱鏁伴噺
+
+ for (int i = 1; i <= arra.Count; i++)//寰幆鑾峰彇鐗╂枡淇℃伅
+ {
+ string labcode = "";//鏍囩淇℃伅
+ decimal suminqty = 0; //鍗曟爣绛惧叆搴撴�绘暟閲�
+ string batchno = ""; //鎵规鍙�
+
+ //鏌ヨ姹囨�绘爣绛句俊鎭�
+ for (int j = 0; j < arra[i]["labcont"].Count(); j++)//寰幆鑾峰彇鏍囩淇℃伅
+ {
+
+ //鏇存柊鍒拌揣鍗曞瓙琛ㄥ叆搴撴暟閲�
+ sql = @"update T_PurchaseArrivalOrder_sub set hinqty=isnull(hinqty,0)+@inqty where hbillno=@hbillno and hpartcode=@hpartcode";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ hbillno = arra[i]["labcont"][j]["arrivelorder"].ToString(),
+ hpartcode = arra[i]["partcode"].ToString(),
+ hinqty = decimal.Parse(arra[i]["labcont"][j]["qty"].ToString())
+ }
+ });
+ labcode = labcode + arra[i]["labcont"][j]["labcode"].ToString() + ",";
+ suminqty = suminqty + decimal.Parse(arra[i]["labcont"][j]["qty"].ToString());
+ partlabqty = partlabqty + decimal.Parse(arra[i]["labcont"][j]["qty"].ToString());
+ batchno = arra[i]["labcont"][j]["batch"].ToString();
+ }
+
+ //鏇存柊閲囪喘璁㈠崟瀛愯〃鍏ュ簱鏁伴噺
+ sql = @"update T_PurchaseOrder_sub set countInquantity=isnull(countInquantity,0)+@countInquantity
+ where purchaseorder_code=@purchaseorder_code and materiel_code=@materiel_code";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ purchaseorder_code = ordercode,
+ materiel_code = arra[i]["partcode"].ToString(),
+ countInquantity = partlabqty
+ }
+ });
+
+ //鍐欏叆閲囪喘鍏ュ簱鍗曞瓙琛�
+ sql = @"insert into TK_WMS_Inwh_Sub(hbillno,labcode,rownumber,materiel_code,storehouse_code,location_code,qty,batchno)
+ values(@hbillno,@labcode,@rownumber,@materiel_code,@storehouse_code,@location_code,@qty,@batchno)";
+ labcode = string.Format("'{0}'", labcode.Substring(0, labcode.Length - 1).Replace(",", "','"));
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ hbillno = djwo,
+ labcode = labcode,
+ rownumber = i,
+ materiel_code = arra[i]["partcode"].ToString(),
+ storehouse_code = arra[i]["storehousecode"].ToString(),
+ location_code = arra[i]["warehousecode"].ToString(),
+ qty = suminqty,
+ batchno = batchno
+ }
+ });
+ //鍐欏叆搴撳瓨琛ㄥ墠鏌ヨ褰撳墠鐗╂枡鍦ㄥ簱瀛樿〃涓槸鍚﹀瓨鍦�,鍐欏叆鎴栨洿鏂板簱瀛樿〃
+ sql = @"select * from TK_WMS_Stock where materiel_code=@materiel_code";
+ dynamicParams.Add("@materiel_code", arra[i]["partcode"].ToString());
+ var data1 = DapperHelper.selectdata(sql, dynamicParams);
+ if (data1.Rows.Count > 0)
+ {
+ sql = @"update TK_WMS_Stock set qty=qty+@suminqty
+ where materiel_code=@materiel_code";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ materiel_code = arra[i]["partcode"].ToString(),
+ suminqty = suminqty
+ }
+ });
+ }
+ else
+ {
+ sql = @"insert into TK_WMS_Stock(materiel_code,batchno,storehouse_code,location_code,customercode,qty,lm_user,lm_date)
+ values(materiel_code,batchno,storehouse_code,location_code,customercode,qty,lm_user,lm_date)";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ materiel_code = arra[i]["partcode"].ToString(),
+ batchno = batchno,
+ storehouse_code= arra[i]["storehousecode"].ToString(),
+ location_code= arra[i]["warehousecode"].ToString(),
+ customercode= arra[i]["customercode"].ToString(),
+ qty= suminqty,
+ lm_user=username,
+ lm_date= datetime,
+ }
+ });
+ }
+ /*鍐欏叆ERP閲囪喘鍏ュ簱鍗�************
+ * ***********************
+ * **********************
+ **********************/
+ }
+ //鏇存柊閲囪喘瀹氬崟鐘舵��(閮ㄥ垎鍏ュ簱銆佸凡鍏ュ簱)
+ if ((countInquantity + partlabqty) < countarrivalquantity) //褰撳墠閲囪喘璁㈠崟绱宸插叆搴�+鏈鎬诲叆搴�<褰撳墠閲囪喘璁㈠崟绱鍒拌揣=閮ㄥ垎鍏ュ簱
+ {
+ storg = "BINSTOG";
+ }
+ else
+ {
+ storg = "INSTOG";
+ }
+ //鏇存柊閲囪喘璁㈠崟涓昏〃鍗曟嵁鐘舵��
+ sql = @"update T_PurchaseOrder set status=@storg
+ where ordercode=@ordercode";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ ordercode = ordercode,
+ storg = storg
+ }
+ });
+
+ bool aa = DapperHelper.DoTransaction(list);
+ if (aa)
+ {
+ mes.code = "200";
+ mes.count = 0;
+ mes.Message = "鎿嶄綔鎴愬姛!";
+ mes.data = null;
+ }
+ else
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "鎿嶄綔澶辫触!";
+ mes.data = null;
+ }
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+
+ #region[閲囪喘閫�璐э細鑾峰彇閲囪喘璁㈠崟鍒楄〃(宸插埌璐х殑閲囪喘璁㈠崟)]
+ public static ToMessage MesAppPurchaseReturnOrderSearch(string purchordercode)
+ {
+ string sql = "";
+ string search = "";
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ if (purchordercode != "" && purchordercode != null) //璁㈠崟鍙蜂笉涓虹┖
+ {
+ search += " and A.ordercode like '%'+@purchordercode+'%' ";
+ }
+ //鏌ヨ鏈叧闂笖鏈夊埌璐х殑閲囪喘璁㈠崟
+ sql = @"select distinct A.ordercode from T_PurchaseOrder A
+ inner join T_PurchaseOrder_sub B on A.ordercode=B.purchaseorder_code
+ where B.countarrivalquantity<=quantity and A.status<>'CLOSED'" + search;
+ dynamicParams.Add("@purchordercode", purchordercode);
+ var data = DapperHelper.selectdata(sql, dynamicParams);
+ if (data.Rows.Count > 0)
+ {
+ mes.code = "200";
+ mes.Message = "鏌ヨ鎴愬姛!";
+ mes.data = data;
+ }
+ else
+ {
+ mes.code = "300";
+ mes.Message = "鏃犺鍗曟暟鎹�!";
+ mes.data = null;
+ }
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+ #region[閲囪喘閫�璐э細閫夋嫨閲囪喘璁㈠崟鑾峰彇鐗╂枡淇℃伅]
+ public static ToMessage MesAppPurchReturnOrderPartSearch(string purchordercode)
+ {
+ string sql = "";
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ //鏍规嵁閲囪喘璁㈠崟鍙锋煡璇㈤潪鍏抽棴鐘舵�佷笅鏈夊埌璐т笖鍒拌揣鏁伴噺澶т簬0鐨勭墿鏂�
+ sql = @"select B.rownumber, B.materiel_code as partcode,M.partname,M.partspec,
+ B.quantity,B.countarrivalquantity,U.code as uomcode,U.name as uomname
+ from T_PurchaseOrder A
+ inner join T_PurchaseOrder_sub B on A.ordercode=B.purchaseorder_code
+ left join TMateriel_Info M on B.materiel_code=M.partcode
+ left join TUom U on M.uom_code=U.code
+ where B.countarrivalquantity>0 and A.status<>'CLOSED' and A.ordercode=@purchordercode";
+ dynamicParams.Add("@purchordercode", purchordercode);
+ var data = DapperHelper.selectdata(sql, dynamicParams);
+ if (data.Rows.Count > 0)
+ {
+ mes.code = "200";
+ mes.Message = "鏌ヨ鎴愬姛!";
+ mes.data = data;
+ }
+ else
+ {
+ mes.code = "300";
+ mes.Message = "鏆傛棤鐗╂枡鏁版嵁!";
+ mes.data = null;
+ }
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
}
}
\ No newline at end of file
diff --git a/VueWebApi/DLL/DAL/AppQualityManagementDAL.cs b/VueWebApi/DLL/DAL/AppQualityManagementDAL.cs
index 7c8bb60..c6821f0 100644
--- a/VueWebApi/DLL/DAL/AppQualityManagementDAL.cs
+++ b/VueWebApi/DLL/DAL/AppQualityManagementDAL.cs
@@ -41,11 +41,23 @@
mes.data = null;
return mes;
}
+ //鍒ゆ柇鏉＄爜鏄惁闇�瑕佹楠�
+ sql = @"select * from TMateriel_Info where partcode=@partcode and is_incheck='N'";
+ dynamicParams.Add("@partcode", data0.Rows[0]["hmaterialcode"].ToString());
+ var data_0 = DapperHelper.selectdata(sql, dynamicParams);
+ if (data_0.Rows.Count > 0)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "姝ゆ爣绛炬潯鐮佸厤妫�!";
+ mes.data = null;
+ return mes;
+ }
//鍒ゆ柇鏉＄爜鏄惁妫�楠�
sql = @"select * from TStepCheckRecord where hbarcode=@labcode and check_type='InCheck'";
dynamicParams.Add("@labcode", labcode);
var data = DapperHelper.selectdata(sql, dynamicParams);
- if (data0.Rows.Count > 0)
+ if (data.Rows.Count > 0)
{
mes.code = "300";
mes.count = 0;
@@ -67,7 +79,7 @@
//鑾峰彇缁戝畾鐨勫叆鍘傝川妫�鏂规銆佹娊鏍锋柟寮忋�佹牱鏈暟
sql = @"select code as checkstandcode,name as checkstandname,sampmethod,sampscare
from TStepCheckStandard
- where PATINDEX('%;' + RTRIM(@partcode) + ';%',';' + suitpart + ';')>0 or PATINDEX('%;' + RTRIM(@stocktype_code) + ';%',';' + suitpart + ';')>0
+ where (PATINDEX('%,' + RTRIM(@partcode) + ',%',',' + suitpart + ',')>0 or PATINDEX('%,' + RTRIM(@stocktype_code) + ',%',',' + suitpart + ',')>0)
and checktype='InCheck'";
dynamicParams.Add("@partcode", data1.Rows[0]["partcode"].ToString());//鐗╂枡缂栫爜
dynamicParams.Add("@stocktype_code", data1.Rows[0]["stocktype_code"].ToString());//瀛樿揣绫诲瀷缂栫爜
@@ -194,11 +206,11 @@
}
//寰幆鏍囩涓暟
- for (int i = 1; i <= obj.Count; i++)
+ for (int i = 0; i <obj.Count; i++)
{
//鍐欏叆妫�楠岃褰曚富琛�
sql = @"insert into TStepCheckRecord(hbarcode,wo_code,partcode,checkstaned_code,customer_code,check_user,check_type,check_typename,sampmethod,check_result,check_qty,good_qty,ng_qty,lm_user,lm_date)
- values(@hbarcode,@wo_code,@partcode,@checkstaned_code,@check_user,@check_type,@check_typename,@sampmethod,@check_result,@check_qty,@good_qty,@ng_qty,@lm_user,@lm_date)";
+ values(@hbarcode,@wo_code,@partcode,@checkstaned_code,@customer_code,@check_user,@check_type,@check_typename,@sampmethod,@check_result,@check_qty,@good_qty,@ng_qty,@lm_user,@lm_date)";
list.Add(new
{
str = sql,
@@ -223,26 +235,26 @@
});
//鑾峰彇涓昏〃鏈�澶D
sql = @"select ISNULL(IDENT_CURRENT('TStepCheckRecord')+@num,1) as id";
- dynamicParams.Add("@num", i);
+ dynamicParams.Add("@num", i+1);
var dt = DapperHelper.selectdata(sql, dynamicParams);
//鍐欏叆妫�楠岃褰曞瓙琛�
for (int j = 0; j < arra.Count; j++)
{
sql = @"insert into TStepCheckRecordSub(m_id,checknum,checkitem_seq,checkitem_code,checkitem_name,checkitem_descr,check_value,check_result,lm_user,lm_date)
- values(@m_id,@checkiem_seq,@checkitem_code,@checkitem_name,@checkitem_descr,@check_result,@lm_user,@lm_date)";
+ values(@m_id,@checknum,@checkiem_seq,@checkitem_code,@checkitem_name,@checkitem_descr,@check_value,@check_result,@lm_user,@lm_date)";
list.Add(new
{
str = sql,
parm = new
{
m_id = int.Parse(dt.Rows[0]["ID"].ToString()),
- checknum = arra[i]["checknum"].ToString(),
- checkiem_seq = arra[i]["checkiem_seq"].ToString(),
- checkitem_code = arra[i]["checkitem_code"].ToString(),
- checkitem_name = arra[i]["checkitem_name"].ToString(),
- checkitem_descr = arra[i]["checkitem_descr"].ToString(),
- check_value = arra[i]["check_value"].ToString(),
- check_result = arra[i]["check_result"].ToString(),
+ checknum = arra[j]["checknum"].ToString(),
+ checkiem_seq = arra[j]["checkiem_seq"].ToString(),
+ checkitem_code = arra[j]["checkitem_code"].ToString(),
+ checkitem_name = arra[j]["checkitem_name"].ToString(),
+ checkitem_descr = arra[j]["checkitem_descr"].ToString(),
+ check_value = arra[j]["check_value"].ToString(),
+ check_result = arra[j]["check_result"].ToString(),
lm_user = username,
lm_date = datetime
}
diff --git a/VueWebApi/DLL/DAL/BaseDateDAL.cs b/VueWebApi/DLL/DAL/BaseDateDAL.cs
index 30491c0..18d71e6 100644
--- a/VueWebApi/DLL/DAL/BaseDateDAL.cs
+++ b/VueWebApi/DLL/DAL/BaseDateDAL.cs
@@ -173,5 +173,29 @@
return mes;
}
#endregion
+
+ #region[璐ㄦ鏂规淇℃伅]
+ public static ToMessage QualityScheme()
+ {
+ string sql = "";
+ try
+ {
+ sql = @"select code,name,sampmethod,sampscare from TStepCheckStandard
+ where status='Y' and checktype='InCheck'";
+ var data = DapperHelper.selecttable(sql);
+ mes.code = "200";
+ mes.Message = "鏌ヨ鎴愬姛!";
+ mes.data = data;
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
}
}
\ No newline at end of file
diff --git a/VueWebApi/DLL/DAL/ProductionManagementDAL.cs b/VueWebApi/DLL/DAL/ProductionManagementDAL.cs
index 47dda89..5bc768c 100644
--- a/VueWebApi/DLL/DAL/ProductionManagementDAL.cs
+++ b/VueWebApi/DLL/DAL/ProductionManagementDAL.cs
@@ -127,7 +127,8 @@
//鑾峰彇鏈�澶у崟鎹彿
if (i == 1) //棣栧崟鑾峰彇宸ュ崟鍙�
{
- sql = @"select isnull(max(substring(wo_code,charindex('_',wo_code)+1,len(wo_code)-charindex('_',wo_code))),0)+1 as worknumb from TK_Wrk_Man where m_po=@erpordercode";
+ sql = @"select isnull(max(cast(substring(wo_code,charindex('_',wo_code)+1,len(wo_code)-charindex('_',wo_code)) as numeric)),0)+1 as worknumb
+ from TK_Wrk_Man where m_po=@erpordercode";
dynamicParams.Add("@erpordercode", erpordercode);
var data = DapperHelper.selectdata(sql, dynamicParams);
num = Convert.ToInt32(data.Rows[0]["WORKNUMB"].ToString());
@@ -559,7 +560,6 @@
}
#endregion
-
#region銆愮敓浜х鐞嗐�佸伐鍗曟柊澧炪�佺紪杈戞椂,閫夋嫨鎺掔▼鏄椂鑾峰彇鐗╂枡娓呭崟鐗堟湰鍙枫��
public static ToMessage JobCreationSonAddVison(string partnumber)
{
@@ -640,6 +640,33 @@
}
}
}
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+ #region[MES宸ュ崟鏂板銆佽幏鍙栧伐鍗曞彿]
+ public static ToMessage AddMesOrderCodeSearch()
+ {
+ string sql = "";
+ string wo_code = "";
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ //鑾峰彇鍗曟嵁鍙�
+ sql = @"SELECT 'SGPO'+CONVERT(varchar(12) , getdate(), 112 )+'_'+cast(isnull(max(cast(substring(wo_code,charindex('_',wo_code)+1,len(wo_code)-charindex('_',wo_code)) as numeric)),0)+1 as varchar) as numct
+ FROM TK_Wrk_Man where wo_code like '%SGPO%'";
+ var data = DapperHelper.selecttable(sql);
+ mes.code = "200";
+ mes.Message = "鏌ヨ鎴愬姛!";
+ mes.data = data.Rows[0]["numct"].ToString();
}
catch (Exception e)
{
@@ -1081,7 +1108,7 @@
public static ToMessage MesOrderStepEqpSearch(string orderstepqrcode)
{
var sql = "";
- string search = "";
+ string search = "";//瀹氫箟涓�涓煡璇㈠弬鏁�,鏌ヨ鏉′欢鏈夊墠绔紶鍏�
string ordercode = "";
string stepcode = "";
var dynamicParams = new DynamicParameters();
diff --git a/VueWebApi/DLL/DAL/PurchaseOrderDAL.cs b/VueWebApi/DLL/DAL/PurchaseOrderDAL.cs
index a5f8513..23d68a0 100644
--- a/VueWebApi/DLL/DAL/PurchaseOrderDAL.cs
+++ b/VueWebApi/DLL/DAL/PurchaseOrderDAL.cs
@@ -74,8 +74,7 @@
}
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
- var sql = @"select case when A.status='NEW' then '鏂拌鍗�' when A.status='CHECK' then '宸插鏍�' when A.status='CLOSED' then '宸插叧闂�' end as status,
- A.orderdate,A.ordercode,T.org_name as deptname,C.name as customername,A.saleorderCode,A.acceptdate,A.lm_user,A.lm_date,U.username as auditoruser,A.auditordate
+ var sql = @"select A.status,A.orderdate,A.ordercode,T.org_name as deptname,C.name as customername,A.saleorderCode,A.acceptdate,A.lm_user,A.lm_date,U.username as auditoruser,A.auditordate
from T_PurchaseOrder A
left join TOrganization T on A.departmentcode=T.org_code
left join TCustomer C on A.customercode=C.code
diff --git a/VueWebApi/DLL/DAL/SystemSettingDAL.cs b/VueWebApi/DLL/DAL/SystemSettingDAL.cs
index 1b35fbd..fb3e107 100644
--- a/VueWebApi/DLL/DAL/SystemSettingDAL.cs
+++ b/VueWebApi/DLL/DAL/SystemSettingDAL.cs
@@ -71,15 +71,25 @@
var dynamicParams = new DynamicParameters();
try
{
- sql = @"select rightcode from T_CodeRules where rightcode=@rightcode";
+ sql = @"select rightcode,value from T_CodeRules where rightcode=@rightcode";
dynamicParams.Add("@rightcode", rightcode);
var data = DapperHelper.selectdata(sql, dynamicParams);
if (data.Rows.Count > 0)
{
- sql = @"update T_CodeRules set prefix=@prefix,filingdate=@filingdate,incbit=@incbit,lm_user=@lm_user,lm_date=@CreateDate where rightcode=@rightcode";
+ string value = data.Rows[0]["value"].ToString();
+ if (decimal.Parse(incbit) > value.Length)
+ {
+ decimal cnum = decimal.Parse(incbit) - value.Length;
+ for (int i = 0; i < cnum; i++)
+ {
+ value = "0" + value;
+ }
+ }
+ sql = @"update T_CodeRules set prefix=@prefix,filingdate=@filingdate,incbit=@incbit,value=@value,lm_user=@lm_user,lm_date=@CreateDate where rightcode=@rightcode";
dynamicParams.Add("@prefix", prefix);
dynamicParams.Add("@filingdate", filingdate);
dynamicParams.Add("@incbit", incbit);
+ dynamicParams.Add("@value", value);
dynamicParams.Add("@lm_user", lm_user);
dynamicParams.Add("@CreateDate", DateTime.Now.ToString());
dynamicParams.Add("@rightcode", rightcode);
diff --git a/VueWebApi/Image/app_8_7.png b/VueWebApi/Image/app_8_7.png
new file mode 100644
index 0000000..cee7be0
--- /dev/null
+++ b/VueWebApi/Image/app_8_7.png
Binary files differ
diff --git a/VueWebApi/Logs/2023-03-27.TXT b/VueWebApi/Logs/2023-03-27.TXT
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/VueWebApi/Logs/2023-03-27.TXT
diff --git a/VueWebApi/Logs/2023-03-28.TXT b/VueWebApi/Logs/2023-03-28.TXT
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/VueWebApi/Logs/2023-03-28.TXT
diff --git a/VueWebApi/Logs/2023-04-04.TXT b/VueWebApi/Logs/2023-04-04.TXT
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/VueWebApi/Logs/2023-04-04.TXT
diff --git a/VueWebApi/Logs/2023-04-06.TXT b/VueWebApi/Logs/2023-04-06.TXT
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/VueWebApi/Logs/2023-04-06.TXT
diff --git a/VueWebApi/Logs/2023-04-07.TXT b/VueWebApi/Logs/2023-04-07.TXT
new file mode 100644
index 0000000..bd0c04d
--- /dev/null
+++ b/VueWebApi/Logs/2023-04-07.TXT
@@ -0,0 +1,25 @@
+ 【时间】:2023-04-07 08:20:33,150
+ 【级别】:ERROR
+ 【类名】:日志记录
+ 【线程ID】: 7
+ 【文件地址】:D:\新凯迪MES\MES产品\VueWebApi\VueWebApi\Tools\LogHelper.cs 第25行
+ 【日志内容】:
+消息类型：SqlException
+消息内容：INSERT 语句中列的数目大于 VALUES 子句中指定的值的数目。VALUES 子句中值的数目必须与 INSERT 语句中指定的列的数目匹配。
+引发异常路径：/api/AppQualityManagement/InFactoryCheckSave
+引发异常的方法：OnError
+引发异常源：.Net SqlClient Data Provider 在 System.Data.SqlClient.SqlConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
+ 在 System.Data.SqlClient.SqlInternalConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
+ 在 System.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, Boolean callerHasConnectionLock, Boolean asyncClose)
+ 在 System.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady)
+ 在 System.Data.SqlClient.SqlCommand.FinishExecuteReader(SqlDataReader ds, RunBehavior runBehavior, String resetOptionsString, Boolean isInternal, Boolean forDescribeParameterEncryption, Boolean shouldCacheForAlwaysEncrypted)
+ 在 System.Data.SqlClient.SqlCommand.RunExecuteReaderTds(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, Boolean async, Int32 timeout, Task& task, Boolean asyncWrite, Boolean inRetry, SqlDataReader ds, Boolean describeParameterEncryptionRequest)
+ 在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method, TaskCompletionSource`1 completion, Int32 timeout, Task& task, Boolean& usedCache, Boolean asyncWrite, Boolean inRetry)
+ 在 System.Data.SqlClient.SqlCommand.InternalExecuteNonQuery(TaskCompletionSource`1 completion, String methodName, Boolean sendToPipe, Int32 timeout, Boolean& usedCache, Boolean asyncWrite, Boolean inRetry)
+ 在 System.Data.SqlClient.SqlCommand.ExecuteNonQuery()
+ 在 Dapper.SqlMapper.ExecuteCommand(IDbConnection cnn, CommandDefinition& command, Action`2 paramReader)
+ 在 Dapper.SqlMapper.ExecuteImpl(IDbConnection cnn, CommandDefinition& command)
+ 在 Dapper.SqlMapper.Execute(IDbConnection cnn, String sql, Object param, IDbTransaction transaction, Nullable`1 commandTimeout, Nullable`1 commandType)
+ 在 VueWebApi.Tools.DapperHelper.DoTransaction(List`1 sqlList) 位置 D:\新凯迪MES\MES产品\VueWebApi\VueWebApi\Tools\DapperHelper.cs:行号 457
+ 【日记详细】：
+---------------------------------------------------------------------------------------------------------------
diff --git a/VueWebApi/Properties/PublishProfiles/FolderProfile.pubxml.user b/VueWebApi/Properties/PublishProfiles/FolderProfile.pubxml.user
index fe0762e..c329982 100644
--- a/VueWebApi/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/VueWebApi/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -5,7 +5,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_PublishTargetUrl>D:\缃戠珯鍙戝竷\XKDMesApi</_PublishTargetUrl>
- <History>True|2023-03-22T09:52:59.0162624Z;True|2023-03-22T17:44:51.7892593+08:00;True|2023-03-22T17:41:41.7366750+08:00;True|2023-03-22T17:30:45.1983751+08:00;True|2023-03-22T17:25:48.0681920+08:00;True|2023-03-22T17:16:16.5578143+08:00;True|2023-03-22T16:36:15.7695476+08:00;True|2023-03-22T10:21:58.5145068+08:00;True|2023-03-20T17:21:47.4459321+08:00;True|2023-03-20T17:21:27.0468975+08:00;True|2023-03-20T16:58:02.8681774+08:00;True|2023-03-20T16:34:42.1058692+08:00;True|2023-03-20T16:23:47.7801897+08:00;True|2023-03-03T08:56:05.4730255+08:00;True|2023-03-02T16:23:31.6756396+08:00;True|2023-03-01T15:52:28.2849007+08:00;True|2023-03-01T15:35:55.8647024+08:00;True|2023-03-01T15:21:23.8133690+08:00;True|2023-02-28T16:00:01.5165754+08:00;True|2023-02-28T14:53:18.0954404+08:00;True|2023-02-28T14:45:14.0183407+08:00;True|2023-02-15T15:10:18.1493103+08:00;True|2023-02-15T14:45:42.3134512+08:00;True|2023-02-15T14:38:34.6207896+08:00;True|2023-02-15T14:28:47.3494779+08:00;True|2023-02-15T14:06:19.8843387+08:00;True|2023-02-15T12:37:06.8372351+08:00;True|2023-02-15T09:18:28.2740085+08:00;True|2023-02-14T16:38:24.2037803+08:00;False|2023-02-14T16:35:10.9291528+08:00;True|2023-02-13T14:56:38.5856100+08:00;True|2023-02-13T12:50:51.9358444+08:00;True|2023-02-11T10:08:39.6831781+08:00;True|2023-02-11T09:54:32.8160454+08:00;True|2023-02-11T09:54:21.9971913+08:00;True|2023-02-11T02:11:17.5904204+08:00;True|2023-02-11T02:04:19.4213456+08:00;True|2023-02-10T13:03:57.4443981+08:00;True|2023-02-09T21:55:13.8322950+08:00;True|2023-02-09T21:34:49.3120350+08:00;True|2023-02-07T10:08:39.5582710+08:00;True|2023-02-03T08:25:45.7718782+08:00;True|2023-01-30T12:40:37.6820386+08:00;True|2023-01-30T08:45:34.0836363+08:00;True|2023-01-11T10:13:36.4366183+08:00;True|2023-01-11T09:37:39.6235517+08:00;True|2023-01-11T09:37:05.7608583+08:00;True|2023-01-11T09:14:36.0337347+08:00;True|2023-01-10T16:29:20.9791940+08:00;True|2023-01-10T16:09:20.2950245+08:00;True|2023-01-10T14:43:30.8069585+08:00;True|2023-01-10T14:43:14.0392269+08:00;True|2023-01-10T13:30:42.7077204+08:00;True|2023-01-10T13:09:48.9547948+08:00;True|2023-01-10T12:18:02.7207328+08:00;True|2023-01-06T16:33:28.2963933+08:00;True|2023-01-06T16:27:31.9342782+08:00;True|2023-01-06T16:23:33.0323708+08:00;True|2023-01-06T14:06:25.7389071+08:00;True|2023-01-06T13:50:39.1399992+08:00;True|2023-01-06T11:55:24.5609585+08:00;True|2023-01-06T11:08:53.3862603+08:00;True|2023-01-06T10:35:25.4696330+08:00;True|2023-01-06T10:27:54.7687528+08:00;True|2023-01-06T09:34:11.0798818+08:00;True|2023-01-05T16:47:28.7063631+08:00;True|2023-01-04T15:09:12.6813075+08:00;True|2023-01-04T15:06:20.1259155+08:00;True|2022-12-27T15:22:00.8719157+08:00;True|2022-12-27T15:18:56.4183337+08:00;True|2022-12-27T11:13:35.0250651+08:00;True|2022-12-26T14:12:52.3868526+08:00;True|2022-12-26T10:35:25.9712626+08:00;True|2022-12-20T09:02:47.7097031+08:00;True|2022-12-19T14:40:38.5851369+08:00;True|2022-12-14T12:51:44.0399559+08:00;True|2022-12-14T10:59:36.5250039+08:00;True|2022-12-14T10:54:23.0704819+08:00;True|2022-12-14T10:54:11.5744699+08:00;True|2022-12-14T10:53:33.7127244+08:00;True|2022-12-14T10:47:34.9597966+08:00;True|2022-12-08T15:06:12.8416810+08:00;True|2022-12-07T16:44:49.7931793+08:00;True|2022-11-26T11:05:21.2315179+08:00;True|2022-11-26T10:56:49.3021067+08:00;True|2022-11-25T13:00:54.9138172+08:00;True|2022-11-25T12:43:01.0212012+08:00;True|2022-11-25T12:36:22.2745198+08:00;True|2022-11-25T12:33:27.1942331+08:00;True|2022-11-25T11:07:23.5860394+08:00;True|2022-11-25T10:36:26.1052993+08:00;True|2022-11-24T16:50:49.0061385+08:00;True|2022-11-24T16:47:23.6152654+08:00;True|2022-11-24T15:36:20.0275278+08:00;True|2022-11-24T15:25:29.2391337+08:00;True|2022-11-24T15:25:19.7988304+08:00;True|2022-11-24T15:06:48.3860466+08:00;True|2022-11-24T14:52:24.7879819+08:00;True|2022-11-24T10:12:41.0992839+08:00;True|2022-11-21T15:13:29.3527873+08:00;True|2022-11-21T10:42:28.8298039+08:00;True|2022-11-18T11:10:34.9917493+08:00;True|2022-11-18T11:10:11.7210670+08:00;True|2022-11-18T10:59:20.7515137+08:00;True|2022-11-18T10:52:33.2724652+08:00;True|2022-11-18T09:22:10.0215858+08:00;True|2022-11-18T09:16:35.0644453+08:00;True|2022-11-16T10:30:33.9013342+08:00;True|2022-11-16T09:55:08.7555656+08:00;True|2022-10-29T11:48:17.9164445+08:00;True|2022-10-29T10:27:39.6224331+08:00;True|2022-10-29T09:25:19.4865788+08:00;True|2022-10-29T09:01:58.2237798+08:00;True|2022-10-29T08:57:17.1749942+08:00;True|2022-10-28T14:44:10.4595607+08:00;True|2022-10-28T14:41:10.8050513+08:00;True|2022-10-28T14:39:02.0096359+08:00;True|2022-10-28T14:27:52.1679095+08:00;True|2022-10-28T14:19:07.6073425+08:00;True|2022-10-28T14:16:46.4140421+08:00;True|2022-10-28T14:06:54.5820895+08:00;True|2022-10-28T14:06:20.4765666+08:00;True|2022-10-28T14:00:01.8073205+08:00;True|2022-10-28T13:56:40.6320465+08:00;True|2022-10-28T12:52:46.3086338+08:00;True|2022-10-28T11:31:08.7626713+08:00;True|2022-10-28T11:28:25.3391022+08:00;True|2022-10-27T17:13:49.3276407+08:00;True|2022-10-27T17:09:49.3362372+08:00;True|2022-10-27T14:49:20.9922482+08:00;True|2022-10-27T11:08:32.7803317+08:00;True|2022-10-27T09:19:17.9537933+08:00;True|2022-10-27T09:14:00.6751533+08:00;True|2022-10-27T09:08:05.5814368+08:00;True|2022-10-27T09:04:21.1435873+08:00;True|2022-10-26T16:47:26.8255243+08:00;True|2022-10-26T16:29:26.3405800+08:00;False|2022-10-26T16:28:18.6237074+08:00;True|2022-10-26T14:29:39.8852546+08:00;True|2022-10-26T14:11:14.0537705+08:00;True|2022-10-26T10:56:16.7897290+08:00;True|2022-10-26T10:29:02.5303566+08:00;True|2022-10-26T10:28:29.9192643+08:00;True|2022-10-26T10:28:16.5901050+08:00;True|2022-10-26T10:22:02.2019236+08:00;True|2022-10-26T10:17:08.3009992+08:00;True|2022-10-20T18:19:28.0452517+08:00;True|2022-10-20T18:14:36.1031080+08:00;True|2022-10-20T16:49:08.1312509+08:00;True|2022-10-20T10:11:30.3988252+08:00;True|2022-10-20T09:52:55.2879279+08:00;True|2022-10-20T09:07:20.5119842+08:00;True|2022-10-20T08:55:23.9003542+08:00;True|2022-10-19T17:56:47.0600040+08:00;True|2022-10-19T17:26:22.4420642+08:00;True|2022-10-19T17:15:09.2591171+08:00;True|2022-10-19T17:00:58.0407123+08:00;True|2022-10-19T16:53:20.8393084+08:00;True|2022-10-19T16:49:09.6859302+08:00;True|2022-10-19T16:40:53.2090492+08:00;True|2022-10-19T16:35:02.0381742+08:00;True|2022-10-19T16:30:49.8415090+08:00;True|2022-10-19T16:05:14.3522346+08:00;True|2022-10-19T15:50:08.9509925+08:00;True|2022-10-19T15:36:28.6015003+08:00;True|2022-10-19T15:33:26.7861204+08:00;True|2022-10-19T15:27:02.8006070+08:00;True|2022-10-19T15:16:31.4065993+08:00;True|2022-10-19T15:14:34.8724996+08:00;True|2022-10-18T18:12:15.5930366+08:00;True|2022-10-18T18:06:54.1679240+08:00;True|2022-10-18T18:02:12.3473981+08:00;True|2022-10-18T17:39:10.7104222+08:00;True|2022-10-18T17:35:14.3679319+08:00;True|2022-10-18T17:32:18.8020932+08:00;True|2022-10-18T17:09:35.5170795+08:00;True|2022-10-18T17:02:58.3933082+08:00;True|2022-10-18T16:46:19.9647705+08:00;True|2022-10-18T11:28:23.1151472+08:00;True|2022-10-17T16:44:34.9653103+08:00;True|2022-10-16T01:53:49.3818533+08:00;True|2022-10-16T01:46:58.7626854+08:00;True|2022-10-16T01:35:19.3037353+08:00;True|2022-10-15T14:31:57.4587818+08:00;True|2022-10-15T14:22:52.4245457+08:00;True|2022-10-14T15:32:59.8175195+08:00;True|2022-10-14T15:24:23.9954226+08:00;True|2022-10-14T15:24:02.4438281+08:00;True|2022-10-14T11:07:04.2629220+08:00;True|2022-10-13T16:44:07.8507864+08:00;True|2022-10-13T16:34:20.4037866+08:00;True|2022-10-13T15:07:55.6527739+08:00;True|2022-10-12T14:59:51.4425162+08:00;True|2022-10-12T11:14:22.2463823+08:00;True|2022-10-12T08:53:16.5351204+08:00;True|2022-10-12T08:24:28.2157523+08:00;False|2022-10-12T08:23:56.2743080+08:00;True|2022-10-12T08:12:38.4791356+08:00;False|2022-10-12T08:12:14.9860966+08:00;True|2022-10-12T08:08:31.1437091+08:00;True|2022-10-11T18:10:13.8327911+08:00;True|2022-10-10T16:21:33.7622381+08:00;True|2022-10-10T09:56:53.1134309+08:00;False|2022-10-10T09:56:18.9153013+08:00;True|2022-10-10T08:46:48.2842004+08:00;True|2022-10-09T16:25:10.1147763+08:00;True|2022-10-08T16:54:50.7779806+08:00;True|2022-10-08T16:35:23.1960956+08:00;True|2022-10-08T16:06:16.5635598+08:00;True|2022-10-08T16:01:24.5889763+08:00;True|2022-10-08T13:11:34.8631266+08:00;True|2022-09-29T15:59:52.7749027+08:00;True|2022-09-28T18:13:25.7208132+08:00;True|2022-09-27T14:01:52.5493804+08:00;True|2022-09-27T08:32:48.3460557+08:00;True|2022-09-23T16:12:28.0271396+08:00;True|2022-09-23T13:50:16.4039745+08:00;True|2022-09-23T13:49:02.0464589+08:00;True|2022-09-23T13:47:12.4458913+08:00;True|2022-09-23T13:42:58.0795715+08:00;True|2022-09-23T13:32:34.2909297+08:00;True|2022-09-23T13:31:14.5573692+08:00;True|2022-09-23T13:27:32.1842906+08:00;True|2022-09-23T12:50:51.2811202+08:00;True|2022-09-22T17:31:41.3605592+08:00;True|2022-09-22T17:25:44.2386416+08:00;True|2022-09-22T09:47:22.9767826+08:00;True|2022-09-16T14:31:58.5334673+08:00;True|2022-09-16T09:04:53.3449040+08:00;True|2022-09-15T15:15:18.3159768+08:00;True|2022-09-14T17:46:23.0171281+08:00;True|2022-09-14T17:43:44.4370239+08:00;True|2022-09-14T17:34:30.3167863+08:00;True|2022-09-14T17:33:00.5148855+08:00;True|2022-09-14T17:06:32.0879029+08:00;True|2022-09-14T16:50:12.7189783+08:00;True|2022-09-14T16:47:48.3868826+08:00;True|2022-09-14T16:42:35.3830356+08:00;True|2022-09-14T16:41:37.8545801+08:00;True|2022-09-14T16:36:47.0944090+08:00;True|2022-09-14T16:26:00.8638173+08:00;True|2022-09-14T16:13:43.6329252+08:00;True|2022-09-14T16:04:16.8093275+08:00;True|2022-09-14T16:02:54.4702614+08:00;True|2022-09-14T15:57:15.9623104+08:00;True|2022-09-14T15:54:23.8745601+08:00;True|2022-09-14T15:49:40.1730864+08:00;True|2022-09-14T15:42:08.2811334+08:00;True|2022-09-14T15:26:40.0417771+08:00;True|2022-09-14T15:24:30.2187269+08:00;True|2022-09-14T15:16:30.3856771+08:00;True|2022-09-14T15:09:22.4313367+08:00;True|2022-09-14T14:59:14.3795036+08:00;True|2022-09-14T14:53:26.8923244+08:00;True|2022-09-14T14:44:00.6688344+08:00;True|2022-09-14T14:41:53.3908108+08:00;True|2022-09-14T14:40:40.3787118+08:00;True|2022-09-14T14:28:39.2273279+08:00;True|2022-09-14T14:27:13.3566861+08:00;True|2022-09-14T14:25:25.4360688+08:00;True|2022-09-14T14:20:42.9734032+08:00;True|2022-09-14T13:51:39.1303401+08:00;True|2022-09-14T13:25:34.8906041+08:00;True|2022-09-14T13:19:28.9172079+08:00;True|2022-09-14T13:18:09.5900815+08:00;True|2022-09-14T10:58:58.0910068+08:00;True|2022-09-14T10:57:11.4834444+08:00;True|2022-09-14T10:45:39.8943674+08:00;True|2022-09-14T10:38:15.2282286+08:00;True|2022-09-14T10:36:54.8259640+08:00;True|2022-09-14T10:14:12.1218790+08:00;True|2022-09-14T10:13:20.0625618+08:00;True|2022-09-14T10:10:15.3538379+08:00;True|2022-09-14T10:07:09.4796434+08:00;True|2022-09-14T10:06:02.0382235+08:00;True|2022-09-14T09:57:12.0082796+08:00;True|2022-09-14T09:52:29.4689029+08:00;True|2022-09-14T09:47:26.7205193+08:00;True|2022-09-14T09:38:56.4089520+08:00;True|2022-09-14T09:32:34.9863473+08:00;True|2022-09-12T13:07:40.5119225+08:00;True|2022-09-09T15:21:48.4251654+08:00;True|2022-09-09T14:45:54.9315147+08:00;True|2022-09-09T11:01:18.2619729+08:00;True|2022-09-09T09:35:40.9779148+08:00;True|2022-09-09T09:26:51.9854326+08:00;True|2022-09-09T09:11:48.8023373+08:00;True|2022-09-09T09:05:45.5528883+08:00;True|2022-09-08T17:47:35.2628987+08:00;True|2022-09-08T17:43:32.6700813+08:00;True|2022-09-08T17:01:23.6259930+08:00;True|2022-09-08T16:55:57.2305777+08:00;True|2022-09-08T16:35:37.3631720+08:00;True|2022-09-08T16:19:13.9122228+08:00;True|2022-09-08T16:04:07.7348285+08:00;True|2022-09-08T16:00:49.9961701+08:00;True|2022-09-08T15:16:03.0110619+08:00;True|2022-09-08T10:19:46.2872822+08:00;True|2022-09-08T10:11:15.5386438+08:00;True|2022-09-08T08:19:02.5242539+08:00;True|2022-09-08T08:18:11.7308721+08:00;True|2022-09-07T11:39:27.2463573+08:00;True|2022-09-07T10:40:57.8877369+08:00;True|2022-09-07T10:37:10.1517098+08:00;True|2022-09-07T10:30:08.7782107+08:00;True|2022-09-07T10:23:52.8534200+08:00;True|2022-09-07T10:09:31.6994230+08:00;True|2022-09-07T10:01:16.2683112+08:00;True|2022-09-07T09:51:47.6282546+08:00;True|2022-09-06T19:11:45.1701913+08:00;True|2022-09-06T18:29:29.2671862+08:00;True|2022-09-06T16:41:04.2719822+08:00;True|2022-09-06T14:17:31.6896132+08:00;True|2022-09-06T13:14:39.9657702+08:00;True|2022-09-05T13:34:47.0627238+08:00;True|2022-09-05T11:07:59.2835592+08:00;True|2022-09-02T14:01:56.1233378+08:00;True|2022-08-31T23:40:49.5468281+08:00;True|2022-08-31T22:15:50.0388123+08:00;True|2022-08-31T19:20:24.7693742+08:00;True|2022-08-31T19:00:06.8271626+08:00;True|2022-08-31T18:45:08.6483670+08:00;True|2022-08-31T16:59:34.8244511+08:00;True|2022-08-31T15:39:51.0653019+08:00;True|2022-08-31T15:25:32.5277796+08:00;True|2022-08-31T13:31:48.5734692+08:00;True|2022-08-31T12:59:02.1022191+08:00;True|2022-08-31T10:06:03.2043884+08:00;True|2022-08-30T17:36:34.5932064+08:00;True|2022-08-30T17:18:12.4582841+08:00;True|2022-08-30T12:55:16.4084322+08:00;True|2022-08-30T10:12:08.0975252+08:00;True|2022-08-30T09:12:46.2845546+08:00;True|2022-08-30T08:58:47.8389468+08:00;True|2022-08-29T17:21:17.7779579+08:00;True|2022-08-29T17:17:49.5334583+08:00;True|2022-08-29T16:53:46.6019453+08:00;True|2022-08-29T16:46:50.8158231+08:00;True|2022-08-29T12:25:19.0140888+08:00;True|2022-08-26T17:02:52.4614637+08:00;True|2022-08-26T16:52:47.8585471+08:00;True|2022-08-26T16:47:02.5766798+08:00;True|2022-08-26T16:36:15.5793109+08:00;True|2022-08-26T16:15:55.1795297+08:00;True|2022-08-26T16:00:22.2697361+08:00;False|2022-08-26T15:58:16.7347649+08:00;True|2022-08-26T15:22:29.6367466+08:00;True|2022-08-25T20:02:24.4685508+08:00;True|2022-08-25T19:50:42.8601696+08:00;True|2022-08-25T15:56:20.3615518+08:00;True|2022-08-25T15:48:16.9923580+08:00;True|2022-08-25T15:27:07.9474640+08:00;True|2022-08-25T13:11:36.9626131+08:00;True|2022-08-24T14:10:58.2790665+08:00;True|2022-08-24T11:43:10.4463552+08:00;True|2022-08-24T08:02:17.9871411+08:00;True|2022-08-23T22:50:41.0238571+08:00;True|2022-08-23T22:16:20.9249814+08:00;True|2022-08-23T21:59:21.1909300+08:00;True|2022-08-23T21:50:40.8106496+08:00;True|2022-08-23T21:06:55.6611505+08:00;True|2022-08-23T19:49:07.0507418+08:00;True|2022-08-23T19:03:15.9808046+08:00;True|2022-08-23T18:58:57.1700899+08:00;True|2022-08-23T18:54:26.8058591+08:00;True|2022-08-23T18:45:39.1928602+08:00;True|2022-08-23T17:32:10.6125039+08:00;True|2022-08-23T15:58:34.9205174+08:00;True|2022-08-23T15:49:21.3383764+08:00;True|2022-08-23T15:14:21.0775398+08:00;True|2022-08-23T15:04:07.8829410+08:00;True|2022-08-23T14:59:17.5143895+08:00;True|2022-08-23T14:55:17.0069050+08:00;True|2022-08-23T14:41:41.0884731+08:00;True|2022-08-23T14:41:06.5045325+08:00;True|2022-08-23T14:28:54.7390570+08:00;True|2022-08-23T13:56:59.3670549+08:00;True|2022-08-23T13:56:38.8588174+08:00;True|2022-08-22T20:48:56.2180227+08:00;True|2022-08-22T19:07:12.1093584+08:00;True|2022-08-22T19:04:07.7837887+08:00;True|2022-08-22T14:38:00.9342884+08:00;True|2022-08-22T10:59:23.2073567+08:00;True|2022-08-22T10:53:58.0920733+08:00;True|2022-08-22T10:53:10.2446944+08:00;True|2022-08-22T10:43:35.3791396+08:00;True|2022-08-18T09:45:46.4643950+08:00;True|2022-08-18T09:40:55.2601145+08:00;True|2022-08-16T16:17:14.3399134+08:00;True|2022-08-15T17:58:16.1460123+08:00;True|2022-08-15T17:55:55.7137518+08:00;True|2022-08-15T17:44:37.6024482+08:00;True|2022-08-15T17:44:21.9583041+08:00;True|2022-08-15T17:43:23.1305690+08:00;True|2022-08-15T17:29:31.1670490+08:00;True|2022-08-15T17:26:42.9269470+08:00;True|2022-08-15T17:23:27.0940168+08:00;True|2022-08-15T17:07:32.9192045+08:00;True|2022-08-15T16:47:03.8611076+08:00;True|2022-08-15T16:41:50.6843705+08:00;True|2022-08-15T16:38:26.7407413+08:00;True|2022-08-15T16:31:49.0805578+08:00;True|2022-08-15T16:27:33.6712012+08:00;True|2022-08-15T16:24:35.1042794+08:00;True|2022-08-15T16:21:57.2757683+08:00;True|2022-08-15T16:18:17.3545368+08:00;True|2022-08-15T16:15:04.2645412+08:00;True|2022-08-15T14:44:09.3078026+08:00;True|2022-08-15T11:20:09.2930712+08:00;True|2022-08-15T10:42:12.2991587+08:00;True|2022-08-15T10:41:38.3711025+08:00;True|2022-08-15T10:19:06.9974383+08:00;True|2022-08-12T17:15:09.2133281+08:00;True|2022-08-12T10:48:05.8776009+08:00;True|2022-08-12T10:26:16.4183447+08:00;True|2022-08-12T08:33:01.9502005+08:00;True|2022-08-11T09:06:08.8394009+08:00;True|2022-08-11T08:39:06.2534634+08:00;True|2022-08-11T08:05:13.6919725+08:00;True|2022-08-08T14:48:16.3637965+08:00;True|2022-08-05T15:44:02.3797448+08:00;True|2022-08-05T09:57:55.7744103+08:00;True|2022-08-04T15:24:38.8785046+08:00;True|2022-08-04T15:11:16.7054147+08:00;True|2022-08-04T14:53:52.7239932+08:00;True|2022-08-04T14:48:35.6115863+08:00;True|2022-08-04T14:39:16.1113507+08:00;True|2022-08-04T12:26:39.4998322+08:00;True|2022-08-04T10:34:23.9626503+08:00;True|2022-08-04T08:12:51.4305728+08:00;True|2022-08-03T15:43:09.2317512+08:00;True|2022-08-02T19:17:55.0460145+08:00;True|2022-08-02T19:08:13.5872184+08:00;True|2022-08-02T18:50:12.1280167+08:00;True|2022-08-02T18:05:53.6540810+08:00;True|2022-08-02T16:13:26.3567210+08:00;True|2022-08-02T15:27:59.9264333+08:00;True|2022-07-25T15:35:49.6958399+08:00;True|2022-07-25T15:30:40.4444876+08:00;True|2022-07-25T13:33:38.4068153+08:00;True|2022-07-22T15:00:56.7326322+08:00;True|2022-07-22T14:51:18.0169121+08:00;True|2022-07-22T14:26:08.4246205+08:00;True|2022-07-22T14:23:05.0897016+08:00;True|2022-07-22T14:18:18.7806854+08:00;True|2022-07-22T14:09:29.7924367+08:00;True|2022-07-22T14:02:26.6403133+08:00;True|2022-07-22T13:56:40.0887615+08:00;True|2022-07-22T13:50:10.7852190+08:00;True|2022-07-22T11:38:25.6671780+08:00;True|2022-07-22T10:55:36.7947659+08:00;True|2022-07-21T17:53:41.1464086+08:00;True|2022-07-21T17:43:33.5311479+08:00;True|2022-07-21T16:09:07.7687640+08:00;True|2022-07-21T16:04:47.9317019+08:00;True|2022-07-21T15:58:21.2359033+08:00;True|2022-07-21T15:56:07.7425829+08:00;True|2022-07-21T15:51:34.7108381+08:00;True|2022-07-21T15:48:57.5735708+08:00;True|2022-07-21T15:44:25.8205030+08:00;True|2022-07-21T15:25:51.4222269+08:00;True|2022-07-21T15:22:36.8818295+08:00;True|2022-07-21T15:19:28.8532774+08:00;True|2022-07-21T14:57:45.7532568+08:00;True|2022-07-21T11:16:12.0900762+08:00;True|2022-07-21T10:10:40.4714948+08:00;True|2022-07-21T10:00:19.5258058+08:00;True|2022-07-14T14:34:28.5093226+08:00;True|2022-07-14T13:59:59.7754985+08:00;True|2022-07-14T12:46:29.6685284+08:00;True|2022-07-14T09:22:25.9079652+08:00;True|2022-07-14T09:22:04.6797478+08:00;True|2022-07-14T09:10:45.0177607+08:00;True|2022-07-14T08:41:43.3026713+08:00;True|2022-07-14T08:27:32.7454972+08:00;True|2022-07-14T08:21:58.6572366+08:00;True|2022-07-14T08:17:59.2904747+08:00;True|2022-07-14T08:12:39.8483472+08:00;True|2022-06-30T15:04:41.6941982+08:00;True|2022-06-24T16:39:01.1080301+08:00;True|2022-06-17T13:23:15.1455451+08:00;True|2022-06-17T13:22:18.5517557+08:00;True|2022-06-17T13:19:27.7323818+08:00;True|2022-06-17T13:12:24.1252779+08:00;True|2022-06-17T13:09:20.4234258+08:00;True|2022-06-17T13:06:49.9869509+08:00;True|2022-06-17T12:58:54.6964621+08:00;False|2022-06-17T12:58:10.6767711+08:00;False|2022-06-17T12:57:08.9747950+08:00;False|2022-06-17T12:56:18.4650121+08:00;False|2022-06-17T12:55:57.9981927+08:00;True|2022-06-13T14:21:36.5610928+08:00;True|2022-06-13T11:41:39.4210151+08:00;True|2022-06-11T02:35:03.4727934+08:00;True|2022-06-11T02:31:13.7362660+08:00;True|2022-06-11T02:30:58.3616790+08:00;True|2022-06-11T01:57:04.4951468+08:00;True|2022-06-10T13:27:13.2097124+08:00;</History>
+ <History>True|2023-04-07T00:30:18.4653189Z;True|2023-04-06T17:29:55.4388629+08:00;True|2023-04-06T16:45:39.5573964+08:00;True|2023-04-04T15:41:18.1582540+08:00;True|2023-04-04T15:33:47.4319210+08:00;True|2023-04-04T15:24:23.0417772+08:00;True|2023-04-04T15:05:34.8694589+08:00;True|2023-04-04T13:51:06.6709099+08:00;True|2023-04-04T08:51:53.0379573+08:00;True|2023-04-04T08:26:14.1581736+08:00;True|2023-04-04T08:09:40.3919185+08:00;True|2023-04-04T08:03:47.3773358+08:00;True|2023-03-29T10:59:42.8557249+08:00;True|2023-03-29T10:32:37.1829423+08:00;True|2023-03-24T15:23:09.2950637+08:00;True|2023-03-22T17:52:59.0162624+08:00;True|2023-03-22T17:44:51.7892593+08:00;True|2023-03-22T17:41:41.7366750+08:00;True|2023-03-22T17:30:45.1983751+08:00;True|2023-03-22T17:25:48.0681920+08:00;True|2023-03-22T17:16:16.5578143+08:00;True|2023-03-22T16:36:15.7695476+08:00;True|2023-03-22T10:21:58.5145068+08:00;True|2023-03-20T17:21:47.4459321+08:00;True|2023-03-20T17:21:27.0468975+08:00;True|2023-03-20T16:58:02.8681774+08:00;True|2023-03-20T16:34:42.1058692+08:00;True|2023-03-20T16:23:47.7801897+08:00;True|2023-03-03T08:56:05.4730255+08:00;True|2023-03-02T16:23:31.6756396+08:00;True|2023-03-01T15:52:28.2849007+08:00;True|2023-03-01T15:35:55.8647024+08:00;True|2023-03-01T15:21:23.8133690+08:00;True|2023-02-28T16:00:01.5165754+08:00;True|2023-02-28T14:53:18.0954404+08:00;True|2023-02-28T14:45:14.0183407+08:00;True|2023-02-15T15:10:18.1493103+08:00;True|2023-02-15T14:45:42.3134512+08:00;True|2023-02-15T14:38:34.6207896+08:00;True|2023-02-15T14:28:47.3494779+08:00;True|2023-02-15T14:06:19.8843387+08:00;True|2023-02-15T12:37:06.8372351+08:00;True|2023-02-15T09:18:28.2740085+08:00;True|2023-02-14T16:38:24.2037803+08:00;False|2023-02-14T16:35:10.9291528+08:00;True|2023-02-13T14:56:38.5856100+08:00;True|2023-02-13T12:50:51.9358444+08:00;True|2023-02-11T10:08:39.6831781+08:00;True|2023-02-11T09:54:32.8160454+08:00;True|2023-02-11T09:54:21.9971913+08:00;True|2023-02-11T02:11:17.5904204+08:00;True|2023-02-11T02:04:19.4213456+08:00;True|2023-02-10T13:03:57.4443981+08:00;True|2023-02-09T21:55:13.8322950+08:00;True|2023-02-09T21:34:49.3120350+08:00;True|2023-02-07T10:08:39.5582710+08:00;True|2023-02-03T08:25:45.7718782+08:00;True|2023-01-30T12:40:37.6820386+08:00;True|2023-01-30T08:45:34.0836363+08:00;True|2023-01-11T10:13:36.4366183+08:00;True|2023-01-11T09:37:39.6235517+08:00;True|2023-01-11T09:37:05.7608583+08:00;True|2023-01-11T09:14:36.0337347+08:00;True|2023-01-10T16:29:20.9791940+08:00;True|2023-01-10T16:09:20.2950245+08:00;True|2023-01-10T14:43:30.8069585+08:00;True|2023-01-10T14:43:14.0392269+08:00;True|2023-01-10T13:30:42.7077204+08:00;True|2023-01-10T13:09:48.9547948+08:00;True|2023-01-10T12:18:02.7207328+08:00;True|2023-01-06T16:33:28.2963933+08:00;True|2023-01-06T16:27:31.9342782+08:00;True|2023-01-06T16:23:33.0323708+08:00;True|2023-01-06T14:06:25.7389071+08:00;True|2023-01-06T13:50:39.1399992+08:00;True|2023-01-06T11:55:24.5609585+08:00;True|2023-01-06T11:08:53.3862603+08:00;True|2023-01-06T10:35:25.4696330+08:00;True|2023-01-06T10:27:54.7687528+08:00;True|2023-01-06T09:34:11.0798818+08:00;True|2023-01-05T16:47:28.7063631+08:00;True|2023-01-04T15:09:12.6813075+08:00;True|2023-01-04T15:06:20.1259155+08:00;True|2022-12-27T15:22:00.8719157+08:00;True|2022-12-27T15:18:56.4183337+08:00;True|2022-12-27T11:13:35.0250651+08:00;True|2022-12-26T14:12:52.3868526+08:00;True|2022-12-26T10:35:25.9712626+08:00;True|2022-12-20T09:02:47.7097031+08:00;True|2022-12-19T14:40:38.5851369+08:00;True|2022-12-14T12:51:44.0399559+08:00;True|2022-12-14T10:59:36.5250039+08:00;True|2022-12-14T10:54:23.0704819+08:00;True|2022-12-14T10:54:11.5744699+08:00;True|2022-12-14T10:53:33.7127244+08:00;True|2022-12-14T10:47:34.9597966+08:00;True|2022-12-08T15:06:12.8416810+08:00;True|2022-12-07T16:44:49.7931793+08:00;True|2022-11-26T11:05:21.2315179+08:00;True|2022-11-26T10:56:49.3021067+08:00;True|2022-11-25T13:00:54.9138172+08:00;True|2022-11-25T12:43:01.0212012+08:00;True|2022-11-25T12:36:22.2745198+08:00;True|2022-11-25T12:33:27.1942331+08:00;True|2022-11-25T11:07:23.5860394+08:00;True|2022-11-25T10:36:26.1052993+08:00;True|2022-11-24T16:50:49.0061385+08:00;True|2022-11-24T16:47:23.6152654+08:00;True|2022-11-24T15:36:20.0275278+08:00;True|2022-11-24T15:25:29.2391337+08:00;True|2022-11-24T15:25:19.7988304+08:00;True|2022-11-24T15:06:48.3860466+08:00;True|2022-11-24T14:52:24.7879819+08:00;True|2022-11-24T10:12:41.0992839+08:00;True|2022-11-21T15:13:29.3527873+08:00;True|2022-11-21T10:42:28.8298039+08:00;True|2022-11-18T11:10:34.9917493+08:00;True|2022-11-18T11:10:11.7210670+08:00;True|2022-11-18T10:59:20.7515137+08:00;True|2022-11-18T10:52:33.2724652+08:00;True|2022-11-18T09:22:10.0215858+08:00;True|2022-11-18T09:16:35.0644453+08:00;True|2022-11-16T10:30:33.9013342+08:00;True|2022-11-16T09:55:08.7555656+08:00;True|2022-10-29T11:48:17.9164445+08:00;True|2022-10-29T10:27:39.6224331+08:00;True|2022-10-29T09:25:19.4865788+08:00;True|2022-10-29T09:01:58.2237798+08:00;True|2022-10-29T08:57:17.1749942+08:00;True|2022-10-28T14:44:10.4595607+08:00;True|2022-10-28T14:41:10.8050513+08:00;True|2022-10-28T14:39:02.0096359+08:00;True|2022-10-28T14:27:52.1679095+08:00;True|2022-10-28T14:19:07.6073425+08:00;True|2022-10-28T14:16:46.4140421+08:00;True|2022-10-28T14:06:54.5820895+08:00;True|2022-10-28T14:06:20.4765666+08:00;True|2022-10-28T14:00:01.8073205+08:00;True|2022-10-28T13:56:40.6320465+08:00;True|2022-10-28T12:52:46.3086338+08:00;True|2022-10-28T11:31:08.7626713+08:00;True|2022-10-28T11:28:25.3391022+08:00;True|2022-10-27T17:13:49.3276407+08:00;True|2022-10-27T17:09:49.3362372+08:00;True|2022-10-27T14:49:20.9922482+08:00;True|2022-10-27T11:08:32.7803317+08:00;True|2022-10-27T09:19:17.9537933+08:00;True|2022-10-27T09:14:00.6751533+08:00;True|2022-10-27T09:08:05.5814368+08:00;True|2022-10-27T09:04:21.1435873+08:00;True|2022-10-26T16:47:26.8255243+08:00;True|2022-10-26T16:29:26.3405800+08:00;False|2022-10-26T16:28:18.6237074+08:00;True|2022-10-26T14:29:39.8852546+08:00;True|2022-10-26T14:11:14.0537705+08:00;True|2022-10-26T10:56:16.7897290+08:00;True|2022-10-26T10:29:02.5303566+08:00;True|2022-10-26T10:28:29.9192643+08:00;True|2022-10-26T10:28:16.5901050+08:00;True|2022-10-26T10:22:02.2019236+08:00;True|2022-10-26T10:17:08.3009992+08:00;True|2022-10-20T18:19:28.0452517+08:00;True|2022-10-20T18:14:36.1031080+08:00;True|2022-10-20T16:49:08.1312509+08:00;True|2022-10-20T10:11:30.3988252+08:00;True|2022-10-20T09:52:55.2879279+08:00;True|2022-10-20T09:07:20.5119842+08:00;True|2022-10-20T08:55:23.9003542+08:00;True|2022-10-19T17:56:47.0600040+08:00;True|2022-10-19T17:26:22.4420642+08:00;True|2022-10-19T17:15:09.2591171+08:00;True|2022-10-19T17:00:58.0407123+08:00;True|2022-10-19T16:53:20.8393084+08:00;True|2022-10-19T16:49:09.6859302+08:00;True|2022-10-19T16:40:53.2090492+08:00;True|2022-10-19T16:35:02.0381742+08:00;True|2022-10-19T16:30:49.8415090+08:00;True|2022-10-19T16:05:14.3522346+08:00;True|2022-10-19T15:50:08.9509925+08:00;True|2022-10-19T15:36:28.6015003+08:00;True|2022-10-19T15:33:26.7861204+08:00;True|2022-10-19T15:27:02.8006070+08:00;True|2022-10-19T15:16:31.4065993+08:00;True|2022-10-19T15:14:34.8724996+08:00;True|2022-10-18T18:12:15.5930366+08:00;True|2022-10-18T18:06:54.1679240+08:00;True|2022-10-18T18:02:12.3473981+08:00;True|2022-10-18T17:39:10.7104222+08:00;True|2022-10-18T17:35:14.3679319+08:00;True|2022-10-18T17:32:18.8020932+08:00;True|2022-10-18T17:09:35.5170795+08:00;True|2022-10-18T17:02:58.3933082+08:00;True|2022-10-18T16:46:19.9647705+08:00;True|2022-10-18T11:28:23.1151472+08:00;True|2022-10-17T16:44:34.9653103+08:00;True|2022-10-16T01:53:49.3818533+08:00;True|2022-10-16T01:46:58.7626854+08:00;True|2022-10-16T01:35:19.3037353+08:00;True|2022-10-15T14:31:57.4587818+08:00;True|2022-10-15T14:22:52.4245457+08:00;True|2022-10-14T15:32:59.8175195+08:00;True|2022-10-14T15:24:23.9954226+08:00;True|2022-10-14T15:24:02.4438281+08:00;True|2022-10-14T11:07:04.2629220+08:00;True|2022-10-13T16:44:07.8507864+08:00;True|2022-10-13T16:34:20.4037866+08:00;True|2022-10-13T15:07:55.6527739+08:00;True|2022-10-12T14:59:51.4425162+08:00;True|2022-10-12T11:14:22.2463823+08:00;True|2022-10-12T08:53:16.5351204+08:00;True|2022-10-12T08:24:28.2157523+08:00;False|2022-10-12T08:23:56.2743080+08:00;True|2022-10-12T08:12:38.4791356+08:00;False|2022-10-12T08:12:14.9860966+08:00;True|2022-10-12T08:08:31.1437091+08:00;True|2022-10-11T18:10:13.8327911+08:00;True|2022-10-10T16:21:33.7622381+08:00;True|2022-10-10T09:56:53.1134309+08:00;False|2022-10-10T09:56:18.9153013+08:00;True|2022-10-10T08:46:48.2842004+08:00;True|2022-10-09T16:25:10.1147763+08:00;True|2022-10-08T16:54:50.7779806+08:00;True|2022-10-08T16:35:23.1960956+08:00;True|2022-10-08T16:06:16.5635598+08:00;True|2022-10-08T16:01:24.5889763+08:00;True|2022-10-08T13:11:34.8631266+08:00;True|2022-09-29T15:59:52.7749027+08:00;True|2022-09-28T18:13:25.7208132+08:00;True|2022-09-27T14:01:52.5493804+08:00;True|2022-09-27T08:32:48.3460557+08:00;True|2022-09-23T16:12:28.0271396+08:00;True|2022-09-23T13:50:16.4039745+08:00;True|2022-09-23T13:49:02.0464589+08:00;True|2022-09-23T13:47:12.4458913+08:00;True|2022-09-23T13:42:58.0795715+08:00;True|2022-09-23T13:32:34.2909297+08:00;True|2022-09-23T13:31:14.5573692+08:00;True|2022-09-23T13:27:32.1842906+08:00;True|2022-09-23T12:50:51.2811202+08:00;True|2022-09-22T17:31:41.3605592+08:00;True|2022-09-22T17:25:44.2386416+08:00;True|2022-09-22T09:47:22.9767826+08:00;True|2022-09-16T14:31:58.5334673+08:00;True|2022-09-16T09:04:53.3449040+08:00;True|2022-09-15T15:15:18.3159768+08:00;True|2022-09-14T17:46:23.0171281+08:00;True|2022-09-14T17:43:44.4370239+08:00;True|2022-09-14T17:34:30.3167863+08:00;True|2022-09-14T17:33:00.5148855+08:00;True|2022-09-14T17:06:32.0879029+08:00;True|2022-09-14T16:50:12.7189783+08:00;True|2022-09-14T16:47:48.3868826+08:00;True|2022-09-14T16:42:35.3830356+08:00;True|2022-09-14T16:41:37.8545801+08:00;True|2022-09-14T16:36:47.0944090+08:00;True|2022-09-14T16:26:00.8638173+08:00;True|2022-09-14T16:13:43.6329252+08:00;True|2022-09-14T16:04:16.8093275+08:00;True|2022-09-14T16:02:54.4702614+08:00;True|2022-09-14T15:57:15.9623104+08:00;True|2022-09-14T15:54:23.8745601+08:00;True|2022-09-14T15:49:40.1730864+08:00;True|2022-09-14T15:42:08.2811334+08:00;True|2022-09-14T15:26:40.0417771+08:00;True|2022-09-14T15:24:30.2187269+08:00;True|2022-09-14T15:16:30.3856771+08:00;True|2022-09-14T15:09:22.4313367+08:00;True|2022-09-14T14:59:14.3795036+08:00;True|2022-09-14T14:53:26.8923244+08:00;True|2022-09-14T14:44:00.6688344+08:00;True|2022-09-14T14:41:53.3908108+08:00;True|2022-09-14T14:40:40.3787118+08:00;True|2022-09-14T14:28:39.2273279+08:00;True|2022-09-14T14:27:13.3566861+08:00;True|2022-09-14T14:25:25.4360688+08:00;True|2022-09-14T14:20:42.9734032+08:00;True|2022-09-14T13:51:39.1303401+08:00;True|2022-09-14T13:25:34.8906041+08:00;True|2022-09-14T13:19:28.9172079+08:00;True|2022-09-14T13:18:09.5900815+08:00;True|2022-09-14T10:58:58.0910068+08:00;True|2022-09-14T10:57:11.4834444+08:00;True|2022-09-14T10:45:39.8943674+08:00;True|2022-09-14T10:38:15.2282286+08:00;True|2022-09-14T10:36:54.8259640+08:00;True|2022-09-14T10:14:12.1218790+08:00;True|2022-09-14T10:13:20.0625618+08:00;True|2022-09-14T10:10:15.3538379+08:00;True|2022-09-14T10:07:09.4796434+08:00;True|2022-09-14T10:06:02.0382235+08:00;True|2022-09-14T09:57:12.0082796+08:00;True|2022-09-14T09:52:29.4689029+08:00;True|2022-09-14T09:47:26.7205193+08:00;True|2022-09-14T09:38:56.4089520+08:00;True|2022-09-14T09:32:34.9863473+08:00;True|2022-09-12T13:07:40.5119225+08:00;True|2022-09-09T15:21:48.4251654+08:00;True|2022-09-09T14:45:54.9315147+08:00;True|2022-09-09T11:01:18.2619729+08:00;True|2022-09-09T09:35:40.9779148+08:00;True|2022-09-09T09:26:51.9854326+08:00;True|2022-09-09T09:11:48.8023373+08:00;True|2022-09-09T09:05:45.5528883+08:00;True|2022-09-08T17:47:35.2628987+08:00;True|2022-09-08T17:43:32.6700813+08:00;True|2022-09-08T17:01:23.6259930+08:00;True|2022-09-08T16:55:57.2305777+08:00;True|2022-09-08T16:35:37.3631720+08:00;True|2022-09-08T16:19:13.9122228+08:00;True|2022-09-08T16:04:07.7348285+08:00;True|2022-09-08T16:00:49.9961701+08:00;True|2022-09-08T15:16:03.0110619+08:00;True|2022-09-08T10:19:46.2872822+08:00;True|2022-09-08T10:11:15.5386438+08:00;True|2022-09-08T08:19:02.5242539+08:00;True|2022-09-08T08:18:11.7308721+08:00;True|2022-09-07T11:39:27.2463573+08:00;True|2022-09-07T10:40:57.8877369+08:00;True|2022-09-07T10:37:10.1517098+08:00;True|2022-09-07T10:30:08.7782107+08:00;True|2022-09-07T10:23:52.8534200+08:00;True|2022-09-07T10:09:31.6994230+08:00;True|2022-09-07T10:01:16.2683112+08:00;True|2022-09-07T09:51:47.6282546+08:00;True|2022-09-06T19:11:45.1701913+08:00;True|2022-09-06T18:29:29.2671862+08:00;True|2022-09-06T16:41:04.2719822+08:00;True|2022-09-06T14:17:31.6896132+08:00;True|2022-09-06T13:14:39.9657702+08:00;True|2022-09-05T13:34:47.0627238+08:00;True|2022-09-05T11:07:59.2835592+08:00;True|2022-09-02T14:01:56.1233378+08:00;True|2022-08-31T23:40:49.5468281+08:00;True|2022-08-31T22:15:50.0388123+08:00;True|2022-08-31T19:20:24.7693742+08:00;True|2022-08-31T19:00:06.8271626+08:00;True|2022-08-31T18:45:08.6483670+08:00;True|2022-08-31T16:59:34.8244511+08:00;True|2022-08-31T15:39:51.0653019+08:00;True|2022-08-31T15:25:32.5277796+08:00;True|2022-08-31T13:31:48.5734692+08:00;True|2022-08-31T12:59:02.1022191+08:00;True|2022-08-31T10:06:03.2043884+08:00;True|2022-08-30T17:36:34.5932064+08:00;True|2022-08-30T17:18:12.4582841+08:00;True|2022-08-30T12:55:16.4084322+08:00;True|2022-08-30T10:12:08.0975252+08:00;True|2022-08-30T09:12:46.2845546+08:00;True|2022-08-30T08:58:47.8389468+08:00;True|2022-08-29T17:21:17.7779579+08:00;True|2022-08-29T17:17:49.5334583+08:00;True|2022-08-29T16:53:46.6019453+08:00;True|2022-08-29T16:46:50.8158231+08:00;True|2022-08-29T12:25:19.0140888+08:00;True|2022-08-26T17:02:52.4614637+08:00;True|2022-08-26T16:52:47.8585471+08:00;True|2022-08-26T16:47:02.5766798+08:00;True|2022-08-26T16:36:15.5793109+08:00;True|2022-08-26T16:15:55.1795297+08:00;True|2022-08-26T16:00:22.2697361+08:00;False|2022-08-26T15:58:16.7347649+08:00;True|2022-08-26T15:22:29.6367466+08:00;True|2022-08-25T20:02:24.4685508+08:00;True|2022-08-25T19:50:42.8601696+08:00;True|2022-08-25T15:56:20.3615518+08:00;True|2022-08-25T15:48:16.9923580+08:00;True|2022-08-25T15:27:07.9474640+08:00;True|2022-08-25T13:11:36.9626131+08:00;True|2022-08-24T14:10:58.2790665+08:00;True|2022-08-24T11:43:10.4463552+08:00;True|2022-08-24T08:02:17.9871411+08:00;True|2022-08-23T22:50:41.0238571+08:00;True|2022-08-23T22:16:20.9249814+08:00;True|2022-08-23T21:59:21.1909300+08:00;True|2022-08-23T21:50:40.8106496+08:00;True|2022-08-23T21:06:55.6611505+08:00;True|2022-08-23T19:49:07.0507418+08:00;True|2022-08-23T19:03:15.9808046+08:00;True|2022-08-23T18:58:57.1700899+08:00;True|2022-08-23T18:54:26.8058591+08:00;True|2022-08-23T18:45:39.1928602+08:00;True|2022-08-23T17:32:10.6125039+08:00;True|2022-08-23T15:58:34.9205174+08:00;True|2022-08-23T15:49:21.3383764+08:00;True|2022-08-23T15:14:21.0775398+08:00;True|2022-08-23T15:04:07.8829410+08:00;True|2022-08-23T14:59:17.5143895+08:00;True|2022-08-23T14:55:17.0069050+08:00;True|2022-08-23T14:41:41.0884731+08:00;True|2022-08-23T14:41:06.5045325+08:00;True|2022-08-23T14:28:54.7390570+08:00;True|2022-08-23T13:56:59.3670549+08:00;True|2022-08-23T13:56:38.8588174+08:00;True|2022-08-22T20:48:56.2180227+08:00;True|2022-08-22T19:07:12.1093584+08:00;True|2022-08-22T19:04:07.7837887+08:00;True|2022-08-22T14:38:00.9342884+08:00;True|2022-08-22T10:59:23.2073567+08:00;True|2022-08-22T10:53:58.0920733+08:00;True|2022-08-22T10:53:10.2446944+08:00;True|2022-08-22T10:43:35.3791396+08:00;True|2022-08-18T09:45:46.4643950+08:00;True|2022-08-18T09:40:55.2601145+08:00;True|2022-08-16T16:17:14.3399134+08:00;True|2022-08-15T17:58:16.1460123+08:00;True|2022-08-15T17:55:55.7137518+08:00;True|2022-08-15T17:44:37.6024482+08:00;True|2022-08-15T17:44:21.9583041+08:00;True|2022-08-15T17:43:23.1305690+08:00;True|2022-08-15T17:29:31.1670490+08:00;True|2022-08-15T17:26:42.9269470+08:00;True|2022-08-15T17:23:27.0940168+08:00;True|2022-08-15T17:07:32.9192045+08:00;True|2022-08-15T16:47:03.8611076+08:00;True|2022-08-15T16:41:50.6843705+08:00;True|2022-08-15T16:38:26.7407413+08:00;True|2022-08-15T16:31:49.0805578+08:00;True|2022-08-15T16:27:33.6712012+08:00;True|2022-08-15T16:24:35.1042794+08:00;True|2022-08-15T16:21:57.2757683+08:00;True|2022-08-15T16:18:17.3545368+08:00;True|2022-08-15T16:15:04.2645412+08:00;True|2022-08-15T14:44:09.3078026+08:00;True|2022-08-15T11:20:09.2930712+08:00;True|2022-08-15T10:42:12.2991587+08:00;True|2022-08-15T10:41:38.3711025+08:00;True|2022-08-15T10:19:06.9974383+08:00;True|2022-08-12T17:15:09.2133281+08:00;True|2022-08-12T10:48:05.8776009+08:00;True|2022-08-12T10:26:16.4183447+08:00;True|2022-08-12T08:33:01.9502005+08:00;True|2022-08-11T09:06:08.8394009+08:00;True|2022-08-11T08:39:06.2534634+08:00;True|2022-08-11T08:05:13.6919725+08:00;True|2022-08-08T14:48:16.3637965+08:00;True|2022-08-05T15:44:02.3797448+08:00;True|2022-08-05T09:57:55.7744103+08:00;True|2022-08-04T15:24:38.8785046+08:00;True|2022-08-04T15:11:16.7054147+08:00;True|2022-08-04T14:53:52.7239932+08:00;True|2022-08-04T14:48:35.6115863+08:00;True|2022-08-04T14:39:16.1113507+08:00;True|2022-08-04T12:26:39.4998322+08:00;True|2022-08-04T10:34:23.9626503+08:00;True|2022-08-04T08:12:51.4305728+08:00;True|2022-08-03T15:43:09.2317512+08:00;True|2022-08-02T19:17:55.0460145+08:00;True|2022-08-02T19:08:13.5872184+08:00;True|2022-08-02T18:50:12.1280167+08:00;True|2022-08-02T18:05:53.6540810+08:00;True|2022-08-02T16:13:26.3567210+08:00;True|2022-08-02T15:27:59.9264333+08:00;True|2022-07-25T15:35:49.6958399+08:00;True|2022-07-25T15:30:40.4444876+08:00;True|2022-07-25T13:33:38.4068153+08:00;True|2022-07-22T15:00:56.7326322+08:00;True|2022-07-22T14:51:18.0169121+08:00;True|2022-07-22T14:26:08.4246205+08:00;True|2022-07-22T14:23:05.0897016+08:00;True|2022-07-22T14:18:18.7806854+08:00;True|2022-07-22T14:09:29.7924367+08:00;True|2022-07-22T14:02:26.6403133+08:00;True|2022-07-22T13:56:40.0887615+08:00;True|2022-07-22T13:50:10.7852190+08:00;True|2022-07-22T11:38:25.6671780+08:00;True|2022-07-22T10:55:36.7947659+08:00;True|2022-07-21T17:53:41.1464086+08:00;True|2022-07-21T17:43:33.5311479+08:00;True|2022-07-21T16:09:07.7687640+08:00;True|2022-07-21T16:04:47.9317019+08:00;True|2022-07-21T15:58:21.2359033+08:00;True|2022-07-21T15:56:07.7425829+08:00;True|2022-07-21T15:51:34.7108381+08:00;True|2022-07-21T15:48:57.5735708+08:00;True|2022-07-21T15:44:25.8205030+08:00;True|2022-07-21T15:25:51.4222269+08:00;True|2022-07-21T15:22:36.8818295+08:00;True|2022-07-21T15:19:28.8532774+08:00;True|2022-07-21T14:57:45.7532568+08:00;True|2022-07-21T11:16:12.0900762+08:00;True|2022-07-21T10:10:40.4714948+08:00;True|2022-07-21T10:00:19.5258058+08:00;True|2022-07-14T14:34:28.5093226+08:00;True|2022-07-14T13:59:59.7754985+08:00;True|2022-07-14T12:46:29.6685284+08:00;True|2022-07-14T09:22:25.9079652+08:00;True|2022-07-14T09:22:04.6797478+08:00;True|2022-07-14T09:10:45.0177607+08:00;True|2022-07-14T08:41:43.3026713+08:00;True|2022-07-14T08:27:32.7454972+08:00;True|2022-07-14T08:21:58.6572366+08:00;True|2022-07-14T08:17:59.2904747+08:00;True|2022-07-14T08:12:39.8483472+08:00;True|2022-06-30T15:04:41.6941982+08:00;True|2022-06-24T16:39:01.1080301+08:00;True|2022-06-17T13:23:15.1455451+08:00;True|2022-06-17T13:22:18.5517557+08:00;True|2022-06-17T13:19:27.7323818+08:00;True|2022-06-17T13:12:24.1252779+08:00;True|2022-06-17T13:09:20.4234258+08:00;True|2022-06-17T13:06:49.9869509+08:00;True|2022-06-17T12:58:54.6964621+08:00;False|2022-06-17T12:58:10.6767711+08:00;False|2022-06-17T12:57:08.9747950+08:00;False|2022-06-17T12:56:18.4650121+08:00;False|2022-06-17T12:55:57.9981927+08:00;True|2022-06-13T14:21:36.5610928+08:00;True|2022-06-13T11:41:39.4210151+08:00;True|2022-06-11T02:35:03.4727934+08:00;True|2022-06-11T02:31:13.7362660+08:00;True|2022-06-11T02:30:58.3616790+08:00;True|2022-06-11T01:57:04.4951468+08:00;True|2022-06-10T13:27:13.2097124+08:00;</History>
</PropertyGroup>
<ItemGroup>
<File Include="Areas/HelpPage/HelpPage.css">
@@ -729,16 +729,16 @@
<publishTime>12/24/2021 15:38:29</publishTime>
</File>
<File Include="bin/VueWebApi.dll">
- <publishTime>03/22/2023 17:52:49</publishTime>
+ <publishTime>04/07/2023 08:30:13</publishTime>
</File>
<File Include="bin/VueWebApi.dll.config">
<publishTime>06/15/2022 15:31:43</publishTime>
</File>
<File Include="bin/VueWebApi.pdb">
- <publishTime>03/22/2023 17:52:49</publishTime>
+ <publishTime>04/07/2023 08:30:13</publishTime>
</File>
<File Include="bin/VueWebApi.xml">
- <publishTime>03/22/2023 17:52:48</publishTime>
+ <publishTime>04/07/2023 08:30:13</publishTime>
</File>
<File Include="bin/WebActivatorEx.dll">
<publishTime>02/08/2013 16:42:28</publishTime>
@@ -1478,6 +1478,9 @@
<File Include="Image/app_8.png">
<publishTime>08/30/2022 10:11:46</publishTime>
</File>
+ <File Include="Image/app_8_7.png">
+ <publishTime>04/04/2023 15:22:25</publishTime>
+ </File>
<File Include="Image/app_9.png">
<publishTime>08/30/2022 10:11:46</publishTime>
</File>
@@ -1557,7 +1560,7 @@
<publishTime>06/10/2022 08:20:24</publishTime>
</File>
<File Include="Web.config">
- <publishTime>03/22/2023 17:52:57</publishTime>
+ <publishTime>04/07/2023 08:30:17</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/VueWebApi/Tools/SeachEncode.cs b/VueWebApi/Tools/SeachEncode.cs
index 6bcebdb..99e7f85 100644
--- a/VueWebApi/Tools/SeachEncode.cs
+++ b/VueWebApi/Tools/SeachEncode.cs
@@ -363,7 +363,6 @@
}
#endregion
-
#region [鏍规嵁瑙掕壊缂栫爜鏌ヨ鍔熻兘鑿滃崟]
/// <summary>
/// 鏍规嵁瑙掕壊缂栫爜鏌ヨ鍔熻兘鑿滃崟
diff --git a/VueWebApi/VueWebApi.csproj b/VueWebApi/VueWebApi.csproj
index 9600dcb..82e97b3 100644
--- a/VueWebApi/VueWebApi.csproj
+++ b/VueWebApi/VueWebApi.csproj
@@ -522,6 +522,7 @@
<Content Include="Image\app_7_3.png" />
<Content Include="Image\app_7_4.png" />
<Content Include="Image\app_8.png" />
+ <Content Include="Image\app_8_7.png" />
<Content Include="Image\app_9.png" />
<Content Include="Image\app_9_1.png" />
<Content Include="Image\index_1.png" />
diff --git a/VueWebApi/bin/VueWebApi.pdb b/VueWebApi/bin/VueWebApi.pdb
index ae41de3..3f600e6 100644
--- a/VueWebApi/bin/VueWebApi.pdb
+++ b/VueWebApi/bin/VueWebApi.pdb
Binary files differ
diff --git a/VueWebApi/bin/VueWebApi.xml b/VueWebApi/bin/VueWebApi.xml
index 6be66bb..248225b 100644
--- a/VueWebApi/bin/VueWebApi.xml
+++ b/VueWebApi/bin/VueWebApi.xml
@@ -656,6 +656,22 @@
<param name="ordercode">閲囪喘璁㈠崟鍙�</param>
<returns></returns>
</member>
+ <member name="M:VueWebApi.Controllers.AppPurchManagementController.MesAppPurchInStorSave(System.String,System.String,System.String)">
+ <summary>
+ 閲囪喘鍏ュ簱鎻愪氦
+ </summary>
+ <param name="ordercode">閲囪喘璁㈠崟鍙�</param>
+ <param name="username">鎿嶄綔浜哄憳</param>
+ <param name="incontent">鎻愪氦鏁版嵁</param>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Controllers.AppPurchManagementController.MesAppPurchaseReturnOrderSearch(System.String)">
+ <summary>
+ 閲囪喘閫�璐э細鑾峰彇閲囪喘璁㈠崟鍒楄〃(宸插埌璐х殑閲囪喘璁㈠崟)
+ </summary>
+ <param name="purchordercode">閲囪喘璁㈠崟鍙�</param>
+ <returns></returns>
+ </member>
<member name="M:VueWebApi.Controllers.AppQualityManagementController.InFactoryCheckScanLabCode(System.String)">
<summary>
鍏ュ巶妫�楠�,鎵弿閲囪喘鍒拌揣鐢熸垚鏍囩
@@ -2342,6 +2358,12 @@
<param name="wkshopcode">杞﹂棿缂栫爜</param>
<returns></returns>
</member>
+ <member name="M:VueWebApi.Controllers.ProductionManagementController.AddMesOrderCodeSearch">
+ <summary>
+ MES宸ュ崟鏂板銆佽幏鍙栧伐鍗曞彿
+ </summary>
+ <returns></returns>
+ </member>
<member name="M:VueWebApi.Controllers.ProductionManagementController.AddUpdateMesOrder(Newtonsoft.Json.Linq.JObject)">
<summary>
MES宸ュ崟鏂板銆佺紪杈戞彁浜�
diff --git a/VueWebApi/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache b/VueWebApi/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
index b972b7b..9163aea 100644
--- a/VueWebApi/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/VueWebApi/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/VueWebApi/obj/Release/Package/PackageTmp/Image/app_8_7.png b/VueWebApi/obj/Release/Package/PackageTmp/Image/app_8_7.png
new file mode 100644
index 0000000..cee7be0
--- /dev/null
+++ b/VueWebApi/obj/Release/Package/PackageTmp/Image/app_8_7.png
Binary files differ
diff --git a/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb b/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb
index ae41de3..5c0804f 100644
--- a/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb
+++ b/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb
Binary files differ
diff --git a/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml b/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml
index 6be66bb..759b462 100644
--- a/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml
+++ b/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml
@@ -656,6 +656,15 @@
<param name="ordercode">閲囪喘璁㈠崟鍙�</param>
<returns></returns>
</member>
+ <member name="M:VueWebApi.Controllers.AppPurchManagementController.MesAppPurchInStorSave(System.String,System.String,System.String)">
+ <summary>
+ 閲囪喘鍏ュ簱鎻愪氦
+ </summary>
+ <param name="ordercode">閲囪喘璁㈠崟鍙�</param>
+ <param name="username">鎿嶄綔浜哄憳</param>
+ <param name="incontent">鎻愪氦鏁版嵁</param>
+ <returns></returns>
+ </member>
<member name="M:VueWebApi.Controllers.AppQualityManagementController.InFactoryCheckScanLabCode(System.String)">
<summary>
鍏ュ巶妫�楠�,鎵弿閲囪喘鍒拌揣鐢熸垚鏍囩
@@ -2342,6 +2351,12 @@
<param name="wkshopcode">杞﹂棿缂栫爜</param>
<returns></returns>
</member>
+ <member name="M:VueWebApi.Controllers.ProductionManagementController.AddMesOrderCodeSearch">
+ <summary>
+ MES宸ュ崟鏂板銆佽幏鍙栧伐鍗曞彿
+ </summary>
+ <returns></returns>
+ </member>
<member name="M:VueWebApi.Controllers.ProductionManagementController.AddUpdateMesOrder(Newtonsoft.Json.Linq.JObject)">
<summary>
MES宸ュ崟鏂板銆佺紪杈戞彁浜�
diff --git a/VueWebApi/obj/Release/VueWebApi.csproj.AssemblyReference.cache b/VueWebApi/obj/Release/VueWebApi.csproj.AssemblyReference.cache
new file mode 100644
index 0000000..d8cae1c
--- /dev/null
+++ b/VueWebApi/obj/Release/VueWebApi.csproj.AssemblyReference.cache
Binary files differ
diff --git a/VueWebApi/obj/Release/VueWebApi.csproj.FileListAbsolute.txt b/VueWebApi/obj/Release/VueWebApi.csproj.FileListAbsolute.txt
index b921405..a75cfd6 100644
--- a/VueWebApi/obj/Release/VueWebApi.csproj.FileListAbsolute.txt
+++ b/VueWebApi/obj/Release/VueWebApi.csproj.FileListAbsolute.txt
@@ -568,3 +568,4 @@
D:\鏂板嚡杩狹ES\MES浜у搧\VueWebApi\VueWebApi\obj\Release\VueWebApi.csproj.CopyComplete
D:\鏂板嚡杩狹ES\MES浜у搧\VueWebApi\VueWebApi\obj\Release\VueWebApi.dll
D:\鏂板嚡杩狹ES\MES浜у搧\VueWebApi\VueWebApi\obj\Release\VueWebApi.pdb
+D:\鏂板嚡杩狹ES\MES浜у搧\VueWebApi\VueWebApi\obj\Release\VueWebApi.csproj.AssemblyReference.cache
diff --git a/VueWebApi/obj/Release/VueWebApi.pdb b/VueWebApi/obj/Release/VueWebApi.pdb
index ae41de3..3f600e6 100644
--- a/VueWebApi/obj/Release/VueWebApi.pdb
+++ b/VueWebApi/obj/Release/VueWebApi.pdb
Binary files differ
--
Gitblit v1.9.3