From f3779c3cbca0d737c7ef7eaf47c1330b355c2f00 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期四, 31 八月 2023 17:30:23 +0800
Subject: [PATCH] ERP订单删除功能
---
VueWebApi/obj/Release/VueWebApi.pdb | 0
VueWebApi/Logs/2023-08-31.TXT | 36 +++++++
.vs/VueWebApi/v16/.suo | 0
VueWebApi/obj/Release/Package/PackageTmp/log4net.config | 12 +-
VueWebApi/DLL/BLL/ProductionManagementBLL.cs | 7 +
VueWebApi/DLL/DAL/ProductionManagementDAL.cs | 172 ++++++++++++++++++++++++++--------
VueWebApi/Properties/PublishProfiles/FolderProfile1.pubxml.user | 8
VueWebApi/bin/VueWebApi.xml | 8 +
VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb | 0
VueWebApi/Controllers/ProductionManagementController.cs | 17 +++
VueWebApi/obj/Debug/VueWebApi.pdb | 0
VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml | 8 +
VueWebApi/DLL/DAL/ReportManagerDAL.cs | 4
VueWebApi/bin/VueWebApi.pdb | 0
VueWebApi/log4net.config | 12 +-
15 files changed, 226 insertions(+), 58 deletions(-)
diff --git a/.vs/VueWebApi/v16/.suo b/.vs/VueWebApi/v16/.suo
index 737240c..6b566dd 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 68c42a7..5dbf07b 100644
--- a/VueWebApi/Controllers/ProductionManagementController.cs
+++ b/VueWebApi/Controllers/ProductionManagementController.cs
@@ -115,6 +115,23 @@
}
#endregion
+ #region[ERP璁㈠崟鍒犻櫎]
+ /// <summary>
+ /// ERP璁㈠崟鍒犻櫎
+ /// </summary>
+ /// <param name="erporderid">璁㈠崟id</param>
+ /// <param name="erpordercode">璁㈠崟鍙�</param>
+ /// <returns></returns>
+ [Route(template: "DeleteErpOrder")]
+ [HttpPost]
+ public HttpResponseMessage DeleteErpOrder(string erporderid, string erpordercode)
+ {
+ var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
+ mes = ProductionManagementBLL.DeleteErpOrder(erporderid, erpordercode, username);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
#region[MES宸ュ崟鏌ヨ]
diff --git a/VueWebApi/DLL/BLL/ProductionManagementBLL.cs b/VueWebApi/DLL/BLL/ProductionManagementBLL.cs
index c60ee05..38ab470 100644
--- a/VueWebApi/DLL/BLL/ProductionManagementBLL.cs
+++ b/VueWebApi/DLL/BLL/ProductionManagementBLL.cs
@@ -33,6 +33,13 @@
}
#endregion
+ #region[ERP璁㈠崟鍒犻櫎]
+ public static ToMessage DeleteErpOrder(string erporderid, string erpordercode, string username)
+ {
+ return ProductionManagementDAL.DeleteErpOrder(erporderid, erpordercode, username);
+ }
+ #endregion
+
#region[MES宸ュ崟鏌ヨ]
diff --git a/VueWebApi/DLL/DAL/ProductionManagementDAL.cs b/VueWebApi/DLL/DAL/ProductionManagementDAL.cs
index 5b802fd..ddb7df5 100644
--- a/VueWebApi/DLL/DAL/ProductionManagementDAL.cs
+++ b/VueWebApi/DLL/DAL/ProductionManagementDAL.cs
@@ -98,7 +98,7 @@
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
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.saleOrderCode,A.saleOrderDeliveryDate,A.planstartdate,A.planenddate,U.username as createuser,A.createdate
+ A.stck_code,D.name as stck_name,A.saleOrderCode,A.saleOrderDeliveryDate,A.planstartdate,A.planenddate,U.username as createuser,A.createdate,A.sbid
from TKimp_Ewo A
left join TMateriel_Info B on A.materiel_code=B.partcode
left join TOrganization C on A.wkshp_code=C.org_code
@@ -149,7 +149,7 @@
if (i == 1) //棣栧崟鑾峰彇宸ュ崟鍙�
{
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";
+ 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());
@@ -313,6 +313,79 @@
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[ERP璁㈠崟鍒犻櫎]
+ public static ToMessage DeleteErpOrder(string erporderid, string erpordercode, string username)
+ {
+ var sql = "";
+ List<object> list = new List<object>();
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ sql = @"select * from TK_Wrk_Man where m_po=@erpordercode and sourceid=@erporderid and status<>'NEW'";
+ dynamicParams.Add("@erpordercode", erpordercode);
+ dynamicParams.Add("@erporderid", erporderid);
+ var data = DapperHelper.selectdata(sql, dynamicParams);
+ if (data.Rows.Count > 0)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "褰撳墠璁㈠崟涓嬫湁宸ュ崟宸叉淳鍙戞垨宸插紑宸ユ垨宸插畬宸�(鍏抽棴),涓嶅厑璁稿垹闄�!";
+ mes.data = null;
+ return mes;
+ }
+ else
+ {
+ //鍒犻櫎宸ュ崟
+ sql = @"delete TK_Wrk_Man where m_po=@wo and sourceid=@erporderid";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ wo = erpordercode,
+ erporderid = erporderid
+ }
+ });
+ //鍒犻櫎璁㈠崟
+ sql = @"delete TKimp_Ewo where wo=@wo and id=@erporderid";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ wo = erpordercode,
+ erporderid = erporderid
+ }
+ });
+ }
+ bool aa = DapperHelper.DoTransaction(list);
+ LogHelper.WriteLogData(aa.ToString());
+ 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;
}
}
@@ -1805,21 +1878,10 @@
}
//鏍规嵁鏉′欢鏌ヨ宸ュ崟宸ュ簭鎶ュ伐(鏀舵枡)璁板綍,涓斾笉鑹暟閲忓ぇ浜�0
//瀛樺偍杩囩▼鍚�
- //sql = @"h_p_IFCLD_MesReportDefectHandleSelect";
- sql = @"select MM.record_id as m_id,MM.wo_code,A.materiel_code,S.seq,MM.step_code,T.stepname,A.id,
- S.plan_qty,A.good_qty as report_qty,MM.defect_qty as ng_qty,A.bad_qty as badqty,'Z' as style,MM.verify,
- MM.defect_code,STUFF((SELECT ',' + P.name
- FROM TDefect P
- WHERE CHARINDEX(',' + P.code + ',', ',' + MM.defect_code + ',') > 0
- FOR XML PATH('')), 1, 1, '') AS defect_name
- from CSR_WorkRecord_Defect MM
- inner join TK_Wrk_Record A on MM.record_id=a.id
- inner join TK_Wrk_Step S on A.wo_code=S.wo_code and A.step_code=S.step_code
- inner join TStep T on MM.step_code=T.stepcode
- where MM.wo_code=@ordercode and MM.step_code=@stepcode and MM.style='B' and A.style='B' and A.ng_qty>0";
+ sql = @"h_p_IFCLD_MesReportDefectHandleSelect";
dynamicParams1.Add("@ordercode", ordercode);
dynamicParams1.Add("@stepcode", stepcode);
- DataTable dt = DapperHelper.selectdata(sql, dynamicParams1);
+ DataTable dt = DapperHelper.selectProcedure(sql, dynamicParams1);
if (dt.Rows.Count > 0)
{
list.Add("data1", rt);
@@ -2018,7 +2080,7 @@
try
{
//鐝粍鑾峰彇浜哄憳鍒楄〃
- sql = @"select U.username,U.username
+ sql = @"select U.usercode,U.username
from TGroup G
inner join TGroupUser T on G.group_code=T.group_code
left join TUser U on T.user_code=U.usercode
@@ -2331,9 +2393,9 @@
//鍐欏叆缂洪櫡璁板綍琛�
for (int i = 0; i < groupedItems.Count; i++)
{
- sql = @"insert into CSR_WorkRecord_Defect(record_id,wo_code,partnumber,step_seq,step_code,defect_qty,defect_code,remarks,style,lm_user,lm_date)
- values(@record_id,@wo_code,@partcode,@stepseq,@stepcode,@ngqty,@defect_code,@remarks,@style,@lm_user,@lm_date)";
- list.Add(new { str = sql, parm = new { record_id = int.Parse(dt.Rows[0]["ID"].ToString()), wo_code = mesordercode, partcode = partcode, stepseq = stepseq, stepcode = stepcode, ngqty = groupedItems[i].badqty, defect_code = groupedItems[i].defect_code, remarks = remarks, style = "B", lm_user = username, lm_date = date } });
+ sql = @"insert into CSR_WorkRecord_Defect(record_id,wo_code,partnumber,step_seq,step_code,defect_qty,defect_pendqty,defect_code,remarks,style,lm_user,lm_date)
+ values(@record_id,@wo_code,@partcode,@stepseq,@stepcode,@ngqty,@defect_pendqty,@defect_code,@remarks,@style,@lm_user,@lm_date)";
+ list.Add(new { str = sql, parm = new { record_id = int.Parse(dt.Rows[0]["ID"].ToString()), wo_code = mesordercode, partcode = partcode, stepseq = stepseq, stepcode = stepcode, ngqty = groupedItems[i].badqty, defect_pendqty= groupedItems[i].badqty, defect_code = groupedItems[i].defect_code, remarks = remarks, style = "B", lm_user = username, lm_date = date } });
}
}
@@ -2402,9 +2464,9 @@
//鍐欏叆缂洪櫡璁板綍琛�
for (int i = 0; i < groupedItems.Count; i++)
{
- sql = @"insert into CSR_WorkRecord_Defect(record_id,wo_code,partnumber,step_seq,step_code,defect_qty,defect_code,remarks,style,lm_user,lm_date)
- values(@record_id,@wo_code,@partcode,@stepseq,@stepcode,@ngqty,@defect_code,@remarks,@style,@lm_user,@lm_date)";
- list.Add(new { str = sql, parm = new { record_id = int.Parse(dt.Rows[0]["ID"].ToString()), wo_code = mesordercode, partcode = partcode, stepseq = stepseq, stepcode = stepcode, ngqty = groupedItems[i].badqty, defect_code = groupedItems[i].defect_code, remarks = remarks, style = "B", lm_user = username, lm_date = date } });
+ sql = @"insert into CSR_WorkRecord_Defect(record_id,wo_code,partnumber,step_seq,step_code,defect_qty,defect_pendqty,defect_code,remarks,style,lm_user,lm_date)
+ values(@record_id,@wo_code,@partcode,@stepseq,@stepcode,@ngqty,@defect_pendqty,@defect_code,@remarks,@style,@lm_user,@lm_date)";
+ list.Add(new { str = sql, parm = new { record_id = int.Parse(dt.Rows[0]["ID"].ToString()), wo_code = mesordercode, partcode = partcode, stepseq = stepseq, stepcode = stepcode, ngqty = groupedItems[i].badqty, defect_pendqty= groupedItems[i].badqty, defect_code = groupedItems[i].defect_code, remarks = remarks, style = "B", lm_user = username, lm_date = date } });
}
}
@@ -2630,9 +2692,9 @@
//鍐欏叆缂洪櫡璁板綍琛�
for (int i = 0; i < groupedItems.Count; i++)
{
- sql = @"insert into CSR_WorkRecord_Defect(record_id,wo_code,partnumber,step_seq,step_code,defect_qty,defect_code,remarks,style,lm_user,lm_date)
- values(@record_id,@wo_code,@partcode,@stepseq,@stepcode,@ngqty,@defect_code,@remarks,@style,@lm_user,@lm_date)";
- list.Add(new { str = sql, parm = new { record_id = int.Parse(dt.Rows[0]["ID"].ToString()), wo_code = mesordercode, partcode = partcode, stepseq = stepseq, stepcode = stepcode, ngqty = groupedItems[i].badqty, defect_code = groupedItems[i].defect_code, remarks = remarks, style = "S", lm_user = username, lm_date = date } });
+ sql = @"insert into CSR_WorkRecord_Defect(record_id,wo_code,partnumber,step_seq,step_code,defect_qty,defect_pendqty,defect_code,remarks,style,lm_user,lm_date)
+ values(@record_id,@wo_code,@partcode,@stepseq,@stepcode,@ngqty,@defect_pendqty,@defect_code,@remarks,@style,@lm_user,@lm_date)";
+ list.Add(new { str = sql, parm = new { record_id = int.Parse(dt.Rows[0]["ID"].ToString()), wo_code = mesordercode, partcode = partcode, stepseq = stepseq, stepcode = stepcode, ngqty = groupedItems[i].badqty, defect_pendqty= groupedItems[i].badqty, defect_code = groupedItems[i].defect_code, remarks = remarks, style = "S", lm_user = username, lm_date = date } });
}
}
@@ -2679,9 +2741,9 @@
//鍐欏叆缂洪櫡璁板綍琛�
for (int i = 0; i < groupedItems.Count; i++)
{
- sql = @"insert into CSR_WorkRecord_Defect(record_id,wo_code,partnumber,step_seq,step_code,defect_qty,defect_code,remarks,style,lm_user,lm_date)
- values(@record_id,@wo_code,@partcode,@stepseq,@stepcode,@ngqty,@defect_code,@remarks,@style,@lm_user,@lm_date)";
- list.Add(new { str = sql, parm = new { record_id = int.Parse(dt.Rows[0]["ID"].ToString()), wo_code = mesordercode, partcode = partcode, stepseq = stepseq, stepcode = stepcode, ngqty = groupedItems[i].badqty, defect_code = groupedItems[i].defect_code, remarks = remarks, style = "S", lm_user = username, lm_date = date } });
+ sql = @"insert into CSR_WorkRecord_Defect(record_id,wo_code,partnumber,step_seq,step_code,defect_qty,defect_pendqty,defect_code,remarks,style,lm_user,lm_date)
+ values(@record_id,@wo_code,@partcode,@stepseq,@stepcode,@ngqty,@defect_pendqty,@defect_code,@remarks,@style,@lm_user,@lm_date)";
+ list.Add(new { str = sql, parm = new { record_id = int.Parse(dt.Rows[0]["ID"].ToString()), wo_code = mesordercode, partcode = partcode, stepseq = stepseq, stepcode = stepcode, ngqty = groupedItems[i].badqty, defect_pendqty= groupedItems[i].badqty, defect_code = groupedItems[i].defect_code, remarks = remarks, style = "S", lm_user = username, lm_date = date } });
}
}
@@ -2754,7 +2816,7 @@
str = sql,
parm = new
{
- m_id = int.Parse(json.Data.Rows[i]["ID"].ToString()),
+ m_id = int.Parse(json.Data.Rows[i]["M_ID"].ToString()),
repair_qty = decimal.Parse(json.Data.Rows[i]["REPAIR_QTY"].ToString()),
bad_qty = decimal.Parse(json.Data.Rows[i]["BAD_QTY"].ToString())
}
@@ -2771,18 +2833,33 @@
bad_qty = decimal.Parse(json.Data.Rows[i]["BAD_QTY"].ToString()),
wo_code = json.Data.Rows[i]["WO_CODE"].ToString(),
step_code = json.Data.Rows[i]["STEP_CODE"].ToString(),
- id = int.Parse(json.Data.Rows[i]["ID"].ToString())
+ id = int.Parse(json.Data.Rows[i]["M_ID"].ToString())
}
});
- //鍐欏叆鎶ュ伐缂洪櫡澶勭悊璁板綍琛�
- sql = @"insert into CSR_WorkRecord_DefectHandle(record_subid,wo_code,partnumber,step_seq,step_code,repair_qty,bad_qty,defect_code,style,lm_user,lm_date)
- values(@record_subid,@wo_code,@partcode,@stepseq,@stepcode,@repair_qty,@bad_qty,@defect_code,@style,@lm_user,@lm_date)";
+ //鍥炲啓缂洪櫡璁板綍琛ㄧ殑寰呭鐞嗘暟閲�
+ sql = @"update CSR_WorkRecord_Defect set defect_pendqty=defect_pendqty-@repair_qty-@bad_qty,bad_qty=bad_qty+@bad_qty
+ where wo_code=@wo_code and step_code=@step_code and id=@id and style='B'";
list.Add(new
{
str = sql,
parm = new
{
- record_subid = int.Parse(json.Data.Rows[i]["M_ID"].ToString()),
+ repair_qty = decimal.Parse(json.Data.Rows[i]["REPAIR_QTY"].ToString()),
+ bad_qty = decimal.Parse(json.Data.Rows[i]["BAD_QTY"].ToString()),
+ wo_code = json.Data.Rows[i]["WO_CODE"].ToString(),
+ step_code = json.Data.Rows[i]["STEP_CODE"].ToString(),
+ id = int.Parse(json.Data.Rows[i]["ID"].ToString())
+ }
+ });
+ //鍐欏叆鎶ュ伐缂洪櫡澶勭悊璁板綍琛�
+ sql = @"insert into CSR_WorkRecord_DefectHandle(defect_id,wo_code,partnumber,step_seq,step_code,repair_qty,bad_qty,defect_code,style,lm_user,lm_date)
+ values(@defect_id,@wo_code,@partcode,@stepseq,@stepcode,@repair_qty,@bad_qty,@defect_code,@style,@lm_user,@lm_date)";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ defect_id = int.Parse(json.Data.Rows[i]["ID"].ToString()),
wo_code = json.Data.Rows[i]["WO_CODE"].ToString(),
partcode = json.Data.Rows[i]["MATERIEL_CODE"].ToString(),
stepseq = json.Data.Rows[i]["SEQ"].ToString(),
@@ -2810,7 +2887,7 @@
str = sql,
parm = new
{
- m_id = int.Parse(json.Data.Rows[i]["ID"].ToString()),
+ m_id = int.Parse(json.Data.Rows[i]["M_ID"].ToString()),
repair_qty = decimal.Parse(json.Data.Rows[i]["REPAIR_QTY"].ToString()),
bad_qty = decimal.Parse(json.Data.Rows[i]["BAD_QTY"].ToString())
}
@@ -2827,18 +2904,33 @@
bad_qty = decimal.Parse(json.Data.Rows[i]["BAD_QTY"].ToString()),
wo_code = json.Data.Rows[i]["WO_CODE"].ToString(),
step_code = json.Data.Rows[i]["STEP_CODE"].ToString(),
- id = int.Parse(json.Data.Rows[i]["ID"].ToString())
+ id = int.Parse(json.Data.Rows[i]["M_ID"].ToString())
}
});
- //鍐欏叆鎶ュ伐缂洪櫡澶勭悊璁板綍琛�
- sql = @"insert into CSR_WorkRecord_DefectHandle(record_subid,wo_code,partnumber,step_seq,step_code,repair_qty,bad_qty,defect_code,style,lm_user,lm_date)
- values(@record_subid,@wo_code,@partcode,@stepseq,@stepcode,@repair_qty,@bad_qty,@defect_code,@style,@lm_user,@lm_date)";
+ //鍥炲啓缂洪櫡璁板綍琛ㄧ殑寰呭鐞嗘暟閲�
+ sql = @"update CSR_WorkRecord_Defect set defect_pendqty=defect_pendqty-@repair_qty-@bad_qty,bad_qty=bad_qty+@bad_qty
+ where wo_code=@wo_code and step_code=@step_code and id=@id and style='S'";
list.Add(new
{
str = sql,
parm = new
{
- record_subid = int.Parse(json.Data.Rows[i]["M_ID"].ToString()),
+ repair_qty = decimal.Parse(json.Data.Rows[i]["REPAIR_QTY"].ToString()),
+ bad_qty = decimal.Parse(json.Data.Rows[i]["BAD_QTY"].ToString()),
+ wo_code = json.Data.Rows[i]["WO_CODE"].ToString(),
+ step_code = json.Data.Rows[i]["STEP_CODE"].ToString(),
+ id = int.Parse(json.Data.Rows[i]["ID"].ToString())
+ }
+ });
+ //鍐欏叆鎶ュ伐缂洪櫡澶勭悊璁板綍琛�
+ sql = @"insert into CSR_WorkRecord_DefectHandle(defect_id,wo_code,partnumber,step_seq,step_code,repair_qty,bad_qty,defect_code,style,lm_user,lm_date)
+ values(@defect_id,@wo_code,@partcode,@stepseq,@stepcode,@repair_qty,@bad_qty,@defect_code,@style,@lm_user,@lm_date)";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ defect_id = int.Parse(json.Data.Rows[i]["ID"].ToString()),
wo_code = json.Data.Rows[i]["WO_CODE"].ToString(),
partcode = json.Data.Rows[i]["MATERIEL_CODE"].ToString(),
stepseq = json.Data.Rows[i]["SEQ"].ToString(),
diff --git a/VueWebApi/DLL/DAL/ReportManagerDAL.cs b/VueWebApi/DLL/DAL/ReportManagerDAL.cs
index ea4717b..52138c2 100644
--- a/VueWebApi/DLL/DAL/ReportManagerDAL.cs
+++ b/VueWebApi/DLL/DAL/ReportManagerDAL.cs
@@ -752,7 +752,7 @@
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
var sql = @"select * from(
- select W.wkshp_code,L.org_name as wkshp_name,A.wo_code,M.partcode,M.partname,M.partspec,T.stepcode,T.stepname,P.plan_qty,A.defect_qty,
+ select W.wkshp_code,L.org_name as wkshp_name,A.wo_code,M.partcode,M.partname,M.partspec,T.stepcode,T.stepname,P.plan_qty,A.defect_qty,A.defect_pendqty,A.bad_qty,
A.defect_code,
STUFF((SELECT ',' + P.name
FROM TDefect P
@@ -852,7 +852,7 @@
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
var sql = @"select AA.wkshp_code as 杞﹂棿缂栫爜,AA.wkshp_name as 杞﹂棿鍚嶇О,AA.wo_code as 宸ュ崟缂栧彿,AA.partcode as 浜у搧缂栫爜,AA.partname as 浜у搧鍚嶇О,AA.partspec as 浜у搧瑙勬牸,AA.stepcode as 宸ュ簭缂栫爜,
- AA.stepname as 宸ュ簭鍚嶇О,AA.plan_qty as 浠诲姟鏁伴噺,AA.defect_qty as 涓嶈壇鏁伴噺,AA.defect_code as 缂洪櫡浠ｇ爜,AA.defect_name as 缂洪櫡鍚嶇О,
+ AA.stepname as 宸ュ簭鍚嶇О,AA.plan_qty as 浠诲姟鏁伴噺,AA.defect_qty as 涓嶈壇鏁伴噺,A.defect_pendqty as 涓嶈壇寰呭鐞嗘暟閲�,A.bad_qty as 鎶ュ簾鏁伴噺,AA.defect_code as 缂洪櫡浠ｇ爜,AA.defect_name as 缂洪櫡鍚嶇О,
(case when AA.style='B' then '鎶ュ伐' when AA.style='S' then '鏀舵枡' end) as '鎿嶄綔绫诲瀷',AA.username as 鎿嶄綔浜哄憳,AA.lm_date as 鎿嶄綔鏃堕棿
from(
select W.wkshp_code,L.org_name as wkshp_name,A.wo_code,M.partcode,M.partname,M.partspec,T.stepcode,T.stepname,P.plan_qty,A.defect_qty,
diff --git a/VueWebApi/Logs/2023-08-31.TXT b/VueWebApi/Logs/2023-08-31.TXT
new file mode 100644
index 0000000..c66a52d
--- /dev/null
+++ b/VueWebApi/Logs/2023-08-31.TXT
@@ -0,0 +1,36 @@
+ 【时间】:2023-08-31 16:15:43,457
+ 【级别】:ERROR
+ 【类名】:日志记录
+ 【线程ID】: 7
+ 【文件地址】:D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\Tools\LogHelper.cs 第37行
+ 【日志内容】:进入DAL方法
+时间：2023-08-31 16:15:43
+ 【日记详细】：
+---------------------------------------------------------------------------------------------------------------
+ 【时间】:2023-08-31 16:21:43,278
+ 【级别】:ERROR
+ 【类名】:日志记录
+ 【线程ID】: 6
+ 【文件地址】:D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\Tools\LogHelper.cs 第37行
+ 【日志内容】:进入DAL方法
+时间：2023-08-31 16:21:43
+ 【日记详细】：
+---------------------------------------------------------------------------------------------------------------
+ 【时间】:2023-08-31 16:22:26,258
+ 【级别】:ERROR
+ 【类名】:日志记录
+ 【线程ID】: 6
+ 【文件地址】:D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\Tools\LogHelper.cs 第37行
+ 【日志内容】:True
+时间：2023-08-31 16:22:26
+ 【日记详细】：
+---------------------------------------------------------------------------------------------------------------
+ 【时间】:2023-08-31 16:22:54,242
+ 【级别】:ERROR
+ 【类名】:日志记录
+ 【线程ID】: 6
+ 【文件地址】:D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\Tools\LogHelper.cs 第37行
+ 【日志内容】:进入DAL方法
+时间：2023-08-31 16:22:54
+ 【日记详细】：
+---------------------------------------------------------------------------------------------------------------
diff --git a/VueWebApi/Properties/PublishProfiles/FolderProfile1.pubxml.user b/VueWebApi/Properties/PublishProfiles/FolderProfile1.pubxml.user
index 5c71494..84362e6 100644
--- a/VueWebApi/Properties/PublishProfiles/FolderProfile1.pubxml.user
+++ b/VueWebApi/Properties/PublishProfiles/FolderProfile1.pubxml.user
@@ -750,13 +750,13 @@
<publishTime>12/24/2021 15:38:29</publishTime>
</File>
<File Include="bin/VueWebApi.dll">
- <publishTime>08/16/2023 17:56:41</publishTime>
+ <publishTime>08/31/2023 16:26:21</publishTime>
</File>
<File Include="bin/VueWebApi.pdb">
- <publishTime>08/16/2023 17:56:41</publishTime>
+ <publishTime>08/31/2023 16:26:21</publishTime>
</File>
<File Include="bin/VueWebApi.xml">
- <publishTime>08/16/2023 17:56:41</publishTime>
+ <publishTime>08/31/2023 16:26:21</publishTime>
</File>
<File Include="bin/WebActivatorEx.dll">
<publishTime>02/08/2013 16:42:28</publishTime>
@@ -1122,7 +1122,7 @@
<publishTime>06/10/2022 09:23:15</publishTime>
</File>
<File Include="log4net.config">
- <publishTime>05/10/2023 09:38:48</publishTime>
+ <publishTime>08/31/2023 16:10:26</publishTime>
</File>
<File Include="Scripts/bootstrap.js">
<publishTime>06/10/2022 08:20:26</publishTime>
diff --git a/VueWebApi/bin/VueWebApi.pdb b/VueWebApi/bin/VueWebApi.pdb
index bdf3970..d5ea379 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 4c91755..9a04171 100644
--- a/VueWebApi/bin/VueWebApi.xml
+++ b/VueWebApi/bin/VueWebApi.xml
@@ -2552,6 +2552,14 @@
<param name="erpordercode">璁㈠崟鍙�</param>
<returns></returns>
</member>
+ <member name="M:VueWebApi.Controllers.ProductionManagementController.DeleteErpOrder(System.String,System.String)">
+ <summary>
+ ERP璁㈠崟鍒犻櫎
+ </summary>
+ <param name="erporderid">璁㈠崟id</param>
+ <param name="erpordercode">璁㈠崟鍙�</param>
+ <returns></returns>
+ </member>
<member name="M:VueWebApi.Controllers.ProductionManagementController.MesOrderSearch(System.Int32,System.Int32,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
<summary>
MES宸ュ崟鏌ヨ
diff --git a/VueWebApi/log4net.config b/VueWebApi/log4net.config
index a92d0d9..7e73a2a 100644
--- a/VueWebApi/log4net.config
+++ b/VueWebApi/log4net.config
@@ -8,11 +8,11 @@
<log4net>
<!--鍐欏叆鍒版枃浠�-->
- <!--<appender name="LogFileAppender" type="log4net.Appender.RollingFileAppender,log4net">
+ <appender name="LogFileAppender" type="log4net.Appender.RollingFileAppender,log4net">
- --><!--鏂囦欢璺緞锛屽鏋淩ollingStyle涓篊omposite鎴朌ate锛屽垯杩欓噷璁剧疆涓虹洰褰曪紝鏂囦欢鍚嶅湪DatePattern閲岃缃紝鍏朵粬鍒欒繖閲岃鏈夋枃浠跺悕銆傚凡缁忔墿灞曟敮鎸佽櫄鎷熺洰褰�--><!--
+ <!--鏂囦欢璺緞锛屽鏋淩ollingStyle涓篊omposite鎴朌ate锛屽垯杩欓噷璁剧疆涓虹洰褰曪紝鏂囦欢鍚嶅湪DatePattern閲岃缃紝鍏朵粬鍒欒繖閲岃鏈夋枃浠跺悕銆傚凡缁忔墿灞曟敮鎸佽櫄鎷熺洰褰�-->
<param name="File" value="Logs\" />
- --><!--灏嗘棩璁板啓鍏ュ埌璺熺洰褰曚笅闈㈢殑Logs鏂囦欢澶逛笅闈㈢殑yyyy-MM-dd.TXT鏂囦欢涓�--><!--
+ <!--灏嗘棩璁板啓鍏ュ埌璺熺洰褰曚笅闈㈢殑Logs鏂囦欢澶逛笅闈㈢殑yyyy-MM-dd.TXT鏂囦欢涓�-->
<param name="AppendToFile" value="true" />
@@ -25,17 +25,17 @@
<param name="RollingStyle" value="Date" />
<param name="DatePattern" value="yyyy-MM-dd.TXT" />
- --><!--TXT鍚庣紑蹇呴』鏄ぇ鍐欑殑锛屽惁鍒欐湁闂--><!--
+ <!--TXT鍚庣紑蹇呴』鏄ぇ鍐欑殑锛屽惁鍒欐湁闂-->
<param name="CountDirection" value="-1" />
- --><!--log4net璁板綍閿欒鐨勬牸寮�(鍗筹細鐢ㄤ粈涔堟牱鐨勬牸寮忥紙甯冨眬锛夋潵璁板綍閿欒)--><!--
+ <!--log4net璁板綍閿欒鐨勬牸寮�(鍗筹細鐢ㄤ粈涔堟牱鐨勬牸寮忥紙甯冨眬锛夋潵璁板綍閿欒)-->
<layout type="log4net.Layout.PatternLayout">
<param name="ConversionPattern" value=" 銆愭椂闂淬��:%d%n 銆愮骇鍒��:%p%n 銆愮被鍚嶃��:%c%n 銆愮嚎绋婭D銆�: %thread %n 銆愭枃浠跺湴鍧�銆�:%F 绗�%L琛�%n 銆愭棩蹇楀唴瀹广��:%m%n 銆愭棩璁拌缁嗐�戯細%exception %n---------------------------------------------------------------------------------------------------------------%n" />
</layout>
- </appender>-->
+ </appender>
<!--姝ゅ灏嗘搷浣滆褰曞啓鍏ユ暟鎹簱,鏃ュ織鍚岀悊-->
<appender name="AdoNetAppender" type="log4net.Appender.AdoNetAppender">
diff --git a/VueWebApi/obj/Debug/VueWebApi.pdb b/VueWebApi/obj/Debug/VueWebApi.pdb
index 391ed3b..ac22928 100644
--- a/VueWebApi/obj/Debug/VueWebApi.pdb
+++ b/VueWebApi/obj/Debug/VueWebApi.pdb
Binary files differ
diff --git a/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb b/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb
index bdf3970..d5ea379 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 4c91755..9a04171 100644
--- a/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml
+++ b/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml
@@ -2552,6 +2552,14 @@
<param name="erpordercode">璁㈠崟鍙�</param>
<returns></returns>
</member>
+ <member name="M:VueWebApi.Controllers.ProductionManagementController.DeleteErpOrder(System.String,System.String)">
+ <summary>
+ ERP璁㈠崟鍒犻櫎
+ </summary>
+ <param name="erporderid">璁㈠崟id</param>
+ <param name="erpordercode">璁㈠崟鍙�</param>
+ <returns></returns>
+ </member>
<member name="M:VueWebApi.Controllers.ProductionManagementController.MesOrderSearch(System.Int32,System.Int32,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
<summary>
MES宸ュ崟鏌ヨ
diff --git a/VueWebApi/obj/Release/Package/PackageTmp/log4net.config b/VueWebApi/obj/Release/Package/PackageTmp/log4net.config
index a92d0d9..7e73a2a 100644
--- a/VueWebApi/obj/Release/Package/PackageTmp/log4net.config
+++ b/VueWebApi/obj/Release/Package/PackageTmp/log4net.config
@@ -8,11 +8,11 @@
<log4net>
<!--鍐欏叆鍒版枃浠�-->
- <!--<appender name="LogFileAppender" type="log4net.Appender.RollingFileAppender,log4net">
+ <appender name="LogFileAppender" type="log4net.Appender.RollingFileAppender,log4net">
- --><!--鏂囦欢璺緞锛屽鏋淩ollingStyle涓篊omposite鎴朌ate锛屽垯杩欓噷璁剧疆涓虹洰褰曪紝鏂囦欢鍚嶅湪DatePattern閲岃缃紝鍏朵粬鍒欒繖閲岃鏈夋枃浠跺悕銆傚凡缁忔墿灞曟敮鎸佽櫄鎷熺洰褰�--><!--
+ <!--鏂囦欢璺緞锛屽鏋淩ollingStyle涓篊omposite鎴朌ate锛屽垯杩欓噷璁剧疆涓虹洰褰曪紝鏂囦欢鍚嶅湪DatePattern閲岃缃紝鍏朵粬鍒欒繖閲岃鏈夋枃浠跺悕銆傚凡缁忔墿灞曟敮鎸佽櫄鎷熺洰褰�-->
<param name="File" value="Logs\" />
- --><!--灏嗘棩璁板啓鍏ュ埌璺熺洰褰曚笅闈㈢殑Logs鏂囦欢澶逛笅闈㈢殑yyyy-MM-dd.TXT鏂囦欢涓�--><!--
+ <!--灏嗘棩璁板啓鍏ュ埌璺熺洰褰曚笅闈㈢殑Logs鏂囦欢澶逛笅闈㈢殑yyyy-MM-dd.TXT鏂囦欢涓�-->
<param name="AppendToFile" value="true" />
@@ -25,17 +25,17 @@
<param name="RollingStyle" value="Date" />
<param name="DatePattern" value="yyyy-MM-dd.TXT" />
- --><!--TXT鍚庣紑蹇呴』鏄ぇ鍐欑殑锛屽惁鍒欐湁闂--><!--
+ <!--TXT鍚庣紑蹇呴』鏄ぇ鍐欑殑锛屽惁鍒欐湁闂-->
<param name="CountDirection" value="-1" />
- --><!--log4net璁板綍閿欒鐨勬牸寮�(鍗筹細鐢ㄤ粈涔堟牱鐨勬牸寮忥紙甯冨眬锛夋潵璁板綍閿欒)--><!--
+ <!--log4net璁板綍閿欒鐨勬牸寮�(鍗筹細鐢ㄤ粈涔堟牱鐨勬牸寮忥紙甯冨眬锛夋潵璁板綍閿欒)-->
<layout type="log4net.Layout.PatternLayout">
<param name="ConversionPattern" value=" 銆愭椂闂淬��:%d%n 銆愮骇鍒��:%p%n 銆愮被鍚嶃��:%c%n 銆愮嚎绋婭D銆�: %thread %n 銆愭枃浠跺湴鍧�銆�:%F 绗�%L琛�%n 銆愭棩蹇楀唴瀹广��:%m%n 銆愭棩璁拌缁嗐�戯細%exception %n---------------------------------------------------------------------------------------------------------------%n" />
</layout>
- </appender>-->
+ </appender>
<!--姝ゅ灏嗘搷浣滆褰曞啓鍏ユ暟鎹簱,鏃ュ織鍚岀悊-->
<appender name="AdoNetAppender" type="log4net.Appender.AdoNetAppender">
diff --git a/VueWebApi/obj/Release/VueWebApi.pdb b/VueWebApi/obj/Release/VueWebApi.pdb
index bdf3970..d5ea379 100644
--- a/VueWebApi/obj/Release/VueWebApi.pdb
+++ b/VueWebApi/obj/Release/VueWebApi.pdb
Binary files differ
--
Gitblit v1.9.3