no message

skyouc

2025-07-02 f3a9f8e0629105203979dce590741941de31ba0e

no message

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OutController.java

@@ -107,7 +107,7 @@
            MergePreviewDto dto = new MergePreviewDto();

            dtos.add(dto);



            double anfme = waveDetl.getAnfme() - waveDetl.getWorkQty();

            double anfme = Math.round((waveDetl.getAnfme() - waveDetl.getWorkQty()) * 1000) / 1000.0;

            dto.setMatnr(waveDetl.getMatnr());

            dto.setBatch(waveDetl.getBatch());

            dto.setStatus(0);

@@ -123,7 +123,7 @@
    }



    @PostMapping("/out/orderOut/merge/wave")

    @OperationLog("波次合并订单出库")

    @OperationLog("生成波次任务")

    @Transactional

    public R orderOutMerge(@RequestBody OrderOutMergeParamDto param) {

        outManage.orderOutMergeWave(param);


 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/ViewLocDetl.java

@@ -35,7 +35,6 @@
     * ID

     */

    @ApiModelProperty(value= "ID")

    @TableId(value = "id", type = IdType.AUTO)

    private Long id;



    /**


 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/enums/LocAreaTypeSts.java

@@ -9,7 +9,7 @@
    //四方库
    LOC_AREA_TYPE_ROUND(1L, "四向库"),
    //UTC库
    LOC_AREA_TYPE_UTC(4L, "TUC库"),
    LOC_AREA_TYPE_UTC(4L, "CTU库"),
    //平库
    LOC_AREA_TYPE_FLAT(7L, "平库")
;

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/manage/OutManage.java

@@ -935,9 +935,9 @@


        /**

         * 波次合并出库

         * 1. 判断是平库还TCU库

         * 1. 判断是平库还CTU库

         * 2. 平库生成拣货单

         * 3. TCU库生成任务单

         * 3. CTU库生成任务单

         */

        outStockByArea(dto, wave);



@@ -1048,13 +1048,11 @@
        if (!flatOrders.isEmpty()) {

            //平库出库

            outStockByFlat(flatOrders, wave);

        } else if (!tucOrders.isEmpty()) {

        }

        if (!tucOrders.isEmpty()) {

            //CTU出库

            outStockByTUC(tucOrders, wave);

        } else {

            throw new CoolException("库存不足");

        }



    }



    /**