计划

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

@@ -26,7 +26,7 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         id,create_time,update_time,
-        plan_no, order_id, audit_status, remark, create_user, plan_status, update_user, start_time, end_time, scheduling_status, produce_status,
+        plan_no, order_id, audit_status, remark, create_user, plan_status, update_user, start_time, end_time, scheduling_status, produce_status,partsNo,partsAlias,bomAlias,
          prority, status,rhythm_type,orderNo,orderStatus,bomDesc,process,planBomNum,zoenDesc,completeNum,qualification
     </sql>
 
@@ -35,7 +35,7 @@
         select
         <include refid="Base_Column_List"/>
         from (
-            select a.*,b.order_no as orderNo,b.order_status as orderStatus,b.custDesc as customDesc,c.bomDesc,
+            select a.*,b.order_no as orderNo,b.order_status as orderStatus,b.custDesc as customDesc,c.bomDesc,c.partsNo,c.partsAlias,c.bomAlias,
         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,
         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 (
@@ -43,7 +43,7 @@
                 left join imcs_c_cust cu on ord.cust_id = cu.id
         )b on a.order_id = b.id
         left join (
-                select pp.*,bo.name as bomDesc from imcs_p_plan_product pp
+                select pp.*,bo.name as bomDesc,bo.parts_no partsNo,bo.parts_alias partsAlias,bo.bom_alias bomAlias from imcs_p_plan_product pp
                 left join imcs_b_bom bo on pp.bom_id = bo.id
             ) c on a.id= c.plan_id
         left join (

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

@@ -234,6 +234,25 @@ public class Plan extends Entity<Long> {
     @TableField(exist = false)
     private String completeNum;
 
+    @ApiModelProperty(value = "零件编号")
+    @Length(max = 128, message = "零件编号长度不能超过128")
+    @TableField(exist = false)
+    private String partsNo;
+
+
+    @ApiModelProperty(value = "零件代号")
+    @Length(max = 128, message = "零件代号长度不能超过128")
+    @TableField(exist = false)
+    private String partsAlias;
+
+
+
+    @ApiModelProperty(value = "产品代号")
+    @Length(max = 128, message = "产品代号长度不能超过128")
+    @TableField(exist = false)
+    private String bomAlias;
+
+
 
     @Builder
     public Plan(Long id, LocalDateTime createTime, LocalDateTime updateTime,