Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

chenlu

2025-09-28 55392d239f31875aee22398bb52e1ecee19ff69a

 north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml

@@ -84,7 +84,7 @@
                   from reporting_work as a
                       left join reporting_work_detail as b on a.reporting_work_id = b.reporting_work_id
                   where this_process=#{previousProcess} and reviewed_state=0 and process_id=#{processIdStr}
                     and  POSITION(b.technology_number in #{technologyStr})
                     and  FIND_IN_SET(b.technology_number , #{technologyStr})
                   ) as rw
        on rw.process_id = fc.process_id
        left join reporting_work_detail as rwd on rw.reporting_work_id = rwd.reporting_work_id and rwd.technology_number=fc.technology_number
@@ -113,7 +113,7 @@
                       left join flow_card as fc on fc.order_id=o.order_id and fc.order_number=ogd.order_number and fc.technology_number=ogd.technology_number
                       where fc.process_id = #{processIdStr}
                         and o.create_order>0
                         and POSITION(fc.technology_number in #{technologyStr})
                         and FIND_IN_SET(fc.technology_number , #{technologyStr})
                       limit 1),'') as  process

    </select>
@@ -166,7 +166,7 @@
                where
                reporting_work.this_process = #{process}
                and a.process_id=#{processIdStr}
                and POSITION(a.technology_number in #{technologyStr})
                and FIND_IN_SET(a.technology_number , #{technologyStr})
                and a.review_status = 1
                group by a.process_id,a.order_sort,a.technology_number
            ) as patch
@@ -177,7 +177,7 @@

        WHERE
            fc.process_id = #{processIdStr}
          AND  POSITION(fc.technology_number in #{technologyStr})
          AND  FIND_IN_SET(fc.technology_number , #{technologyStr})
          AND odpd.process = #{process}
          and if(#{reportType}=1,o.order_type!='样品订单',o.order_id!='')
        and o.create_order>0 and fc.quantity - ifnull(fc.termination_quantity,0)>0
@@ -223,7 +223,7 @@
            from sd.order_glass_detail
            where order_id = ogd.order_id
            and order_number = ogd.order_number
            and POSITION(technology_number in #{technologyStr})
            and  FIND_IN_SET(technology_number , #{technologyStr})
            limit 1)
        </if>

@@ -262,7 +262,7 @@
        left join reporting_work_detail as b on a.reporting_work_id = b.reporting_work_id
        where this_process=#{previousProcess} and process_id= #{processIdStr} and a.reviewed_state>=0
        <if test="laminating == ''">
            AND POSITION(b.technology_number in #{technologyStr})
            AND FIND_IN_SET(b.technology_number , #{technologyStr})
        </if>
        GROUP BY b.order_number,b.technology_number
        ) as rws
@@ -272,7 +272,7 @@

        AND odpd.process = #{process}
        <if test="laminating == ''">
            AND POSITION(fc.technology_number in #{technologyStr})
            AND FIND_IN_SET(fc.technology_number , #{technologyStr})
        </if>
        order by fc.order_number
    </select>
@@ -435,9 +435,9 @@
            ifnull(f.completed_quantity,0) as thisQuantitySum ,-- 本工序完工和
            if(c.quantity-f.completed_quantity = 0 ,true,false) as saveFlag,
            e.other_columns,
        if(ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'')!='',
        ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),''),
        od.building_number) as s01Value
        if(ifnull(JSON_UNQUOTE(JSON_EXTRACT(e.other_columns, '$.S01')),'')!='',
        ifnull(JSON_UNQUOTE(JSON_EXTRACT(e.other_columns, '$.S01')),''),
        e.building_number) as s01Value,
        IF(count(pl.id)>0,'已补片','') as patchStatusOther,

            <if test="nextProcess != null and nextProcess != ''">  -- 非最后一道工序
@@ -448,17 +448,17 @@
                   a.completed_quantity,
                (a.completed_quantity+ a.breakage_quantity),
                   (f.completed_quantity
                       -ifnull(g.completed_quantity,0))
                       -ifnull(g.completed_quantity,0) + a.breakage_quantity)
                    )  as minQuantity -- 修改最小数
            </if>
            <if test="nextProcess == null or nextProcess == ''">  -- 最后一道工序
#               c.received_quantity, -- 已入库数量
#               c.inventory_quantity, --   库存数量
               c.received_quantity, -- 已入库数量
               c.inventory_quantity, --   库存数量
              if(ifnull(inventory_quantity,0)
                 -ifnull(c.received_quantity,0)
                 &gt;= a.completed_quantity,0,
                (a.completed_quantity-(ifnull(c.inventory_quantity,0)
                    -ifnull(c.received_quantity,0)))
                 &gt;= a.completed_quantity,a.completed_quantity,
                (ifnull(c.inventory_quantity,0)
                -ifnull(c.received_quantity,0))
                )
                as minQuantity -- 修改最小数
            </if>
@@ -930,6 +930,11 @@

                          SELECT * FROM sd.basic_data
                          WHERE basic_type='product' AND basic_category='process' AND basic_name='钢化'

                          UNION

                          SELECT * FROM sd.basic_data
                          WHERE basic_type='product' AND basic_category='process' AND basic_name='热弯'
                      ) AS combined_results;
    </select>

@@ -1109,4 +1114,14 @@
        GROUP BY rw.reporting_work_id
        ORDER BY rw.reporting_work_id desc
    </select>

    <select id="mesSelectWorkBasicDeviceMp">
        SELECT bdp.id,bdp.basic_type,bdp.basic_name, bd.basic_name as basic_category FROM  sd.basic_data as bd left join  `basic_data_produce` as bdp
        on bd.id=bdp.basic_category
        where bd.basic_category="process" and bdp.basic_type="device" and bd.basic_name = #{process}
    </select>

    <select id="mesSelectWorkBasicTeamsMp">
        select id,login_name,user_name,address from erp_user_info.`user`
    </select>
</mapper>