add:任务页面

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/controller/SchBaseTaskController.java

@@ -1,9 +1,31 @@
 package org.nl.wms.dispatch_manage.task.controller;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
+import cn.hutool.core.date.DateUtil;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.nl.common.TableDataInfo;
+import org.nl.common.anno.Log;
+import org.nl.common.domain.entity.PageQuery;
+import org.nl.common.domain.exception.BadRequestException;
+import org.nl.common.enums.StatusEnum;
+import org.nl.common.utils.IdUtil;
+import org.nl.common.utils.SecurityUtils;
+import org.nl.wms.dispatch_manage.task.service.ISchBaseTaskService;
+import org.nl.wms.dispatch_manage.task.service.dao.SchBaseTask;
+import org.nl.wms.dispatch_manage.task.service.dto.TaskQuery;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.util.CollectionUtils;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
 
-import org.springframework.web.bind.annotation.RestController;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -14,8 +36,69 @@ import org.springframework.web.bind.annotation.RestController;
  * @since 2024-05-06
  */
 @RestController
-@RequestMapping("/schBaseTask")
+@RequestMapping("api/schBaseTask")
 public class SchBaseTaskController {
 
+    @Autowired
+    private ISchBaseTaskService iSchBaseTaskService;
+
+    @PostMapping("getVehicleTask")
+    public ResponseEntity<Object> getVehicleTask(@RequestBody JSONObject param) {
+        if (CollectionUtils.isEmpty(param)){
+            throw new BadRequestException("参数不能为空");
+        }
+        return new ResponseEntity<>(iSchBaseTaskService.getByVehicle(param.getString("vehicle_code")), HttpStatus.OK);
+    }
+
+    @GetMapping
+    @Log("查询任务")
+    public ResponseEntity<Object> query(TaskQuery query, PageQuery pageQuery) {
+        Page<SchBaseTask> page = iSchBaseTaskService.page(pageQuery.build(), query.build());
+        return new ResponseEntity<>(TableDataInfo.build(page), HttpStatus.OK);
+    }
+
+
+    @GetMapping("/undo")
+    @Log("查询任务")
+    public ResponseEntity<Object> undo() {
+        int count = iSchBaseTaskService.count(new QueryWrapper<SchBaseTask>()
+                .lt("task_status", StatusEnum.FORM_STATUS.code("完成")));
+        return new ResponseEntity<>(count, HttpStatus.OK);
+    }
+
+    @PostMapping
+    @Log("新增任务")
+    public ResponseEntity<Object> create(@RequestBody JSONObject task) {
+        SchBaseTask schBaseTask = task.toJavaObject(SchBaseTask.class);
+        schBaseTask.setId(IdUtil.getStringId());
+        schBaseTask.setCreate_name(SecurityUtils.getCurrentNickName());
+        schBaseTask.setCreate_time(DateUtil.now());
+        iSchBaseTaskService.save(schBaseTask);
+        return new ResponseEntity<>(HttpStatus.CREATED);
+    }
+
+    @PutMapping
+    @Log("修改任务")
+    public ResponseEntity<Object> update(@Validated @RequestBody JSONObject task) {
+        iSchBaseTaskService.updateById(task.toJavaObject(SchBaseTask.class));
+        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
+    }
+
+    @DeleteMapping
+    @Log("删除任务")
+    public ResponseEntity<Object> delete(@RequestBody String[] ids) {
+        if (ids!=null && ids.length>0){
+            iSchBaseTaskService.removeByIds(Arrays.asList(ids));
+        }
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+
+    @PostMapping("/operation")
+    @Log("任务操作")
+    public ResponseEntity<Object> taskOperation(@RequestBody JSONObject map) {
+        iSchBaseTaskService.operation(map);
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+
 }
 

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/ISchBaseTaskService.java

@@ -5,6 +5,9 @@ import com.alibaba.fastjson.JSONObject;
 import org.nl.wms.dispatch_manage.task.service.dao.SchBaseTask;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 任务表 服务类
@@ -16,4 +19,10 @@ import com.baomidou.mybatisplus.extension.service.IService;
 public interface ISchBaseTaskService extends IService<SchBaseTask> {
 
         void createTask(SchBaseTask task);
+
+        void operation(JSONObject param);
+
+
+        List<Map> getByVehicle(String vehicle_code);
+
 }

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/dao/mapper/SchBaseTaskMapper.java

@@ -1,8 +1,12 @@
 package org.nl.wms.dispatch_manage.task.service.dao.mapper;
 
+import org.apache.ibatis.annotations.Select;
 import org.nl.wms.dispatch_manage.task.service.dao.SchBaseTask;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 任务表 Mapper 接口
@@ -13,4 +17,13 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface SchBaseTaskMapper extends BaseMapper<SchBaseTask> {
 
+    @Select("SELECT\n" +
+            "\tsch_base_task.*, md_pb_vehicleMater.*,md_me_materialbase.material_code,md_me_materialbase.material_name,md_me_materialbase.material_spec\n" +
+            "FROM\n" +
+            "\tsch_base_task\n" +
+            "\tLEFT JOIN md_pb_vehicleMater ON sch_base_task.vehicle_code = md_pb_vehicleMater.vehicle_code \n" +
+            "\tleft join md_me_materialbase on md_pb_vehicleMater.material_id = md_me_materialbase.material_id\n" +
+            "WHERE\n" +
+            "\tsch_base_task.vehicle_code = #{vehicle_code}")
+    List<Map> getByVehicle(String vehicle_code);
 }

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/dto/TaskQuery.java

@@ -0,0 +1,45 @@
+package org.nl.wms.dispatch_manage.task.service.dto;
+
+import lombok.Data;
+import org.nl.common.domain.entity.BaseQuery;
+import org.nl.common.domain.entity.QParam;
+import org.nl.common.enums.QueryTEnum;
+import org.nl.wms.dispatch_manage.task.service.dao.SchBaseTask;
+
+/*
+ * @author ZZQ
+ * @Date 2024/5/23 20:10
+ */
+@Data
+public class TaskQuery extends BaseQuery<SchBaseTask> {
+    /**
+     * 任务编码
+     */
+    private String task_code;
+    /**
+     * 任务类型
+     */
+    private String task_type;
+    /**
+     * Acs任务类型
+     */
+    private String acs_type;
+    /**
+     * 任务状态
+     */
+    private String task_status;
+    /**
+     * 点位
+     */
+    private String point_code;
+    /**
+     * 载具编码1
+     */
+    private String vehicle_code;
+
+
+    @Override
+    public void paramMapping() {
+        super.doP.put("point_code", QParam.builder().k(new String[]{"point_code1","point_code2"}).type(QueryTEnum.ORLK).build());
+    }
+}

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/impl/SchBaseTaskServiceImpl.java

@@ -1,6 +1,7 @@
 package org.nl.wms.dispatch_manage.task.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
+import org.apache.commons.lang3.StringUtils;
 import org.nl.common.utils.ListOf;
 import org.nl.wms.dispatch_manage.task.handler.TaskHandler;
 import org.nl.wms.dispatch_manage.task.service.dao.SchBaseTask;
@@ -11,6 +12,8 @@ import org.nl.wms.external_system.acs.service.WmsToAcsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -31,6 +34,18 @@ public class SchBaseTaskServiceImpl extends ServiceImpl<SchBaseTaskMapper, SchBa
     @Override
     public void createTask(SchBaseTask task) {
         this.save(task);
-//        wmsToAcsService.interationToExt(ListOf.of(task));
+    }
+
+    @Override
+    public List<Map> getByVehicle(String vehicle_code) {
+        if (StringUtils.isEmpty(vehicle_code)){
+            return new ArrayList<>();
+        }
+        return this.baseMapper.getByVehicle(vehicle_code);
+    }
+
+    @Override
+    public void operation(JSONObject param) {
+
     }
 }

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/engine/behavior/FlowNodeActivityBehavior.java

@@ -43,7 +43,7 @@ public abstract class FlowNodeActivityBehavior<T> {
         IActRuExecutionService iActRuExecutionService = SpringContextHolder.getBean(IActRuExecutionService.class);
 
         try {
-            //当前节点
+            //当前节点:子节点更换form_type
             log.info("流程:{},开始流程数据:{}", entity.getActivityName(),JSONObject.toJSONString(entity.getT()));
             if (StringUtils.isNotEmpty(entity.getProc_inst_id())){
                 iActRuExecutionService.update(new UpdateWrapper<ActRuExecution>()

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/engine/behavior/impl/EndEventActivityBehavior.java

@@ -46,9 +46,6 @@ public class EndEventActivityBehavior extends FlowNodeActivityBehavior<JSONObjec
     @Override
     public void execute(ExecutionEntity<JSONObject> entity) {
         //流程结束：判断是否是子流程，是的话调用父流程
-        iActRuExecutionService.update(new UpdateWrapper<ActRuExecution>()
-                .eq("proc_inst_id",entity.getProc_inst_id())
-                .set("status", StatusEnum.FLOW_STATUS.code("完成")));
         JSONObject data = entity.getT();
         ExecutionDto executionDto = data.toJavaObject(ExecutionDto.class);
 
@@ -59,14 +56,17 @@ public class EndEventActivityBehavior extends FlowNodeActivityBehavior<JSONObjec
     }
 
     @Override
-    @SneakyThrows
+    public void leave(ExecutionEntity<JSONObject> entity) {
-    public void leave(ExecutionEntity entity) {
+        //流程结束：判断是否是子流程，是的话调用父流程
+        iActRuExecutionService.update(new UpdateWrapper<ActRuExecution>()
+                .eq("proc_inst_id",entity.getProc_inst_id())
+                .set("status", StatusEnum.FLOW_STATUS.code("完成")));
         ActRuExecution execution = iActRuExecutionService.getById(entity.getProc_inst_id());
         if (StringUtils.isNotEmpty(execution.getParent_id())){
             //判断当前所有子流程是否都完成：全都完成则执行父流程
             int count = iActRuExecutionService.count(new QueryWrapper<ActRuExecution>()
                     .eq("parent_id", execution.getParent_id())
-                    .ne("status", StatusEnum.FLOW_STATUS.code("节点完成")));
+                    .lt("status", StatusEnum.FLOW_STATUS.code("完成")));
             if (count ==  0){
                 ActRuExecution parent = iActRuExecutionService.getById(entity.getParent_id());
                 ActReProcdef deployment = reProcdefService.getOne(new LambdaUpdateWrapper<ActReProcdef>().eq(ActReProcdef::getDeployment_id, entity.getDeploymentId()));

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/engine/behavior/impl/ServerTaskActivityBehavior.java

@@ -28,8 +28,7 @@ public class ServerTaskActivityBehavior extends FlowNodeActivityBehavior<JSONObj
     @Override
     @Transactional
     public void execute(ExecutionEntity<JSONObject> entity) {
-        String form_id = entity.getForm_id();
+
-        String form_type = entity.getForm_type();
         FlowElement element = entity.getCurrentFlowElement();
         ServerTask currentNode = (ServerTask) element;
         if (!CollectionUtils.isEmpty(currentNode.getSkipExpression())) {
@@ -39,8 +38,8 @@ public class ServerTaskActivityBehavior extends FlowNodeActivityBehavior<JSONObj
             }
             JSONObject handler = typeHandler.handler(currentNode.getSkipExpression(), entity, null);
             entity.setT(handler);
-            entity.setForm_id(form_id);
+            entity.setForm_id(entity.getForm_id());
-            entity.setForm_type(form_type);
+            entity.setForm_type(entity.getForm_type());
         }
     }
 }

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/engine/behavior/impl/StrucFormActivityBehavior.java

@@ -79,14 +79,15 @@ public class StrucFormActivityBehavior extends FlowNodeActivityBehavior<JSONObje
                 //该参数里包含三部分：主数据基础字段，组数据自定义及明细，
                 //明细：基础字段，组数据自定义及参数:
                 //TODO:id,code等非映射字段后续可以通过SpringEL表达式生成
-                handler.put("id",IdUtil.getStringId());
+                JSONObject mst_json = handler.getJSONObject("t");
-                handler.put("create_time",DateUtil.now());
+                mst_json.put("id",IdUtil.getStringId());
-                handler.put("form_type",entity.getForm_type());
+                mst_json.put("create_time",DateUtil.now());
-                handler.put("create_name",SecurityUtils.getCurrentNickName());
+                mst_json.put("form_type",targetStruc.getForm_type());
-                handler.put("status",StatusEnum.FORM_STATUS.code("生成"));
+                mst_json.put("create_name",SecurityUtils.getCurrentNickName());
-                handler.put("code",CodeUtil.getNewCode(currentNode.getForm_type()));
+                mst_json.put("status",StatusEnum.FORM_STATUS.code("生成"));
-                PmFormData mst = handler.toJavaObject(PmFormData.class);
+                mst_json.put("code",CodeUtil.getNewCode(currentNode.getForm_type()));
-
+                PmFormData mst = mst_json.toJavaObject(PmFormData.class);
+                handler.put("form_id",mst.getId());
                 JSONArray itemArr = handler.getJSONArray("item");
                 if(itemArr !=null){
                     for (int i = 0; i < itemArr.size(); i++) {
@@ -100,8 +101,8 @@ public class StrucFormActivityBehavior extends FlowNodeActivityBehavior<JSONObje
                 }
                 iPmFormDataService.save(mst);
                 entity.setT(handler);
-                entity.setForm_id(mst.getId());
+                entity.setForm_id(entity.getForm_id());
-                entity.setForm_type(currentNode.getForm_type());
+                entity.setForm_type(entity.getForm_type());
             }
         }
     }

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/process/nodeType/excess/impl/DecisionHandler.java

@@ -57,6 +57,7 @@ public class DecisionHandler extends TypeHandler<JSONObject,ExecutionEntity<JSON
             List<StIvtStructattr> list = iStIvtStructattrService.list(new QueryWrapper<StIvtStructattr>()
                     .eq("vehicle_code", "")
                     .eq("is_used", true)
+                    .eq("lock_type", StatusEnum.LOCK.code("无"))
                     .eq("stor_code",iostorinvdtlIn.getStor_code()));
             if (CollectionUtils.isEmpty(list)){
                 throw new BadRequestException("当前分配策略无可用货位");

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/impl/MdGruopDickServiceImpl.java

@@ -8,6 +8,7 @@ import com.github.pagehelper.PageHelper;
 import org.apache.commons.lang3.StringUtils;
 import org.nl.common.TableDataInfo;
 import org.nl.common.domain.entity.PageQuery;
+import org.nl.common.enums.StatusEnum;
 import org.nl.common.publish.BussEventMulticaster;
 import org.nl.common.utils.CodeUtil;
 import org.nl.common.utils.IdUtil;
@@ -77,6 +78,7 @@ public class MdGruopDickServiceImpl extends ServiceImpl<MdGruopDickMapper, MdGru
             forms.put("create_time", now);
             forms.put("id",IdUtil.getStringId());
             forms.put("id",IdUtil.getStringId());
+            forms.put("status", StatusEnum.FORM_STATUS.code("生成"));
             forms.put("code", CodeUtil.getNewCode("md_group_dick"));
         MdGruopDick mdGroupMst = forms.toJavaObject(MdGruopDick.class);
 

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/controller/in/StIvtIostorinvInController.java

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.nl.common.TableDataInfo;
 import org.nl.common.domain.entity.PageQuery;
+import org.nl.wms.dispatch_manage.task.service.ISchBaseTaskService;
 import org.nl.wms.stor_manage.io.service.dto.StorInvQuery;
 import org.nl.wms.stor_manage.io.service.in.iostor.IStIvtIostorinvInService;
 import org.nl.wms.stor_manage.io.service.in.iostor.dao.StIvtIostorinvIn;
@@ -33,6 +34,8 @@ public class StIvtIostorinvInController {
     IStIvtIostorinvInService iStIvtIostorinvInService;
     @Autowired
     IStIvtIostorinvdtlService iStIvtIostorinvDtlInService;
+    @Autowired
+    ISchBaseTaskService schBaseTaskService;
 
 
     @GetMapping

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/dict/SysDictController.java

@@ -11,6 +11,8 @@ import org.nl.common.anno.Log;
 import org.nl.common.TableDataInfo;
 import org.nl.common.domain.entity.PageQuery;
 
+import org.nl.common.enums.StatusEnum;
+import org.nl.common.utils.MapOf;
 import org.nl.wms.system_manage.service.dict.ISysDictService;
 import org.nl.wms.system_manage.service.dict.dao.Dict;
 import org.nl.wms.system_manage.service.dict.dto.DictQuery;
@@ -19,10 +21,7 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.HashMap;
+import java.util.*;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
 
 /**
  * <p>
@@ -120,5 +119,21 @@ public class SysDictController {
         return new ResponseEntity<>(TableDataInfo.build(dictService.getDictByName(code.getString("code"))),HttpStatus.OK);
     }
 
+    @GetMapping("/getStatusEnum/{type}")
+    @Log("获取acs任务类型列表")
+    @SaIgnore
+    public ResponseEntity<Object> getAcsTaskType(@PathVariable String type) {
+        List<Map> items = new ArrayList<>();
+        for (StatusEnum value : StatusEnum.values()) {
+            if (value.name().equals(type)){
+                Map<String, String> code = value.getCode();
+                for (String label : code.keySet()) {
+                    items.add(MapOf.of("label",label,"value",code.get(label)));
+                }
+                break;
+            }
+        }
+        return new ResponseEntity<>(items, HttpStatus.OK);
+    }
 }
 

wms_pro/qd/src/views/wms/dispatch_manage/task/index.vue

@@ -0,0 +1,441 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <div v-if="crud.props.searchToggle">
+        <el-form
+          :inline="true"
+          class="demo-form-inline"
+          label-position="right"
+          label-width="80px"
+          label-suffix=":"
+        >
+          <el-form-item label="生产车间">
+            <el-select
+              v-model="query.product_area"
+              clearable
+              filterable
+              size="mini"
+              placeholder="区域类型"
+              class="filter-item"
+              @change="hand"
+            >
+              <el-option
+                v-for="item in dict.product_area"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="任务号">
+            <label slot="label">任&nbsp;&nbsp;务&nbsp;号:</label>
+            <el-input
+              v-model="query.task_code"
+              clearable
+              style="width: 180px"
+              placeholder="任务号"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <el-form-item label="载具号">
+            <label slot="label">载&nbsp;&nbsp;具&nbsp;号:</label>
+            <el-input
+              v-model="query.vehicle_code"
+              clearable
+              style="width: 180px"
+              placeholder="载具号"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <el-form-item label="点位编码">
+            <el-input
+              v-model="query.point_code"
+              clearable
+              style="width: 180px"
+              placeholder="起点"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <el-form-item label="任务类型">
+            <el-select
+              v-model="query.task_type"
+              style="width: 180px"
+              placeholder="任务类型"
+              class="filter-item"
+              clearable
+              @change="hand"
+            >
+              <el-option
+                v-for="item in taskTypeList"
+                :key="item.value"
+                clearable
+                :label="item.text"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="完成方式">
+            <el-select
+              v-model="query.finished_type"
+              style="width: 180px"
+              placeholder="完成方式"
+              class="filter-item"
+              clearable
+              @change="hand"
+            >
+              <el-option
+                v-for="item in finishTypeList"
+                :key="item.code"
+                clearable
+                :label="item.name"
+                :value="item.code"
+              />
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="创建时间">
+            <el-date-picker
+              v-model="query.createTime"
+              type="daterange"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              :default-time="['00:00:00', '23:59:59']"
+              @change="crud.toQuery"
+            />
+          </el-form-item>
+
+          <el-form-item label="任务状态">
+            <el-select
+              v-model="task_status"
+              multiple
+              style="width: 200px"
+              placeholder="任务状态"
+              class="filter-item"
+              clearable
+              @change="handTaskStatus"
+            >
+              <el-option
+                label="调度中任务"
+                value="-1"
+              />
+              <el-option
+                v-for="item in taskStatusList"
+                :key="item.code"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <rrOperation />
+        </el-form>
+      </div>
+      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
+      <span>
+        未完成数：
+        <el-input
+          v-model="undo"
+          clearable
+          style="width: 60px"
+        />
+        <el-button type="primary" @click="taskScheduler()">任务调度</el-button>
+      </span>
+
+      <crudOperation :permission="permission" />
+      <!--表格渲染-->
+      <el-table
+        ref="table"
+        v-loading="crud.loading"
+        :data="crud.data"
+        size="mini"
+        style="width: 100%;"
+        @selection-change="crud.selectionChangeHandler"
+      >
+        <el-table-column prop="task_code" label="任务编码" min-width="100" show-overflow-tooltip />
+        <el-table-column prop="table_fk_id" label="关联业务" min-width="100" show-overflow-tooltip />
+        <el-table-column v-if="true" prop="task_id" label="任务标识" min-width="150" show-overflow-tooltip />
+        <el-table-column v-if="true" prop="material_id" label="物料id" min-width="150" show-overflow-tooltip />
+        <el-table-column v-if="true" prop="material_spec" label="规格" min-width="150" show-overflow-tooltip />
+        <el-table-column prop="task_name" label="任务类型" :min-width="flexWidth('task_name',crud.data,'任务类型')" />
+        <el-table-column prop="acs_task_type" label="acs任务类型" min-width="120" show-overflow-tooltip :formatter="acsTypeName" />
+        <el-table-column prop="task_status" label="任务状态" width="120px" :formatter="formatTaskStatusName" />
+        <el-table-column prop="point_code1" label="起点" :min-width="flexWidth('point_code1',crud.data,'起点')" />
+        <el-table-column prop="point_code2" label="倒料点" :min-width="flexWidth('point_code2',crud.data,'终点')" />
+        <el-table-column prop="point_code3" label="终点" :min-width="flexWidth('point_code3',crud.data,'返回点')" />
+        <el-table-column prop="product_area" label="生产车间" />
+        <el-table-column prop="point1_region_name" label="起点区域" width="120" />
+        <el-table-column prop="point2_region_name" label="倒料点区域" min-width="120" show-overflow-tooltip />
+        <el-table-column prop="point3_region_name" label="终点区域" min-width="120" show-overflow-tooltip />
+        <el-table-column prop="vehicle_code" label="载具编码1" min-width="100" show-overflow-tooltip />
+        <el-table-column prop="vehicle_type" label="载具类型" min-width="100" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ dict.label.vehicle_type[scope.row.vehicle_type] }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="remark" label="提示" width="120" show-overflow-tooltip />
+        <el-table-column prop="finished_type" label="任务完成类型" min-width="100" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ dict.label.task_finished_type[scope.row.finished_type] }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="create_time" label="创建时间" width="135">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.create_time) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="update_time" label="修改时间" width="135">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.update_time) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="priority" label="任务优先级" min-width="100" show-overflow-tooltip />
+        <el-table-column prop="task_step" label="任务执行步骤" min-width="100" show-overflow-tooltip />
+        <el-table-column
+          v-permission="['admin','instruction:edit','instruction:del']"
+          fixed="right"
+          label="操作"
+          width="160px"
+          align="center"
+        >
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              icon="el-icon-upload"
+              @click="doOperate(scope.row, 'c')"
+            >下发</el-button>
+            <el-button
+              type="text"
+              icon="el-icon-success"
+              @click="doOperate(scope.row, 'a')"
+            >完成</el-button>
+            <el-button
+              type="text"
+              icon="el-icon-error"
+              @click="doOperate(scope.row, 'b')"
+            >取消</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <!--分页组件-->
+      <pagination />
+    </div>
+    <el-dialog
+      title="任务详情"
+      :fullscreen="fullscreen"
+      :visible.sync="viewDialogVisible"
+      width="30%"
+    >
+      <!--  组件-->
+      <!--      <component-->
+      <!--        :is="currentComponent"-->
+      <!--        :task-uuid="task_id"-->
+      <!--        :dialog-visible="viewDialogVisible"-->
+      <!--      />-->
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="viewDialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="viewDialogVisible = false">确 定</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import crudTask from '@/views/wms/dispatch_manage/task/task'
+import CRUD, { crud, header, presenter } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import crudOperation from '@crud/CRUD.operation'
+import udOperation from '@crud/UD.operation'
+import pagination from '@crud/Pagination'
+import Treeselect, { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+
+export default {
+  name: 'Task',
+  dicts: ['SCH_TASK_TYPE_DTL', 'vehicle_type', 'task_finished_type', 'product_area'],
+  components: {
+    pagination, crudOperation, rrOperation, Treeselect, udOperation
+  },
+  mixins: [presenter(), header(), crud()],
+  cruds() {
+    return CRUD({
+      title: '任务',
+      url: 'api/schBaseTask',
+      idField: 'task_id',
+      sort: 'task_code,desc',
+      crudMethod: { ...crudTask },
+      query: {
+        task_code: '',
+        vehicle_code: '',
+        start_point_code: '',
+        next_point_code: '',
+        task_type: '',
+        finished_type: '',
+        product_area: 'A1',
+        task_status: '-1'
+      },
+      optShow: {
+        add: false,
+        edit: false,
+        del: false,
+        download: false,
+        reset: true
+      }
+    })
+  },
+  data() {
+    return {
+      viewDialogVisible: false,
+      fullscreen: false,
+      currentComponent: '',
+      openParam: {},
+      undo: 0,
+      create_time: [],
+      task_status: ['-1'],
+      taskStatusList: [],
+      taskTypeList: [],
+      acsTaskTypeList: [],
+      finishTypeList: [],
+      permission: {
+
+      },
+      rules: {},
+      classes1: []
+    }
+  },
+  created() {
+    this.initClass1()
+    crudTask.getTaskStatus().then(data => {
+      this.taskStatusList = data
+    })
+    crudTask.getFinishType().then(data => {
+      this.finishTypeList = data
+    })
+    crudTask.getTaskType().then(res => {
+      this.taskTypeList = res
+    })
+    crudTask.undo().then(res => {
+      this.undo = res
+    })
+    crudTask.getAcsTaskType().then(res => {
+      this.acsTaskTypeList = res
+    })
+    this.crud.query.task_status = ['-1']
+    // this.crud.toQuery()
+  },
+  methods: {
+    [CRUD.HOOK.afterRefresh]() {
+      crudTask.undo().then(res => {
+        this.undo = res
+      })
+    },
+    initClass1() {
+      const param = {
+        parent_class_code: 'task_type'
+      }
+    },
+    taskScheduler() {
+      crudTask.scheduler().then(res => {
+        this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+      })
+    },
+    buildTree(classes) {
+      classes.forEach(data => {
+        if (data.children) {
+          this.buildTree(data.children)
+        }
+        if (data.hasChildren && !data.children) {
+          data.children = null // 重点代码
+        }
+      })
+    },
+    hand(value) {
+      this.crud.toQuery()
+    },
+    handTaskStatus(value) {
+      this.crud.query.task_status = value.toString()
+      this.crud.toQuery()
+    },
+    acsTypeName(row, column) {
+      for (const item of this.acsTaskTypeList) {
+        if (Number(item.value) === Number(row.acs_task_type)) {
+          return item.label
+        }
+      }
+      return ''
+    },
+    formatTaskStatusName(row, column) {
+      for (const item of this.taskStatusList) {
+        if (item.value === row.task_status) {
+          return item.label
+        }
+      }
+      return ''
+    },
+    doOperate(row, command) {
+      let method_name = ''
+      switch (command) {
+        case 'a':// 完成
+          method_name = 'forceFinish'
+          break
+        case 'b':// 取消
+          method_name = 'cancel'
+          break
+        case 'c':// 下发
+          method_name = 'immediateNotifyAcs'
+          break
+        case 'd':// 详情
+          method_name = 'view'
+          break
+      }
+      if (method_name === 'view') {
+        this.view(row)
+        return
+      }
+      const data = {
+        task_id: row.task_id,
+        method_name: method_name
+      }
+      crudTask.operation(data).then(res => {
+        this.crud.toQuery()
+        this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+      }).catch(err => {
+        console.log(err.response.data.message)
+      })
+    },
+    view(row) {
+      this.task_id = row.task_id
+      switch (row.task_type) {
+        case '01':// 入库
+          this.fullscreen = true
+          this.currentComponent = 'IOStore'
+          break
+        case '02':// 出库
+          this.fullscreen = true
+          this.currentComponent = 'IOStore'
+          break
+        case '03':// 入空载具
+          this.crud.notify('入空载具无详情', CRUD.NOTIFICATION_TYPE.INFO)
+          return
+        case '04':// 出空载具
+          this.crud.notify('出空载具无详情', CRUD.NOTIFICATION_TYPE.INFO)
+          return
+        case '05':// 转储
+          this.fullscreen = true
+          this.currentComponent = 'DumpInv'
+          break
+        case '06':// 质检
+          this.fullscreen = true
+          this.currentComponent = 'Quality'
+          break
+      }
+      this.viewDialogVisible = true
+    }
+
+  }
+
+}
+</script>
+
+<style scoped>
+
+</style>

wms_pro/qd/src/views/wms/dispatch_manage/task/task.js

@@ -0,0 +1,85 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: 'api/schBaseTask',
+    method: 'post',
+    data
+  })
+}
+
+export function del(ids) {
+  return request({
+    url: 'api/schBaseTask',
+    method: 'delete',
+    data: ids
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/schBaseTask',
+    method: 'put',
+    data
+  })
+}
+
+export function getTaskStatus() {
+  return request({
+    url: 'api/schBaseTask/taskStatus',
+    method: 'get'
+  })
+}
+
+export function getTaskType() {
+  return request({
+    url: 'api/schBaseTask/taskType',
+    method: 'post'
+  })
+}
+export function getAcsTaskType() {
+  return request({
+    url: 'api/schBaseTask/acsTaskType',
+    method: 'get'
+  })
+}
+export function undo() {
+  return request({
+    url: 'api/schBaseTask/undo',
+    method: 'get'
+  })
+}
+
+export function getFinishType() {
+  return request({
+    url: 'api/schBaseTask/finishType',
+    method: 'get'
+  })
+}
+
+export function operation(data) {
+  return request({
+    url: 'api/schBaseTask/operation',
+    method: 'put',
+    data
+  })
+}
+export function scheduler() {
+  return request({
+    url: '/api/schBaseTask/task/taskPublish',
+    method: 'get'
+  })
+}
+
+export default {
+  add,
+  edit,
+  del,
+  operation,
+  getTaskStatus,
+  getTaskType,
+  getAcsTaskType,
+  getFinishType,
+  scheduler,
+  undo
+}

wms_pro/qd/src/views/wms/pm_manage/form_data/ViewDialog.vue

@@ -219,7 +219,7 @@ export default {
     },
     queryTableDdis() {
       if (this.currentdtl !== null) {
-        crudProductIn.getIosInvDis({'iostorinvdtl_id': this.currentdtl.iostorinvdtl_id}).then(res => {
+        crudProductIn.getVehicleTask({'iostorinvdtl_id': this.currentdtl.iostorinvdtl_id}).then(res => {
           this.tabledis = res
         }).catch(() => {
           this.tabledis = []

wms_pro/qd/src/views/wms/pm_manage/form_data/index.vue

@@ -228,6 +228,7 @@ export default {
         formstruc.getHeader(this.query.form_type).then(res => {
           this.cols = res
           res.forEach(a => {
+            this.form.form_data[a.value,'']
             this.$set(this.query, 'form_query', {})
           })
         })

wms_pro/qd/src/views/wms/stor_manage/in/DivDialog.vue

@@ -359,7 +359,7 @@ export default {
     clcikRow(row, column, event) {
       this.form.dtl_row = row
       this.form.storage_qty = this.form.dtl_row.plan_qty
-      crudProductIn.getIosInvDis({ 'iostorinv_id': row.iostorinv_id, 'iostorinvdtl_id': row.iostorinvdtl_id }).then(res => {
+      crudProductIn.getVehicleTask({ 'iostorinv_id': row.iostorinv_id, 'iostorinvdtl_id': row.iostorinvdtl_id }).then(res => {
 
         if (res.length !== 0) {
           this.form.tableMater = res

wms_pro/qd/src/views/wms/stor_manage/in/ViewDialog.vue

@@ -144,13 +144,15 @@
         <el-table-column min-width="120" show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
         <el-table-column min-width="120" show-overflow-tooltip prop="material_spec" label="物料规格" align="center" />
         <el-table-column prop="pcsn" label="批次" align="center" width="150" />
-        <el-table-column show-overflow-tooltip prop="storagevehicle_code" label="托盘号" align="center" />
+        <el-table-column show-overflow-tooltip prop="vehicle_code" label="托盘号" align="center" />
         <el-table-column show-overflow-tooltip prop="bucketunique" label="箱号" align="center" />
-        <el-table-column prop="plan_qty" :formatter="crud.formatNum3" label="数量 align="center" />
+        <el-table-column prop="plan_qty" :formatter="crud.formatNum3" label="数量" align="center" />
-        <el-table-column prop="point_code1" label="起始位置" align="center" />
+        <el-table-column prop="point_code1" label="起始位置" align="center" width="120"/>
-        <el-table-column prop="struct_code" label="目的位置" align="center" />
+        <el-table-column prop="point_code2" label="目的位置" align="center" width="120"/>
         <el-table-column prop="task_code" label="任务号" align="center" />
         <el-table-column prop="task_status" label="任务状态" align="center" :formatter="formatStatus"/>
+        <el-table-column prop="source_form_type" label="源单类型" align="center" width="150"/>
+        <el-table-column show-overflow-tooltip prop="source_form_id" label="源单id" align="center" width="150"/>
       </el-table>
     </el-card>
   </el-dialog>
@@ -222,15 +224,7 @@ export default {
     stateFormat(row, column) {
       return this.dict.label.FORM_STATUS[row.bill_status]
     },
-    taskdtl_typeFormat(row) {
+
-      return this.dict.label.SCH_TASK_TYPE_DTL[row.taskdtl_type]
-    },
-    task_statusFormat(row) {
-      return this.dict.label.task_status[row.task_status]
-    },
-    work_statusFormat(row) {
-      return this.dict.label.work_status[row.work_status]
-    },
     handleDtlCurrentChange(current) {
       if (current !== null) {
         this.tabledis = []
@@ -258,7 +252,7 @@ export default {
     },
     queryTableDdis() {
       if (this.currentdtl !== null) {
-        crudProductIn.getIosInvDis({ 'iostorinvdtl_id': this.currentdtl.iostorinvdtl_id }).then(res => {
+        crudProductIn.getVehicleTask({ 'vehicle_code': this.currentdtl.vehicle_code }).then(res => {
           this.tabledis = res
         }).catch(() => {
           this.tabledis = []
@@ -266,7 +260,7 @@ export default {
       }
     },
     formatStatus(row) {
-      return this.dict.label.task_status[row.task_status]
+      return this.dict.label.FORM_STATUS[row.task_status]
     },
     formatBaseType(row) {
       return this.dict.label.PCS_SAL_TYPE[row.base_bill_type]

wms_pro/qd/src/views/wms/stor_manage/in/storinvin.js

@@ -38,9 +38,9 @@ export function getPoint(data) {
     data
   })
 }
-export function getIosInvDis(data) {
+export function getVehicleTask(data) {
   return request({
-    url: '/api/stIvtIostorinvIn/getIosInvDis',
+    url: '/api/schBaseTask/getVehicleTask',
     method: 'post',
     data
   })
@@ -137,7 +137,7 @@ export default {
   add,
   edit,
   del,
-  getIosInvDis,
+  getVehicleTask,
   getIosInvDtl,
   vehicleCheck,
   confirmvehicle,