.

18516761980

2022-03-28 58bccbc9d1a23c8184217317a9a37345d98883c2

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

@@ -64,11 +64,13 @@
        excludeTrash(param);
        convert(param, wrapper);
        hostEq(wrapper);
//        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
//        else {
//            wrapper.orderBy("update_time", false);
//        }
        wrapper.orderBy("create_time",false);
        if (!Cools.isEmpty(orderByField)){
            wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
        }
        else {
            wrapper.orderBy("create_time",false);
        }

        Page<Order> orderPage = orderService.selectPage(new Page<>(curr, limit), wrapper);
        return R.ok(orderPage);
    }
@@ -205,6 +207,7 @@
     */
    @RequestMapping("/orders/wave/auth")
    @ManagerAuth
    @Transactional
    public R createWave(@RequestBody List<Order> orders){
        /**
         * 控管与初始化
@@ -216,11 +219,9 @@
            }
        }


        /**
         * 生成波次表头
         */

        Wave wave = new Wave();
        wave.setHostId(getHostId());
        String s = UUID.randomUUID().toString().replace("-","");
@@ -229,12 +230,13 @@
        String currNum = waveService.getCurrNum(waveNo);
        if (!Cools.isEmpty(currNum)) {
            String[] split = currNum.split("-");
            if (split.length < 2){
            if (split.length < 3){
                wave.setWaveNo(waveNo + "0001");
            } else {
                Integer newNum = Integer.parseInt(split[2]) + 1;
                String format = AddZero.addZeroForNum(newNum + "", 4);
                wave.setWaveNo(waveNo + format);
            }
            Integer newNum = Integer.parseInt(split[2]) +1;
            String format = AddZero.addZeroForNum(newNum + "", 4);
            wave.setWaveNo(waveNo + format);
        }else {
            wave.setWaveNo(waveNo + "0001");
        }