修改质量管理列表

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

@@ -19,7 +19,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id,create_time,update_time,bomName,bomNo, order_no,unqualifiedCount,addOrderCount,
+        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
     </sql>
 
@@ -28,7 +28,12 @@
         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, unqualifiedCount,addOrderCount,d.produce_status
+        (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
         left join imcs_b_bom b on a.bom_id = b.id
         left join (

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

@@ -201,6 +201,16 @@ public class OrderProduct extends Entity<Long> {
     @Excel(name = "补单次")
     private Integer addOrderCount;
 
+    @ApiModelProperty(value = "完成数量")
+    @TableField(exist = false)
+    @Excel(name = "完成数量")
+    private Integer finishedCount;
+
+    @ApiModelProperty(value = "合格品数量")
+    @TableField(exist = false)
+    @Excel(name = "合格品数量")
+    private Integer qualifiedCount;
+
 
     @TableField(exist = false)
     private String deliveryTime_st;