Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventor...

chenhj

2026-04-21 1bbe6f787d58b768dce5370aa4e0d242c5e4b62d

 src/main/resources/mapper/production/ProductWorkOrderMapper.xml

@@ -4,7 +4,7 @@
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.production.mapper.ProductWorkOrderMapper">

    <resultMap id="BaseResultMap" type="com.ruoyi.production.pojo.ProductWorkOrder">
    <resultMap id="BaseResultMap" type="com.ruoyi.production2.pojo.ProductWorkOrder">
        <result column="id" property="id"/>
        <result column="product_process_route_item_id" property="productProcessRouteItemId"/>
        <result column="create_time" property="createTime"/>
@@ -18,7 +18,7 @@
        <result column="actualEndTime" property="actualEndTime"/>
    </resultMap>

    <select id="pageProductWorkOrder" resultType="com.ruoyi.production.dto.ProductWorkOrderDto">
    <select id="pageProductWorkOrder" resultType="com.ruoyi.production2.dto.ProductWorkOrderDto">
        SELECT
        pwo.*,
        pp.NAME as processName,
@@ -45,11 +45,11 @@
            <if test="c.planStartTime != null and c.planEndTime != null">
                and DATE(pwo.create_time) between #{c.planStartTime} and #{c.planEndTime}
            </if>
            <if test="c.productOrderId != null and c.productOrderId != ''">
               and pwo.product_order_id = #{c.productOrderId}
            <if test="c.productOrderNpsNo != null and c.productOrderNpsNo != ''">
               and po.nps_no like concat('%',#{c.productOrderNpsNo},'%')
            </if>
    </select>
    <select id="getProductWorkOrderFlowCard" resultType="com.ruoyi.production.dto.ProductWorkOrderDto">
    <select id="getProductWorkOrderFlowCard" resultType="com.ruoyi.production2.dto.ProductWorkOrderDto">
        SELECT
        pwo.*,
        pp.NAME as processName,
@@ -76,7 +76,7 @@
                p.product_name,
                po.nps_no
    </select>
    <select id="selectWorkOrderStartStats" resultType="com.ruoyi.production.dto.ProductWorkOrderDto">
    <select id="selectWorkOrderStartStats" resultType="com.ruoyi.production2.dto.ProductWorkOrderDto">
        SELECT
            id,
            actual_start_time AS planStartTime,
@@ -87,4 +87,12 @@
            actual_start_time &gt;= #{startDate}
            AND actual_start_time &lt;= #{endDate}
    </select>
    <select id="selectMax" resultType="com.ruoyi.production2.pojo.ProductWorkOrder">
        SELECT SUBSTRING(work_order_no, 3) as work_order_no
        FROM product_work_order
        WHERE SUBSTRING(work_order_no, 3) like concat(#{datePrefix},'%')
        order by work_order_no  desc
        limit 1
        ;
    </select>
</mapper>