Changes

mrzhssss

2022-04-11 d2adac4e369165ec523c23e7ffd19fc5775d43b5

Changes

 src/main/java/zy/cloud/wms/manager/controller/OrderController.java

@@ -326,6 +326,7 @@
        if (Cools.isEmpty(waves)) {
            throw new CoolException("找不到该波次");
        }

        HashSet<String> allOrders = new HashSet<>();
        for (Wave wave : waves) {
            List<WaveDetl> waveDetls = waveDetlService.selectList(new EntityWrapper<WaveDetl>()

 src/main/java/zy/cloud/wms/manager/controller/PickoutController.java

@@ -131,7 +131,8 @@
    @RequestMapping(value = "/pickout/check/column/auth")
    @ManagerAuth
    public R query(@RequestBody JSONObject param) {
        Wrapper<Pickout> wrapper = new EntityWrapper<Pickout>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
        Wrapper<Pickout> wrapper = new EntityWrapper<Pickout>()
                .eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
        if (null != pickoutService.selectOne(wrapper)){
            return R.parse(BaseRes.REPEAT).add(getComment(Pickout.class, String.valueOf(param.get("key"))));
        }
@@ -193,6 +194,8 @@
                .eq("id",wave.getId()));
        List<WaveDetl> waveDetls = waveDetlService.selectList(new EntityWrapper<WaveDetl>()
                .eq("wave_id", wave.getId()));


        if (Cools.isEmpty(waveDetls)) {
            return R.error("找不到对应波次明细");
        }
@@ -206,6 +209,7 @@
                orderNos.add(s);
            }
        }

        /**
         * 循环所有拣货单明细,依次分配给所有出库单
         */

 src/main/webapp/static/js/order/orderResult.js

@@ -170,8 +170,7 @@
        limits: [15, 30, 50, 100, 200, 500],
        height: 'full-100',
        cols: [[
            {type: 'checkbox'}
            ,{field: 'orderNo', align: 'center',title: '单据编号'}
            {field: 'orderNo', align: 'center',title: '单据编号'}
            ,{field: 'matnr', align: 'center',title: '物料ID'}
            ,{field: 'maktx', align: 'center',title: '物料名称'}
            ,{field: 'anfme', align: 'center',title: '应出库量', minWidth: 100}