#

mrzhssss

2022-03-24 4c1e8761e3fa0516d5e6d316e838e83c8e0f5edf

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

@@ -26,6 +26,7 @@
import zy.cloud.wms.manager.service.OrderService;
import zy.cloud.wms.manager.service.WaveDetlService;
import zy.cloud.wms.manager.service.WaveService;
import zy.cloud.wms.manager.utils.AddZero;

import javax.imageio.ImageIO;
import javax.servlet.http.HttpServletResponse;
@@ -204,7 +205,7 @@
    @ManagerAuth
    public R createWave(@RequestBody List<Order> orders){
        /**
         * 控管
         * 控管与初始化
         */
        Integer seqNo = 1;
        for (Order order : orders) {
@@ -222,8 +223,20 @@
        wave.setHostId(getHostId());
        String s = UUID.randomUUID().toString().replace("-","");
        wave.setUuid(s);
        String waveNo = "WAVE-" + new SimpleDateFormat("yyyyMMddHHmmss").format(new Date());
        wave.setWaveNo(waveNo);
        String waveNo = "WAVE-" + new SimpleDateFormat("yyyyMMdd").format(new Date())+"-";
        String currNum = waveService.getCurrNum(waveNo);
        if (!Cools.isEmpty(currNum)) {
            String[] split = currNum.split("-");
            if (split.length < 2){
                wave.setWaveNo(waveNo + "0001");
            }
            Integer newNum = Integer.parseInt(split[2]) +1;
            String format = AddZero.addZeroForNum(newNum + "", 4);
            wave.setWaveNo(waveNo + format);
        }else {
            wave.setWaveNo(waveNo + "0001");
        }

        wave.setOrdersQty(orders.size());
        wave.setStatus((short) 0);
        wave.setCreateBy(getUserId());
@@ -267,6 +280,15 @@
                        .eq("id",checkWaveDetl.getId()));
            }
        }

        /**
         * 控管,出过BUG,只生成表头,不生成表身
         */
        if (Cools.isEmpty(allOrderDetls)) {
            waveService.delete(new EntityWrapper<Wave>()
                    .eq("id",wave.getId()));
            throw new CoolException("找不到出库单细节,请联系管理员");
        }
        /**
         * 反写出库单表头
         */