更新质量管理查询的bug

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

@@ -19,29 +19,22 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id,create_time,update_time,bomName,bomNo, order_no,unqualifiedCount,addOrderCount,finishedCount,qualifiedCount,
-        order_id, bom_id, bom_num, delivery_time, remark, create_user, update_user, prority, produce_status
+        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
     </sql>
 
     <!-- 分页 -->
     <select id="pageList" parameterType="String" resultMap="BaseResultMap">
         select
         <include refid="Base_Column_List"/>
-        from (select a.*,b.name as bomName,b.no as bomNo,b.specifications ,b.model,b.brand,ifnull(c.planNum,0) as planNum,
-        (ifnull(a.bom_num,0)-ifnull(c.planNum,0)) as stayPlanNum,d.delivery_time as orderDeliveryTime,
-        ifnull(e.unqualifiedCount, 0) AS unqualifiedCount,
-        ifnull(e.addOrderCount, 0) AS addOrderCount,
-        ifnull(a.bom_num, 0) AS finishedCount,
-        (ifnull(a.bom_num,0) - ifnull(e.unqualifiedCount, 0)) AS qualifiedCount,
-        d.produce_status
-        from imcs_o_order_product a
+        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
+        from imcs_p_plan_product a
         left join imcs_b_bom b on a.bom_id = b.id
-        left join (
-          select order_product_id,count(1) as planNum from imcs_p_plan_product where 1=1 group by order_product_id
-        )c on a.id= c.order_product_id
-        left join imcs_o_order d on a.order_id = d.id
+        left join imcs_p_plan d on a.plan_id = d.id
         LEFT JOIN
-        (select order_product_id,count(1) as unqualifiedCount,count(u.add_order_id) as addOrderCount from
+        (select order_product_id,count(order_product_id) AS completeNum, count(1) as unqualifiedCount,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

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

@@ -188,29 +188,26 @@ public class OrderProduct extends Entity<Long> {
     @Excel(name = "生产状态(1-待生产2-生产中3-暂停4-已完成)")
     private String produceStatus;
 
-
     @ApiModelProperty(value = "不合格品数量")
     @TableField(exist = false)
     @Excel(name = "不合格品数量")
     private Integer unqualifiedCount;
 
-
+    @ApiModelProperty(value = "合格品数量")
+    @TableField(exist = false)
+    @Excel(name = "合格品数量")
+    private Integer qualifiedCount;
 
     @ApiModelProperty(value = "补单次")
     @TableField(exist = false)
     @Excel(name = "补单次")
     private Integer addOrderCount;
 
-    @ApiModelProperty(value = "完成数量")
-    @TableField(exist = false)
-    @Excel(name = "完成数量")
-    private Integer finishedCount;
 
-    @ApiModelProperty(value = "合格品数量")
+    @ApiModelProperty(value = "完成零件数")
     @TableField(exist = false)
-    @Excel(name = "合格品数量")
-    private Integer qualifiedCount;
-
+    @Excel(name = "完成零件数")
+    private Integer completeNum;
 
     @TableField(exist = false)
     private String deliveryTime_st;