add:深坑物料管理

mes/hd/nladmin-system/src/main/java/org/nl/common/enums/AcsTaskEnum.java

@@ -56,8 +56,8 @@ public enum AcsTaskEnum {
 
     ACS_TASK_TYPE_NOBLE_DOUBLE_TASK("1","诺宝双工任务"),
     ACS_TASK_TYPE_NOBLE_SINGLE_TASK("2","诺宝单工任务"),
-    ACS_TASK_TYPE_NOBLE_DOUBLE_ENTRY_TASK("4","诺宝双入-双任务"),
     ACS_TASK_TYPE_NOBLE_SINGLE_ENTRY_TASK("3","诺宝单入-单任务"),
+    ACS_TASK_TYPE_NOBLE_DOUBLE_ENTRY_TASK("4","诺宝双入-双任务"),
     ACS_TASK_TYPE_NOBLE_POINT_POINT_TASK("5","诺宝点对点任务"),
     ACS_TASK_TYPE_WEIGHING_TASK_OF_PS20("6","PS20称重任务（刻字-包装）"),
     ACS_TASK_TYPE_NON_WEIGHING_TASK_OF_PS20("7","PS20不称重任务（刻字-包装）"),
@@ -89,12 +89,17 @@ public enum AcsTaskEnum {
         return res;
     }
 
-    public static List<String> getAcsTaskTypes() {
+    public static List<Map> getAcsTaskTypes() {
         List<AcsTaskEnum> task = Arrays.stream(AcsTaskEnum.values())
                 .filter(taskEnum -> taskEnum.name().startsWith("ACS_TASK_"))
                 .collect(Collectors.toList());
-        List<String> list = new ArrayList<>(task.size());
+        List<Map> list = new ArrayList<>(task.size());
-        task.forEach(t-> list.add(t.getDesc()));
+        task.forEach(t->{
+            Map<String, Object> map = new HashMap<>();
+            map.put("value",Integer.valueOf(t.getCode()));
+            map.put("label",t.getDesc());
+            list.add(map);
+        });
         return list;
     }
 

mes/hd/nladmin-system/src/main/java/org/nl/common/enums/StatusEnum.java

@@ -69,7 +69,12 @@ public enum StatusEnum {
     IOS_CREATE("01","生成","",null),
     IOS_RUNNING("02","执行中","",null),
     IOS_FINISH("99","完成","",null),
-    ;
+    // 1-PC创建、2-Excel导入
+    PCINTO("1","PC创建", "",null),
+    EXCELINTO("2","EXCEL导入", "2",null),
+    // 1白班、2夜班
+    DAYSHIFT("1","白班", "1",null),
+    NIGHTSHIFT("2","夜班", "2",null);
 
     private String code;
     private String desc;

mes/hd/nladmin-system/src/main/java/org/nl/common/enums/WorkerOrderEnum.java

@@ -1,5 +1,8 @@
 package org.nl.common.enums;
 
+import java.util.*;
+import java.util.stream.Collectors;
+
 /**
  * @Author: lyd
  * @Description: 工单枚举
@@ -11,14 +14,11 @@ public enum WorkerOrderEnum {
     SEND("下发", "2"),
     PRODUCTING("生产中", "3"),
     STOP("暂停", "4"),
-    COMPLETE("完成", "5"),
+    AUTO_COMPLETE("自动完成", "5"),
-    FORCE_COMPLETE("强制完成", "6"),
+    COMPLETE("完成", "6"),
-    // 1-PC创建、2-Excel导入
+    FORCE_COMPLETE("强制完成", "7"),
-    PCINTO("PC创建", "1"),
+    CANCEL("取消", "8"),
-    EXCELINTO("EXCEL导入", "2"),
+
-    // 1白班、2夜班
-    DAYSHIFT("白班", "1"),
-    NIGHTSHIFT("夜班", "2")
     ;
 
 
@@ -30,6 +30,17 @@ public enum WorkerOrderEnum {
         this.code = code;
     }
 
+    public static List<Map> getWorkOrderStatus() {
+        List<Map> list = new ArrayList<>();
+        for (WorkerOrderEnum value : WorkerOrderEnum.values()) {
+            Map<String, Object> map = new HashMap<>();
+            map.put("value",Integer.valueOf(value.getCode()));
+            map.put("label",value.getName());
+            list.add(map);
+        }
+        return list;
+    }
+
     public String getName() {
         return name;
     }

mes/hd/nladmin-system/src/main/java/org/nl/common/publish/BussEventMulticaster.java

@@ -21,7 +21,7 @@ import java.util.Set;
 @Component
 public class BussEventMulticaster implements BeanPostProcessor {
 
-    private static Set<AbstraceListener<?>> LISTENER_SRT = new LinkedHashSet<>();
+    public static Set<AbstraceListener<?>> LISTENER_SRT = new LinkedHashSet<>();
 
     public final static void publish(PublishEvent event, Boolean sync){
         if (event == null){

mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java

@@ -69,6 +69,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService{
 
             },param.getString("type"),5);
         }catch (Exception ex){
+            log.error("acs申请任务失败:ex:{}",ex.getMessage());
             result.put("status", HttpStatus.BAD_REQUEST.value());
             result.put("message",ex.getMessage());
         }
@@ -128,7 +129,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService{
                 AbstractAcsTask taskHandler = (AbstractAcsTask)SpringContextHolder.getBean(Class.forName(processing_class));
                 taskHandler.updateTaskStatus(row,status);
             } catch (Exception e) {
-                log.info("任务状态更新失败:{}", e.getMessage());
+                log.error("任务状态更新失败:{}", e.getMessage());
                 JSONObject json = new JSONObject();
                 json.put("task_id", task_id);
                 json.put("message", e.getMessage());
@@ -193,10 +194,12 @@ public class AcsToWmsServiceImpl implements AcsToWmsService{
                 workorder.setRealproducestart_date(DateUtil.now());
             }
             if (orderJson.getString("status").equals(WorkerOrderEnum.COMPLETE.getCode())){
+                workorder.setWorkorder_status(WorkerOrderEnum.AUTO_COMPLETE.getCode());
                 workorder.setRealproduceend_date(DateUtil.now());
             }
             workorderService.updateById(workorder);
         } catch (Exception e){
+            log.error("工单状态更新失败:{}", e.getMessage());
             result.put("status", 400);
             result.put("message", e.getMessage());
             return result;

mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/classstandard/impl/MdPbClassstandardServiceImpl.java

@@ -127,10 +127,10 @@ public class MdPbClassstandardServiceImpl extends ServiceImpl<MdPbClassstandardM
             query.eq("parent_class_id",whereJson.get("parent_class_id"));
         }
         if (ObjectUtil.isNotEmpty(whereJson.get("class_idStr"))) {
-            query.in("class_id",Arrays.asList(((String)whereJson.get("class_idStr")).split(",")));
+            query.last("and class_id in "+whereJson.get("class_idStr"));
         }
-
+        List<Map<String, Object>> list = this.listMaps(query);
-        return getMaps(this.listMaps(query));
+        return getMaps(list);
     }
 
     @Override

mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/service/impl/ProduceshiftorderServiceImpl.java

@@ -327,7 +327,7 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService{
           //获取前台传入的开工的工单信息
           String workorder_id = param.getString("workorder_id");
           //1-创建、2-下发、3-生产中、4-暂停、5-完成
-          JSONObject result = WQLObject.getWQLObject("pdm_produce_workorder").query("device_code = '" + param.getString("device_code") + "' and workorder_status in ('2','3','4') and workorder_id != '" + workorder_id + "'").uniqueResult(0);
+          JSONObject result = WQLObject.getWQLObject("pdm_produce_workorder").query("device_code = '" + param.getString("device_code") + "' and workorder_status in ('2','3','4','5') and workorder_id != '" + workorder_id + "'").uniqueResult(0);
           //判断该工单状态
           if(ObjectUtil.isNotEmpty(result)) {
                throw new BadRequestException("已有工单选择该设备开工,请更换开工设备!");

mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/wql/MPS_PRODUCEWORKORDER.wql

@@ -74,7 +74,7 @@
         WHERE
         	ShiftOrder.is_delete = '0'
             OPTION 输入.unFinish <> ""
-                    ShiftOrder.workorder_status <> '5'
+                    ShiftOrder.workorder_status <> '6'
             ENDOPTION
             OPTION 输入.current_produce_person_id <> ""
                     ShiftOrder.current_produce_person_id = 输入.current_produce_person_id
@@ -129,7 +129,7 @@
                 and device.device_code not in (
                     select o.device_code as device_code
                     from PDM_produce_workOrder o
-                    where o.workorder_status <> '5' and o.is_delete = '0'
+                    where o.workorder_status <> '6' and o.is_delete = '0'
                 )
             ENDOPTION
         ENDSELECT

mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/device/SpecialDeviceController.java

@@ -0,0 +1,83 @@
+package org.nl.wms.product_manage.controller.device;
+
+import cn.dev33.satoken.annotation.SaIgnore;
+import cn.hutool.core.date.DateUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.nl.common.TableDataInfo;
+import org.nl.common.anno.Log;
+import org.nl.common.domain.query.PageQuery;
+import org.nl.common.utils.SecurityUtils;
+import org.nl.wms.masterdata_manage.service.material.IMdMeMaterialbaseService;
+import org.nl.wms.masterdata_manage.service.material.dao.MdMeMaterialbase;
+import org.nl.wms.product_manage.service.device.IPdmBiDeviceService;
+import org.nl.wms.product_manage.service.device.dao.PdmBiDevice;
+import org.nl.wms.product_manage.service.device.dto.DeviceQuery;
+import org.nl.wms.product_manage.备份pdm.service.DeviceService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * @author lyd
+ * @date 2023-03-15
+ **/
+@RestController
+@Api(tags = "生产设备管理")
+@RequestMapping("/api/specialDevice")
+@Slf4j
+public class SpecialDeviceController {
+    @Autowired
+    private IMdMeMaterialbaseService materialbaseService;
+    @Autowired
+    private IPdmBiDeviceService iDeviceService;
+
+    @PostMapping("/query")
+    @ApiOperation("查询生产设备")
+    @SaIgnore
+    public ResponseEntity<Object> query(@RequestBody DeviceQuery query) {
+        List<PdmBiDevice> list = iDeviceService.list(query.build());
+        Set<String> materials = list.stream().map(PdmBiDevice::getMaterial_id).collect(Collectors.toSet());
+        Map<String, MdMeMaterialbase> materialMap = materialbaseService.list(new QueryWrapper<MdMeMaterialbase>().in("material_id", materials)).stream().collect(HashMap::new, (k, v) -> k.put(v.getMaterial_id(), v), HashMap::putAll);
+        List<Map> result = new ArrayList<>();
+        for (PdmBiDevice pdmBiDevice : list) {
+            Map<String, Object> map = new HashMap<>();
+            map.put("device_code",pdmBiDevice.getDevice_code());
+            map.put("product_area",pdmBiDevice.getProduct_area());
+            map.put("material_id",pdmBiDevice.getMaterial_id());
+            MdMeMaterialbase materialbase = materialMap.get("pdmBiDevice.getMaterial_id()");
+            map.put("material_name",materialbase!=null?materialbase.getMaterial_name():"");
+            map.put("material_spec",materialbase!=null?materialbase.getMaterial_spec():"");
+            map.put("deviceinstor_qty",pdmBiDevice.getDeviceinstor_qty());
+            result.add(map);
+        }
+        return new ResponseEntity<>(TableDataInfo.build(result), HttpStatus.OK);
+    }
+
+    @PostMapping("/update")
+    @Log("更新物料")
+    @ApiOperation("更新物料")
+    @SaIgnore
+    public ResponseEntity<Object> queryList (@RequestBody JSONObject query){
+        String device_code = query.getString("device_code");
+        if (StringUtils.isNotEmpty(device_code)){
+            iDeviceService.update(new UpdateWrapper<PdmBiDevice>()
+                    .set("material_id",query.getString("material_id"))
+                    .set("deviceinstor_qty",query.getBigDecimal("deviceinstor_qty"))
+                    .eq("device_code",device_code));
+        }
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+}
+

mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workorder/ProduceshiftorderController.java

@@ -8,6 +8,7 @@ import lombok.RequiredArgsConstructor;
 import org.nl.common.TableDataInfo;
 import org.nl.common.anno.Log;
 import lombok.extern.slf4j.Slf4j;
+import org.nl.common.enums.WorkerOrderEnum;
 import org.nl.common.utils.RedissonUtils;
 import org.nl.common.utils.api.RestBusinessTemplate;
 import org.nl.common.utils.api.ResultCode;
@@ -85,7 +86,7 @@ public class ProduceshiftorderController{
                throw new BizCoreException(ResultCode.VALIDATE_FAILED);
           }
           /** @see org.nl.common.enums.WorkerOrderEnum */
-          param.put("workorder_status","'2','3','4'");
+          param.put("workorder_status","'2','3','4','5'");
           List<Map> list = iPdmProduceWorkorderService.getOrderList(param, page);
           return new ResponseEntity<>(TableDataInfo.build(list), HttpStatus.OK);
      }
@@ -164,4 +165,12 @@ public class ProduceshiftorderController{
      public ResponseEntity<Object> getUser() {
           return new ResponseEntity<>(produceshiftorderService.getUser(), HttpStatus.OK);
      }
+
+
+     @GetMapping("/orderStatus")
+     @Log("查询操作人员")
+     @ApiOperation("查询操作人员")
+     public ResponseEntity<Object> getWorkOrderStatus() {
+          return new ResponseEntity<>(WorkerOrderEnum.getWorkOrderStatus(), HttpStatus.OK);
+     }
 }

mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/service/TaskService.java

@@ -91,5 +91,5 @@ public interface TaskService {
      */
     JSONArray getTaskTypes();
 
-    List<String> getAcsTaskType();
+    List<Map> getAcsTaskType();
 }

mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/service/impl/TaskServiceImpl.java

@@ -9,6 +9,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.nl.common.enums.AcsTaskEnum;
 import org.nl.common.enums.StatusEnum;
 import org.nl.common.utils.SecurityUtils;
@@ -52,21 +53,12 @@ public class TaskServiceImpl implements TaskService {
         map.put("flag", "1");
         JSONObject whereJson = JSONObject.parseObject(JSON.toJSONString(form));
 
-        String task_status = whereJson.getString("task_status");
         map.put("product_area", whereJson.getString("product_area"));
-        if (StrUtil.isNotEmpty(task_status)) {
+        map.put("task_status",whereJson.getString("task_status"));
-            task_status = task_status.replace("[\"", "").replace("\"]", "").replace("\"", "");
+        if (!StringUtils.isEmpty(whereJson.getString("task_status")) && whereJson.getString("task_status").contains("-1")){
-        }
+            map.put("task_status",whereJson.getString("task_status").replaceAll("-1","1,4,5"));
-        String moreTaskStatus = whereJson.getString("more_task_status");
-        if (ObjectUtil.isNotEmpty(moreTaskStatus)) {
-            task_status = moreTaskStatus;
-        }
-        map.put("task_status", task_status);
-        //处理状态为未完成
-        if (StrUtil.isNotEmpty(task_status) && task_status.contains("-1")) {
-            map.put("unFinish", "-1");
-            map.put("task_status", task_status.replace("-1", ""));
         }
+
         if (StrUtil.isNotEmpty(whereJson.getString("task_code"))) {
             map.put("task_code", "%" + whereJson.getString("task_code") + "%");
         }
@@ -92,7 +84,7 @@ public class TaskServiceImpl implements TaskService {
         if (StrUtil.isNotEmpty(whereJson.getString("end_time"))) {
             map.put("end_time", whereJson.getString("end_time"));
         }
-        JSONObject json = WQL.getWO("QSCH_TASK_01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "task.update_time desc");
+        JSONObject json = WQL.getWO("QSCH_TASK_01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "task.task_code desc");
         return json;
     }
 
@@ -183,7 +175,7 @@ public class TaskServiceImpl implements TaskService {
     }
 
     @Override
-    public List<String> getAcsTaskType() {
+    public List<Map> getAcsTaskType() {
         return AcsTaskEnum.getAcsTaskTypes();
     }
 }

mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/SpeMachinery/SpeEmpTask.java

@@ -3,15 +3,17 @@ package org.nl.wms.product_manage.sch.tasks.SpeMachinery;
 import cn.hutool.core.date.DateUnit;
 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.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.jetbrains.annotations.Nullable;
 import org.nl.common.enums.AcsTaskEnum;
 import org.nl.common.enums.StatusEnum;
+import org.nl.common.enums.WorkerOrderEnum;
+import org.nl.common.utils.IdUtil;
 import org.nl.common.utils.MapOf;
 import org.nl.common.utils.SecurityUtils;
 import org.nl.modules.common.exception.BadRequestException;
@@ -23,6 +25,8 @@ import org.nl.wms.product_manage.service.device.IPdmBiDeviceService;
 import org.nl.wms.product_manage.service.device.dao.PdmBiDevice;
 import org.nl.wms.product_manage.service.workorder.IPdmProduceWorkorderService;
 import org.nl.wms.product_manage.service.workorder.dao.PdmProduceWorkorder;
+import org.nl.wms.scheduler_manage.service.cacheline.ISchCachelineVehilematerialService;
+import org.nl.wms.scheduler_manage.service.cacheline.dao.SchCachelineVehilematerial;
 import org.nl.wms.scheduler_manage.service.point.ISchBasePointService;
 import org.nl.wms.scheduler_manage.service.point.dao.SchBasePoint;
 import org.nl.wms.scheduler_manage.service.scheduler.ISchProcessRouteService;
@@ -34,12 +38,10 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import java.math.BigDecimal;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.*;
-import java.util.function.Function;
 import java.util.stream.Collectors;
 
 /**
@@ -58,7 +60,8 @@ public class SpeEmpTask extends AbstractAcsTask {
     private AgvInstService agvInstService;
     @Autowired
     private ISchBasePointService basePointService;
-
+    @Autowired
+    private ISchCachelineVehilematerialService vehilematerialService;
     @Autowired
     private ISchProcessRouteService schProcessRouteService;
 
@@ -88,7 +91,7 @@ public class SpeEmpTask extends AbstractAcsTask {
         if (cahceLine == null) { return null; }
         PdmProduceWorkorder one = workorderService.getOne(new QueryWrapper<PdmProduceWorkorder>()
                 .eq("workorder_code", param.getString("workorder_code"))
-                .lt("workorder_status", StatusEnum.TASK_FINISH.getCode()));
+                .lt("workorder_status", WorkerOrderEnum.COMPLETE.getCode()));
         Assert.notNull(one, String.format("下发工单%s不存在未完成工单", param.getString("workorder_code")));
         List<SchBaseTask> list = taskService.list(new QueryWrapper<SchBaseTask>()
                 .eq("point_code2", param.getString("device_code")).lt("task_status", StatusEnum.TASK_FINISH.getCode())
@@ -100,7 +103,7 @@ public class SpeEmpTask extends AbstractAcsTask {
         JSONObject form = new JSONObject(MapOf.of("start_point_code",cahceLine,
                 "next_point_code",param.getString("device_code"),"return_point_code", cahceLine,"vehicle_code",
                 "","product_area",one.getProduct_area(),"quantity", param.getString("quantity"),"type",AcsTaskEnum.TASK_CACHELINE_OUT.getCode(),"material_id", one.getMaterial_id()));
-        String taskId = IdUtil.getSnowflake(1, 1).nextId() + "";
+        String taskId = IdUtil.getStringId();
         JSONObject task = packageParam(form, taskId);
         taskService.save(task.toJavaObject(SchBaseTask.class));
 
@@ -179,11 +182,23 @@ public class SpeEmpTask extends AbstractAcsTask {
             AcsTaskEnum status = AcsTaskEnum.getType(sta,"status_");
             switch (status){
                 case STATUS_START:
+                    Map<String, String> extParam = (Map)param.get("ext_param");
                     taskService.update(new UpdateWrapper<SchBaseTask>()
                             .set("task_status",StatusEnum.TASK_RUNNING.getCode())
                             .set("update_name","acs")
                             .set("update_time", DateUtil.now())
                             .eq("task_id",task.getTask_id()));
+                    if (extParam.get("fall_finish") != null){
+                        //TODO:添加任务唯一性校验防止重复更新
+                        PdmBiDevice device = iDeviceService.getDeviceByPointCode(task.getPoint_code2());
+                        if (!("fall_finish"+task.getTask_id()).equals(device.getRemark())){
+                            iDeviceService.update(new UpdateWrapper<PdmBiDevice>()
+                                    .set("material_id", task.getMaterial_id())
+                                    .set("deviceinstor_qty",device.getDeviceinstor_qty().add(task.getMaterial_qty()))
+                                    .set("remark","fall_finish"+task.getTask_id())
+                                    .eq("device_code", task.getPoint_code2()));
+                        }
+                    }
                     break;
                 case STATUS_FINISH:
                     taskService.update(new UpdateWrapper<SchBaseTask>()
@@ -191,10 +206,17 @@ public class SpeEmpTask extends AbstractAcsTask {
                             .set("update_name","acs")
                             .set("update_time", DateUtil.now())
                             .eq("task_id",task.getTask_id()));
-                    SchBasePoint point = basePointService.getOne(new QueryWrapper<SchBasePoint>().eq("point_code", task.getPoint_code2()));
+                    String vehicle_code = param.getString("vehicle_code");
-                    PdmBiDevice device = iDeviceService.getOne(new QueryWrapper<PdmBiDevice>().eq("device_code", point.getDevice_code()));
+                    if (StringUtils.isNotEmpty(vehicle_code)){
-                    BigDecimal currentQty = device.getDeviceinstor_qty().add(task.getMaterial_qty());
+                        SchCachelineVehilematerial vehilematerial = new SchCachelineVehilematerial();
-                    iDeviceService.update(new UpdateWrapper<PdmBiDevice>().set("deviceinstor_qty",currentQty).eq("device_code",point.getDevice_code()));
+                        vehilematerial.setCreate_time(DateUtil.now());
+                        vehilematerial.setVehmaterial_id(IdUtil.getStringId());
+                        vehilematerial.setVehicle_code(vehicle_code);
+                        vehilematerial.setVehicle_status(StatusEnum.CACHE_VEL_EMT.getCode());
+                        vehilematerial.setErr_type(StatusEnum.STATUS_FLASE.getCode());
+                        vehilematerial.setCacheLine_code(task.getPoint_code1());
+                        vehilematerialService.save(vehilematerial);
+                    }
                     break;
                 case STATUS_CANNEL:
                     cancel(param.getString("task_id"));
@@ -226,7 +248,7 @@ public class SpeEmpTask extends AbstractAcsTask {
             List<SchBaseTask> waitingTask = new ArrayList<>();//可合并，但是只有单条任务
             Map<String, String> taskGroupMap = new HashMap<>();
             for (SchBaseTask task : array) {
-                String taskGroupId = org.nl.common.utils.IdUtil.getStringId();
+                String taskGroupId = IdUtil.getStringId();
                 String taskId = task.getTask_id();
                 task.setIs_send(true);
                 if (taskGroupMap.get(taskId) != null){

mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/SpeMachinery/SpeFullTask.java

@@ -11,6 +11,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.nl.common.enums.AcsTaskEnum;
 import org.nl.common.enums.InterfaceLogType;
 import org.nl.common.enums.StatusEnum;
+import org.nl.common.enums.WorkerOrderEnum;
 import org.nl.common.utils.IdUtil;
 import org.nl.common.utils.MapOf;
 import org.nl.common.utils.SecurityUtils;
@@ -41,6 +42,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.*;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * 专机任务
@@ -94,7 +96,7 @@ public class SpeFullTask extends AbstractAcsTask {
         PdmProduceWorkorder order = workorderService.getOne(new QueryWrapper<PdmProduceWorkorder>()
                 .eq("workorder_code", param.getString("workorder_code"))
                 .eq("is_delete", false)
-                .lt("workorder_status", StatusEnum.TASK_FINISH.getCode()));
+                .lt("workorder_status",  WorkerOrderEnum.COMPLETE.getCode()));
         Assert.notNull(order, String.format("下发工单%s不存在未完成工单", param.getString("workorder_code")));
         List<SchBaseTask> list = taskService.list(new QueryWrapper<SchBaseTask>()
                 .eq("point_code1", point_code).lt("task_status", StatusEnum.TASK_FINISH.getCode())
@@ -215,11 +217,13 @@ public class SpeFullTask extends AbstractAcsTask {
                     //outboxt箱子更新到任务表vechile_code2?
                     if (extParam.get("inbox") != null){
                         SchCachelineVehilematerial vehilematerial = new SchCachelineVehilematerial();
+                        vehilematerial.setCreate_time(DateUtil.now());
                         vehilematerial.setVehmaterial_id(IdUtil.getStringId());
                         vehilematerial.setVehicle_code(extParam.get("inbox"));
+                        vehilematerial.setVehicle_status(StatusEnum.CACHE_VEL_FULL.getCode());
+                        vehilematerial.setErr_type(StatusEnum.STATUS_FLASE.getCode());
+                        vehilematerial.setCacheLine_code(task.getPoint_code1());
                         vehilematerial.setMaterial_id(task.getMaterial_id());
-                        vehilematerial.setErr_type("0");
-                        vehilematerial.setCreate_time(DateUtil.now());
                         vehilematerial.setQuantity(task.getMaterial_qty());
                         cacheLineVechileService.save(vehilematerial);
                     }
@@ -254,7 +258,7 @@ public class SpeFullTask extends AbstractAcsTask {
                     if (extParam.get("fall_finish") != null){
                         //TODO:添加任务唯一性校验防止重复更新
                         PdmBiDevice one = deviceService.getOne(new QueryWrapper<PdmBiDevice>().eq("device_code", task.getPoint_code2()));
-                        if (!one.getRemark().equals("fall_finish"+task.getTask_id())){
+                        if (!("fall_finish"+task.getTask_id()).equals(one.getRemark())){
                             deviceService.update(new UpdateWrapper<PdmBiDevice>()
                                     .set("material_id", task.getMaterial_id())
                                     .set("deviceinstor_qty",one.getDeviceinstor_qty().add(task.getMaterial_qty()))
@@ -309,14 +313,16 @@ public class SpeFullTask extends AbstractAcsTask {
                 taskGroupMap.put(taskId,taskGroupId);
                 task.setTask_group_id(taskGroupId);
                 //如果点位不属于查询出来可以合并点位集合：则单独下发集合
-                if (!mergePointCollent.contains(start) && !mergePointCollent.contains(end)){
+                if (!mergePointCollent.contains(start) || !mergePointCollent.contains(end)){
                     notMerge.add(task);
                     continue;
                 }
                 //起点点位是否有多个合并任务点，如果没有则判断终点是否有多个合并任务点；都没有则说明当前起点终点对应区域只有一个任务：放入等待下发集合中
                 List<String> collect = taskGroupMap.keySet().stream().collect(Collectors.toList());
                 collect.add(taskId);
-                String mergeTargetId = getMergePoint(pointRegionCollent, start,end,array,collect);
+                //相同任务类型的任务
+                List<SchBaseTask> tasks = array.stream().filter(a -> a.getAcs_task_type().equals(task.getAcs_task_type())).collect(Collectors.toList());
+                String mergeTargetId = getMergePointByone(pointRegionCollent, start,end,tasks,collect);
                 if (mergeTargetId == null){
                     waitingTask.add(task);
                     continue;
@@ -359,9 +365,27 @@ public class SpeFullTask extends AbstractAcsTask {
                 if (tag){task.setIs_send(true);tag = false;}else {task.setIs_send(false); }
             }
         }
+        if (value.size() == 1){
+            for (SchBaseTask task : value) {
+                if (task.getAcs_task_type().equals(AcsTaskEnum.ACS_TASK_TYPE_NOBLE_DOUBLE_ENTRY_TASK.getCode())){
+                    task.setAcs_task_type(AcsTaskEnum.ACS_TASK_TYPE_NOBLE_SINGLE_ENTRY_TASK.getCode());
+                }
+                if (task.getAcs_task_type().equals(AcsTaskEnum.ACS_TASK_TYPE_NOBLE_DOUBLE_TASK.getCode())){
+                    task.setAcs_task_type(AcsTaskEnum.ACS_TASK_TYPE_NOBLE_SINGLE_TASK.getCode());
+                }
+                task.setIs_send(true);
+            }
+        }
     }
 
-    private String getMergePoint(Map<String, List<Object>> pointRegionCollent, String start,String end,List<SchBaseTask> tasks,List<String>  taskIds) {
+    private String getMergePointByone(Map<String, List<Object>> pointRegionCollent, String start,String end,List<SchBaseTask> tasks,List<String>  taskIds) {
+        String findpoint = findpoint(pointRegionCollent, start, tasks, taskIds);
+        if (findpoint == null){
+            findpoint = findpoint(pointRegionCollent, end, tasks, taskIds);
+        }
+        return findpoint;
+    }
+    private String getMergePointBytow(Map<String, List<Object>> pointRegionCollent, String start,String end,List<SchBaseTask> tasks,List<String>  taskIds) {
         String findpoint = findpoint(pointRegionCollent, start, tasks, taskIds);
         if (findpoint == null){
             findpoint = findpoint(pointRegionCollent, end, tasks, taskIds);

mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/device/IPdmBiDeviceService.java

@@ -27,5 +27,12 @@ public interface IPdmBiDeviceService extends IService<PdmBiDevice> {
      */
     List<Map> workproceduceDevices(Map<String,Object> param);
 
+    /**
+     * 根据点位查询对应设备
+     * @param PointCode
+     * @return
+     */
+    PdmBiDevice getDeviceByPointCode(String PointCode);
+
 
 }

mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/device/dao/mapper/PdmBiDeviceMapper.java

@@ -20,4 +20,6 @@ public interface PdmBiDeviceMapper extends BaseMapper<PdmBiDevice> {
     List<Map> getNotWorkDevice(Map<String,Object> query);
 
     List<Map> workproceduceDevices(Map<String,Object> query);
+
+    PdmBiDevice getDeviceByPoint(String pointCode);
 }

mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/device/dao/mapper/PdmBiDeviceMapper.xml

@@ -39,4 +39,9 @@
         GROUP BY pdm_bi_device.device_code
         HAVING currentQty > #{qty}
     </select>
+    <select id="getDeviceByPoint" resultType="org.nl.wms.product_manage.service.device.dao.PdmBiDevice">
+        select pdm_bi_device.* from pdm_bi_device
+        left join sch_base_point on sch_base_point.device_code = pdm_bi_device.device_code
+        where sch_base_point.point_code = #{pointCode}
+    </select>
 </mapper>

mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/device/impl/PdmBiDeviceServiceImpl.java

@@ -30,4 +30,9 @@ public class PdmBiDeviceServiceImpl extends ServiceImpl<PdmBiDeviceMapper, PdmBi
     public List<Map> workproceduceDevices(Map<String, Object> param) {
         return this.baseMapper.workproceduceDevices(param);
     }
+
+    @Override
+    public PdmBiDevice getDeviceByPointCode(String PointCode) {
+        return this.baseMapper.getDeviceByPoint(PointCode);
+    }
 }

mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/impl/IPdmProduceWorkorderServiceImpl.java

@@ -19,6 +19,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.jetbrains.annotations.NotNull;
 import org.nl.common.TableDataInfo;
 import org.nl.common.domain.query.PageQuery;
+import org.nl.common.enums.StatusEnum;
 import org.nl.common.enums.WorkerOrderEnum;
 import org.nl.common.utils.*;
 import org.nl.common.utils.api.RestBusinessTemplate;
@@ -117,7 +118,7 @@ public class IPdmProduceWorkorderServiceImpl extends ServiceImpl<PdmProduceWorko
         entity.setCreate_id(SecurityUtils.getCurrentUserId());
         entity.setCreate_name(SecurityUtils.getCurrentNickName());
         entity.setCreate_time(DateUtil.now());
-        entity.setCreate_type(WorkerOrderEnum.PCINTO.getCode());
+        entity.setCreate_type(StatusEnum.PCINTO.getCode());
         entity.setWorkorder_status(WorkerOrderEnum.CREATE.getCode());
         this.save(entity);
 
@@ -260,7 +261,7 @@ public class IPdmProduceWorkorderServiceImpl extends ServiceImpl<PdmProduceWorko
             param.put("workorder_code", CodeUtil.getNewCode("PDM_SHIFTORDER"));
 //            param.put("macoperate_id", IdUtil.getSnowflake(1, 1).nextId());
             param.put("workorder_status", WorkerOrderEnum.CREATE.getCode());
-            param.put("shift_type_scode", WorkerOrderEnum.DAYSHIFT.getCode()); // 默认白班
+            param.put("shift_type_scode", StatusEnum.DAYSHIFT.getCode()); // 默认白班
             String is_error = "0";
             String error_message = "";
             //循环每一行
@@ -358,7 +359,7 @@ public class IPdmProduceWorkorderServiceImpl extends ServiceImpl<PdmProduceWorko
             }
             param.put("is_error", is_error);
             param.put("error_info", error_message);
-            param.put("create_type", WorkerOrderEnum.EXCELINTO.getCode());
+            param.put("create_type", StatusEnum.EXCELINTO.getCode());
             param.put("planproducestart_date", produce_date + "07:30:00");
             param.put("planproduceend_date", produce_date + "18:30:00");
             param.put("create_id", currentUserId);
@@ -391,7 +392,7 @@ public class IPdmProduceWorkorderServiceImpl extends ServiceImpl<PdmProduceWorko
 //            param.put("producedeviceorder_code", CodeUtil.getNewCode("PDM_SHIFTORDER"));
             param.put("workorder_status", WorkerOrderEnum.CREATE.getCode());
 //            param.put("produce_date", produce_date);
-            param.put("shift_type_scode", WorkerOrderEnum.NIGHTSHIFT.getCode()); // 夜班
+            param.put("shift_type_scode", StatusEnum.NIGHTSHIFT.getCode()); // 夜班
             //循环每一行
             col:
             for (int j = 0; j < list.size(); j++) {
@@ -495,7 +496,7 @@ public class IPdmProduceWorkorderServiceImpl extends ServiceImpl<PdmProduceWorko
             }
             param.put("is_error", is_error);
             param.put("error_info", error_message);
-            param.put("create_type", WorkerOrderEnum.EXCELINTO.getCode());
+            param.put("create_type", StatusEnum.EXCELINTO.getCode());
             param.put("planproducestart_date", produce_date + "18:30:00");
             DateTime dateTime = DateUtil.offsetDay(DateUtil.parse(produce_date), 1);
             param.put("planproduceend_date", DateUtil.format(dateTime, "yyyy-MM-dd") + " 07:30:00");
@@ -514,7 +515,7 @@ public class IPdmProduceWorkorderServiceImpl extends ServiceImpl<PdmProduceWorko
     @Transactional
     public Object openStart(JSONObject param) {
         //获取前台传入的开工的工单信息
-        //1-创建、2-下发、3-生产中、4-暂停、5-完成
+        //1-创建、2-下发、3-生产中、4-暂停、6-完成
         //判断该工单状态
         PdmProduceWorkorder result = this.getOne(new QueryWrapper<PdmProduceWorkorder>()
                 .eq("device_code", param.getString("device_code"))
@@ -535,13 +536,15 @@ public class IPdmProduceWorkorderServiceImpl extends ServiceImpl<PdmProduceWorko
         workOrder.setReal_qty(null);
         this.update(workOrder, new QueryWrapper<PdmProduceWorkorder>().eq("workorder_id", param.getString("workorder_id")));
         PdmProduceWorkorderrecord workorderrecord = packageRecordForm(workOrder);
-        reportRecordService.save(workorderrecord);
+        try {
-
+            reportRecordService.save(workorderrecord);
+        }catch (Exception ex){
+            throw new BadRequestException("当前工单存在未报工的报工记录,请先进行报工");
+        }
         Map<String, Object> resp = wmsToAcsService.order(array);
         if (HttpStatus.BAD_REQUEST.equals(resp.get("status"))) {
             throw new BadRequestException(resp.get("message")!=null?String.valueOf(resp.get("message")):"acs反馈异常");
         }
-
         return RestBusinessTemplate.execute(() -> resp);
     }
 
@@ -588,9 +591,9 @@ public class IPdmProduceWorkorderServiceImpl extends ServiceImpl<PdmProduceWorko
         Assert.notNull(new Object[]{param, param.get("report_qty"), param.get("nok_qty"), param.getBigDecimal("repare_qty")}, "请求参数不能为空");
 
         PdmProduceWorkorder workorder = this.getOne(new QueryWrapper<PdmProduceWorkorder>().eq("workorder_id", param.getString("workorder_id")));
-        if (workorder.getWorkorder_status().equals(WorkerOrderEnum.COMPLETE.getCode()) || workorder.getWorkorder_status().equals(WorkerOrderEnum.FORCE_COMPLETE.getCode())) {
+//        if (workorder.getWorkorder_status().equals(WorkerOrderEnum.COMPLETE.getCode()) || workorder.getWorkorder_status().equals(WorkerOrderEnum.FORCE_COMPLETE.getCode())) {
-            throw new BadRequestException(param.getString("workorder_id") + "当前工单已经完工不允许报工");
+//            throw new BadRequestException(param.getString("workorder_id") + "当前工单已经完工不允许报工");
-        }
+//        }
         PdmProduceWorkorderrecord one = reportRecordService.getOne(new QueryWrapper<PdmProduceWorkorderrecord>()
                 .eq("workorder_id", param.getString("workorder_id")).eq("report_status", ReportEnum.REPORT_STATUS.code("生成")));
         if (one == null) {
@@ -604,11 +607,11 @@ public class IPdmProduceWorkorderServiceImpl extends ServiceImpl<PdmProduceWorko
         }
         workorder.setReal_qty(null);
         this.updateById(workorder);
-
         reportRecordService.update(new UpdateWrapper<PdmProduceWorkorderrecord>()
                 .set("report_qty", param.getBigDecimal("report_qty"))
                 .set("nok_qty", param.getBigDecimal("nok_qty"))
                 .set("repare_qty", param.getBigDecimal("repare_qty"))
+                .set("report_status", ReportEnum.REPORT_STATUS.code("报工"))
                 .set("needproduct_qty", Math.max(0,workorder.getPlan_qty().intValue() - workorder.getReport_qty().intValue()))
                 .eq("macoperate_id", one.getMacoperate_id()));
         return one.getMacoperate_id();

mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/region/dao/mapper/SchBaseRegionMapper.xml

@@ -7,12 +7,12 @@
             region.*
         FROM
         SCH_BASE_Region region
-        <where>
+        <where> 1=1
             <if test="product_area != null and product_area != ''">
-                region.product_area = #{product_area}
+               and region.product_area = #{product_area}
             </if>
             <if test="region_code != null and region_code != ''">
-                (region.region_code like '%${region_code}%' or region.region_name like '%${region_code}%')
+                and (region.region_code like '%${region_code}%' or region.region_name like '%${region_code}%')
             </if>
         </where>
     </select>

mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/task/TaskStatusEvent.java

@@ -0,0 +1,25 @@
+package org.nl.wms.scheduler_manage.service.task;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+import org.nl.common.publish.event.PublishEvent;
+import org.nl.wms.storage_manage.CHANGE_BILL_TYPE_ENUM;
+
+import java.math.BigDecimal;
+
+/*
+ * @author ZZQ
+ * @Date 2023/5/10 11:37
+ * 仓库物料事件
+ */
+@SuperBuilder
+@AllArgsConstructor
+@NoArgsConstructor
+@Data
+public class TaskStatusEvent extends PublishEvent {
+
+    private String task_id;
+    private String type;
+}

mes/hd/nladmin-system/src/main/resources/config/application-dev3.yml

@@ -22,11 +22,11 @@ spring:
     druid:
       db-type: com.alibaba.druid.pool.DruidDataSource
       driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
-      url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.46.5}:${DB_PORT:3306}/${DB_NAME:hl_one_mes_test}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false
+#      url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.46.5}:${DB_PORT:3306}/${DB_NAME:hl_one_mes_test}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false
-      #      url: jdbc:log4jdbc:mysql://${DB_HOST:localhost}:${DB_PORT:3306}/${DB_NAME:hl_one_mes}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false
+      url: jdbc:log4jdbc:mysql://${DB_HOST:localhost}:${DB_PORT:3306}/${DB_NAME:hl_one_mes}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false
       username: ${DB_USER:root}
       #      password: ${DB_PWD:123456}
-      password: ${DB_PWD:123456}
+      password: ${DB_PWD:942464Yy}
 
       # 初始连接数
       initial-size: 5

mes/hd/nladmin-system/src/main/resources/logback-spring.xml

@@ -145,6 +145,33 @@ https://juejin.cn/post/6844903775631572999
             <appender-ref ref="CONSOLE"/>
         </logger>
     </springProfile>
+    <springProfile name="dev3">
+        <root level="debug">
+            <appender-ref ref="CONSOLE"/>
+        </root>
+
+        <logger name="jdbc.audit" level="ERROR" additivity="false">
+            <appender-ref ref="CONSOLE"/>
+        </logger>
+        <logger name="jdbc.resultset" level="ERROR" additivity="false">
+            <appender-ref ref="CONSOLE"/>
+        </logger>
+        <logger name="springfox.documentation" level="ERROR" additivity="false">
+            <appender-ref ref="CONSOLE"/>
+        </logger>
+        <logger name="jdbc.resultsettable" level="ERROR" additivity="false">
+            <appender-ref ref="CONSOLE"/>
+        </logger>
+        <logger name="jdbc.sqlonly" level="ERROR" additivity="false">
+            <appender-ref ref="CONSOLE"/>
+        </logger>
+        <logger name="jdbc.sqltiming" level="ERROR" additivity="false">
+            <appender-ref ref="CONSOLE"/>
+        </logger>
+        <logger name="org.jinterop" level="ERROR" additivity="false">
+            <appender-ref ref="CONSOLE"/>
+        </logger>
+    </springProfile>
     <!--测试环境:打印控制台-->
     <springProfile name="test">
         <!-- 打印sql -->

mes/hd/nladmin-system/src/main/resources/scheduler.xml

@@ -9,7 +9,6 @@
       </param>
     </flow>
     <flow id="A1_TWYTJ" name="推弯一体工序" sourceRef="A1_JGXL" targetRef="A1_SKQX">
-
     </flow>
     <flow id="A1_SKQX" name="深坑清洗" sourceRef="A1_TWYTJ" targetRef="end"></flow>
     <end id="end" name="Junior Reject End" sourceRef="A1_SKQX"></end>

mes/qd/src/views/wms/scheduler_manage/region/index.vue

@@ -70,9 +70,9 @@
           <el-form-item label="区域名称" prop="region_name">
             <el-input v-model="form.region_name" style="width: 370px;" />
           </el-form-item>
-          <el-form-item label="是否合并任务" prop="merge">
+          <el-form-item label="是否合并任务" prop="is_merge">
             <el-select
-              v-model="form.merge"
+              v-model="form.is_merge"
               placeholder=""
               style="width: 370px"
             >
@@ -111,9 +111,9 @@
         <el-table-column prop="region_code" label="区域编码" :min-width="flexWidth('region_code',crud.data,'区域编码')" />
         <el-table-column prop="region_name" label="区域名称" :min-width="flexWidth('region_name',crud.data,'区域名称')" />
         <el-table-column prop="product_area" label="生产车间" :min-width="flexWidth('product_area',crud.data,'生产车间')" />
-        <el-table-column prop="merge" label="是否合并任务" :min-width="flexWidth('merge',crud.data,'是否合并任务')">
+        <el-table-column prop="is_merge" label="是否合并任务" :min-width="flexWidth('is_merge',crud.data,'是否合并任务')">
           <template slot-scope="scope">
-            {{ scope.row.merge ? '是' : '否' }}
+            {{ dict.label.IS_OR_NOT[scope.row.is_merge] }}
           </template>
         </el-table-column>
         <el-table-column prop="point_type_explain" label="点位类型说明" :min-width="flexWidth('point_type_explain',crud.data,'点位类型说明')" />
@@ -150,7 +150,7 @@ const defaultForm = {
   product_area: 'A1',
   point_type_explain: null,
   point_status_explain: null,
-  merge: '1',
+  is_merge: '1',
   remark: null,
   create_id: null,
   create_name: null,

mes/qd/src/views/wms/scheduler_manage/task/index.vue

@@ -56,15 +56,6 @@
               @keyup.enter.native="crud.toQuery"
             />
           </el-form-item>
-          <!--          <el-form-item label="任务类型">-->
-          <!--            <treeselect-->
-          <!--              v-model="query.task_type"-->
-          <!--              :load-options="loadChildNodes"-->
-          <!--              :options="classes1"-->
-          <!--              style="width: 180px"-->
-          <!--              placeholder="请选择"-->
-          <!--            />-->
-          <!--          </el-form-item>-->
           <el-form-item label="任务类型">
             <el-select
               v-model="query.task_type"
@@ -116,7 +107,7 @@
 
           <el-form-item label="任务状态">
             <el-select
-              v-model="query.task_status"
+              v-model="task_status"
               multiple
               style="width: 400px"
               placeholder="任务状态"
@@ -124,6 +115,10 @@
               clearable
               @change="handTaskStatus"
             >
+              <el-option
+                label="调度中任务"
+                value="-1"
+              />
               <el-option
                 v-for="item in taskStatusList"
                 :key="item.code"
@@ -137,7 +132,7 @@
         </el-form>
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
-      <el-button  type="primary" @click="taskScheduler()" >任务调度</el-button>
+      <el-button type="primary" @click="taskScheduler()">任务调度</el-button>
       <crudOperation :permission="permission" />
       <!--表格渲染-->
       <el-table
@@ -152,16 +147,11 @@
         <el-table-column prop="task_code" 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="物料标识" min-width="150" show-overflow-tooltip />
-        <el-table-column prop="acs_task_type" label="acs任务类型" min-width="120" show-overflow-tooltip>
+        <el-table-column prop = "acs_task_type" label="acs任务类型" min-width="120" show-overflow-tooltip :formatter = "acsTypeName"></el-table-column>
-          <template slot-scope="scope">
-            {{ acsTaskTypeList[scope.row.acs_task_type - 1] }}
-          </template>
-        </el-table-column>
         <el-table-column prop="task_name" label="任务类型" min-width="120" show-overflow-tooltip />
         <el-table-column v-if="false" prop="task_status" label="任务状态" />
         <el-table-column prop="product_area" label="生产车间" />
         <el-table-column prop="task_status_name" label="任务状态" width="120px" :formatter="formatTaskStatusName" />
-
         <el-table-column prop="point_code1" label="起点" width="100" />
         <el-table-column prop="point1_region_name" label="起点区域" width="120" />
         <el-table-column prop="point_code2" label="终点" min-width="100" show-overflow-tooltip />
@@ -242,7 +232,7 @@ import pagination from '@crud/Pagination'
 import Treeselect, { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 import crudClassstandard from '@/api/wms/basedata/master/classstandard'
-import {scheduler} from "./task";
+import { scheduler } from './task'
 
 export default {
   name: 'Task',
@@ -266,7 +256,7 @@ export default {
         task_type: '',
         finished_type: '',
         product_area: 'A1',
-        task_status: ''
+        task_status: '-1'
       },
       optShow: {
         add: false,
@@ -284,6 +274,7 @@ export default {
       currentComponent: '',
       openParam: {},
       create_time: [],
+      task_status: ['-1'],
       taskStatusList: [],
       taskTypeList: [],
       acsTaskTypeList: [],
@@ -309,7 +300,7 @@ export default {
     crudTask.getAcsTaskType().then(res => {
       this.acsTaskTypeList = res
     })
-    // this.crud.query.task_status = ['-1']
+    this.crud.query.task_status = ['-1']
     // this.crud.toQuery()
   },
   methods: {
@@ -359,12 +350,17 @@ export default {
       this.crud.toQuery()
     },
     handTaskStatus(value) {
-      this.crud.query.more_task_status = null
+      this.crud.query.task_status = value.toString()
-      if (value) {
-        this.crud.query.more_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) {