Merge branch 'master' of http://121.40.234.130:8899/root/stand_lms

nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/dao/PdmBdWorkorder.java

@@ -29,8 +29,7 @@ public class PdmBdWorkorder implements Serializable {
     @ApiModelProperty(value = "工单编号")
     private String workorder_code;
 
-    @ApiModelProperty(value = "生产日期")
+
-    private String produce_date;
 
     @ApiModelProperty(value = "计划数量")
     private BigDecimal plan_qty;

nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/dto/PdmBdWorkorderDto.java

@@ -18,8 +18,6 @@ public class PdmBdWorkorderDto implements Serializable {
     /** 工单编号 */
     private String workorder_code;
 
-    /** 生产日期 */
-    private String produce_date;
 
     /** 计划数量 */
     private BigDecimal plan_qty;

nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/region/service/dao/SchBaseRegion.java

@@ -10,10 +10,10 @@ import lombok.EqualsAndHashCode;
 import java.io.Serializable;
 
 /**
-* @description /
+ * @description /
-* @author lyd
+ * @author lyd
-* @date 2023-05-15
+ * @date 2023-05-16
-**/
+ **/
 @Data
 @EqualsAndHashCode(callSuper = false)
 @TableName("sch_base_region")
@@ -61,4 +61,7 @@ public class SchBaseRegion implements Serializable {
     @ApiModelProperty(value = "修改时间")
     private String update_time;
 
+    @ApiModelProperty(value = "顺和号")
+    private Integer order_seq;
+
 }

nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/region/service/dto/SchBaseRegionDto.java

@@ -4,10 +4,10 @@ import lombok.Data;
 import java.io.Serializable;
 
 /**
-* @description /
+ * @description /
-* @author lyd
+ * @author lyd
-* @date 2023-05-15
+ * @date 2023-05-16
-**/
+ **/
 @Data
 public class SchBaseRegionDto implements Serializable {
 
@@ -24,7 +24,7 @@ public class SchBaseRegionDto implements Serializable {
     private String point_status_explain;
 
     /** 是否创建工单 */
-    private String is_has_workder;
+    private Boolean is_has_workder;
 
     /** 车间编码 */
     private String workshop_code;
@@ -33,7 +33,7 @@ public class SchBaseRegionDto implements Serializable {
     private String remark;
 
     /** 创建人 */
-    private Long create_id;
+    private String create_id;
 
     /** 创建人 */
     private String create_name;
@@ -42,11 +42,14 @@ public class SchBaseRegionDto implements Serializable {
     private String create_time;
 
     /** 修改人 */
-    private Long update_id;
+    private String update_id;
 
     /** 修改人 */
     private String update_name;
 
     /** 修改时间 */
     private String update_time;
+
+    /** 顺和号 */
+    private Integer order_seq;
 }

nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/region/service/impl/SchBaseRegionServiceImpl.java

@@ -46,7 +46,8 @@ public class SchBaseRegionServiceImpl extends ServiceImpl<SchBaseRegionMapper, S
         lam.eq(ObjectUtil.isNotEmpty(workshop_code), SchBaseRegion::getWorkshop_code, workshop_code)
                 .eq(ObjectUtil.isNotEmpty(is_has_workder), SchBaseRegion::getIs_has_workder, is_has_workder)
                 .like(ObjectUtil.isNotEmpty(blurry), SchBaseRegion::getRegion_code, blurry)
-                .or(ObjectUtil.isNotEmpty(blurry), la -> la.like(SchBaseRegion::getRegion_name, blurry));
+                .or(ObjectUtil.isNotEmpty(blurry), la -> la.like(SchBaseRegion::getRegion_name, blurry))
+                .orderByAsc(SchBaseRegion::getOrder_seq);
         IPage<SchBaseRegion> pages = new Page<>(page.getPage() + 1, page.getSize());
         schBaseRegionMapper.selectPage(pages, lam);
         return pages;

nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/controller/SchBaseTaskController.java

@@ -1,5 +1,8 @@
 package org.nl.wms.sch.task.controller;
 
+import cn.dev33.satoken.annotation.SaIgnore;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -13,6 +16,7 @@ import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
+import sun.security.krb5.internal.PAData;
 
 import java.util.Map;
 import java.util.Set;
@@ -63,4 +67,15 @@ public class SchBaseTaskController {
         schBaseTaskService.deleteAll(ids);
         return new ResponseEntity<>(HttpStatus.OK);
     }
+
+    @PostMapping("/apply")
+    @Log("新增任务管理")
+    @ApiOperation("新增任务管理")
+    //@SaCheckPermission("@el.check('schBaseTask:add')")
+    @SaIgnore
+    public ResponseEntity<Object> apply(@RequestBody Map param){
+        schBaseTaskService.apply(JSONObject.parseObject(JSON.toJSONString(param)));
+        return new ResponseEntity<>(HttpStatus.CREATED);
+    }
+
 }

nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/core/task/TaskListType.java

@@ -1 +0,0 @@
-package org.nl.wms.sch.task.core.task;

nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/core/task/core/BaseTask.java

@@ -1 +0,0 @@
-package org.nl.wms.sch.task.core.task.core;

nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/core/task/core/TaskApplyDto.java

@@ -1 +0,0 @@
-package org.nl.wms.sch.task.core.task.core;

nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/core/task/core/TaskInterface.java

@@ -1 +0,0 @@
-package org.nl.wms.sch.task.core.task.core;

nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/core/task/core/TaskOperateType.java

@@ -1 +0,0 @@
-package org.nl.wms.sch.task.core.task.core;

nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/core/task/core/TaskStatus.java

@@ -1 +0,0 @@
-package org.nl.wms.sch.task.core.task.core;

nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/core/task/tasks/HNMLTask.java

@@ -1 +0,0 @@
-package org.nl.wms.sch.task.core.task.tasks;

nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/ISchBaseTaskService.java

@@ -1,43 +1,66 @@
 package org.nl.wms.sch.task.service;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.nl.common.domain.query.PageQuery;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.nl.wms.sch.task.service.dao.SchBaseTask;
 
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
 /**
-* @description 服务接口
+ * @author lyd
-* @author lyd
+ * @description 服务接口
-* @date 2023-05-15
+ * @date 2023-05-15
-**/
+ **/
 public interface ISchBaseTaskService extends IService<SchBaseTask> {
 
     /**
-    * 查询数据分页
+     * 查询数据分页
-    * @param whereJson 条件
+     *
-    * @param pageable 分页参数
+     * @param whereJson 条件
-    * @return IPage<SchBaseTask>
+     * @param pageable  分页参数
-    */
+     * @return IPage<SchBaseTask>
+     */
     IPage<SchBaseTask> queryAll(Map whereJson, PageQuery pageable);
 
+
     /**
-    * 创建
+     * 创建
-    * @param entity /
+     *
-    */
+     * @param entity /
+     */
     void create(SchBaseTask entity);
 
     /**
-    * 编辑
+     * 编辑
-    * @param entity /
+     *
-    */
+     * @param entity /
+     */
     void update(SchBaseTask entity);
 
     /**
-    * 多选删除
+     * 多选删除
-    * @param ids /
+     *
-    */
+     * @param ids /
+     */
     void deleteAll(Set<String> ids);
+
+
+    /**
+     * 根据任务配置查询为完成的任务数
+     *
+     * @param config_code 任务配置编码
+     * @return 未完成任务列表
+     */
+    List<SchBaseTask> findUnFishedTasksByTaskConfig(String config_code);
+
+    /**
+     * 任务申请
+     *
+     * @param param /
+     */
+    void apply(JSONObject param);
 }

nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dao/SchBaseTask.java

@@ -26,8 +26,6 @@ public class SchBaseTask implements Serializable {
     @ApiModelProperty(value = "任务编码")
     private String task_code;
 
-    @ApiModelProperty(value = "任务分类")
-    private String task_class_id;
 
     @ApiModelProperty(value = "任务状态")
     private String task_status;
@@ -56,11 +54,6 @@ public class SchBaseTask implements Serializable {
     @ApiModelProperty(value = "载具编码")
     private String vehicle_code;
 
-    @ApiModelProperty(value = "优先级")
-    private String priority;
-
-    @ApiModelProperty(value = "处理类")
-    private String handle_class;
 
     @ApiModelProperty(value = "处理状态")
     private String handle_status;
@@ -68,8 +61,6 @@ public class SchBaseTask implements Serializable {
     @ApiModelProperty(value = "车号")
     private String car_no;
 
-    @ApiModelProperty(value = "是否自动下发")
-    private Boolean is_auto_issue;
 
     @ApiModelProperty(value = "任务组标识")
     private Long task_group_id;

nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dao/SchBaseTaskconfig.java

@@ -47,10 +47,10 @@ public class SchBaseTaskconfig implements Serializable {
     private String priority;
 
     @ApiModelProperty(value = "允许最大任务生成数")
-    private BigDecimal task_create_num;
+    private Integer task_create_max_num;
 
     @ApiModelProperty(value = "允许最大任务下发数")
-    private BigDecimal task_issue_num;
+    private Integer task_issue_max_num;
 
     @ApiModelProperty(value = "是否自动下发")
     private Boolean is_auto_issue;

nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dto/SchBaseTaskDto.java

@@ -15,8 +15,6 @@ public class SchBaseTaskDto implements Serializable {
     /** 任务编码 */
     private String task_code;
 
-    /** 任务分类 */
-    private String task_class_id;
 
     /** 任务状态 */
     private String task_status;
@@ -45,20 +43,12 @@ public class SchBaseTaskDto implements Serializable {
     /** 载具编码 */
     private String vehicle_code;
 
-    /** 优先级 */
-    private String priority;
-
-    /** 处理类 */
-    private String handle_class;
-
     /** 处理状态 */
     private String handle_status;
 
     /** 车号 */
     private String car_no;
 
-    /** 是否自动下发 */
-    private Boolean is_auto_issue;
 
     /** 任务组标识 */
     private Long task_group_id;

nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dto/SchBaseTaskconfigDto.java

@@ -34,10 +34,10 @@ public class SchBaseTaskconfigDto implements Serializable {
     private String priority;
 
     /** 允许最大任务生成数 */
-    private BigDecimal task_create_num;
+    private Integer task_create_max_num;
 
     /** 允许最大任务下发数 */
-    private BigDecimal task_issue_num;
+    private Integer task_issue_max_num;
 
     /** 是否自动下发 */
     private Boolean is_auto_issue;

nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/impl/SchBaseTaskServiceImpl.java

@@ -1,12 +1,14 @@
 package org.nl.wms.sch.task.service.impl;
 
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.lang.Assert;
 import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.common.domain.query.PageQuery;
 import org.nl.common.exception.BadRequestException;
@@ -14,17 +16,20 @@ import org.nl.common.utils.SecurityUtils;
 import org.nl.wms.sch.task.service.ISchBaseTaskService;
 import org.nl.wms.sch.task.service.dao.mapper.SchBaseTaskMapper;
 import org.nl.wms.sch.task.service.dao.SchBaseTask;
+import org.nl.wms.sch.task_manage.BaseTask;
+import org.nl.wms.sch.task_manage.task.TaskFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
 /**
-* @description 服务实现
+ * @author lyd
-* @author lyd
+ * @description 服务实现
-* @date 2023-05-15
+ * @date 2023-05-15
-**/
+ **/
 @Slf4j
 @Service
 public class SchBaseTaskServiceImpl extends ServiceImpl<SchBaseTaskMapper, SchBaseTask> implements ISchBaseTaskService {
@@ -33,28 +38,14 @@ public class SchBaseTaskServiceImpl extends ServiceImpl<SchBaseTaskMapper, SchBa
     private SchBaseTaskMapper schBaseTaskMapper;
 
     @Override
-    public IPage<SchBaseTask> queryAll(Map whereJson, PageQuery page){
+    public IPage<SchBaseTask> queryAll(Map whereJson, PageQuery page) {
         LambdaQueryWrapper<SchBaseTask> lam = new LambdaQueryWrapper<>();
         IPage<SchBaseTask> pages = new Page<>(page.getPage() + 1, page.getSize());
         schBaseTaskMapper.selectPage(pages, lam);
         return pages;
     }
 
-    @Override
-    public void create(SchBaseTask entity) {
-        String currentUserId = SecurityUtils.getCurrentUserId();
-        String nickName = SecurityUtils.getCurrentNickName();
-        String now = DateUtil.now();
 
-        entity.setTask_code(IdUtil.getSnowflake(1, 1).nextIdStr());
-        entity.setCreate_id(currentUserId);
-        entity.setCreate_name(nickName);
-        entity.setCreate_time(now);
-        entity.setUpdate_id(currentUserId);
-        entity.setUpdate_name(nickName);
-        entity.setUpdate_time(now);
-        schBaseTaskMapper.insert(entity);
-    }
 
     @Override
     public void update(SchBaseTask entity) {
@@ -77,4 +68,43 @@ public class SchBaseTaskServiceImpl extends ServiceImpl<SchBaseTaskMapper, SchBa
         schBaseTaskMapper.deleteBatchIds(ids);
     }
 
+    @Override
+    public List<SchBaseTask> findUnFishedTasksByTaskConfig(String config_code) {
+        return null;
+    }
+
+    @Override
+    public void create(SchBaseTask entity) {
+        String currentUserId = SecurityUtils.getCurrentUserId();
+        String nickName = SecurityUtils.getCurrentNickName();
+        String now = DateUtil.now();
+//        if (ObjectUtil.isEmpty(entity.getTask_status())) throw new BadRequestException("任务状态不能为空!");
+        Assert.notNull(entity.getTask_status(),"任务状态不能为空!");
+
+        entity.setTask_code(IdUtil.getSnowflake(1, 1).nextIdStr());
+        entity.setCreate_id(currentUserId);
+        entity.setCreate_name(nickName);
+        entity.setCreate_time(now);
+        entity.setUpdate_id(currentUserId);
+        entity.setUpdate_name(nickName);
+        entity.setUpdate_time(now);
+        schBaseTaskMapper.insert(entity);
+
+    }
+
+    @Override
+    public void apply(JSONObject param) {
+        String device_code = "123";
+        String type = "123";
+        String vehicle_code = "123";
+
+        //1、如果是送料，检测载具状态
+        //2、送空载具
+        //3、叫料
+        //4、叫空载具
+        TaskFactory taskFactory = new TaskFactory();
+        BaseTask task = taskFactory.getTask("HNMLTask");
+        task.apply(param);
+    }
+
 }

nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/BaseTask.java

@@ -0,0 +1,48 @@
+package org.nl.wms.sch.task_manage;
+
+import com.alibaba.fastjson.JSONObject;
+import org.nl.config.SpringContextHolder;
+import org.nl.wms.sch.task.service.ISchBaseTaskService;
+import org.nl.wms.sch.task.service.dao.SchBaseTask;
+import org.nl.wms.sch.task.service.dao.SchBaseTaskconfig;
+import org.nl.wms.sch.task.service.impl.SchBaseTaskServiceImpl;
+import org.nl.wms.sch.task.service.impl.SchBaseTaskconfigServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * @author ldjun
+ * @version 1.0
+ * @date 2023年05月16日 16:42
+ * @desc desc
+ */
+
+public abstract class BaseTask {
+    @Autowired
+    private ISchBaseTaskService taskService;
+
+    public void apply(JSONObject param) {
+        //1、校验数据
+        SchBaseTaskconfig taskConfig = SpringContextHolder.getBean(SchBaseTaskconfigServiceImpl.class).getById(null);
+        Integer tcmn = taskConfig.getTask_create_max_num();
+
+        SpringContextHolder.getBean(SchBaseTaskServiceImpl.class);
+
+
+        SchBaseTask task = new SchBaseTask();
+        task.setAcs_trace_id("");
+        task.setConfig_code("");
+        task.setCreate_id("");
+        task.setCreate_mode("");
+        task.setPoint_code1("");
+        task.setVehicle_code("");
+//        task.setTask_status("01");
+        SpringContextHolder.getBean(SchBaseTaskServiceImpl.class).create(task);
+        //1、如果是送料，检测载具状态
+        //2、送空载具
+        //3、叫料
+        //4、叫空载具
+
+        //校验
+
+    }
+}

nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/TaskFactory.java

@@ -0,0 +1,23 @@
+package org.nl.wms.sch.task_manage.task;
+
+import org.nl.wms.sch.task_manage.BaseTask;
+import org.nl.wms.sch.task_manage.task.tasks.HNMLTask;
+
+/**
+ * @author ldjun
+ * @version 1.0
+ * @date 2023年05月16日 16:42
+ * @desc desc
+ */
+public class TaskFactory {
+    //使用 getShape 方法获取形状类型的对象
+    public BaseTask getTask(String taskType) {
+        if (taskType == null) {
+            return null;
+        }
+        if (taskType.equalsIgnoreCase("HNMLTask")) {
+            return new HNMLTask();
+        }
+        return null;
+    }
+}

nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/TaskListType.java

@@ -0,0 +1 @@
+package org.nl.wms.sch.task_manage.task;

nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/TaskServiceImpl.java

@@ -1,4 +1,4 @@
-package org.nl.wms.sch.task.core.task;
+package org.nl.wms.sch.task_manage.task;
 
 import cn.hutool.core.lang.Assert;
 import com.alibaba.fastjson.JSONObject;

nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/core/BaseTask.java

@@ -0,0 +1 @@
+package org.nl.wms.sch.task_manage.task.core;

nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/core/BaseTaskDto.java

@@ -1,4 +1,4 @@
-package org.nl.wms.sch.task.core.task.core;
+package org.nl.wms.sch.task_manage.task.core;
 
 /**
  * @author ldjun

nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/core/TaskApplyDto.java

@@ -0,0 +1 @@
+package org.nl.wms.sch.task_manage.task.core;

nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/core/TaskApplyType.java

@@ -1,4 +1,4 @@
-package org.nl.wms.sch.task.core.task.core;
+package org.nl.wms.sch.task_manage.task.core;
 
 /**
  * @author ldjun

nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/core/TaskDto.java

@@ -1,4 +1,4 @@
-package org.nl.wms.sch.task.core.task.core;
+package org.nl.wms.sch.task_manage.task.core;
 
 /**
  * @author ldjun

nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/core/TaskInterface.java

@@ -0,0 +1 @@
+package org.nl.wms.sch.task_manage.task.core;

nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/core/TaskOperateType.java

@@ -0,0 +1 @@
+package org.nl.wms.sch.task_manage.task.core;

nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/core/TaskStatus.java

@@ -0,0 +1 @@
+package org.nl.wms.sch.task_manage.task.core;

nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/HNMLTask.java

@@ -0,0 +1,12 @@
+package org.nl.wms.sch.task_manage.task.tasks;
+
+import org.nl.wms.sch.task_manage.BaseTask;
+
+/**
+ * @author ldjun
+ * @version 1.0
+ * @date 2023年05月16日 16:44
+ * @desc desc
+ */
+public class HNMLTask extends BaseTask {
+}

nladmin-ui/src/views/wms/pdm/workerorder/index.vue

@@ -18,9 +18,6 @@
           <el-form-item label="工单编号">
             <el-input v-model="form.workorder_code" style="width: 240px;" />
           </el-form-item>
-          <el-form-item label="生产日期">
-            <el-input v-model="form.produce_date" style="width: 240px;" />
-          </el-form-item>
           <el-form-item label="计划数量">
             <el-input v-model="form.plan_qty" style="width: 240px;" />
           </el-form-item>
@@ -79,7 +76,6 @@
       <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
         <el-table-column type="selection" width="55" />
         <el-table-column prop="workorder_code" label="工单编号" :min-width="flexWidth('workorder_code',crud.data,'工单编号')"/>
-        <el-table-column prop="produce_date" label="生产日期" :min-width="flexWidth('produce_date',crud.data,'生产日期')"/>
         <el-table-column prop="plan_qty" label="计划数量" :min-width="flexWidth('plan_qty',crud.data,'计划数量')"/>
         <el-table-column prop="real_qty" label="实际数量" :min-width="flexWidth('real_qty',crud.data,'实际数量')"/>
         <el-table-column prop="material_id" label="物料标识" :min-width="flexWidth('material_id',crud.data,'物料标识')"/>
@@ -128,7 +124,6 @@ import pagination from '@crud/Pagination'
 const defaultForm = {
   workorder_id: null,
   workorder_code: null,
-  produce_date: null,
   plan_qty: null,
   real_qty: null,
   material_id: null,

nladmin-ui/src/views/wms/sch/region/index.vue

@@ -35,14 +35,6 @@
               @keyup.enter.native="crud.toQuery"
             />
           </el-form-item>
-          <el-form-item label="是否建工单">
-            <el-switch
-              v-model="query.is_has_workder"
-              active-color="#409EFF"
-              inactive-color="#C0CCDA"
-              @change="hand"
-            />
-          </el-form-item>
           <rrOperation />
         </el-form>
       </div>
@@ -75,6 +67,18 @@
           <el-form-item label="区域名称">
             <el-input v-model="form.region_name" style="width: 370px;" />
           </el-form-item>
+          <el-form-item label="顺序号">
+            <label slot="label">顺序号</label>
+            <el-input-number
+              v-model="form.order_seq"
+              :controls="true"
+              :precision="0"
+              :min="0"
+              :step="1"
+              style="width: 370px"
+            />
+          </el-form-item>
+
           <el-form-item label="点位类型说明">
             <el-input v-model="form.point_type_explain" style="width: 370px;" />
           </el-form-item>
@@ -118,6 +122,7 @@
           </template>
         </el-table-column>
         <el-table-column prop="workshop_code" label="车间编码" :min-width="flexWidth('workshop_code',crud.data,'车间编码')" />
+        <el-table-column prop="order_seq" label="顺序号" :min-width="flexWidth('order_seq',crud.data,'顺序号')" />
         <el-table-column prop="remark" label="备注" :min-width="flexWidth('remark',crud.data,'备注')" />
         <el-table-column prop="create_name" label="创建人" :min-width="flexWidth('create_name',crud.data,'创建人')" />
         <el-table-column prop="create_time" label="创建时间" :min-width="flexWidth('create_time',crud.data,'创建时间')" />
@@ -154,6 +159,7 @@ const defaultForm = {
   point_status_explain: null,
   is_has_workder: 'true',
   workshop_code: null,
+  order_seq: 0,
   remark: null
 }
 export default {
@@ -167,10 +173,7 @@ export default {
       url: 'api/schBaseRegion',
       idField: 'region_code',
       sort: 'region_code,desc',
-      crudMethod: { ...crudSchBaseRegion },
+      crudMethod: { ...crudSchBaseRegion }
-      query: {
-        is_has_workder: true
-      }
     })
   },
   created() {

nladmin-ui/src/views/wms/sch/task/index.vue

@@ -5,85 +5,82 @@
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
       <crudOperation :permission="permission" />
       <!--表单组件-->
-      <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="500px">
+      <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="800px">
-        <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
+        <el-form ref="form" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true" :model="form" :rules="rules" size="mini" label-width="115px" label-suffix=":">
           <el-form-item label="任务编码">
-            <el-input v-model="form.task_code" style="width: 370px;" />
+            <el-input v-model="form.task_code" style="width: 240px;" />
           </el-form-item>
           <el-form-item label="任务分类">
-            <el-input v-model="form.task_class_id" style="width: 370px;" />
+            <el-input v-model="form.task_class_id" style="width: 240px;" />
           </el-form-item>
           <el-form-item label="任务状态">
-            <el-input v-model="form.task_status" style="width: 370px;" />
+            <el-input v-model="form.task_status" style="width: 240px;" />
           </el-form-item>
           <el-form-item label="配置编码">
-            <el-input v-model="form.config_code" style="width: 370px;" />
+            <el-input v-model="form.config_code" style="width: 240px;" />
           </el-form-item>
           <el-form-item label="点位1">
-            <el-input v-model="form.point_code1" style="width: 370px;" />
+            <el-input v-model="form.point_code1" style="width: 240px;" />
           </el-form-item>
           <el-form-item label="点位2">
-            <el-input v-model="form.point_code2" style="width: 370px;" />
+            <el-input v-model="form.point_code2" style="width: 240px;" />
           </el-form-item>
           <el-form-item label="点位3">
-            <el-input v-model="form.point_code3" style="width: 370px;" />
+            <el-input v-model="form.point_code3" style="width: 240px;" />
           </el-form-item>
           <el-form-item label="点位4">
-            <el-input v-model="form.point_code4" style="width: 370px;" />
+            <el-input v-model="form.point_code4" style="width: 240px;" />
           </el-form-item>
           <el-form-item label="载具类型">
-            <el-input v-model="form.vehicle_type" style="width: 370px;" />
+            <el-input v-model="form.vehicle_type" style="width: 240px;" />
           </el-form-item>
           <el-form-item label="载具数量">
-            <el-input v-model="form.vehicle_qty" style="width: 370px;" />
+            <el-input v-model="form.vehicle_qty" style="width: 240px;" />
           </el-form-item>
           <el-form-item label="载具编码">
-            <el-input v-model="form.vehicle_code" style="width: 370px;" />
+            <el-input v-model="form.vehicle_code" style="width: 240px;" />
           </el-form-item>
           <el-form-item label="优先级">
-            <el-input v-model="form.priority" style="width: 370px;" />
+            <el-input v-model="form.priority" style="width: 240px;" />
           </el-form-item>
-          <el-form-item label="处理类">
+          <el-form-item v-if="false" label="处理类">
-            <el-input v-model="form.handle_class" style="width: 370px;" />
+            <el-input v-model="form.handle_class" style="width: 240px;" />
           </el-form-item>
           <el-form-item label="处理状态">
-            <el-input v-model="form.handle_status" style="width: 370px;" />
+            <el-input v-model="form.handle_status" style="width: 240px;" />
           </el-form-item>
           <el-form-item label="车号">
-            <el-input v-model="form.car_no" style="width: 370px;" />
+            <el-input v-model="form.car_no" style="width: 240px;" />
-          </el-form-item>
-          <el-form-item label="是否自动下发">
-            <el-input v-model="form.is_auto_issue" style="width: 370px;" />
           </el-form-item>
           <el-form-item label="任务组标识">
-            <el-input v-model="form.task_group_id" style="width: 370px;" />
+            <el-input v-model="form.task_group_id" style="width: 240px;" />
           </el-form-item>
           <el-form-item label="任务组顺序号">
-            <el-input v-model="form.task_group_seq" style="width: 370px;" />
+            <el-input v-model="form.task_group_seq" style="width: 240px;" />
           </el-form-item>
           <el-form-item label="任务完成类型">
-            <el-input v-model="form.finished_type" style="width: 370px;" />
+            <el-input v-model="form.finished_type" style="width: 240px;" />
           </el-form-item>
           <el-form-item label="生成方式">
-            <el-input v-model="form.create_mode" style="width: 370px;" />
+            <el-input v-model="form.create_mode" style="width: 240px;" />
           </el-form-item>
           <el-form-item label="链路标识">
-            <el-input v-model="form.acs_trace_id" style="width: 370px;" />
+            <el-input v-model="form.acs_trace_id" style="width: 240px;" />
           </el-form-item>
-          <el-form-item label="生成任务的请求参数">
+          <el-form-item v-if="false" label="生成任务的请求参数">
-            <el-input v-model="form.request_param" style="width: 370px;" />
+            <el-input v-model="form.request_param" style="width: 240px;" />
           </el-form-item>
           <el-form-item label="下发任务的请求参数">
-            <el-input v-model="form.response_param" style="width: 370px;" />
+            <el-input v-model="form.response_param" style="width: 240px;" />
           </el-form-item>
           <el-form-item label="车间编码">
-            <el-input v-model="form.workshop_code" style="width: 370px;" />
+            <el-input v-model="form.workshop_code" style="width: 240px;" />
           </el-form-item>
           <el-form-item label="额外组盘信息">
-            <el-input v-model="form.ext_group_data" style="width: 370px;" />
+            <el-input v-model="form.ext_group_data" style="width: 240px;" />
           </el-form-item>
           <el-form-item label="备注">
-            <el-input v-model="form.remark" style="width: 370px;" />
+            <el-input v-model="form.remark" style="width: 240px;" />
           </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
@@ -106,10 +103,9 @@
         <el-table-column prop="vehicle_qty" label="载具数量" :min-width="flexWidth('vehicle_qty',crud.data,'载具数量')"/>
         <el-table-column prop="vehicle_code" label="载具编码" :min-width="flexWidth('vehicle_code',crud.data,'载具编码')"/>
         <el-table-column prop="priority" label="优先级" :min-width="flexWidth('priority',crud.data,'优先级')"/>
-        <el-table-column prop="handle_class" label="处理类" :min-width="flexWidth('handle_class',crud.data,'处理类')"/>
+        <el-table-column prop="handle_class" v-if="false" label="处理类" :min-width="flexWidth('handle_class',crud.data,'处理类')"/>
         <el-table-column prop="handle_status" label="处理状态" :min-width="flexWidth('handle_status',crud.data,'处理状态')"/>
         <el-table-column prop="car_no" label="车号" :min-width="flexWidth('car_no',crud.data,'车号')"/>
-        <el-table-column prop="is_auto_issue" label="是否自动下发" :min-width="flexWidth('is_auto_issue',crud.data,'是否自动下发')"/>
         <el-table-column prop="task_group_id" label="任务组标识" :min-width="flexWidth('task_group_id',crud.data,'任务组标识')"/>
         <el-table-column prop="task_group_seq" label="任务组顺序号" :min-width="flexWidth('task_group_seq',crud.data,'任务组顺序号')"/>
         <el-table-column prop="finished_type" label="任务完成类型" :min-width="flexWidth('finished_type',crud.data,'任务完成类型')"/>
@@ -163,7 +159,6 @@ const defaultForm = {
   handle_class: null,
   handle_status: null,
   car_no: null,
-  is_auto_issue: null,
   task_group_id: null,
   task_group_seq: null,
   finished_type: null,