Merge remote-tracking branch 'origin/master' into master

imcs-admin-boot/imcs-business-biz/src/main/resources/mapper_business/base/operationManagementCenter/PlanMapper.xml

@@ -27,7 +27,7 @@
     <sql id="Base_Column_List">
         id,create_time,update_time,order_product_id,
         plan_no, order_id, audit_status, remark, create_user, plan_status, update_user, start_time, end_time, scheduling_status, produce_status,partsNo,partsAlias,bomAlias,deliveryTime,pdeliveryTime,
-         prority, status,rhythm_type,orderNo,orderStatus,orderName,source,bomDesc,process,planBomNum,zoenDesc,completeNum,qualification,org_id
+        unqualifiedBomNum, prority, status,rhythm_type,orderNo,orderStatus,orderName,source,bomDesc,process,planBomNum,zoenDesc,completeNum,org_id
     </sql>
 
     <!-- 分页 -->
@@ -36,7 +36,7 @@
         <include refid="Base_Column_List"/>
         from (
         select a.*,b.order_no as orderNo,b.order_name orderName,b.source,b.order_status as orderStatus,c.bomDesc,c.partsNo,c.partsAlias,c.bomAlias,c.pdeliveryTime,b.delivery_time deliveryTime,c.order_product_id,d.org_id,
-        CASE WHEN ifnull(v.completeCount ,0)=0 then 0 else round(100 *( v.verifyCount / v.completeCount),2) end qualification, ifnull(v.completeCount ,0) as completeNum,
+        ifnull(v.completeCount ,0) as completeNum,unqualifiedBomNum,
         CASE WHEN ifnull(w.taskCount,0)=0 then 0 else  round(100 *( wcCount / taskCount),2) end process,ifnull(c.plan_bom_num,0) as planBomNum,d.name as zoenDesc from imcs_p_plan a
         left join (
         select ord.* from imcs_o_order ord
@@ -47,14 +47,10 @@
         left join imcs_o_order_product op on pp.order_product_id = op.id
         ) c on a.id= c.plan_id
         left join
-        /*(
-        select pz.plan_id,GROUP_CONCAT(ze.name) name from imcs_p_plan_zone pz
-        left join imcs_z_zone ze on pz.zone_id = ze.id
-        GROUP BY pz.plan_id
-        ) */
+
         imcs_z_zone d on d.id = b.zone_id
         LEFT JOIN ( SELECT t.plan_id, count(1) taskCount,  sum(CASE WHEN t. STATUS = '3' THEN 1 ELSE 0 END) wcCount FROM imcs_t_task t GROUP BY t.plan_id) w ON a.id = w.plan_id
-        LEFT JOIN ( SELECT i.plan_id, count(1) completeCount, sum(CASE WHEN i. test_result = '1' THEN 1 ELSE 0 END) verifyCount FROM imcs_t_workpiece i GROUP BY i.plan_id ) v ON a.id = v.plan_id
+        LEFT JOIN ( SELECT i.plan_id, sum(CASE WHEN i.is_end = '1' THEN 1 ELSE 0 END) completeCount,sum(CASE WHEN i.test_result = '0' THEN 1 ELSE 0 END) unqualifiedBomNum FROM imcs_t_workpiece i GROUP BY i.plan_id ) v ON a.id = v.plan_id
         where 1=1
         <if test="taskBatchNo != null and taskBatchNo != ''">
             and a.id in(select plan_id from imcs_t_task where task_batch_no = #{taskBatchNo})

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/operationManagementCenter/entity/Plan.java

@@ -210,6 +210,10 @@ public class Plan extends Entity<Long> {
     @TableField(exist = false)
     private Integer delBomNum;
 
+    @ApiModelProperty(value = "合格产品数量")
+    @TableField(exist = false)
+    private Integer unqualifiedBomNum;
+
     @ApiModelProperty(value = "任务批次号")
     @TableField(exist = false)
     private String taskBatchNo;