Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-09-07 c28d3bb363dde2afb44c168b93379b2bf6b1f67f

 production-server/src/main/resources/mapper/ManufactureOrderMapper.xml

@@ -15,9 +15,9 @@
        scheduled_production,
        DATE_FORMAT(downTime, '%Y-%m-%d') downTime,
        DATE_FORMAT(delTime, '%Y-%m-%d') delTime,
        go_state,
        go_state
        from mom_ocean.manufacture_order
        where state=1
        where state = 1
        <if test="downTime!=null and downTime!=''">
            and downTime=#{downTime}
        </if>
@@ -28,8 +28,9 @@
            and customer_code like concat('%',#{customerCode},'%')
        </if>
        <if test="type!=null">
            and type=#{type}
            and go_state=#{type}
        </if>
        ORDER BY create_time DESC
    </select>

    <update id="deleteManufacture">
@@ -55,6 +56,7 @@
        SELECT m.`order_code`, m.`name`, m.`id`
        FROM manufacture_order m
        WHERE m.`state` = 1
        ORDER BY m.`create_time` DESC
    </select>

    <update id="updateManufacture">