订单首页流程卡新增楼层编号显示

廖井涛

2 天以前 a660db06773007b1be690e0674829c00a57aeb7b

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

@@ -37,6 +37,7 @@
        <association property="flowCard" javaType="com.example.erp.entity.pp.FlowCard">
            <result property="orderId" column="order_id"/>
            <result property="productionId" column="production_id"/>
            <result property="processId" column="processIdFirst"/>
        </association>
        <association property="reportingWorkDetail" javaType="com.example.erp.entity.pp.ReportingWorkDetail">
            <result property="completedQuantity" column="completed_quantity"/>
@@ -69,6 +70,7 @@
    <select id="AddSelectLastWorkMp" resultMap="reportingWorkMap">
        select o.order_id,
               fc.production_id,
               fc.process_id as 'processIdFirst',
               o.customer_id,
               o.customer_name,
               o.project,
@@ -84,7 +86,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 +115,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>
@@ -135,8 +137,15 @@
            ogd.child_width,
            ogd.child_height,
            if(od.shape=1,'普形',if(od.shape=2,'异形','')) as shape,
            fc.quantity -fc.export_number + ifnull(patch.patch_num,0) -odpd.reporting_work_num -odpd.broken_num - ifnull(fc.termination_quantity,0)  as quantity,
            fc.quantity -fc.export_number + ifnull(patch.patch_num,0) -odpd.reporting_work_num -odpd.broken_num - ifnull(fc.termination_quantity,0)   as completedQuantity,
        IF(odpd.reporting_work_num>=fc.quantity-fc.termination_quantity,
        (fc.quantity  -fc.export_number + ifnull(patch.patch_num,0) -odpd.reporting_work_num -odpd.broken_num),
        IF((fc.quantity - ifnull(fc.termination_quantity,0) -fc.export_number + ifnull(patch.patch_num,0) -odpd.reporting_work_num -odpd.broken_num )&lt;0,0,
            (fc.quantity - ifnull(fc.termination_quantity,0) -fc.export_number + ifnull(patch.patch_num,0) -odpd.reporting_work_num -odpd.broken_num)))
        as quantity,
        IF(odpd.reporting_work_num>=fc.quantity-fc.termination_quantity,
        (fc.quantity  -fc.export_number + ifnull(patch.patch_num,0) -odpd.reporting_work_num -odpd.broken_num),
        IF((fc.quantity - ifnull(fc.termination_quantity,0) -fc.export_number + ifnull(patch.patch_num,0) -odpd.reporting_work_num -odpd.broken_num )&lt;0,0,
            (fc.quantity - ifnull(fc.termination_quantity,0) -fc.export_number + ifnull(patch.patch_num,0) -odpd.reporting_work_num -odpd.broken_num)))   as completedQuantity,
            odpd.reporting_work_num as completed,
            odpd.broken_num as onceBroken,
            if(fc.quantity -odpd.reporting_work_num = 0 ,true,false) as saveFlag, -- 判断是否已经完成，已经完成不序号和同序号数量相同才能提交
@@ -166,7 +175,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 +186,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
@@ -197,12 +206,23 @@
        ogd.child_width,
        ogd.child_height,
        if(od.shape=1,'普形',if(od.shape=2,'异形','')) as shape,
        if((odpds.reporting_work_num_count + ifnull(c.patchNumSum,0) -odpd.reporting_work_num_count -odpd.broken_num ) &lt; 0,
        0,
        odpds.reporting_work_num_count + ifnull(c.patchNumSum,0) -odpd.reporting_work_num_count -odpd.broken_num) as quantity,
        if((odpds.reporting_work_num_count + ifnull(c.patchNumSum,0) -odpd.reporting_work_num_count -odpd.broken_num) &lt; 0,
        0,
        odpds.reporting_work_num_count + ifnull(c.patchNumSum,0) -odpd.reporting_work_num_count -odpd.broken_num) as completedQuantity,
        IF(
        odpds.reporting_work_num_count + ifnull( c.patchNumSum, 0 ) - odpd.reporting_work_num_count - odpd.broken_num&lt;=fc.quantity-fc.termination_quantity,
        IF(odpds.reporting_work_num_count + ifnull( c.patchNumSum, 0 ) - odpd.reporting_work_num_count - odpd.broken_num=fc.termination_quantity,0,
            odpds.reporting_work_num_count + ifnull( c.patchNumSum, 0 ) - odpd.reporting_work_num_count - odpd.broken_num),
        IF(odpds.reporting_work_num_count + ifnull( c.patchNumSum, 0 ) - odpd.reporting_work_num_count - odpd.broken_num-fc.termination_quantity&lt;0
        ,0,
        odpds.reporting_work_num_count + ifnull( c.patchNumSum, 0 ) - odpd.reporting_work_num_count - odpd.broken_num-fc.termination_quantity)
        )
        AS quantity,
        IF(
        odpds.reporting_work_num_count + ifnull( c.patchNumSum, 0 ) - odpd.reporting_work_num_count - odpd.broken_num&lt;=fc.quantity-fc.termination_quantity,
        IF(odpds.reporting_work_num_count + ifnull( c.patchNumSum, 0 ) - odpd.reporting_work_num_count - odpd.broken_num=fc.termination_quantity,0,
            odpds.reporting_work_num_count + ifnull( c.patchNumSum, 0 ) - odpd.reporting_work_num_count - odpd.broken_num),
        IF(odpds.reporting_work_num_count + ifnull( c.patchNumSum, 0 ) - odpd.reporting_work_num_count - odpd.broken_num-fc.termination_quantity&lt;0
        ,0,
        odpds.reporting_work_num_count + ifnull( c.patchNumSum, 0 ) - odpd.reporting_work_num_count - odpd.broken_num-fc.termination_quantity)
        ) AS completedQuantity,
        odpd.reporting_work_num as completed,
        odpd.broken_num as onceBroken,
        ogd.`group`,
@@ -223,7 +243,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 +282,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 +292,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 +455,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 +468,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, --   库存数量
              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)))
                c.received_quantity, -- 已入库数量
                c.inventory_quantity, --   库存数量
                if(ifnull(inventory_quantity,0)
                -ifnull(c.received_quantity,0)
                > a.completed_quantity,a.completed_quantity+ a.breakage_quantity,
                (ifnull(c.inventory_quantity,0)
                -ifnull(c.received_quantity,0)+ a.breakage_quantity)
                )
                as minQuantity -- 修改最小数
            </if>
@@ -490,7 +510,7 @@
                       from reporting_work as rw
                       left join  reporting_work_detail  as rwd
                       on rw.reporting_work_id = rwd.reporting_work_id
              where rw.reviewed_state>-1
              where rw.reviewed_state>-1 and rw.order_id=#{orderId}
                       group by rw.process_id,
                                rw.this_process,
                                rwd.order_number,
@@ -509,7 +529,7 @@
                           from reporting_work as rw
                           left join  reporting_work_detail  as rwd
                           on rw.reporting_work_id = rwd.reporting_work_id
              where rw.reviewed_state>=0
              where rw.reviewed_state>=0 and rw.order_id=#{orderId}
                           group by rw.process_id,
                                    rw.this_process,
                                    rwd.order_number,
@@ -543,11 +563,11 @@
                rwd.wornArea
        # (IF(rw.reviewed_state = 0, '未审核', IF(rw.reviewed_state = 1, '审核通过', '审核不通过'))) as reviewed_state
        from
            reporting_work as rw
            pp.reporting_work as rw
    left join (
    SELECT cc.reporting_work_id,cc.goup,round(sum(cc.completedArea),2)  as completedArea ,round(sum(cc.wornArea),2)  as wornArea from  (SELECT rwds.reporting_work_id, GROUP_CONCAT(distinct rwds.technology_number SEPARATOR '') as goup,
    sum(rwds.child_width*rwds.child_height*completed_quantity/1000000)as completedArea,
    sum(rwds.child_width*rwds.child_height*rwds.breakage_quantity/1000000) as wornArea  from reporting_work_detail as rwds GROUP BY rwds.reporting_work_id,order_number ) as cc GROUP BY cc.reporting_work_id)as rwd on rw.reporting_work_id=rwd.reporting_work_id
    sum(rwds.child_width*rwds.child_height*rwds.breakage_quantity/1000000) as wornArea  from pp.reporting_work_detail as rwds GROUP BY rwds.reporting_work_id,order_number ) as cc GROUP BY cc.reporting_work_id)as rwd on rw.reporting_work_id=rwd.reporting_work_id

            left join sd.`order` as o on o.order_id=rw.order_id
        where rw.reviewed_state != 2
@@ -579,7 +599,7 @@
            and rw.device_name regexp #{reportingWork.deviceName}
        </if>
        <if test="reportingWork.teamsGroupsName != null and reportingWork.teamsGroupsName != ''">
            and rw.teams_groups_name regexp #{reportingWork.teamsGroupsName}
            and rw.teams_groups_name like concat('%', #{reportingWork.teamsGroupsName}, '%')
        </if>
        GROUP BY rw.reporting_work_id
        ORDER BY rw.reporting_work_id desc
@@ -1040,11 +1060,11 @@
        ROUND(SUM(rwd.wornArea), 2) AS wornArea,
        CEILING(count(rw.reporting_work_id)/#{pageSize}) as 'pageTotal',
        count(distinct rw.reporting_work_id) as 'total'
        FROM reporting_work AS rw
        FROM pp.reporting_work AS rw
        LEFT JOIN
        (SELECT cc.reporting_work_id,cc.goup,round(sum(cc.completedArea),2)  as completedArea ,round(sum(cc.wornArea),2)  as wornArea from  (SELECT rwds.reporting_work_id, GROUP_CONCAT(distinct rwds.technology_number SEPARATOR '') as goup,
        sum(rwds.child_width*rwds.child_height*completed_quantity/1000000)as completedArea,
        sum(rwds.child_width*rwds.child_height*rwds.breakage_quantity/1000000) as wornArea  from reporting_work_detail as rwds GROUP BY rwds.reporting_work_id,order_number ) as cc GROUP BY cc.reporting_work_id)
        sum(rwds.child_width*rwds.child_height*rwds.breakage_quantity/1000000) as wornArea  from pp.reporting_work_detail as rwds GROUP BY rwds.reporting_work_id,order_number ) as cc GROUP BY cc.reporting_work_id)
            AS rwd
                ON rw.reporting_work_id = rwd.reporting_work_id
        /*LEFT JOIN sd.order_glass_detail AS ogd ON ogd.order_id = rw.order_id
@@ -1064,7 +1084,7 @@
            and o.order_id regexp #{reportingWork.orderId}
        </if>
        <if test="reportingWork.processId != null and reportingWork.processId != ''">
            and rw.process_id regexp #{reportingWork.processId}
            and CONCAT(rw.process_id,'/',rwd.goup) LIKE CONCAT('%', #{reportingWork.processId}, '%')
        </if>
        <if test="reportingWork.order.project != null and reportingWork.order.project != ''">
            and o.project regexp #{reportingWork.order.project}
@@ -1079,7 +1099,7 @@
            and rw.device_name regexp #{reportingWork.deviceName}
        </if>
        <if test="reportingWork.teamsGroupsName != null and reportingWork.teamsGroupsName != ''">
            and rw.teams_groups_name regexp #{reportingWork.teamsGroupsName}
            and rw.teams_groups_name like concat('%', #{reportingWork.teamsGroupsName}, '%')
        </if>
    </select>

@@ -1114,4 +1134,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"
    </select>

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