#

TQS

2023-02-04 222faaec622c83f10dc0416d2683b974cc5900d4

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

@@ -53,8 +53,8 @@
    @ManagerAuth
    public R pikingAuth(String barcode) {
        WrkMast wrkMast = wrkMastService.selectByBarcode(barcode);
        if (wrkMast.getIoType() != 103){
            throw new CoolException("此托盘码不为拣料出库");
        if (wrkMast.getIoType() != 103 && wrkMast.getIoType() != 107){
            throw new CoolException(barcode + "不为拣料/盘点出库");
        }
        List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
        return R.ok().add(wrkDetls);
@@ -66,18 +66,18 @@
    @Transactional
    public R pikingToFull(String barcode) {
        WrkMast wrkMast = wrkMastService.selectByBarcode(barcode);
        if (wrkMast.getIoType() != 103){
            throw new CoolException(barcode + "不为拣料出库");
        }
        if(Cools.isEmpty(wrkMast)){
            throw new CoolException("工作档不能为空");
        }
        if (wrkMast.getIoType() != 103 && wrkMast.getIoType() != 107){
            throw new CoolException(barcode + "不为拣料/盘点出库");
        }

        Date now = new Date();
        List<LocDetl> locDetls = locDetlService.selectByLocNo(wrkMast.getSourceLocNo());
        wrkMast.setIoType(101);
        wrkMast.setSourceStaNo(wrkMast.getStaNo());
        wrkMast.setStaNo(200);
//        wrkMast.setSourceStaNo(wrkMast.getStaNo());
//        wrkMast.setStaNo(200);
        wrkMastService.updateById(wrkMast);

        wrkDetlService.deleteByWrkNo(wrkMast.getWrkNo());
@@ -364,10 +364,15 @@

    @RequestMapping("/adjustNew/auth")
    @ManagerAuth(memo = "盘点")
    public R adjustNew(@RequestBody MobileAdjustParam combParam){
        mobileService.adjustNew(combParam, getUserId());
    public synchronized R adjustNew(@RequestBody MobileAdjustParam combParam){
        mobileService.adjustNew(combParam, Boolean.FALSE, getUserId());
        return R.ok("盘点成功");
    }


    @RequestMapping("/adjustNew/v2/auth")
    @ManagerAuth(memo = "补货")
    public synchronized R adjustNewV2(@RequestBody MobileAdjustParam combParam){
        mobileService.adjustNew(combParam, Boolean.TRUE, getUserId());
        return R.ok("补货成功");
    }
}