Changes

mrzhssss

2022-04-11 d2adac4e369165ec523c23e7ffd19fc5775d43b5

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

@@ -64,11 +64,15 @@
        excludeTrash(param);
        convert(param, wrapper);
        hostEq(wrapper);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        else {
            wrapper.orderBy("update_time", false);
        if (!Cools.isEmpty(orderByField)){
            wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
        }
        return R.ok(orderService.selectPage(new Page<>(curr, limit), wrapper));
        else {
            wrapper.orderBy("create_time",false);
        }

        Page<Order> orderPage = orderService.selectPage(new Page<>(curr, limit), wrapper);
        return R.ok(orderPage);
    }

    private void convert(Map<String, Object> map, EntityWrapper wrapper){
@@ -203,6 +207,7 @@
     */
    @RequestMapping("/orders/wave/auth")
    @ManagerAuth
    @Transactional
    public R createWave(@RequestBody List<Order> orders){
        /**
         * 控管与初始化
@@ -214,11 +219,9 @@
            }
        }


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

        Wave wave = new Wave();
        wave.setHostId(getHostId());
        String s = UUID.randomUUID().toString().replace("-","");
@@ -227,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");
        }
@@ -301,4 +305,56 @@
        return R.ok("已生成波次");
    }

    /**
     * 通过批号订单中包含的出库单
     */

    @RequestMapping("/order/orderByWave/auth")
    @ManagerAuth
    public R getOrderDetailByWave(@RequestParam(defaultValue = "1")Integer curr,
                                  @RequestParam(defaultValue = "10")Integer limit,
                                  @RequestParam(required = false)String orderByField,
                                  @RequestParam(required = false)String orderByType,
                                  @RequestParam Map<String, Object> param,
                                  String research){
        EntityWrapper<Wave> wrapper = new EntityWrapper<>();
        excludeTrash(param);
        convert(param, wrapper);
        hostEq(wrapper);
        wrapper.orderBy("create_time",false);
        List<Wave> waves = waveService.selectList(wrapper);
        if (Cools.isEmpty(waves)) {
            throw new CoolException("找不到该波次");
        }

        HashSet<String> allOrders = new HashSet<>();
        for (Wave wave : waves) {
            List<WaveDetl> waveDetls = waveDetlService.selectList(new EntityWrapper<WaveDetl>()
                    .eq("wave_id", wave.getId()));
            for (WaveDetl waveDetl : waveDetls) {
                String[] split = waveDetl.getOrderNos().split(",");
                for (String s : split) {
                    allOrders.add(s);
                }
            }
        }
        ArrayList<String> allOrdersList = new ArrayList<>(allOrders);
        EntityWrapper<OrderDetl> orderDetailWrapper = new EntityWrapper<>();
        for (int i = 0; i < allOrdersList.size(); i++) {
            String s = allOrdersList.get(i);
            if (i == 0){
                orderDetailWrapper
                        .eq("order_no",s);
            }else {
                orderDetailWrapper
                        .or()
                        .eq("order_no",s);
            }
        }
        if (!Cools.isEmpty(research)) {
            orderDetailWrapper.eq("order_no",research);
        }
        Page<OrderDetl> orderDetlPage = orderDetlService.selectPage(new Page<>(curr, limit),orderDetailWrapper);
        return R.ok(orderDetlPage);
    }
}