#

ytfl

3 天以前 7e8c672d13a4d5c9ef6d8b62f6fc1ce092a6c123

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

@@ -268,6 +268,7 @@
        matParam.setWeight(nccJcQilibcBarcodeflowWms.getNastnum() == null ? 0.0D : nccJcQilibcBarcodeflowWms.getNastnum().doubleValue());
        matParam.setAnfme2(nccJcQilibcBarcodeflowWms.getNastnum() == null ? 0.0D : nccJcQilibcBarcodeflowWms.getNastnum().doubleValue());
        matParam.setTiaoma(nccJcQilibcBarcodeflowWms.getVbarcode());
        matParam.setCstateid(nccJcQilibcBarcodeflowWms.getCstateid());
        return R.ok().add(matParam);

    }
@@ -291,6 +292,7 @@
        matParam.setAnfme2(0.0D);
        matParam.setTiaoma(nccQilibcTmprintWms.getBarcode());
        matParam.setStandby1(nccQilibcTmprintWms.getCkbm());
        matParam.setCstateid(nccQilibcTmprintWms.getCstateid());
        return R.ok().add(matParam);
    }

@@ -330,11 +332,19 @@
        matParam.setAnfme(0.0D);
        matParam.setAnfme2(0.0D);
        matParam.setTiaoma(batch);
        matParam.setCstateid(wrkDetlLog.getCstateid());

        String[] split = wrkDetlLog.getOrderNo().split("-");
        map.put("orderNo", split[0]);
        map.put("matData", matParam);
        return R.ok().add(map);
    }

    @RequestMapping("/comb/cancel")
    @ManagerAuth(memo = "取消组托")
    public R combCancel(@RequestBody CombCancelParam param) {
        mobileService.combCancel(param, getUserId());
        return R.ok("取消组托成功");
    }

    @RequestMapping("/comb/auth")
@@ -356,41 +366,41 @@
            ckbmList.add(storeType.getStoreId());
        }

        NccSaleXclGgsybWms nccSaleXclGgsybWms = nccSaleXclGgsybWmsService.selectOne(new EntityWrapper<NccSaleXclGgsybWms>()
                .eq("WLBM", combMat.getMatnr())
                .eq("VBATCHCODE", combMat.getBatch())
                .in("CKBM", ckbmList)
        );
        if(null == nccSaleXclGgsybWms) {
            return R.error("未查到ERP库存");
        }

        //ERP库存数量
        BigDecimal zsl = nccSaleXclGgsybWms.getZsl();

        //获取立库数量
        List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>()
                .eq("matnr", combMat.getMatnr())
                .eq("batch", combMat.getBatch())
        );
        BigDecimal stockNum = new BigDecimal(0);
        for (LocDetl locDetl : locDetls) {
            stockNum = stockNum.add(BigDecimal.valueOf(locDetl.getAnfme()));
        }

        //加上组托数量
        for (CombParam.CombMat mat : combParam.getCombMats()) {
            stockNum = stockNum.add(BigDecimal.valueOf(mat.getAnfme()));
        }

        if(stockNum.doubleValue() > zsl.doubleValue()) {
            return R.error("组托数量超过ERP库存");
        }

        List<CombParam.CombMat> combMats = combParam.getCombMats();
        for (CombParam.CombMat mat : combMats) {
            mat.setStandby1(nccSaleXclGgsybWms.getCkbm());
        }
//        NccSaleXclGgsybWms nccSaleXclGgsybWms = nccSaleXclGgsybWmsService.selectOne(new EntityWrapper<NccSaleXclGgsybWms>()
//                .eq("WLBM", combMat.getMatnr())
//                .eq("VBATCHCODE", combMat.getBatch())
//                .in("CKBM", ckbmList)
//        );
//        if(null == nccSaleXclGgsybWms) {
//            return R.error("未查到ERP库存");
//        }
//
//        //ERP库存数量
//        BigDecimal zsl = nccSaleXclGgsybWms.getZsl();
//
//        //获取立库数量
//        List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>()
//                .eq("matnr", combMat.getMatnr())
//                .eq("batch", combMat.getBatch())
//        );
//        BigDecimal stockNum = new BigDecimal(0);
//        for (LocDetl locDetl : locDetls) {
//            stockNum = stockNum.add(BigDecimal.valueOf(locDetl.getAnfme()));
//        }
//
//        //加上组托数量
//        for (CombParam.CombMat mat : combParam.getCombMats()) {
//            stockNum = stockNum.add(BigDecimal.valueOf(mat.getAnfme()));
//        }
//
//        if(stockNum.doubleValue() > zsl.doubleValue()) {
//            return R.error("组托数量超过ERP库存");
//        }
//
//        List<CombParam.CombMat> combMats = combParam.getCombMats();
//        for (CombParam.CombMat mat : combMats) {
//            mat.setStandby1(nccSaleXclGgsybWms.getCkbm());
//        }

        mobileService.comb(combParam, getUserId());
        return R.ok("组托成功");
@@ -691,4 +701,18 @@
        return R.ok("上报ERP成功");
    }

    @RequestMapping("/pallet/toOutSta")
    @ManagerAuth(memo = "托盘去出库口")
    public R toOutSta(@RequestBody PalletToOutStaParam param) {
        mobileService.toOutSta(param, getUserId());
        return R.ok();
    }

    @RequestMapping("/pallet/toAllOut")
    @ManagerAuth(memo = "拣料转全板")
    public R toAllOut(@RequestBody PalletToAllOutParam param) {
        mobileService.toAllOut(param, getUserId());
        return R.ok();
    }

}