bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

app-退料接收

This commit is contained in:
bns_han 2023-12-24 16:48:38 +08:00
parent 44e8ae0a82
commit 1ac495d7ac
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java
View File

@ -67,6 +67,8 @@ public class BackReceiveServiceImpl implements BackReceiveService {
public int setCodeBack(BackApplyInfo record) { public int setCodeBack(BackApplyInfo record) {
int res = 0; int res = 0;
try{ try{
//todo 此处需要判断 接收数量是否大于退料数量或者查询待接收数量是否为0
int taskId = record.getTaskId(); int taskId = record.getTaskId();
//修改任务状态 //修改任务状态
res= updateTaskStatus(taskId,39); res= updateTaskStatus(taskId,39);
@ -118,9 +120,9 @@ public class BackReceiveServiceImpl implements BackReceiveService {
//插入任务表tm_task //插入任务表tm_task
int newTaskId = insertTT(wxList,41); int newTaskId = insertTT(wxList,41);
//插入协议任务表tm_task_agreement //插入协议任务表tm_task_agreement
res = insertTTA(taskId,wxList); res = insertTTA(newTaskId,wxList);
//插入维修记录表repair_apply_details //插入维修记录表repair_apply_details
res = insertRAD(taskId,wxList); res = insertRAD(newTaskId,wxList);
} }
//待报废的创建报废任务，插入任务协议表 //待报废的创建报废任务，插入任务协议表
@ -129,9 +131,9 @@ public class BackReceiveServiceImpl implements BackReceiveService {
//插入任务表tm_task //插入任务表tm_task
int newTaskId = insertTT(bfList,57); int newTaskId = insertTT(bfList,57);
//插入协议任务表tm_task_agreement //插入协议任务表tm_task_agreement
res = insertTTA(taskId,bfList); res = insertTTA(newTaskId,bfList);
//插入维修记录表scrap_apply_details //插入维修记录表scrap_apply_details
res = insertSAD(taskId,bfList); res = insertSAD(newTaskId,bfList);
} }
}catch (Exception e){ }catch (Exception e){
throw new RuntimeException(e.getMessage()); throw new RuntimeException(e.getMessage());

1
sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml
View File

@ -702,6 +702,7 @@
LEFT JOIN sys_dic sd on mm.ma_status=sd.id LEFT JOIN sys_dic sd on mm.ma_status=sd.id
WHERE WHERE
ma_code LIKE concat('%', #{maCode}, '%') ma_code LIKE concat('%', #{maCode}, '%')
and sd.id='16'
</select> </select>
<select id="qrcodeQuery" resultType="com.bonus.sgzb.app.domain.BackApplyInfo"> <select id="qrcodeQuery" resultType="com.bonus.sgzb.app.domain.BackApplyInfo">

2
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/BackApplyController.java
View File

@ -93,7 +93,7 @@ public class BackApplyController extends BaseController {
@Log(title = "领料申请提交", businessType = BusinessType.INSERT) @Log(title = "退料申请提交", businessType = BusinessType.INSERT)
@PostMapping("/submitBackApply") @PostMapping("/submitBackApply")
public AjaxResult submitBackApply(@RequestBody BackApplyInfo bean) { public AjaxResult submitBackApply(@RequestBody BackApplyInfo bean) {
if (StringUtils.isNull(bean)) { if (StringUtils.isNull(bean)) {

1
sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml
View File

@ -307,7 +307,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
LEFT JOIN ma_type mt4 ON mt4.type_id=mt3.parent_id LEFT JOIN ma_type mt4 ON mt4.type_id=mt3.parent_id
WHERE WHERE
1=1 1=1
# bai.company_id=#{companyId}
<if test="keyWord != null and keyWord != ''"> <if test="keyWord != null and keyWord != ''">
and bai.`code` like concat('%', #{keyWord}, '%') or and bai.`code` like concat('%', #{keyWord}, '%') or
bai.back_person like concat('%', #{keyWord}, '%') or bai.back_person like concat('%', #{keyWord}, '%') or