This commit is contained in:
zds
2022-11-02 10:54:01 +08:00
parent a5328d48f6
commit 1653f4ce31
5 changed files with 75 additions and 82 deletions

View File

@@ -219,6 +219,7 @@ public class DevicerepairmstServiceImpl implements DevicerepairmstService {
jsonMst.put("fault_level", whereJson.getString("fault_level"));
jsonMst.put("remark", whereJson.getString("remark"));
jsonMst.put("plan_start_date", whereJson.getString("plan_start_date"));
jsonMst.put("estimaterepair_times", whereJson.getString("estimaterepair_times"));
jsonMst.put("detail_count", tableData.size());
mstTab.update(jsonMst);
@@ -480,9 +481,11 @@ public class DevicerepairmstServiceImpl implements DevicerepairmstService {
}
// 3.更新维修单主表
jsonRemst.put("invstatus",invstatus);
jsonRemst.put("confirm_optid",currentUserId);
jsonRemst.put("confirm_optname",nickName);
jsonRemst.put("confirm_time",DateUtil.now());
if("07".equals(invstatus)){
jsonRemst.put("confirm_optid",currentUserId);
jsonRemst.put("confirm_optname",nickName);
jsonRemst.put("confirm_time",DateUtil.now());
}
reMstTab.update(jsonRemst);
}
}

View File

@@ -286,7 +286,7 @@
WHERE
mst.is_delete = '0'
AND file.is_delete = '0'
AND mst.invstatus not in ('04','06','99')
AND mst.invstatus not in ('04','06','07','99')
OPTION 输入.device_code <> ""
(file.device_code like 输入.device_code or
file.device_name like 输入.device_code)