#

LSH

2022-11-01 94dba00dbc6f351f5835d6f4a98d3126cedd9e80

 src/main/java/com/zy/asrs/controller/WrkMastController.java

@@ -188,7 +188,7 @@
        if (wrkMast.getIoType() != 107) {
            return R.error("工作档非捡料任务");
        }
        if (wrkMast.getWrkSts() != 14){
        if (wrkMast.getWrkSts() != 17){
            return R.error("盘点任务正在执行中,请等待设备运行结束后进行操作");
        }
        List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
@@ -284,5 +284,45 @@
        return R.ok("库存更新已成功");
    }

    @GetMapping("/wrkMast/pickToFill")
    public R pickToFill(String barcode){
        Date now = new Date();
        if (Cools.isEmpty(barcode)) {
            return R.error("托盘码为空,请检查");
        }
        WrkMast wrkMast = wrkMastService.selectByBarcode(barcode);
        if (Cools.isEmpty(wrkMast)) {
            return R.error("无法通过托盘码找到该工作档,请检查托盘码是否正确");
        }
        if (wrkMast.getIoType() != 103) {
            return R.error("仅有捡料出库可以使用该功能");
        }
        if (wrkMast.getWrkSts() != 17) {
            return R.error("捡料出库未完成,请等待设备运行完成");
        }
        wrkMast.setIoType(101);
        wrkMast.setMemo("捡料转全板工作档");
        wrkMastService.update(wrkMast,new EntityWrapper<WrkMast>()
                .eq("wrk_no",wrkMast.getWrkNo()));
        wrkDetlService.deleteByWrkNo(wrkMast.getWrkNo());
        List<LocDetl> locDetls = locDetlService.selectByLocNo(wrkMast.getSourceLocNo());
        for (LocDetl locDetl : locDetls) {
            WrkDetl wrkDetl = new WrkDetl();
            wrkDetl.sync(locDetl);
            wrkDetl.setWrkNo(wrkMast.getWrkNo());
            wrkDetl.setIoTime(wrkMast.getIoTime());
            wrkDetl.setZpallet(wrkDetl.getBarcode());
            wrkDetl.setBarcode(wrkMast.getBarcode());
            wrkDetl.setAppeTime(now);
            wrkDetl.setModiTime(now);
            wrkDetl.setAppeUser(1L);
            wrkDetl.setModiUser(1L);
            wrkDetlService.insert(wrkDetl);

        }
        locMastService.updateLocSts(wrkMast.getSourceLocNo(),"R");
        return R.ok();
    }


}