Browse Source

添加产线字段

laoyao 3 năm trước cách đây
mục cha
commit
3cbe8797fe

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

@@ -39,7 +39,7 @@
     <!-- 通用查询结果列 -->
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
     <sql id="Base_Column_List">
         id,create_time,update_time,update_user,
         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_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,
         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,
         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
         overtimeStatus,bomDesc,procedure_no,planTime,ratedWorkHours,actualTime,resourceDesc,content,prepareWorkHours,bomNo,procedureDesc,ip,port
     </sql>
     </sql>

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

@@ -255,7 +255,12 @@ public class TTask extends Entity<Long> {
     @Excel(name = "计划状态(1-未开始2-进行中3-完成)")
     @Excel(name = "计划状态(1-未开始2-进行中3-完成)")
     private String mulPlanStatus;
     private String mulPlanStatus;
 
 
-
+    @ApiModelProperty(value = "订单名称")
+    @NotEmpty(message = "订单名称不能为空")
+    @Length(max = 128, message = "订单名称长度不能超过128")
+    @TableField(value = "order_name", condition = LIKE)
+    @Excel(name = "订单名称")
+    private String orderName;
 
 
     /**
     /**
      * 任务批次号
      * 任务批次号