#

Junjie

6 天以前 497366bb6b6075ba8fc8af43322f38c5d6697e5f

 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);

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

@@ -329,11 +331,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")
@@ -389,6 +399,7 @@
        List<CombParam.CombMat> combMats = combParam.getCombMats();
        for (CombParam.CombMat mat : combMats) {
            mat.setStandby1(nccSaleXclGgsybWms.getCkbm());
            mat.setCstateid(nccSaleXclGgsybWms.getCstateid());
        }

        mobileService.comb(combParam, getUserId());
@@ -690,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();
    }

}