no message

skyouc

2025-08-07 b8dbadb0b1bc4e5f3d6379fddf96fe11053f2de4

no message

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

@@ -145,6 +145,9 @@
    @ApiModelProperty(value= "备注")

    private String memo;



    @ApiModelProperty("优先级")

    private Integer sorted;



    /**

     * 商品库存索引

     */


 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WaitPakinServiceImpl.java

@@ -111,13 +111,13 @@
        }



        if (orderDetl.getWaitQty().compareTo(orderDetl.getAnfme()) >= 0) {

            waitPakin.setSort(0);

            orderDetl.setSorted(0);

        } else if (orderDetl.getWaitQty().compareTo(0.0) > 0) {

            waitPakin.setSort(55);

            orderDetl.setSorted(55);

        } else {

            waitPakin.setSort(49);

            orderDetl.setSorted(49);

        }

        waitPakinService.updateById(waitPakin);

        orderDetlService.updateById(orderDetl);



        //更新订单状态

        if (order.getOrderSettle().equals(OrderSettleType.INIT.val())) {


 zy-asrs-wms/src/main/resources/mapper/asrs/OrderMapper.xml

@@ -3,31 +3,34 @@
<mapper namespace="com.zy.asrs.wms.asrs.mapper.OrderMapper">



    <select id="getDetlForOrderId" resultType="com.zy.asrs.wms.asrs.entity.dto.OrderInfoDto">

        SELECT

            odl.id AS detl_id,

            odl.order_id,

            odl.order_no,

            odl.anfme,

            odl.qty,

            odl.work_qty,

            odl.batch,

            odl.anfme - odl.qty - work_qty AS merge_num,

            mm.matnr,

            mm.maktx,

            mm.specs,

            mm.model,

            mm.barcode

        FROM

            man_order_detl odl

        SELECT * FROM (

            SELECT

                odl.id AS detl_id,

                odl.order_id,

                odl.order_no,

                odl.anfme,

                odl.sorted,

                odl.qty,

                odl.work_qty,

                odl.batch,

                odl.anfme - odl.qty - work_qty AS merge_num,

                mm.matnr,

                mm.maktx,

                mm.specs,

                mm.model,

                mm.barcode

            FROM

                man_order_detl odl

                INNER JOIN man_mat mm ON odl.mat_id = mm.id

        WHERE odl.deleted = 0 AND odl.`status` = 1

        <if test="orderId != null">

            AND odl.order_id = #{orderId}

        </if>

        <if test="matnr != null">

            AND mm.matnr LIKE CONCAT('%', #{matnr}, '%')

        </if>

                WHERE odl.deleted = 0 AND odl.`status` = 1

                <if test="orderId != null">

                    AND odl.order_id = #{orderId}

                </if>

                <if test="matnr != null">

                    AND mm.matnr LIKE CONCAT('%', #{matnr}, '%')

                </if>

        ) t

        ORDER BY

         work_qty ASC

         `sorted` DESC

    </select>

</mapper>