From e807bc7e010a93b85cae988b0d2d3c969d8b10f5 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期三, 16 十一月 2022 10:28:59 +0800
Subject: [PATCH] 班组、个人计件工资接口修改
---
VueWebApi/DLL/DAL/AppDeviceManageDAL.cs | 49 +++++++++++++++++++++++++++++++------------------
1 files changed, 31 insertions(+), 18 deletions(-)
diff --git a/VueWebApi/DLL/DAL/AppDeviceManageDAL.cs b/VueWebApi/DLL/DAL/AppDeviceManageDAL.cs
index 6fa3413..ebb6838 100644
--- a/VueWebApi/DLL/DAL/AppDeviceManageDAL.cs
+++ b/VueWebApi/DLL/DAL/AppDeviceManageDAL.cs
@@ -384,7 +384,7 @@
try
{
//鑾峰彇褰撳墠鎵爜璁惧鏄惁鐢宠缁翠慨璁板綍
- sql = @"select * from TEqp_RepairRequest where eqp_code=@eqpcode and status='REPA' or status='COMP'";
+ sql = @"select * from TEqp_RepairRequest where eqp_code=@eqpcode and status<>'CONFIR'";
dynamicParams.Add("@eqpcode", eqpcode);
var data0 = DapperHelper.selectdata(sql, dynamicParams);
if (data0.Rows.Count > 0)
@@ -579,7 +579,7 @@
#endregion
#region[璁惧缁翠慨鎻愪氦]
- public static ToMessage RepairScanDeviceSave(string username, string eqpcode, string wkshpcode, string faultdescr, string is_stoprepair, string repaircontent, string replaceparts, HttpFileCollection files)
+ public static ToMessage RepairScanDeviceSave(string docu_code, string username, string eqpcode, string wkshpcode, string faultdescr, string is_stoprepair, string repaircontent, string replaceparts, HttpFileCollection files)
{
var sql = "";
string wxwo = "", numvalue = "";
@@ -637,8 +637,8 @@
}
}
//鍐欏叆缁翠慨璁板綍琛�
- sql = @"insert into TEqp_Repair(repair_code,docu_date,status,wksp_code,eqp_code,repair_person,repair_date,repair_content,repair_part,failure_descript,is_shutdown)
- values(@repair_code,@docu_date,@status,@wksp_code,@eqp_code,@repair_person,@repair_date,@repair_content,@repair_part,@failure_descript,@is_shutdown)";
+ sql = @"insert into TEqp_Repair(repair_code,docu_date,status,wksp_code,eqp_code,repair_person,repair_date,repair_content,repair_part,failure_descript,is_shutdown,source_wo)
+ values(@repair_code,@docu_date,@status,@wksp_code,@eqp_code,@repair_person,@repair_date,@repair_content,@repair_part,@failure_descript,@is_shutdown,@source_wo)";
list.Add(new
{
str = sql,
@@ -654,9 +654,13 @@
repair_content = repaircontent,
repair_part = replaceparts,
failure_descript = faultdescr,
- is_shutdown = is_stoprepair
+ is_shutdown = is_stoprepair,
+ source_wo= docu_code
}
});
+ //鏇存柊缁翠慨鐢宠鍗曠姸鎬�
+ sql = @"update TEqp_RepairRequest set status=@status where docu_code=@docu_code and wksp_code=@wkshpcode and eqp_code=@eqpcode";
+ list.Add(new { str = sql, parm = new { docu_code = docu_code, wkshpcode = wkshpcode, eqpcode= eqpcode, status= "COMP" } });
//鍥炲啓瀛楀吀琛�,鏇存柊褰撳墠娴佹按鍙�
sql = @"update T_CodeRules set value=@cunm2 where rightcode=@RightCode";
@@ -731,7 +735,7 @@
#endregion
#region[缁翠慨楠岃瘉璇︽儏淇℃伅]
- public static ToMessage RepairVerificationScanDeviceDataSub(string eqpcode, string wkshpcode)
+ public static ToMessage RepairVerificationScanDeviceDataSub(string repair_code,string eqpcode, string wkshpcode)
{
string sql = "";
var dynamicParams = new DynamicParameters();
@@ -741,7 +745,8 @@
//鏍规嵁璁惧缂栫爜\杞﹂棿缂栫爜鑾峰彇缁翠慨璇︽儏
sql = @"select repair_code,failure_descript,is_shutdown,repair_content,repair_part
from TEqp_Repair
- where wksp_code=@wkshpcode and eqp_code=@eqpcode";
+ where repair_code=@repair_code and wksp_code=@wkshpcode and eqp_code=@eqpcode";
+ dynamicParams.Add("@repair_code", repair_code);
dynamicParams.Add("@wkshpcode", wkshpcode);
dynamicParams.Add("@eqpcode", eqpcode);
var data = DapperHelper.selectdata(sql, dynamicParams);
@@ -763,7 +768,7 @@
dict.Add("repair_part", data.Rows[0]["repair_part"].ToString()); //鏇存崲澶囦欢
//鑾峰彇鏇存崲澶囦欢涓婁紶鍥剧墖
- sql = @"select img1ur2 from TEqp_RepairImage where source_wo=@source_wo and wo_type='COMP'";
+ sql = @"select img2url from TEqp_RepairImage where source_wo=@source_wo and wo_type='COMP'";
dynamicParams.Add("@source_wo", data.Rows[0]["repair_code"].ToString());
var data1 = DapperHelper.selectdata(sql, dynamicParams);
if (data1.Rows.Count > 0)
@@ -798,9 +803,14 @@
{
var sql = "";
List<object> list = new List<object>();
+ var dynamicParams = new DynamicParameters();
try
{
list.Clear();
+ //鏍规嵁璁惧缁翠慨鍗曟煡鎵炬簮鍗�(缁翠慨鐢宠鍗�)
+ sql = @"select source_wo from TEqp_Repair where repair_code=@repairwo";
+ dynamicParams.Add("@repairwo", repairwo);
+ var data = DapperHelper.selectdata(sql, dynamicParams);
//鏇存柊璁惧缁翠慨璁板綍楠岃瘉浜哄憳銆侀獙璇佹椂闂淬�侀獙璇佺粨鏋溿�侀獙璇佺姸鎬�
sql = @"update TEqp_Repair set status=@status,is_verifi=@is_verifi,verify_result=@verify_result,verify_person=@verify_person,verify_date=@verify_date
where repair_code=@repair_code and wksp_code=@wksp_code and eqp_code=@eqp_code";
@@ -819,6 +829,9 @@
eqp_code = eqpcode
}
});
+ //鏇存柊缁翠慨鐢宠鍗曠姸鎬�
+ sql = @"update TEqp_RepairRequest set status=@status where docu_code=@docu_code and wksp_code=@wkshpcode and eqp_code=@eqpcode";
+ list.Add(new { str = sql, parm = new { docu_code = data.Rows[0]["source_wo"].ToString(), wkshpcode = wkshpcode, eqpcode = eqpcode, status = "CONFIR" } });
bool aa = DapperHelper.DoTransaction(list);
if (aa)
@@ -960,16 +973,18 @@
public static ToMessage AppDeviceAnDengCallSave(string username, string eqpcode, string wkshpcode, List<AnDnDate> json)
{
string sql = "";
+ int AnDnID = 0; //鏈�澶d
var dynamicParams = new DynamicParameters();
List<object> list = new List<object>();
ChatHub chthub = new ChatHub();
try
{
list.Clear();
- //鎵ц娑堟伅鎺ㄩ��
- chthub.SendByGroupList(username, wkshpcode, eqpcode, json);
- for (int i = 1; i <= json.Count; i++)
+ //鑾峰彇涓昏〃鏈�澶D
+ AnDnID = DapperHelper.insertReturnId("TAnDon_Task_Info");
+ for (int i = 0; i < json.Count; i++)
{
+ AnDnID = AnDnID + 1;//鑷1
string code = json[i].code.ToString();
string name = json[i].name.ToString();
sql = @"select * from TAnDon_Task_Info where wkshp_code=@wkshpcode and eqp_code=@eqpcode and type=@typecode and status='START'";
@@ -986,10 +1001,6 @@
}
else
{
- //鑾峰彇涓昏〃鏈�澶D
- sql = @"select ISNULL(IDENT_CURRENT('TK_Wrk_Record')+@num,1) as id";
- dynamicParams.Add("@num", i);
- var dt = DapperHelper.selectdata(sql, dynamicParams);
//鍐欏叆瀹夌伅鍛煎彨琛�
sql = @"insert into TAnDon_Task_Info(wkshp_code,eqp_code,type,start_date,start_user,status)
values(@wkshp_code,@eqp_code,@type,@start_date,@start_user,@status)";
@@ -1006,6 +1017,7 @@
status = "START"
}
});
+
for (int j = 0; j < json[i].children.Count; j++)
{
//鍐欏叆瀹夌伅璁板綍鎺ㄩ�佷汉鍛樿〃
@@ -1016,11 +1028,12 @@
str = sql,
parm = new
{
- m_id = int.Parse(dt.Rows[0]["ID"].ToString()),
+ m_id = AnDnID,
+ //m_id = int.Parse(dt.Rows[0]["ID"].ToString()),
wkshp_code = wkshpcode,
eqp_code = eqpcode,
type = code,
- resp_user = json[i].children[i].usercode,
+ resp_user = json[i].children[j].usercode,
status = "N"
}
});
@@ -1107,7 +1120,7 @@
try
{
list.Clear();
- for (int i = 1; i <= json.Count; i++)
+ for (int i = 0; i <json.Count; i++)
{
string code = json[i].code.ToString();
string name = json[i].name.ToString();
--
Gitblit v1.9.3