app-退料接收
This commit is contained in:
parent
94b692e241
commit
9c134fde80
|
|
@ -111,7 +111,7 @@ public class BackApplyInfo {
|
|||
private Integer backNum;
|
||||
|
||||
/**
|
||||
* 退料数量
|
||||
* 退料状态
|
||||
*/
|
||||
private String backStatus;
|
||||
|
||||
|
|
|
|||
|
|
@ -133,19 +133,14 @@ public class BackReceiveServiceImpl implements BackReceiveService {
|
|||
//插入维修记录表scrap_apply_details
|
||||
res = insertSAD(taskId,hgList);
|
||||
}
|
||||
|
||||
|
||||
|
||||
}catch (Exception e){
|
||||
throw new RuntimeException(e.getMessage());
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<BackApplyInfo> codeQuery(BackApplyInfo record) {
|
||||
|
||||
return backReceiveMapper.codeQuery(record);
|
||||
}
|
||||
|
||||
|
|
@ -155,14 +150,12 @@ public class BackReceiveServiceImpl implements BackReceiveService {
|
|||
}
|
||||
|
||||
private int insertRAD(int taskId, List<BackApplyInfo> wxList) {
|
||||
|
||||
int result = 0;
|
||||
if(wxList !=null){
|
||||
for( BackApplyInfo wx : wxList ){
|
||||
wx.setTaskId(taskId);
|
||||
result = backReceiveMapper.insertRAD(wx);
|
||||
}
|
||||
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
|
@ -174,7 +167,6 @@ public class BackReceiveServiceImpl implements BackReceiveService {
|
|||
bf.setTaskId(taskId);
|
||||
result = backReceiveMapper.insertSAD(bf);
|
||||
}
|
||||
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
|
@ -188,10 +180,8 @@ public class BackReceiveServiceImpl implements BackReceiveService {
|
|||
|
||||
private int insertTT(List<BackApplyInfo> hgList, int taskType) {
|
||||
int newTask = 0;
|
||||
|
||||
//生成单号
|
||||
String code = genCodeRule(taskType);
|
||||
|
||||
BackApplyInfo applyInfo = new BackApplyInfo();
|
||||
applyInfo.setTaskType(taskType);
|
||||
String taskStatus="";
|
||||
|
|
@ -215,11 +205,9 @@ public class BackReceiveServiceImpl implements BackReceiveService {
|
|||
for(BackApplyInfo bi : hgList){
|
||||
Integer maId = bi.getMaId();
|
||||
if(maId == null){
|
||||
|
||||
}else{
|
||||
res = backReceiveMapper.updateMaStatus(maId,"15");
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
return res;
|
||||
|
|
@ -270,7 +258,6 @@ public class BackReceiveServiceImpl implements BackReceiveService {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
return res;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -620,6 +620,7 @@
|
|||
bai.id,
|
||||
bai.task_id as taskId,
|
||||
tta.agreement_id as agreementId,
|
||||
mt.type_id as typeId,
|
||||
mt.type_name typeCode,
|
||||
mt2.type_name AS typeName,
|
||||
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 mt1 ON mt1.type_id=bad.type_id
|
||||
LEFT JOIN ma_type mt2 ON mt2.type_id=mt1.parent_id
|
||||
|
||||
WHERE
|
||||
bai.id=#{id}
|
||||
</select>
|
||||
|
|
|
|||
Loading…
Reference in New Issue