添加产线字段

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

@@ -39,7 +39,7 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         id,create_time,update_time,update_user,
-        order_id,order_no, plan_id,plan_no, resource_id, procedure_id,procedure_name, task_no, status, expect_start_time, expect_end_time, start_time, end_time,order_name,
+        order_id,order_no, plan_id,plan_no, resource_id, procedure_id,procedure_name, task_no, status, expect_start_time, expect_end_time, start_time, end_time,orderName,
         prority, draft_flag, executor_id, executor_type, executor_name,procedure_meterial_id, procedure_tray_group_id, procedure_program_id, task_batch_no,process,bom_batch_no,
         overtimeStatus,bomDesc,procedure_no,planTime,ratedWorkHours,actualTime,resourceDesc,content,prepareWorkHours,bomNo,procedureDesc,ip,port
     </sql>
@@ -114,13 +114,14 @@
         from (
             select a.*,(case when TO_DAYS(NOW())-TO_DAYS(b.end_time) > 0 then '超时' else '否' end)as overtimeStatus,bo.name bomDesc,
             concat(a.expect_start_time,'到',a.expect_end_time) as planTime,d.rated_workHours as
-            ratedWorkHours,concat(a.start_time,'到',a.end_time) as actualTime,
+            ratedWorkHours,concat(a.start_time,'到',a.end_time) as actualTime,o.order_name orderName,
             b.plan_no as planNo,f.name as resourceDesc,d.content,d.prepare_workHours as prepareWorkHours,bo.no as bomNo,d.name as procedureDesc,f.ip,f.port
             from imcs_t_task a
             left join imcs_p_plan b on a.plan_id = b.id
             left join imcs_b_bom bo on a.bom_id = bo.id
             left join imcs_b_bom_procedure d on a.procedure_id = d.id
             left join imcs_tenant_productionresource f on a.resource_id = f.id
+             left join imcs_o_order o on a.order_id = o.id
         where 1=1
         <if test="mulPlanStatus != null and mulPlanStatus != ''">
             and b.plan_status in(${mulPlanStatus})

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

@@ -258,7 +258,7 @@ public class TTask extends Entity<Long> {
     @ApiModelProperty(value = "订单名称")
     @NotEmpty(message = "订单名称不能为空")
     @Length(max = 128, message = "订单名称长度不能超过128")
-    @TableField(value = "order_name", condition = LIKE)
+    @TableField(exist = false)
     @Excel(name = "订单名称")
     private String orderName;