1.不合格品管理问题修改

2.质量管理问题修改

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

@@ -5,6 +5,7 @@
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.github.zuihou.business.operationManagementCenter.entity.OrderProduct">
         <id column="id" jdbcType="BIGINT" property="id"/>
+        <result column="plan_id" jdbcType="BIGINT" property="planId"/>
         <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
         <result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
         <result column="order_id" jdbcType="BIGINT" property="orderId"/>
@@ -19,8 +20,8 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id,create_time,update_time,bomName,bomNo, order_no,unqualifiedCount,addOrderCount,completeNum,qualifiedCount,
-        order_id, bom_id, bom_num, orderDeliveryTime, remark, create_user, update_user, produce_status
+        id,plan_id,create_time,update_time,bomName,bomNo, order_no,unqualifiedCount,addOrderCount,completeNum,qualifiedCount,
+        order_id, bom_id, bom_num, orderDeliveryTime, remark, create_user, update_user, produce_status,orderName
     </sql>
 
     <!-- 分页 -->
@@ -28,19 +29,27 @@
         select
         <include refid="Base_Column_List"/>
         from (select a.*,a.plan_bom_num as bom_num, b.name as bomName,b.no as bomNo,b.specifications ,b.model,b.brand,
-        ifnull(completeNum, 0) as completeNum,d.start_time as orderDeliveryTime, ifnull(unqualifiedCount,0) as unqualifiedCount, ifnull(completeNum-unqualifiedCount, 0) as qualifiedCount,
-        ifnull(addOrderCount,0) as addOrderCount ,d.produce_status
+        ifnull(completeNum, 0) as completeNum,d.start_time as orderDeliveryTime, ifnull(unqualifiedCount,0) as unqualifiedCount, IFNULL(qualifiedCount, 0) as qualifiedCount,
+        ifnull(addOrderCount,0) as addOrderCount ,d.produce_status, ioo.order_name AS  orderName
         from imcs_p_plan_product a
         left join imcs_b_bom b on a.bom_id = b.id
         left join imcs_p_plan d on a.plan_id = d.id
+        left join imcs_o_order ioo on a.order_id = ioo.id
         LEFT JOIN
-        (select order_product_id,count(order_product_id) AS completeNum, count(1) as unqualifiedCount,count(u.add_order_id) as addOrderCount from
+        (select order_product_id,count(u.add_order_id) as addOrderCount from
         imcs_t_task_test_unqualified_bom u
         GROUP BY u.order_product_id
         )e on a.id = e.order_product_id
+        LEFT JOIN (SELECT
+            itw.plan_id,
+            COUNT((CASE itw.test_result WHEN '1' THEN 1 END)) AS qualifiedCount,
+            COUNT((CASE itw.test_result WHEN '0' THEN 1 END)) AS unqualifiedCount,
+            COUNT((CASE WHEN itw.is_end = '1' AND itw.test_result='1' THEN 1 END)) AS completeNum
+            FROM imcs_t_workpiece itw
+            GROUP BY itw.plan_id) f ON a.plan_id = f.plan_id
         where 1=1
         <if test="produceStatus != null and produceStatus != ''">
-            and d.produce_Status = #{produceStatus}
+            and d.produce_status in (${produceStatus})
         </if>
         ) s ${ew.customSqlSegment}
     </select>

imcs-admin-boot/imcs-business-controller/src/main/java/com/github/zuihou/business/controller/operationManagementCenter/OrderProductController.java

@@ -1,6 +1,7 @@
 package com.github.zuihou.business.controller.operationManagementCenter;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.MybatisConfiguration;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -16,6 +17,8 @@ import com.github.zuihou.business.operationManagementCenter.entity.Plan;
 import com.github.zuihou.business.operationManagementCenter.service.OrderProductService;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -68,7 +71,9 @@ public class OrderProductController extends SuperController<OrderProductService,
         wrapper.like(StringUtil.isNotEmpty(orderProduct.getOrderNo()),OrderProduct::getOrderNo, orderProduct.getOrderNo())
                 .like(StringUtil.isNotEmpty(orderProduct.getBomName()),OrderProduct::getBomName, orderProduct.getBomName()).orderByDesc(OrderProduct::getCreateTime);
 
-        baseService.pageList(page,orderProduct.getProduceStatus(), wrapper);
+        String produceStatus = CollectionUtil.join(new ArrayList<>(Arrays.asList(orderProduct.getProduceStatus().split(","))), ",");
+
+        baseService.pageList(page,produceStatus, wrapper);
 
     }
 

imcs-admin-boot/imcs-business-controller/src/main/java/com/github/zuihou/business/controller/operationManagementCenter/TTaskTestUnqualifiedBomController.java

@@ -18,6 +18,7 @@ import com.github.zuihou.security.model.SysUser;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
@@ -58,10 +59,18 @@ public class TTaskTestUnqualifiedBomController extends SuperController<TTaskTest
                 .like(TTaskTestUnqualifiedBom::getOrderName,taskTestUnqualifiedBom.getOrderName())
                 .like(TTaskTestUnqualifiedBom::getBomName,taskTestUnqualifiedBom.getBomName())
                 .like(TTaskTestUnqualifiedBom::getUniqueCode,taskTestUnqualifiedBom.getUniqueCode())
-                .eq(TTaskTestUnqualifiedBom::getHandleStatus,taskTestUnqualifiedBom.getHandleStatus())
                 .eq(TTaskTestUnqualifiedBom::getBomId,taskTestUnqualifiedBom.getBomId())
-                .like(TTaskTestUnqualifiedBom::getPlanNo,taskTestUnqualifiedBom.getPlanNo())
-                .orderByDesc(TTaskTestUnqualifiedBom::getCreateTime);
+                .like(TTaskTestUnqualifiedBom::getPlanNo,taskTestUnqualifiedBom.getPlanNo());
+                if(StringUtils.isNotBlank(taskTestUnqualifiedBom.getTestResult())){
+                    wrapper.eq(TTaskTestUnqualifiedBom::getTestResult,"0");
+                }
+                if(null != taskTestUnqualifiedBom.getPlanId()){
+                    wrapper.eq(TTaskTestUnqualifiedBom::getPlanId,taskTestUnqualifiedBom.getPlanId());
+                }
+                if(StringUtils.isNotBlank(taskTestUnqualifiedBom.getHandleStatus())){
+                    wrapper.eq(TTaskTestUnqualifiedBom::getHandleStatus,taskTestUnqualifiedBom.getHandleStatus());
+                }
+        wrapper.orderByDesc(TTaskTestUnqualifiedBom::getCreateTime);
         baseService.pageList(page,wrapper);
 
     }

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

@@ -54,14 +54,23 @@ public class OrderProduct extends Entity<Long> {
 
     private static final long serialVersionUID = 1L;
 
+    /**
+     * 计划id
+     */
+    @ApiModelProperty(value = "计划id")
+    @NotNull(message = "计划id不能为空")
+    @TableField("order_id")
+    @Excel(name = "计划id")
+    private Long orderId;
+
     /**
      * 订单id
      */
     @ApiModelProperty(value = "订单id")
     @NotNull(message = "订单id不能为空")
-    @TableField("order_id")
+    @TableField("plan_id")
     @Excel(name = "订单id")
-    private Long orderId;
+    private Long planId;
 
 
     /**