From facb807b19e232c44852a91b6b442285eddfb0f5 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期一, 22 八月 2022 22:21:57 +0800
Subject: [PATCH] 看板接口修改,工序编辑接口修改
---
VueWebApi/obj/Release/VueWebApi.pdb | 0
VueWebApi/Image/app_6_14.png | 0
VueWebApi/obj/Release/Package/PackageTmp/Image/app_6_12.png | 0
VueWebApi/obj/Release/Package/PackageTmp/Image/app_6_2.png | 0
VueWebApi/Image/app_6_8.png | 0
VueWebApi/Image/app_6_4.png | 0
VueWebApi/obj/Release/Package/PackageTmp/Image/app_6_1.png | 0
.vs/VueWebApi/v16/.suo | 0
VueWebApi/DLL/DAL/ProductionManagementDAL.cs | 23 +++--
VueWebApi/obj/Release/Package/PackageTmp/Image/app_6_7.png | 0
VueWebApi/Image/app_6_7.png | 0
VueWebApi/obj/Release/Package/PackageTmp/Image/app_6_13.png | 0
VueWebApi/VueWebApi.csproj | 14 +++
VueWebApi/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache | 0
VueWebApi/obj/Release/Package/PackageTmp/Image/app_6_3.png | 0
VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb | 0
VueWebApi/Image/app_6_13.png | 0
VueWebApi/Controllers/ProductionManagementController.cs | 10 +-
VueWebApi/Image/app_6_12.png | 0
VueWebApi/Image/app_6_3.png | 0
VueWebApi/bin/VueWebApi.pdb | 0
VueWebApi/Logs/2022-08-22.TXT | 0
VueWebApi/obj/Release/Package/PackageTmp/Image/app_6_8.png | 0
VueWebApi/Image/app_6_1.png | 0
VueWebApi/obj/Release/Package/PackageTmp/Image/app_6_9.png | 0
VueWebApi/obj/Release/Package/PackageTmp/Image/app_6_4.png | 0
VueWebApi/DLL/DAL/ProductModelDAL.cs | 34 ++++++--
VueWebApi/Image/app_6_6.png | 0
VueWebApi/obj/Release/Package/PackageTmp/Image/app_6_10.png | 0
VueWebApi/Image/app_6_11.png | 0
VueWebApi/Properties/PublishProfiles/FolderProfile.pubxml.user | 108 ++++++++++++++++++--------
VueWebApi/DLL/BLL/ProductionManagementBLL.cs | 8 +-
VueWebApi/obj/Release/Package/PackageTmp/Image/app_6_14.png | 0
VueWebApi/obj/Release/Package/PackageTmp/Image/app_6_5.png | 0
VueWebApi/bin/VueWebApi.xml | 3
VueWebApi/Image/app_6_2.png | 0
VueWebApi/Tools/ScanStartReport.cs | 2
VueWebApi/obj/Release/Package/PackageTmp/Image/app_6_11.png | 0
VueWebApi/Image/app_6_9.png | 0
VueWebApi/obj/Release/Package/PackageTmp/Image/app_6_6.png | 0
VueWebApi/Image/app_6_5.png | 0
VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml | 3
VueWebApi/Image/app_6_10.png | 0
43 files changed, 142 insertions(+), 63 deletions(-)
diff --git a/.vs/VueWebApi/v16/.suo b/.vs/VueWebApi/v16/.suo
index 2c34a81..1a57144 100644
--- a/.vs/VueWebApi/v16/.suo
+++ b/.vs/VueWebApi/v16/.suo
Binary files differ
diff --git a/VueWebApi/Controllers/ProductionManagementController.cs b/VueWebApi/Controllers/ProductionManagementController.cs
index 883048c..5d3c0db 100644
--- a/VueWebApi/Controllers/ProductionManagementController.cs
+++ b/VueWebApi/Controllers/ProductionManagementController.cs
@@ -15,7 +15,7 @@
{
[RoutePrefix(prefix: "api/ProductionManagement")]
[ControllerGroup("鐢熶骇绠＄悊", "鍦ㄧ嚎鎺ュ彛")]
- [ChannelActionFilter]
+ //[ChannelActionFilter]
public class ProductionManagementController : ApiController
{
//瀹氫箟鍏ㄥ眬淇℃伅杩斿洖鍙橀噺
@@ -76,6 +76,7 @@
[HttpPost]
public HttpResponseMessage MarkSaveErpOrder([FromBody] JObject obj)
{
+ string erporderid = obj["erporderid"].ToString(); //璁㈠崟id
string erpordercode = obj["erpordercode"].ToString(); //璁㈠崟缂栧彿
string partcode = obj["partcode"].ToString(); //浜у搧缂栫爜
string wkshopcode = obj["wkshopcode"].ToString(); //杞﹂棿缂栫爜
@@ -85,7 +86,7 @@
string ordernum = obj["ordernum"].ToString(); //涓嬪崟鍗曟暟
string relse_qty = obj["relse_qty"].ToString(); //宸蹭笅鍗曟暟閲�
var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
- mes = ProductionManagementBLL.MarkSaveErpOrder(erpordercode, partcode, wkshopcode, warehousecode, erpqty, markqty, ordernum, relse_qty, username);
+ mes = ProductionManagementBLL.MarkSaveErpOrder(erporderid,erpordercode, partcode, wkshopcode, warehousecode, erpqty, markqty, ordernum, relse_qty, username);
return TJson.toJson(mes);
}
#endregion
@@ -94,15 +95,16 @@
/// <summary>
/// ERP璁㈠崟鍏抽棴
/// </summary>
+ /// <param name="erporderid">璁㈠崟id</param>
/// <param name="erpordercode">璁㈠崟鍙�</param>
/// <returns></returns>
[Route(template: "ClosedErpOrder")]
[HttpPost]
- public HttpResponseMessage ClosedErpOrder(string erpordercode)
+ public HttpResponseMessage ClosedErpOrder(string erporderid, string erpordercode)
{
//var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
var username = "Admin";
- mes = ProductionManagementBLL.ClosedErpOrder(erpordercode, username);
+ mes = ProductionManagementBLL.ClosedErpOrder(erporderid,erpordercode, username);
return TJson.toJson(mes);
}
#endregion
diff --git a/VueWebApi/DLL/BLL/ProductionManagementBLL.cs b/VueWebApi/DLL/BLL/ProductionManagementBLL.cs
index 3856e8d..bd6227c 100644
--- a/VueWebApi/DLL/BLL/ProductionManagementBLL.cs
+++ b/VueWebApi/DLL/BLL/ProductionManagementBLL.cs
@@ -18,16 +18,16 @@
#endregion
#region[ERP璁㈠崟涓嬭揪]
- public static ToMessage MarkSaveErpOrder(string erpordercode, string partcode, string wkshopcode, string warehousecode, string erpqty, string markqty, string ordernum, string relse_qty, string username)
+ public static ToMessage MarkSaveErpOrder(string erporderid, string erpordercode, string partcode, string wkshopcode, string warehousecode, string erpqty, string markqty, string ordernum, string relse_qty, string username)
{
- return ProductionManagementDAL.MarkSaveErpOrder(erpordercode, partcode, wkshopcode, warehousecode, erpqty, markqty, ordernum, relse_qty, username);
+ return ProductionManagementDAL.MarkSaveErpOrder(erporderid,erpordercode, partcode, wkshopcode, warehousecode, erpqty, markqty, ordernum, relse_qty, username);
}
#endregion
#region[ERP璁㈠崟鍏抽棴]
- public static ToMessage ClosedErpOrder(string erpordercode, string username)
+ public static ToMessage ClosedErpOrder(string erporderid, string erpordercode, string username)
{
- return ProductionManagementDAL.ClosedErpOrder(erpordercode,username);
+ return ProductionManagementDAL.ClosedErpOrder(erporderid,erpordercode, username);
}
#endregion
diff --git a/VueWebApi/DLL/DAL/ProductModelDAL.cs b/VueWebApi/DLL/DAL/ProductModelDAL.cs
index 0d6b0f3..5166223 100644
--- a/VueWebApi/DLL/DAL/ProductModelDAL.cs
+++ b/VueWebApi/DLL/DAL/ProductModelDAL.cs
@@ -1125,6 +1125,8 @@
public static ToMessage AddUpdateStep(string stepid, string stepcode, string stepname, string steptypecode, string enable, string description, string username, string operType)
{
var dynamicParams = new DynamicParameters();
+ List<object> list = new List<object>();
+ var sql_1 = "";
try
{
if (operType == "Add")
@@ -1167,6 +1169,7 @@
}
if (operType == "Update")
{
+ list.Clear();
//濡傛灉褰撳墠宸ュ簭浣跨敤鐘舵�佷綅N(鏈惎鐢�),闇�鍒ゆ柇褰撳墠宸ュ簭瀵瑰簲宸ヨ壓璺嚎琚紩鐢ㄧ殑宸ュ崟鏄惁鍏抽棴
if (enable == "N")
{
@@ -1184,18 +1187,29 @@
return mes;
}
}
+ //褰撳墠宸ュ簭绫诲瀷涓庡叧鑱斿伐浣滅珯涓殑绫诲瀷鏄惁鍖归厤,涓嶅尮閰嶅垯娓呴櫎鍏宠仈宸ヤ綔绔欐暟鎹紝鍚屾椂娓呯悊宸ュ簭鏍�(鍏宠仈宸ヤ綔绔欐爣璇嗗瓧娈典负N)
+ var sql_10 = @"select * from TFlw_Rteqp where step_code=@stepcode";
+ dynamicParams.Add("@stepcode", stepcode);
+ var data_10 = DapperHelper.selectdata(sql_10, dynamicParams);
+ if (data_10.Rows.Count > 0)
+ {
+ if (data_10.Rows[0]["STYLE"].ToString() != "steptypecode")
+ {
+ //鍒犻櫎宸ュ簭鍏宠仈宸ヤ綔绔欒〃
+ sql_1 = @"delete TFlw_Rteqp where step_code=@stepcode";
+ list.Add(new { str = sql_1, parm = new { stepcode = stepcode } });
+ //淇敼宸ュ簭琛ㄥ叧鑱斿伐浣滅珯鏍囪瘑
+ sql_1 = @"update TStep set is_eqp='N' where stepcode=@stepcode";
+ list.Add(new { str = sql_1, parm = new { stepcode = stepcode } });
+ }
+ }
- var sql = @"update TStep set stepname=@stepname,flwtype=@steptypecode,enable=@enable,descr=@description,
+
+ sql_1 = @"update TStep set stepname=@stepname,flwtype=@steptypecode,enable=@enable,descr=@description,
lm_user=@username,lm_date=@CreateDate where id=@stepid";
- dynamicParams.Add("@stepid", stepid);
- dynamicParams.Add("@stepname", stepname);
- dynamicParams.Add("@steptypecode", steptypecode);
- dynamicParams.Add("@enable", enable);
- dynamicParams.Add("@description", description);
- dynamicParams.Add("@username", username);
- dynamicParams.Add("@CreateDate", DateTime.Now.ToString());
- int cont = DapperHelper.SQL(sql, dynamicParams);
- if (cont > 0)
+ list.Add(new { str = sql_1, parm = new { stepid = stepid, stepname= stepname, steptypecode = steptypecode, enable= enable, description = description, username= username, CreateDate= DateTime.Now.ToString() } });
+ bool aa = DapperHelper.DoTransaction(list);
+ if (aa)
{
mes.code = "200";
mes.count = 0;
diff --git a/VueWebApi/DLL/DAL/ProductionManagementDAL.cs b/VueWebApi/DLL/DAL/ProductionManagementDAL.cs
index d66e48a..27f7230 100644
--- a/VueWebApi/DLL/DAL/ProductionManagementDAL.cs
+++ b/VueWebApi/DLL/DAL/ProductionManagementDAL.cs
@@ -76,7 +76,7 @@
}
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
- var sql = @"select A.status,A.wo,A.materiel_code as partcode,B.partname,B.partspec,A.qty,A.relse_qty,A.wkshp_code,C.org_name as wkshp_name,
+ var sql = @"select A.id, A.status,A.wo,A.materiel_code as partcode,B.partname,B.partspec,A.qty,A.relse_qty,A.wkshp_code,C.org_name as wkshp_name,
A.stck_code,D.name as stck_name,A.planstartdate,A.planenddate,U.username as createuser,A.createdate
from TKimp_Ewo A
left join TMateriel_Info B on A.materiel_code=B.partcode
@@ -102,7 +102,7 @@
#endregion
#region[ERP璁㈠崟涓嬭揪]
- public static ToMessage MarkSaveErpOrder(string erpordercode, string partcode, string wkshopcode, string warehousecode, string erpqty, string markqty, string ordernum, string relse_qty, string username)
+ public static ToMessage MarkSaveErpOrder(string erporderid, string erpordercode, string partcode, string wkshopcode, string warehousecode, string erpqty, string markqty, string ordernum, string relse_qty, string username)
{
var sql = "";
List<object> list = new List<object>();
@@ -181,26 +181,28 @@
}
if (decimal.Parse(erpqty) == decimal.Parse(markqty) + decimal.Parse(relse_qty)) //濡傛灉ERP璁㈠崟=涓嬪崟鏁伴噺+宸蹭笅鍗曟暟閲�,鍒欐洿鏂癊RP璁㈠崟琛ㄧ姸鎬佷负CREATED:宸插垱寤�
{
- sql = @"update TKimp_Ewo set status='CREATED',relse_qty=relse_qty+@sumqty where wo=@wo";
+ sql = @"update TKimp_Ewo set status='CREATED',relse_qty=relse_qty+@sumqty where wo=@wo and id=@erporderid";
list.Add(new
{
str = sql,
parm = new
{
wo = erpordercode,
+ erporderid = erporderid,
sumqty = sumqty
}
});
}
else //鏇存柊ERP璁㈠崟琛ㄧ姸鎬佷负CREATING:鍒涘缓涓�
{
- sql = @"update TKimp_Ewo set status='CREATING',relse_qty=relse_qty+@sumqty where wo=@wo";
+ sql = @"update TKimp_Ewo set status='CREATING',relse_qty=relse_qty+@sumqty where wo=@wo and id=@erporderid";
list.Add(new
{
str = sql,
parm = new
{
wo = erpordercode,
+ erporderid = erporderid,
sumqty = sumqty
}
});
@@ -233,7 +235,7 @@
#endregion
#region[ERP璁㈠崟鍏抽棴]
- public static ToMessage ClosedErpOrder(string erpordercode, string username)
+ public static ToMessage ClosedErpOrder(string erporderid,string erpordercode, string username)
{
var sql = "";
List<object> list = new List<object>();
@@ -253,13 +255,14 @@
else
{
//鍏抽棴璁㈠崟
- sql = @"update TKimp_Ewo set status='CLOSED' where wo=@wo";
+ sql = @"update TKimp_Ewo set status='CLOSED' where wo=@wo and id=@erporderid";
list.Add(new
{
str = sql,
parm = new
{
- wo = erpordercode
+ wo = erpordercode,
+ erporderid= erporderid
}
});
}
@@ -729,8 +732,10 @@
try
{
//鑾峰彇宸ュ簭浠诲姟淇℃伅
- sql = @"select A.wo_code,A.seq,B.stepcode,B.stepname,A.plan_qty,A.good_qty,A.ng_qty from TK_Wrk_Step A
- left join TStep B on A.step_code=B.stepcode
+ sql = @"select A.wo_code,P.partcode,P.partname,P.partspec,A.seq,B.stepcode,B.stepname,A.plan_qty,A.good_qty,A.ng_qty from TK_Wrk_Step A
+ left join TStep B on A.step_code=B.stepcode
+ left join TK_Wrk_Man M on A.wo_code=M.wo_code
+ left join TMateriel_Info P on M.materiel_code=P.partcode
where A.wo_code=@wo_code";
dynamicParams.Add("@wo_code", wo_code);
var data = DapperHelper.selectdata(sql, dynamicParams);
diff --git a/VueWebApi/Image/app_6_1.png b/VueWebApi/Image/app_6_1.png
new file mode 100644
index 0000000..d05f494
--- /dev/null
+++ b/VueWebApi/Image/app_6_1.png
Binary files differ
diff --git a/VueWebApi/Image/app_6_10.png b/VueWebApi/Image/app_6_10.png
new file mode 100644
index 0000000..91bc400
--- /dev/null
+++ b/VueWebApi/Image/app_6_10.png
Binary files differ
diff --git a/VueWebApi/Image/app_6_11.png b/VueWebApi/Image/app_6_11.png
new file mode 100644
index 0000000..1ebb6f4
--- /dev/null
+++ b/VueWebApi/Image/app_6_11.png
Binary files differ
diff --git a/VueWebApi/Image/app_6_12.png b/VueWebApi/Image/app_6_12.png
new file mode 100644
index 0000000..ba94d5c
--- /dev/null
+++ b/VueWebApi/Image/app_6_12.png
Binary files differ
diff --git a/VueWebApi/Image/app_6_13.png b/VueWebApi/Image/app_6_13.png
new file mode 100644
index 0000000..a4ab53b
--- /dev/null
+++ b/VueWebApi/Image/app_6_13.png
Binary files differ
diff --git a/VueWebApi/Image/app_6_14.png b/VueWebApi/Image/app_6_14.png
new file mode 100644
index 0000000..6c2981e
--- /dev/null
+++ b/VueWebApi/Image/app_6_14.png
Binary files differ
diff --git a/VueWebApi/Image/app_6_2.png b/VueWebApi/Image/app_6_2.png
new file mode 100644
index 0000000..d512935
--- /dev/null
+++ b/VueWebApi/Image/app_6_2.png
Binary files differ
diff --git a/VueWebApi/Image/app_6_3.png b/VueWebApi/Image/app_6_3.png
new file mode 100644
index 0000000..a9431b2
--- /dev/null
+++ b/VueWebApi/Image/app_6_3.png
Binary files differ
diff --git a/VueWebApi/Image/app_6_4.png b/VueWebApi/Image/app_6_4.png
new file mode 100644
index 0000000..2d2d722
--- /dev/null
+++ b/VueWebApi/Image/app_6_4.png
Binary files differ
diff --git a/VueWebApi/Image/app_6_5.png b/VueWebApi/Image/app_6_5.png
new file mode 100644
index 0000000..8bcaccc
--- /dev/null
+++ b/VueWebApi/Image/app_6_5.png
Binary files differ
diff --git a/VueWebApi/Image/app_6_6.png b/VueWebApi/Image/app_6_6.png
new file mode 100644
index 0000000..2353e4d
--- /dev/null
+++ b/VueWebApi/Image/app_6_6.png
Binary files differ
diff --git a/VueWebApi/Image/app_6_7.png b/VueWebApi/Image/app_6_7.png
new file mode 100644
index 0000000..23f5f22
--- /dev/null
+++ b/VueWebApi/Image/app_6_7.png
Binary files differ
diff --git a/VueWebApi/Image/app_6_8.png b/VueWebApi/Image/app_6_8.png
new file mode 100644
index 0000000..d3397cd
--- /dev/null
+++ b/VueWebApi/Image/app_6_8.png
Binary files differ
diff --git a/VueWebApi/Image/app_6_9.png b/VueWebApi/Image/app_6_9.png
new file mode 100644
index 0000000..6542617
--- /dev/null
+++ b/VueWebApi/Image/app_6_9.png
Binary files differ
diff --git a/VueWebApi/Logs/2022-08-22.TXT b/VueWebApi/Logs/2022-08-22.TXT
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/VueWebApi/Logs/2022-08-22.TXT
diff --git a/VueWebApi/Properties/PublishProfiles/FolderProfile.pubxml.user b/VueWebApi/Properties/PublishProfiles/FolderProfile.pubxml.user
index 736103f..0b3b6b6 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|2022-08-22T02:59:23.2073567Z;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|2022-08-22T12:48:56.2180227Z;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">
@@ -696,16 +696,16 @@
<publishTime>12/24/2021 15:38:29</publishTime>
</File>
<File Include="bin/VueWebApi.dll">
- <publishTime>08/22/2022 10:59:18</publishTime>
+ <publishTime>08/22/2022 20:48:50</publishTime>
</File>
<File Include="bin/VueWebApi.dll.config">
<publishTime>06/15/2022 15:31:43</publishTime>
</File>
<File Include="bin/VueWebApi.pdb">
- <publishTime>08/22/2022 10:59:18</publishTime>
+ <publishTime>08/22/2022 20:48:50</publishTime>
</File>
<File Include="bin/VueWebApi.xml">
- <publishTime>08/22/2022 10:59:18</publishTime>
+ <publishTime>08/22/2022 20:48:50</publishTime>
</File>
<File Include="bin/WebActivatorEx.dll">
<publishTime>02/08/2013 16:42:28</publishTime>
@@ -1266,88 +1266,130 @@
<publishTime>08/11/2022 08:20:52</publishTime>
</File>
<File Include="Image/app_1.png">
- <publishTime>08/19/2022 09:53:24</publishTime>
+ <publishTime>08/22/2022 12:08:31</publishTime>
</File>
<File Include="Image/app_1_1.png">
- <publishTime>08/19/2022 09:53:24</publishTime>
+ <publishTime>08/22/2022 12:08:31</publishTime>
</File>
<File Include="Image/app_1_2.png">
- <publishTime>08/19/2022 09:53:24</publishTime>
+ <publishTime>08/22/2022 12:08:31</publishTime>
</File>
<File Include="Image/app_2.png">
- <publishTime>08/19/2022 09:53:24</publishTime>
+ <publishTime>08/22/2022 12:08:31</publishTime>
</File>
<File Include="Image/app_3.png">
- <publishTime>08/19/2022 09:53:24</publishTime>
+ <publishTime>08/22/2022 12:08:31</publishTime>
</File>
<File Include="Image/app_3_1.png">
- <publishTime>08/19/2022 09:53:24</publishTime>
+ <publishTime>08/22/2022 12:08:31</publishTime>
</File>
<File Include="Image/app_3_2.png">
- <publishTime>08/19/2022 09:53:24</publishTime>
+ <publishTime>08/22/2022 12:08:31</publishTime>
</File>
<File Include="Image/app_4.png">
- <publishTime>08/19/2022 09:53:24</publishTime>
+ <publishTime>08/22/2022 12:08:31</publishTime>
</File>
<File Include="Image/app_4_1.png">
- <publishTime>08/19/2022 09:53:24</publishTime>
+ <publishTime>08/22/2022 12:08:31</publishTime>
</File>
<File Include="Image/app_4_2.png">
- <publishTime>08/19/2022 09:53:24</publishTime>
+ <publishTime>08/22/2022 12:08:31</publishTime>
</File>
<File Include="Image/app_4_3.png">
- <publishTime>08/19/2022 09:53:24</publishTime>
+ <publishTime>08/22/2022 12:08:31</publishTime>
</File>
<File Include="Image/app_4_4.png">
- <publishTime>08/19/2022 09:53:24</publishTime>
+ <publishTime>08/22/2022 12:08:31</publishTime>
</File>
<File Include="Image/app_5.png">
- <publishTime>08/19/2022 09:53:24</publishTime>
+ <publishTime>08/22/2022 12:08:31</publishTime>
</File>
<File Include="Image/app_5_1.png">
- <publishTime>08/19/2022 09:53:24</publishTime>
+ <publishTime>08/22/2022 12:08:31</publishTime>
</File>
<File Include="Image/app_5_2.png">
- <publishTime>08/19/2022 09:53:21</publishTime>
+ <publishTime>08/22/2022 12:08:31</publishTime>
</File>
<File Include="Image/app_5_3.png">
- <publishTime>08/19/2022 09:53:21</publishTime>
+ <publishTime>08/22/2022 12:08:31</publishTime>
</File>
<File Include="Image/app_5_4.png">
- <publishTime>08/19/2022 09:53:21</publishTime>
+ <publishTime>08/22/2022 12:08:31</publishTime>
</File>
<File Include="Image/app_5_5.png">
- <publishTime>08/19/2022 09:53:21</publishTime>
+ <publishTime>08/22/2022 12:08:31</publishTime>
</File>
<File Include="Image/app_5_6.png">
- <publishTime>08/19/2022 09:53:21</publishTime>
+ <publishTime>08/22/2022 12:08:31</publishTime>
</File>
<File Include="Image/app_5_7.png">
- <publishTime>08/19/2022 09:53:21</publishTime>
+ <publishTime>08/22/2022 12:08:31</publishTime>
</File>
<File Include="Image/app_5_8.png">
- <publishTime>08/19/2022 09:53:21</publishTime>
+ <publishTime>08/22/2022 12:08:31</publishTime>
</File>
<File Include="Image/app_5_9.png">
- <publishTime>08/19/2022 09:53:21</publishTime>
+ <publishTime>08/22/2022 12:08:31</publishTime>
</File>
<File Include="Image/app_6.png">
- <publishTime>08/19/2022 09:53:24</publishTime>
+ <publishTime>08/22/2022 12:08:31</publishTime>
+ </File>
+ <File Include="Image/app_6_1.png">
+ <publishTime>08/22/2022 12:08:31</publishTime>
+ </File>
+ <File Include="Image/app_6_10.png">
+ <publishTime>08/22/2022 12:08:31</publishTime>
+ </File>
+ <File Include="Image/app_6_11.png">
+ <publishTime>08/22/2022 12:08:31</publishTime>
+ </File>
+ <File Include="Image/app_6_12.png">
+ <publishTime>08/22/2022 12:08:31</publishTime>
+ </File>
+ <File Include="Image/app_6_13.png">
+ <publishTime>08/22/2022 12:08:31</publishTime>
+ </File>
+ <File Include="Image/app_6_14.png">
+ <publishTime>08/22/2022 12:08:27</publishTime>
+ </File>
+ <File Include="Image/app_6_2.png">
+ <publishTime>08/22/2022 12:08:31</publishTime>
+ </File>
+ <File Include="Image/app_6_3.png">
+ <publishTime>08/22/2022 12:08:31</publishTime>
+ </File>
+ <File Include="Image/app_6_4.png">
+ <publishTime>08/22/2022 12:08:31</publishTime>
+ </File>
+ <File Include="Image/app_6_5.png">
+ <publishTime>08/22/2022 12:08:31</publishTime>
+ </File>
+ <File Include="Image/app_6_6.png">
+ <publishTime>08/22/2022 12:08:31</publishTime>
+ </File>
+ <File Include="Image/app_6_7.png">
+ <publishTime>08/22/2022 12:08:31</publishTime>
+ </File>
+ <File Include="Image/app_6_8.png">
+ <publishTime>08/22/2022 12:08:31</publishTime>
+ </File>
+ <File Include="Image/app_6_9.png">
+ <publishTime>08/22/2022 12:08:31</publishTime>
</File>
<File Include="Image/app_7.png">
- <publishTime>08/19/2022 09:53:24</publishTime>
+ <publishTime>08/22/2022 12:08:31</publishTime>
</File>
<File Include="Image/app_8.png">
- <publishTime>08/19/2022 09:53:24</publishTime>
+ <publishTime>08/22/2022 12:08:31</publishTime>
</File>
<File Include="Image/app_9.png">
- <publishTime>08/19/2022 09:53:24</publishTime>
+ <publishTime>08/22/2022 12:08:31</publishTime>
</File>
<File Include="Image/index_1.png">
- <publishTime>08/19/2022 09:53:21</publishTime>
+ <publishTime>08/22/2022 12:08:31</publishTime>
</File>
<File Include="Image/index_2.png">
- <publishTime>08/19/2022 09:53:21</publishTime>
+ <publishTime>08/22/2022 12:08:31</publishTime>
</File>
<File Include="index.html">
<publishTime>06/30/2022 14:02:46</publishTime>
@@ -1407,7 +1449,7 @@
<publishTime>06/10/2022 08:20:24</publishTime>
</File>
<File Include="Web.config">
- <publishTime>08/22/2022 10:59:22</publishTime>
+ <publishTime>08/22/2022 20:48:55</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/VueWebApi/Tools/ScanStartReport.cs b/VueWebApi/Tools/ScanStartReport.cs
index 7decc57..d0bb1ad 100644
--- a/VueWebApi/Tools/ScanStartReport.cs
+++ b/VueWebApi/Tools/ScanStartReport.cs
@@ -232,7 +232,7 @@
{
decimal sqty = data3.AsEnumerable().Select(d => d.Field<decimal>("SQTY")).Sum(); //涓婇亾鏀舵枡鏁伴噺
decimal good_qty = data2.AsEnumerable().Select(d => d.Field<decimal>("GOOD_QTY")).Sum(); //鏈亾鎶ュ伐鎬绘暟閲�
- decimal ng_qty = data2.AsEnumerable().Select(d => d.Field<decimal>("GOOD_QTY")).Sum(); //鏈亾涓嶈壇鎬绘暟閲�
+ decimal ng_qty = data2.AsEnumerable().Select(d => d.Field<decimal>("NG_QTY")).Sum(); //鏈亾涓嶈壇鎬绘暟閲�
decimal sybqty = sqty - good_qty - ng_qty;//鏈亾鍓╀綑鍙姤鏁伴噺=涓婇亾鏀舵枡鎬绘暟閲�-鏈亾鎶ュ伐鎬绘暟閲�-鏈亾涓嶈壇鎬绘暟閲�
if (sybqty <= 0)
diff --git a/VueWebApi/VueWebApi.csproj b/VueWebApi/VueWebApi.csproj
index 3c00bde..45a7ef9 100644
--- a/VueWebApi/VueWebApi.csproj
+++ b/VueWebApi/VueWebApi.csproj
@@ -409,6 +409,20 @@
<Content Include="Image\app_5_8.png" />
<Content Include="Image\app_5_9.png" />
<Content Include="Image\app_6.png" />
+ <Content Include="Image\app_6_1.png" />
+ <Content Include="Image\app_6_10.png" />
+ <Content Include="Image\app_6_11.png" />
+ <Content Include="Image\app_6_12.png" />
+ <Content Include="Image\app_6_13.png" />
+ <Content Include="Image\app_6_14.png" />
+ <Content Include="Image\app_6_2.png" />
+ <Content Include="Image\app_6_3.png" />
+ <Content Include="Image\app_6_4.png" />
+ <Content Include="Image\app_6_5.png" />
+ <Content Include="Image\app_6_6.png" />
+ <Content Include="Image\app_6_7.png" />
+ <Content Include="Image\app_6_8.png" />
+ <Content Include="Image\app_6_9.png" />
<Content Include="Image\app_7.png" />
<Content Include="Image\app_8.png" />
<Content Include="Image\app_9.png" />
diff --git a/VueWebApi/bin/VueWebApi.pdb b/VueWebApi/bin/VueWebApi.pdb
index 6378af8..dc9e1b2 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 56a1192..477db7f 100644
--- a/VueWebApi/bin/VueWebApi.xml
+++ b/VueWebApi/bin/VueWebApi.xml
@@ -1368,10 +1368,11 @@
<param name="obj">鎻愪氦鏁版嵁</param>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.ProductionManagementController.ClosedErpOrder(System.String)">
+ <member name="M:VueWebApi.Controllers.ProductionManagementController.ClosedErpOrder(System.String,System.String)">
<summary>
ERP璁㈠崟鍏抽棴
</summary>
+ <param name="erporderid">璁㈠崟id</param>
<param name="erpordercode">璁㈠崟鍙�</param>
<returns></returns>
</member>
diff --git a/VueWebApi/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache b/VueWebApi/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
index 82c6482..c90c440 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_6_1.png b/VueWebApi/obj/Release/Package/PackageTmp/Image/app_6_1.png
new file mode 100644
index 0000000..d05f494
--- /dev/null
+++ b/VueWebApi/obj/Release/Package/PackageTmp/Image/app_6_1.png
Binary files differ
diff --git a/VueWebApi/obj/Release/Package/PackageTmp/Image/app_6_10.png b/VueWebApi/obj/Release/Package/PackageTmp/Image/app_6_10.png
new file mode 100644
index 0000000..91bc400
--- /dev/null
+++ b/VueWebApi/obj/Release/Package/PackageTmp/Image/app_6_10.png
Binary files differ
diff --git a/VueWebApi/obj/Release/Package/PackageTmp/Image/app_6_11.png b/VueWebApi/obj/Release/Package/PackageTmp/Image/app_6_11.png
new file mode 100644
index 0000000..1ebb6f4
--- /dev/null
+++ b/VueWebApi/obj/Release/Package/PackageTmp/Image/app_6_11.png
Binary files differ
diff --git a/VueWebApi/obj/Release/Package/PackageTmp/Image/app_6_12.png b/VueWebApi/obj/Release/Package/PackageTmp/Image/app_6_12.png
new file mode 100644
index 0000000..ba94d5c
--- /dev/null
+++ b/VueWebApi/obj/Release/Package/PackageTmp/Image/app_6_12.png
Binary files differ
diff --git a/VueWebApi/obj/Release/Package/PackageTmp/Image/app_6_13.png b/VueWebApi/obj/Release/Package/PackageTmp/Image/app_6_13.png
new file mode 100644
index 0000000..a4ab53b
--- /dev/null
+++ b/VueWebApi/obj/Release/Package/PackageTmp/Image/app_6_13.png
Binary files differ
diff --git a/VueWebApi/obj/Release/Package/PackageTmp/Image/app_6_14.png b/VueWebApi/obj/Release/Package/PackageTmp/Image/app_6_14.png
new file mode 100644
index 0000000..6c2981e
--- /dev/null
+++ b/VueWebApi/obj/Release/Package/PackageTmp/Image/app_6_14.png
Binary files differ
diff --git a/VueWebApi/obj/Release/Package/PackageTmp/Image/app_6_2.png b/VueWebApi/obj/Release/Package/PackageTmp/Image/app_6_2.png
new file mode 100644
index 0000000..d512935
--- /dev/null
+++ b/VueWebApi/obj/Release/Package/PackageTmp/Image/app_6_2.png
Binary files differ
diff --git a/VueWebApi/obj/Release/Package/PackageTmp/Image/app_6_3.png b/VueWebApi/obj/Release/Package/PackageTmp/Image/app_6_3.png
new file mode 100644
index 0000000..a9431b2
--- /dev/null
+++ b/VueWebApi/obj/Release/Package/PackageTmp/Image/app_6_3.png
Binary files differ
diff --git a/VueWebApi/obj/Release/Package/PackageTmp/Image/app_6_4.png b/VueWebApi/obj/Release/Package/PackageTmp/Image/app_6_4.png
new file mode 100644
index 0000000..2d2d722
--- /dev/null
+++ b/VueWebApi/obj/Release/Package/PackageTmp/Image/app_6_4.png
Binary files differ
diff --git a/VueWebApi/obj/Release/Package/PackageTmp/Image/app_6_5.png b/VueWebApi/obj/Release/Package/PackageTmp/Image/app_6_5.png
new file mode 100644
index 0000000..8bcaccc
--- /dev/null
+++ b/VueWebApi/obj/Release/Package/PackageTmp/Image/app_6_5.png
Binary files differ
diff --git a/VueWebApi/obj/Release/Package/PackageTmp/Image/app_6_6.png b/VueWebApi/obj/Release/Package/PackageTmp/Image/app_6_6.png
new file mode 100644
index 0000000..2353e4d
--- /dev/null
+++ b/VueWebApi/obj/Release/Package/PackageTmp/Image/app_6_6.png
Binary files differ
diff --git a/VueWebApi/obj/Release/Package/PackageTmp/Image/app_6_7.png b/VueWebApi/obj/Release/Package/PackageTmp/Image/app_6_7.png
new file mode 100644
index 0000000..23f5f22
--- /dev/null
+++ b/VueWebApi/obj/Release/Package/PackageTmp/Image/app_6_7.png
Binary files differ
diff --git a/VueWebApi/obj/Release/Package/PackageTmp/Image/app_6_8.png b/VueWebApi/obj/Release/Package/PackageTmp/Image/app_6_8.png
new file mode 100644
index 0000000..d3397cd
--- /dev/null
+++ b/VueWebApi/obj/Release/Package/PackageTmp/Image/app_6_8.png
Binary files differ
diff --git a/VueWebApi/obj/Release/Package/PackageTmp/Image/app_6_9.png b/VueWebApi/obj/Release/Package/PackageTmp/Image/app_6_9.png
new file mode 100644
index 0000000..6542617
--- /dev/null
+++ b/VueWebApi/obj/Release/Package/PackageTmp/Image/app_6_9.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 6378af8..dc9e1b2 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 56a1192..477db7f 100644
--- a/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml
+++ b/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml
@@ -1368,10 +1368,11 @@
<param name="obj">鎻愪氦鏁版嵁</param>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.ProductionManagementController.ClosedErpOrder(System.String)">
+ <member name="M:VueWebApi.Controllers.ProductionManagementController.ClosedErpOrder(System.String,System.String)">
<summary>
ERP璁㈠崟鍏抽棴
</summary>
+ <param name="erporderid">璁㈠崟id</param>
<param name="erpordercode">璁㈠崟鍙�</param>
<returns></returns>
</member>
diff --git a/VueWebApi/obj/Release/VueWebApi.pdb b/VueWebApi/obj/Release/VueWebApi.pdb
index 6378af8..dc9e1b2 100644
--- a/VueWebApi/obj/Release/VueWebApi.pdb
+++ b/VueWebApi/obj/Release/VueWebApi.pdb
Binary files differ
--
Gitblit v1.9.3