|
|
|
@ -34,18 +34,18 @@ public class QuaController {
|
|
|
|
|
QcProCheck qcProCheck = map.keySet().iterator().next();
|
|
|
|
|
BaseFile baseFile = map.values().iterator().next();
|
|
|
|
|
|
|
|
|
|
if (!qcProCheck.getFactoryId().isEmpty()){
|
|
|
|
|
if (!qcProCheck.getFactoryCode().isEmpty()){
|
|
|
|
|
if (baseFile==null){
|
|
|
|
|
baseFile = new BaseFile();
|
|
|
|
|
qcProCheckService.saveQcProCheck(qcProCheck,baseFile);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (qcProCheck.getIsqua()=="1"){
|
|
|
|
|
// System.out.println("调用wcs接口开发转移");
|
|
|
|
|
WCSDTO wcsdto = new WCSDTO();
|
|
|
|
|
wcsdto.setFactory(qcProCheck.getFactoryCode());
|
|
|
|
|
wcsdto.setRfidNo(qcProCheck.getRfid());
|
|
|
|
|
remoteMesService.requestDestinationStations(wcsdto);
|
|
|
|
|
System.out.println("调用wcs接口开发转移");
|
|
|
|
|
// WCSDTO wcsdto = new WCSDTO();
|
|
|
|
|
// wcsdto.setFactory(qcProCheck.getFactoryCode());
|
|
|
|
|
// wcsdto.setRfidNo(qcProCheck.getRfid());
|
|
|
|
|
// remoteMesService.requestDestinationStations(wcsdto);
|
|
|
|
|
return R.ok();
|
|
|
|
|
}
|
|
|
|
|
else{
|
|
|
|
@ -54,6 +54,37 @@ public class QuaController {
|
|
|
|
|
}
|
|
|
|
|
return R.fail();
|
|
|
|
|
}
|
|
|
|
|
@PostMapping("/test")
|
|
|
|
|
public R<Boolean> test() {
|
|
|
|
|
// System.out.println(qcProCheck);
|
|
|
|
|
// System.out.println(baseFile);
|
|
|
|
|
// QcProCheck qcProCheck = map.keySet().iterator().next();
|
|
|
|
|
// BaseFile baseFile = map.values().iterator().next();
|
|
|
|
|
QcProCheck qcProCheck = new QcProCheck();
|
|
|
|
|
BaseFile baseFile = new BaseFile();
|
|
|
|
|
// qcProCheck.setId("1232132132121321");
|
|
|
|
|
qcProCheck.setRfid("rfiddddddddddddddddddddddddddddddddddddd");
|
|
|
|
|
qcProCheck.setFactoryCode("qewqewqewq");
|
|
|
|
|
qcProCheck.setIsqua("1");
|
|
|
|
|
baseFile.setFileAddress("qwewqewqewqewqewqq");
|
|
|
|
|
if (!qcProCheck.getFactoryCode().isEmpty()){
|
|
|
|
|
if (baseFile==null){
|
|
|
|
|
baseFile = new BaseFile();
|
|
|
|
|
qcProCheckService.saveQcProCheck(qcProCheck,baseFile);
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
qcProCheckService.saveQcProCheck(qcProCheck,baseFile);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (qcProCheck.getIsqua()=="1"){
|
|
|
|
|
System.out.println("调用下一个接口");
|
|
|
|
|
return R.ok();
|
|
|
|
|
}
|
|
|
|
|
else{
|
|
|
|
|
return R.ok();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return R.fail();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|