#

1

3 天以前 52bf6adbb12da2690be2db07fd6620844e84e6d3

 src/main/java/com/zy/common/web/WcsController.java

@@ -222,11 +222,11 @@
    @ResponseBody
    public R autoTransplantingOut(@RequestBody TransplantWork transplantWork){
        // 源站点状态检测
        BasDevp sourceStaNo = basDevpService.checkSiteStatus(transplantWork.getStaNo(), true);
//        BasDevp sourceStaNo = basDevpService.checkSiteStatus(transplantWork.getStaNo(), true);
        WrkMast wrkMast1 = wrkMastService.selectWrkMast(transplantWork.getWorkNo(),transplantWork.getBarcode());
        if(sourceStaNo ==null ){
            return R.error("该站点盘点移栽许可，请查看源站点状态检测");
        }
//        if(sourceStaNo ==null ){
//            return R.error("该站点盘点移栽许可，请查看源站点状态检测");
//        }
        if(wrkMast1== null){
            return  R.error("无该盘点移栽任务");
        }
@@ -271,11 +271,11 @@
    @ResponseBody
    public R autoTransplantingIn(@RequestBody TransplantWork transplantWork){
        // 源站点状态检测
        BasDevp sourceStaNo = basDevpService.checkSiteStatus(transplantWork.getStaNo(), true);
//        BasDevp sourceStaNo = basDevpService.checkSiteStatus(transplantWork.getStaNo(), true);
        WrkMast wrkMast1 = wrkMastService.selectWrkMast(transplantWork.getWorkNo(),transplantWork.getBarcode());
        if(sourceStaNo == null){

        }
//        if(sourceStaNo == null){
//
//        }
        if(wrkMast1== null){
            return  R.error("无该盘点移栽任务");
        }
@@ -286,7 +286,7 @@
        WrkMast wrkMast = new WrkMast();
        wrkMast.setWrkNo(9996);
        wrkMast.setIoTime(now);
        wrkMast.setWrkSts(2L);
        wrkMast.setWrkSts(11L);
        wrkMast.setIoPri(14D);
        wrkMast.setIoType(12);
        wrkMast.setCrnNo(3);