|
|
@ -4162,6 +4162,13 @@ public class ScheduleServiceImpl implements ScheduleService { |
|
|
@Override |
|
|
@Override |
|
|
@Transactional |
|
|
@Transactional |
|
|
public R workbenchCancelallops(SearchScheduleData inData) { |
|
|
public R workbenchCancelallops(SearchScheduleData inData) { |
|
|
|
|
|
//公共参数 |
|
|
|
|
|
String site = inData.getSite(); |
|
|
|
|
|
String orderNo = inData.getOrderNo(); |
|
|
|
|
|
Integer itemNo = inData.getItemNo(); |
|
|
|
|
|
String seqNo = inData.getSeqNo(); |
|
|
|
|
|
String username = inData.getUsername(); |
|
|
|
|
|
String userDisplay = inData.getUserDisplay(); |
|
|
List<Object> list = new ArrayList<>(); |
|
|
List<Object> list = new ArrayList<>(); |
|
|
list.add(inData.getSite()); |
|
|
list.add(inData.getSite()); |
|
|
list.add(inData.getOrderNo()); |
|
|
list.add(inData.getOrderNo()); |
|
|
@ -4171,9 +4178,50 @@ public class ScheduleServiceImpl implements ScheduleService { |
|
|
if ("400".equals(map.get("resultCode"))){ |
|
|
if ("400".equals(map.get("resultCode"))){ |
|
|
throw new XJException(map.get("resultMsg").toString(), 400); |
|
|
throw new XJException(map.get("resultMsg").toString(), 400); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
//调用接口处理SI的transData |
|
|
|
|
|
this.cancelScheduleallopsWithSITransData(site, orderNo, itemNo, seqNo, username, userDisplay); |
|
|
|
|
|
//调用接口处理SIR的transData |
|
|
|
|
|
this.cancelScheduleallopsWithSIRTransData(site, orderNo, itemNo, seqNo, username, userDisplay); |
|
|
return R.ok("操作成功!"); |
|
|
return R.ok("操作成功!"); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
|
* TODO 调用接口处理SIR的transData |
|
|
|
|
|
* @author LR |
|
|
|
|
|
* @date 2022/5/18 9:19 |
|
|
|
|
|
* @Param [site, orderNo, itemNo, seqNo, username, userDisplay] |
|
|
|
|
|
* @return void |
|
|
|
|
|
**/ |
|
|
|
|
|
public void cancelScheduleallopsWithSIRTransData(String site, String orderNo, Integer itemNo, String seqNo, String username, String userDisplay) { |
|
|
|
|
|
List<Object> params = new ArrayList<>(); |
|
|
|
|
|
params.add(site); |
|
|
|
|
|
params.add(orderNo); |
|
|
|
|
|
params.add(itemNo); |
|
|
|
|
|
params.add(seqNo); |
|
|
|
|
|
params.add(username); |
|
|
|
|
|
params.add(userDisplay); |
|
|
|
|
|
List<Map<String, Object>> resultList = procedureMapper.getProcedureData("cancelScheduleallopsWithSIRTransData", params); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
|
* TODO 调用接口处理SI的transData |
|
|
|
|
|
* @author LR |
|
|
|
|
|
* @date 2022/5/18 9:16 |
|
|
|
|
|
* @Param [site, orderNo, itemNo, seqNo, username, userDisplay] |
|
|
|
|
|
* @return void |
|
|
|
|
|
**/ |
|
|
|
|
|
public void cancelScheduleallopsWithSITransData(String site, String orderNo, Integer itemNo, String seqNo, String username, String userDisplay) { |
|
|
|
|
|
List<Object> params = new ArrayList<>(); |
|
|
|
|
|
params.add(site); |
|
|
|
|
|
params.add(orderNo); |
|
|
|
|
|
params.add(itemNo); |
|
|
|
|
|
params.add(seqNo); |
|
|
|
|
|
params.add(username); |
|
|
|
|
|
params.add(userDisplay); |
|
|
|
|
|
List<Map<String, Object>> resultList = procedureMapper.getProcedureData("cancelScheduleallopsWithSITransData", params); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
@Override |
|
|
@Override |
|
|
@Transactional |
|
|
@Transactional |
|
|
public R soscheduleNewReinspectjob(SearchScheduleData inData) { |
|
|
public R soscheduleNewReinspectjob(SearchScheduleData inData) { |
|
|
|