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 09:56:38 +08:00
parent 94b692e241
commit 9c134fde80
3 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/BackApplyInfo.java
View File

@ -111,7 +111,7 @@ public class BackApplyInfo {
private Integer backNum; private Integer backNum;
/** /**
* 退料数量 * 退料状态
*/ */
private String backStatus; private String backStatus;

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

@ -133,19 +133,14 @@ public class BackReceiveServiceImpl implements BackReceiveService {
//插入维修记录表scrap_apply_details //插入维修记录表scrap_apply_details
res = insertSAD(taskId,hgList); res = insertSAD(taskId,hgList);
} }
}catch (Exception e){ }catch (Exception e){
throw new RuntimeException(e.getMessage()); throw new RuntimeException(e.getMessage());
} }
return 0; return 0;
} }
@Override @Override
public List<BackApplyInfo> codeQuery(BackApplyInfo record) { public List<BackApplyInfo> codeQuery(BackApplyInfo record) {
return backReceiveMapper.codeQuery(record); return backReceiveMapper.codeQuery(record);
} }
@ -155,14 +150,12 @@ public class BackReceiveServiceImpl implements BackReceiveService {
} }
private int insertRAD(int taskId, List<BackApplyInfo> wxList) { private int insertRAD(int taskId, List<BackApplyInfo> wxList) {
int result = 0; int result = 0;
if(wxList !=null){ if(wxList !=null){
for( BackApplyInfo wx : wxList ){ for( BackApplyInfo wx : wxList ){
wx.setTaskId(taskId); wx.setTaskId(taskId);
result = backReceiveMapper.insertRAD(wx); result = backReceiveMapper.insertRAD(wx);
} }
} }
return result; return result;
} }
@ -174,7 +167,6 @@ public class BackReceiveServiceImpl implements BackReceiveService {
bf.setTaskId(taskId); bf.setTaskId(taskId);
result = backReceiveMapper.insertSAD(bf); result = backReceiveMapper.insertSAD(bf);
} }
} }
return result; return result;
} }
@ -188,10 +180,8 @@ public class BackReceiveServiceImpl implements BackReceiveService {
private int insertTT(List<BackApplyInfo> hgList, int taskType) { private int insertTT(List<BackApplyInfo> hgList, int taskType) {
int newTask = 0; int newTask = 0;
//生成单号 //生成单号
String code = genCodeRule(taskType); String code = genCodeRule(taskType);
BackApplyInfo applyInfo = new BackApplyInfo(); BackApplyInfo applyInfo = new BackApplyInfo();
applyInfo.setTaskType(taskType); applyInfo.setTaskType(taskType);
String taskStatus=""; String taskStatus="";
@ -215,11 +205,9 @@ public class BackReceiveServiceImpl implements BackReceiveService {
for(BackApplyInfo bi : hgList){ for(BackApplyInfo bi : hgList){
Integer maId = bi.getMaId(); Integer maId = bi.getMaId();
if(maId == null){ if(maId == null){
}else{ }else{
res = backReceiveMapper.updateMaStatus(maId,"15"); res = backReceiveMapper.updateMaStatus(maId,"15");
} }
} }
} }
return res; return res;
@ -270,7 +258,6 @@ public class BackReceiveServiceImpl implements BackReceiveService {
} }
} }
} }
return res; return res;
} }

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

@ -620,6 +620,7 @@
bai.id, bai.id,
bai.task_id as taskId, bai.task_id as taskId,
tta.agreement_id as agreementId, tta.agreement_id as agreementId,
mt.type_id as typeId,
mt.type_name typeCode, mt.type_name typeCode,
mt2.type_name AS typeName, mt2.type_name AS typeName,
bad.audit_num as num, bad.audit_num as num,
@ -631,7 +632,6 @@
LEFT JOIN ma_type mt on mt.type_id=bad.type_id LEFT JOIN ma_type mt on mt.type_id=bad.type_id
LEFT JOIN ma_type mt1 ON mt1.type_id=bad.type_id LEFT JOIN ma_type mt1 ON mt1.type_id=bad.type_id
LEFT JOIN ma_type mt2 ON mt2.type_id=mt1.parent_id LEFT JOIN ma_type mt2 ON mt2.type_id=mt1.parent_id
WHERE WHERE
bai.id=#{id} bai.id=#{id}
</select> </select>