From adc376c2c6c19dbc28b45540448331c4c8f6bc34 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期一, 14 十一月 2022 17:21:48 +0800
Subject: [PATCH] 修改报工反审核接口、修改报工删除接口开发
---
VueWebApi/Controllers/ProductionManagementController.cs | 32 +++++
.vs/VueWebApi/v16/.suo | 0
VueWebApi/DLL/BLL/ProductionManagementBLL.cs | 14 ++
VueWebApi/DLL/DAL/ProductionManagementDAL.cs | 290 +++++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 331 insertions(+), 5 deletions(-)
diff --git a/.vs/VueWebApi/v16/.suo b/.vs/VueWebApi/v16/.suo
index ab7e13d..5c9cf7c 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 bfef773..ed0b861 100644
--- a/VueWebApi/Controllers/ProductionManagementController.cs
+++ b/VueWebApi/Controllers/ProductionManagementController.cs
@@ -694,6 +694,11 @@
#endregion
#region[鐢熶骇绠＄悊,淇敼鎶ュ伐瀹℃牳鎻愪氦]
+ /// <summary>
+ /// 鐢熶骇绠＄悊,淇敼鎶ュ伐瀹℃牳鎻愪氦
+ /// </summary>
+ /// <param name="json"></param>
+ /// <returns></returns>
[Route(template: "MesOrderStepVerifySeave")]
[HttpPost]
public HttpResponseMessage MesOrderStepVerifySeave(List<UpdateProductReport> json)
@@ -704,6 +709,33 @@
}
#endregion
+ #region[鐢熶骇绠＄悊,淇敼鎶ュ伐鍙嶅鏍告彁浜
+ /// <summary>
+ /// 鐢熶骇绠＄悊,淇敼鎶ュ伐鍙嶅鏍告彁浜�
+ /// </summary>
+ /// <param name="json"></param>
+ /// <returns></returns>
+ [Route(template: "MesOrderStepNoVerifySeave")]
+ [HttpPost]
+ public HttpResponseMessage MesOrderStepNoVerifySeave(List<UpdateProductReport> json)
+ {
+ var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
+ mes = ProductionManagementBLL.MesOrderStepNoVerifySeave(username, json);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[鐢熶骇绠＄悊,鍒犻櫎鎶ュ伐璁板綍]
+ [Route(template: "MesOrderStepDeleteSeave")]
+ [HttpPost]
+ public HttpResponseMessage MesOrderStepDeleteSeave(List<UpdateProductReport> json)
+ {
+ var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
+ mes = ProductionManagementBLL.MesOrderStepDeleteSeave(username, json);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
diff --git a/VueWebApi/DLL/BLL/ProductionManagementBLL.cs b/VueWebApi/DLL/BLL/ProductionManagementBLL.cs
index 5d90d0e..ddd7219 100644
--- a/VueWebApi/DLL/BLL/ProductionManagementBLL.cs
+++ b/VueWebApi/DLL/BLL/ProductionManagementBLL.cs
@@ -256,6 +256,20 @@
}
#endregion
+ #region[鐢熶骇绠＄悊,淇敼鎶ュ伐鍙嶅鏍告彁浜
+ public static ToMessage MesOrderStepNoVerifySeave(string username, List<UpdateProductReport> json)
+ {
+ return ProductionManagementDAL.MesOrderStepNoVerifySeave(username, json);
+ }
+ #endregion
+
+ #region[鐢熶骇绠＄悊,鍒犻櫎鎶ュ伐璁板綍]
+ public static ToMessage MesOrderStepDeleteSeave(string username, List<UpdateProductReport> json)
+ {
+ return ProductionManagementDAL.MesOrderStepDeleteSeave(username, json);
+ }
+ #endregion
+
diff --git a/VueWebApi/DLL/DAL/ProductionManagementDAL.cs b/VueWebApi/DLL/DAL/ProductionManagementDAL.cs
index 0e422ac..a56f202 100644
--- a/VueWebApi/DLL/DAL/ProductionManagementDAL.cs
+++ b/VueWebApi/DLL/DAL/ProductionManagementDAL.cs
@@ -2425,7 +2425,7 @@
left join TFlw_Rtdt D on M.route_code=D.rout_code and A.step_code=D.step_code
left join TUser U on B.report_person=U.usercode
left join TGroup O on U.usergroup_code=O.group_code
- where A.style='B' and B.style='B'
+ where A.style='B' and B.style='B' and M.status<>'CLOSED'
) as AA where" + search;
//union all
//select A.id,A.wo_code,A.materiel_code as partnumber,P.partname,P.partspec,M.plan_qty as task_qty,M.wkshp_code,G.org_name as wkshp_name,A.wx_code as eqp_code,E.name as eqp_name,
@@ -2442,7 +2442,7 @@
//left join TFlw_Rout R on M.route_code = R.code
//left join TFlw_Rtdt D on M.route_code = D.rout_code and A.step_code = D.step_code
//left join TUser U on B.in_person = U.usercode
- //where A.style = 'S' and B.style = 'S'
+ //where A.style = 'S' and B.style = 'S' and M.status<>'CLOSED'
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
mes.Message = "鏌ヨ鎴愬姛!";
@@ -2464,10 +2464,8 @@
public static ToMessage MesOrderStepUpdateSeave(string username, List<UpdateProductReport> json)
{
var sql = "";
- string[] arra1 = new string[] { };
List<object> list = new List<object>();
var dynamicParams = new DynamicParameters();
- decimal sumrepair_qty = 0, sumbad_qty = 0; //绱缁翠慨鏁伴噺銆佺疮璁℃姤搴熸暟閲�
try
{
string date = DateTime.Now.ToString(); //鑾峰彇绯荤粺鏃堕棿
@@ -2769,7 +2767,42 @@
verifydate = date
}
});
-
+ //鍐欏叆鎶ュ伐璁板綍瀹℃牳琛�
+ sql = @"insert into TK_WorkRecord_Verify(report_id,report_sbid,wo_code,partnumber,task_qty,wkshp_code,eqp_code,route_code,
+ step_seq,step_code,flw_type,first_choke,last_choke,unprice,usergroup_code,usercode,report_date,report_qty,report_dvalue,ng_qty,ng_dvalue,bad_qty,bad_dvalue,bad_money)
+ values(@report_id,@report_sbid,@wo_code,@partnumber,@task_qty,@wkshp_code,@eqp_code,@route_code,
+ @step_seq,@step_code,@flw_type,@first_choke,@last_choke,@unprice,@usergroup_code,@usercode,@report_date,@report_qty,@report_dvalue,@ng_qty,@ng_dvalue,@bad_qty,@bad_dvalue,@bad_money)";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ report_id=json[i].id.ToString(),
+ report_sbid=json[i].sbid.ToString(),
+ wo_code=json[i].wo_code.ToString(),
+ partnumber=json[i].partnumber.ToString(),
+ task_qty=json[i].task_qty.ToString(),
+ wkshp_code=json[i].wkshp_code.ToString(),
+ eqp_code=json[i].eqp_code.ToString(),
+ route_code=json[i].route_code.ToString(),
+ step_seq=json[i].step_seq.ToString(),
+ step_code=json[i].step_code.ToString(),
+ flw_type=json[i].flw_type.ToString(),
+ first_choke=json[i].first_choke.ToString(),
+ last_choke=json[i].last_choke.ToString(),
+ unprice=json[i].unprice.ToString(),
+ usergroup_code=json[i].usergroup_code.ToString(),
+ usercode=json[i].usercode.ToString(),
+ report_date=json[i].report_date.ToString(),
+ report_qty=json[i].report_qty.ToString(),
+ report_dvalue=json[i].report_dvalue.ToString(),
+ ng_qty=json[i].ng_qty.ToString(),
+ ng_dvalue=json[i].ng_dvalue.ToString(),
+ bad_qty=json[i].bad_qty.ToString(),
+ bad_dvalue=json[i].bad_dvalue.ToString(),
+ bad_money=json[i].bad_money.ToString()
+ }
+ });
}
bool aa = DapperHelper.DoTransaction(list);
@@ -2799,6 +2832,253 @@
}
#endregion
+ #region[鐢熶骇绠＄悊,淇敼鎶ュ伐鍙嶅鏍告彁浜
+ public static ToMessage MesOrderStepNoVerifySeave(string username, List<UpdateProductReport> json)
+ {
+ var sql = "";
+ List<object> list = new List<object>();
+ try
+ {
+ string date = DateTime.Now.ToString(); //鑾峰彇绯荤粺鏃堕棿
+ list.Clear();
+
+ //寰幆json鏁版嵁
+ for (int i = 0; i < json.Count; i++)
+ {
+
+ ///////////////////////////////淇敼鎶ュ伐//////////////////////////////
+
+ //鍥炲啓瀵瑰簲鐨勬姤宸ヨ褰曞瓙琛ㄥ鏍哥姸鎬併�佸鏍镐汉銆佸鏍告椂闂�
+ sql = @"update TK_Wrk_RecordSub set verify=@verify,verifyuser=@verifyuser,verifydate=@verifydate
+ where m_id=@m_id and id=@id and style='B'";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ m_id = int.Parse(json[i].id),
+ id = int.Parse(json[i].sbid),
+ verify = "N",
+ verifyuser = "",
+ verifydate = ""
+ }
+ });
+ //鍥炲啓涓嶈壇
+ sql = @"update CSR_WorkRecord_Defect set verify=verify,verifyuser=@verifyuser,verifydate=@verifydate
+ where wo_code=@wo_code and step_code=@step_code and record_id=@id and style='B'";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ wo_code = json[i].wo_code,
+ step_code = json[i].step_code,
+ id = int.Parse(json[i].id),
+ verify = "N",
+ verifyuser = "",
+ verifydate = ""
+ }
+ });
+ //鍒犻櫎鎶ュ伐璁板綍瀹℃牳琛�
+ sql = @"delete from TK_WorkRecord_Verify where wo_code=@wo_code and report_id=@report_id and report_sbid=@report_sbid and step_seq=@step_seq and step_code=@step_code";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ report_id = json[i].id.ToString(),
+ report_sbid = json[i].sbid.ToString(),
+ wo_code = json[i].wo_code.ToString(),
+ step_seq = json[i].step_seq.ToString(),
+ step_code = json[i].step_code.ToString()
+ }
+ });
+ }
+
+ 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 MesOrderStepDeleteSeave(string username, List<UpdateProductReport> json)
+ {
+ var sql = "";
+ string[] arra1 = new string[] { };
+ List<object> list = new List<object>();
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ string date = DateTime.Now.ToString(); //鑾峰彇绯荤粺鏃堕棿
+ list.Clear();
+
+ //寰幆json鏁版嵁
+ for (int i = 0; i < json.Count; i++)
+ {
+ //鑷埗宸ュ簭
+ if (json[i].flw_type.ToString() == "Z")
+ {
+ //鍒ゆ柇褰撳墠宸ュ簭鏄惁瀛樺湪涓嬮亾宸ュ簭寮�宸ヨ褰�
+ sql = @"select * from TK_Wrk_Record where wo_code=@wo_code and style='S' and step_seq=@step_seq+1";
+ dynamicParams.Add("@wo_code", json[i].wo_code);
+ dynamicParams.Add("@step_seq", json[i].step_seq);
+ var dt0 = DapperHelper.selectdata(sql, dynamicParams);
+ if (dt0.Rows.Count > 0)
+ {
+ //鍒ゆ柇褰撳墠宸ュ簭鏄惁瀛樺湪涓嬮亾宸ュ簭鎶ュ伐璁板綍
+ sql = @"select * from TK_Wrk_Record where wo_code=@wo_code and style='B' and step_seq=@step_seq+1";
+ dynamicParams.Add("@wo_code", json[i].wo_code);
+ dynamicParams.Add("@step_seq", json[i].step_seq);
+ var dt = DapperHelper.selectdata(sql, dynamicParams);
+ if (dt.Rows.Count > 0)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "褰撳墠宸ュ簭涓嬮亾宸ュ簭宸叉姤宸ヤ笉鍏佽鍒犻櫎!";
+ mes.data = null;
+ return mes;
+ }
+ }
+
+ ///////////////////////////////鍒犻櫎鎶ュ伐//////////////////////////////
+ //鍒犻櫎涓嬮亾宸ュ簭寮�宸ヨ褰�(涓昏澶勭悊涓嬮亾宸ュ簭宸插紑宸ユ湭鎶ュ伐)
+ sql = @"delete from TK_Wrk_Record where wo_code=@wo_code and step_seq=@step_seq+1 and style=@style";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ wo_code=json[i].wo_code.ToString(),
+ step_seq=json[i].step_seq.ToString(),
+ style = "S"
+ }
+ });
+ //鍒犻櫎鎶ュ伐缂洪櫡璁板綍琛�
+ sql = @"delete from CSR_WorkRecord_Defect where wo_code=@wo_code and partnumber=@partnumber and step_seq=@step_seq and step_code=@step_code and record_id=@record_id and style=@style ";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ wo_code=json[i].wo_code.ToString(),
+ partnumber = json[i].partnumber.ToString(),
+ step_seq = json[i].step_seq.ToString(),
+ step_code = json[i].step_code.ToString(),
+ record_id = int.Parse(json[i].id),
+ style = "B"
+ }
+ });
+ //鍒犻櫎鎶ュ伐缂洪櫡澶勭悊璁板綍琛�
+ sql = @"delete from CSR_WorkRecord_DefectHandle where wo_code=@wo_code and partnumber=@partnumber and step_seq=@step_seq and step_code=@step_code and record_subid=@record_subid and style=@style";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ wo_code = json[i].wo_code.ToString(),
+ partnumber = json[i].partnumber.ToString(),
+ step_seq = json[i].step_seq.ToString(),
+ step_code = json[i].step_code.ToString(),
+ record_subid = int.Parse(json[i].id),
+ style = "B"
+ }
+ });
+ //鍒犻櫎鎶ュ伐璁板綍瀛愯〃
+ sql = @"delete from TK_Wrk_RecordSub where id=@id and m_id=@m_id and style=@style";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ id = int.Parse(json[i].id),
+ m_id = int.Parse(json[i].sbid),
+ style = "B"
+ }
+ });
+ //鍒犻櫎鎶ュ伐璁板綍涓昏〃
+ sql = @"delete from TK_Wrk_Record where id=@id and style=@style";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ id = int.Parse(json[i].id),
+ m_id = int.Parse(json[i].sbid),
+ style = "B"
+ }
+ });
+ //鍥炲啓宸ュ崟宸ュ簭琛�(鍚堟牸鏁伴噺銆佷笉鑹暟閲忋�佹姤搴熸暟閲�)
+ sql = @"update TK_Wrk_Step set good_qty=good_qty-@report_qty,ng_qty=ng_qty-@ng_qty,bad_qty=bad_qty-@bad_qty where wo_code=@wo_code and seq=@step_seq and step_code=@step_code";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ wo_code=json[i].wo_code.ToString(),
+ step_seq=json[i].step_seq.ToString(),
+ step_code=json[i].step_code.ToString(),
+ repair_qty = decimal.Parse(json[i].report_qty),
+ ng_qty = decimal.Parse(json[i].ng_qty),
+ bad_qty = decimal.Parse(json[i].bad_qty),
+ }
+ });
+ }
+ //澶栧崗宸ュ簭
+ if (json[i].flw_type.ToString() == "S")
+ {
+
+ }
+ }
+
+ 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[MES宸ュ崟鎵归噺鍏抽棴鏌ヨ]
--
Gitblit v1.9.3