测试问题修改

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

@@ -5,7 +5,6 @@
     <!-- 通用查询映射结果 -->
     <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"/>
@@ -20,7 +19,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id,plan_id,create_time,update_time,bomName,bomNo, order_no,unqualifiedCount,addOrderCount,completeNum,qualifiedCount,
+        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,org_id
     </sql>
 
@@ -30,7 +29,7 @@
         <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(qualifiedCount, 0) as qualifiedCount,
-        ifnull(addOrderCount,0) as addOrderCount ,d.produce_status, ioo.order_name AS  orderName,z.org_id
+        ifnull(addOrderCount,0) as addOrderCount ,d.produce_status, ioo.order_name AS orderName,z.org_id
         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

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

@@ -10,7 +10,6 @@
         <result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
         <result column="update_user" jdbcType="BIGINT" property="updateUser"/>
         <result column="order_no" jdbcType="VARCHAR" property="orderNo"/>
-        <result column="order_name" jdbcType="VARCHAR" property="orderName"/>
         <result column="order_id" jdbcType="BIGINT" property="orderId"/>
         <result column="task_id" jdbcType="BIGINT" property="taskId"/>
         <result column="workpiece_id" jdbcType="VARCHAR" property="workpieceId"/>
@@ -38,18 +37,19 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         id,create_time,create_user,update_time,update_user,
-        order_no, order_name, order_id,task_id,workpiece_id,workpiece_name,procedure_id,procedure_name,measuring_type,measuring_program,ok_flag,
+        order_no, orderName, order_id,task_id,workpiece_id,workpiece_name,procedure_id,procedure_name,measuring_type,measuring_program,ok_flag,
         sketchy_xaxis_offset,sketchy_yaxis_offset,sketchy_zaxis_offset,sketchy_aaxis_offset,sketchy_baxis_offset,sketchy_caxis_offset,
-        exact_xaxis_offset,exact_yaxis_offset,exact_zaxis_offset,exact_aaxis_offset,exact_baxis_offset,exact_caxis_offset,measuring_report,org_id
+        exact_xaxis_offset,exact_yaxis_offset,exact_zaxis_offset,exact_aaxis_offset,exact_baxis_offset,exact_caxis_offset,measuring_report,uniqueCode
     </sql>
 
     <!-- 分页 -->
     <select id="pageList" resultMap="BaseResultMap">
         select
         <include refid="Base_Column_List"/>
-        from (select w.*, o.order_name,z.org_id
+        from (select w.*, o.order_name AS orderName,z.org_id, itw.unique_code AS uniqueCode
         from imcs_order_quality_info w
             left join imcs_o_order o on w.order_id = o.id
+            left join imcs_t_workpiece itw on w.workpiece_id = itw.complete_batch_no
             left join imcs_z_zone z on o.zone_id = z.id
         ) s ${ew.customSqlSegment}
     </select>

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

@@ -202,7 +202,7 @@
     <select id="getTaskDdCount" resultType="map">
         select sum(producePlan) as producePlan,sum(delayPlan) as delayPlan,sum(producePart)producePart ,sum(badPart)badPart from
         (
-        select count(0)producePlan,0 as delayPlan,0 as producePart,0 as badPart from imcs_p_plan p where p.plan_status in('2','3')
+        select count(0)producePlan,0 as delayPlan,0 as producePart,0 as badPart from imcs_p_plan p where p.plan_status = '2'
         union ALL
         select 0 producePlan,COUNT(0) as delayPlan,0 as producePart,0 as badPart from imcs_p_plan p where p.finish_produce_time>p.end_time
         union ALL

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

@@ -1,5 +1,13 @@
 package com.github.zuihou.business.controller.operationManagementCenter;
-
+/**
+ * <p>
+ * 前端控制器
+ * 计划表
+ * </p>
+ *
+ * @author imcs
+ * @date 2020-12-29
+ */
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.zuihou.base.R;
@@ -28,15 +36,7 @@ import java.util.List;
 import java.util.Map;
 
 
-/**
- * <p>
- * 前端控制器
- * 计划表
- * </p>
- *
- * @author imcs
- * @date 2020-12-29
- */
+
 @Slf4j
 @Validated
 @RestController

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

@@ -57,19 +57,16 @@ public class OrderProduct extends Entity<Long> {
     /**
      * 计划id
      */
-    @ApiModelProperty(value = "计划id")
-    @NotNull(message = "计划id不能为空")
+    @ApiModelProperty(value = "订单id")
+    @NotNull(message = "订单id不能为空")
     @TableField("order_id")
-    @Excel(name = "计划id")
+    @Excel(name = "订单id")
     private Long orderId;
 
     /**
-     * 订单id
+     * 计划id
      */
-    @ApiModelProperty(value = "订单id")
-    @NotNull(message = "订单id不能为空")
-    @TableField("plan_id")
-    @Excel(name = "订单id")
+    @TableField(exist = false)
     private Long planId;
 
 

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

@@ -228,4 +228,12 @@ public class OrderQuality extends Entity {
     @Excel(name = "测量报告")
     private String measuringReport;
 
+    /**
+     * 零件唯一码
+     */
+    @ApiModelProperty(value = "零件唯一码")
+    @TableField(exist = false)
+    @Excel(name = "零件唯一码")
+    private String uniqueCode;
+
 }