优化

pom.xml

@@ -37,7 +37,7 @@
         <spring-framework.version>5.3.39</spring-framework.version>
         <hutool.version>5.8.27</hutool.version>
         <lombok.version>1.18.30</lombok.version>
-        <HslCommunication.version>3.7.0</HslCommunication.version>
+        <HslCommunication.version>2.0.0</HslCommunication.version>
         <mybatis-plus.version>3.5.2</mybatis-plus.version>
 
     </properties>

ruoyi-admin/src/main/java/com/ruoyi/MyStartupRunner.java

@@ -0,0 +1,21 @@
+package com.ruoyi;
+
+import com.ruoyi.schedule.ScheduleThread;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.stereotype.Component;
+
+@Component
+public class MyStartupRunner implements CommandLineRunner {
+
+    @Autowired
+    private ScheduleThread scheduleThread;
+
+    @Override
+    public void run(String... args) throws Exception {
+        // 这里编写项目启动后要执行的方法逻辑
+        //System.out.println("项目启动成功后自动执行此方法");
+        scheduleThread.startAllThread();
+        scheduleThread.startAllThread2();
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/api/controller/AgvController.java

@@ -96,14 +96,13 @@ public class AgvController extends BaseController {
             cancelTaskRequest.setReqCode(IdUtil.fastSimpleUUID());
             cancelTaskRequest.setReqTime(DateUtil.formatDateTime(DateUtil.date()));
             cancelTaskRequest.setTaskCode(agvQueue.getTaskCode());
-
             //取消rcs中指定的agv任务
             CancelTaskResponse cancelTaskResponse = apiService.cancelTask(cancelTaskRequest);
-
+            if("0".equals(cancelTaskResponse.getCode())){
-            if(cancelTaskResponse.getCode() == 0 && "成功".equals(cancelTaskResponse.getMessage()) && cancelTaskResponse.getReqCode() == cancelTaskRequest.getReqCode()){
+                agvQueueService.insertHistory(agvQueue.getReqCode());
+                agvQueueService.deleteAgvQueueByReqCode(agvQueue.getReqCode());
                 return AjaxResult.success("AGV任务队列取消成功！", cancelTaskResponse);
             }
-
             return AjaxResult.error("取消RCS-AGV任务队列失败！");
         }
 

ruoyi-admin/src/main/java/com/ruoyi/api/domain/agv/cancelTask/CancelTaskResponse.java

@@ -3,11 +3,46 @@ package com.ruoyi.api.domain.agv.cancelTask;
 import com.ruoyi.api.domain.agv.ResponseBase;
 import lombok.Data;
 
+import java.io.Serializable;
+
 @Data
-public class CancelTaskResponse extends ResponseBase {
+public class CancelTaskResponse implements Serializable {
 
     /**
      * 请求编号
      */
     public String reqCode;
+
+    /**
+     * 返回码
+     */
+    private String code;
+    /**
+     * 返回消息
+     */
+    private String message;
+
+    public String getReqCode() {
+        return reqCode;
+    }
+
+    public void setReqCode(String reqCode) {
+        this.reqCode = reqCode;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
 }

ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ApiServiceImpl.java

@@ -33,10 +33,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
+import java.text.SimpleDateFormat;
-import java.util.HashMap;
+import java.util.*;
-import java.util.List;
-import java.util.Map;
 
 import static com.ruoyi.common.Constant.*;
 import static com.ruoyi.common.TaskStatusCode.TASK_EP_CREATE;
@@ -63,7 +61,6 @@ public class ApiServiceImpl implements IApiService {
     private IBasCargoSpaceService basCargoSpaceService;
 
 
-
     /**
      * 下发agv编码
      *
@@ -75,7 +72,7 @@ public class ApiServiceImpl implements IApiService {
         RequestLog requestLog = requestLogService.getRequestLog2(GEN_AGV_SCHEDULING_TASK, "生成AGV任务", JSONUtil.toJsonStr(genAgvSchedulingTaskRequest));
         if ("1".equals(requestLog.getIsSuccessful())) {
             AgvQueue agvQueue = agvQueueService.selectAgvQueueByTaskCode(genAgvSchedulingTaskRequest.getTaskCode());
-            if(agvQueue != null){
+            if (agvQueue != null) {
                 agvQueue.setStatus("1");
                 agvQueueService.updateAgvQueue(agvQueue);
             }
@@ -130,7 +127,7 @@ public class ApiServiceImpl implements IApiService {
         String wmsTaskNo = param.get("wmsTaskNo");
         GenAgvSchedulingTaskResponse response = new GenAgvSchedulingTaskResponse();
         AgvQueue queue = agvQueueService.selectAgvQueueByTaskCode(param.get("taskCode"));
-        if(queue == null){
+        if (queue == null) {
             AgvQueue agvQueue = createAgvQueue(startPoint, endPoint, param.get("trayCode"), param.get("taskCode"), "1", traySize, wmsTaskNo);
             response = requestAgvQueue(agvQueue);
             if (response.getCode() == 0) {
@@ -220,26 +217,23 @@ public class ApiServiceImpl implements IApiService {
     public AjaxResult cancelMydoJob(JobParam jobParam) {
 
         MydoJob mydoJob = mydoJobService.selectMydoJobByTaskNo(Convert.toLong(jobParam.getTaskNo()));
-        if(mydoJob==null){
+        if (mydoJob == null) {
             return AjaxResult.error("任务不存在");
         }
-        if("1".equals(mydoJob.getStatus())){
+        mydoJob.setStatus("5");
-            mydoJob.setStatus("5");
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-            mydoJobService.insertHistory(mydoJob.getJobId());
+        mydoJob.setFinishTime(sdf.format(new Date()));
-            mydoJobService.deleteMydoJobByJobId(mydoJob.getJobId());
+        mydoJobService.updateMydoJob(mydoJob);
-            return AjaxResult.success();
+        mydoJobService.insertHistory(mydoJob.getJobId());
-        }else{
+        mydoJobService.deleteMydoJobByJobId(mydoJob.getJobId());
-            return AjaxResult.error("任务已开始");
+        return AjaxResult.success();
-        }
     }
 
 
-
-
     @Override
     public AjaxResult reAssign(JobParam jobParam) {
         RequestLog requestLog = requestLogService.getRequestLog(RE_ASSIGN_URL, "重新分配货位", JSONUtil.toJsonStr(jobParam));
-        if ("1".equals(requestLog.getIsSuccessful())){
+        if ("1".equals(requestLog.getIsSuccessful())) {
             InterfaceReceive bean = JSONUtil.toBean(requestLog.getResponseBody(), InterfaceReceive.class);
             MydoJob wmsMydoJob = BeanUtil.toBean(bean.getData(), MydoJob.class);
             MydoJob mydoJob = mydoJobService.selectMydoJobByJobId(wmsMydoJob.getJobId());
@@ -253,7 +247,7 @@ public class ApiServiceImpl implements IApiService {
     @Override
     public AjaxResult reMaterial(JobParam jobParam) {
         RequestLog requestLog = requestLogService.getRequestLog(RE_MATERIAL_URL, "重新分配物料", JSONUtil.toJsonStr(jobParam));
-        if ("1".equals(requestLog.getIsSuccessful())){
+        if ("1".equals(requestLog.getIsSuccessful())) {
             return AjaxResult.success();
         }
         return AjaxResult.error();
@@ -279,9 +273,9 @@ public class ApiServiceImpl implements IApiService {
         agvQueue.setReqTime(DateUtil.formatDateTime(DateUtil.date()));
         agvQueue.setAgvType("AGV");
         agvQueue.setPositionCode1(code1);
-        if("4".equals(traySize) && "L1001".equals(code2)){
+        if ("4".equals(traySize) && "L1001".equals(code2)) {
             agvQueue.setPositionCode2("L1001-1");
-        }else{
+        } else {
             agvQueue.setPositionCode2(code2);
         }
 
@@ -379,15 +373,19 @@ public class ApiServiceImpl implements IApiService {
 
     @Override
     public AjaxResult receiveOutMydoJob(ReceiveJob receiveOutJob) {
+        List<MydoJob> outList = mydoJobService.getJobById(receiveOutJob.getJobId());
+        if (outList != null && outList.size() > 0) {
+            return AjaxResult.success();
+        }
         MydoJob mydoJob = new MydoJob();
         mydoJob.setJobId(receiveOutJob.getJobId());
         mydoJob.setTaskNo(receiveOutJob.getTaskNo());
         mydoJob.setCargoSpaceId(receiveOutJob.getCargoSpaceId());
 
-        if("L2002".equals(receiveOutJob.getExitId()) || "L2008".equals(receiveOutJob.getExitId())
+        if ("L2002".equals(receiveOutJob.getExitId()) || "L2008".equals(receiveOutJob.getExitId())
                 || "L2004".equals(receiveOutJob.getExitId()) || "L2006".equals(receiveOutJob.getExitId())) {
             mydoJob.setExitId("1");
-        }else{
+        } else {
             mydoJob.setExitId(receiveOutJob.getExitId());
         }
         mydoJob.setInOrOut(receiveOutJob.getInOrOut());
@@ -401,7 +399,7 @@ public class ApiServiceImpl implements IApiService {
         int i = mydoJobService.insertMydoJob(mydoJob);
         if (i > 0) {
             return AjaxResult.success();
-        }else{
+        } else {
             return AjaxResult.error();
         }
 
@@ -422,7 +420,8 @@ public class ApiServiceImpl implements IApiService {
             return AjaxResult.error();
         }
     }
-//todo  新增agv站点
+
+    //todo  新增agv站点
     @Override
     public AjaxResult deleteAgvTray(AgvQueue agvQueue) {
         Map<String, String> paramMap = new HashMap<>();
@@ -430,13 +429,13 @@ public class ApiServiceImpl implements IApiService {
         paramMap.put("ctnrTyp", agvQueue.getCtnrType());
         paramMap.put("ctnrCode", agvQueue.getCtnrCode());
 
-        if("L1001".equals(agvQueue.getPositionCode2())){
+        if ("L1001".equals(agvQueue.getPositionCode2())) {
             paramMap.put("stgBinCode", "JT000307001013");
         }
-        if("L1003".equals(agvQueue.getPositionCode2())){
+        if ("L1003".equals(agvQueue.getPositionCode2())) {
             paramMap.put("stgBinCode", "JT000206001013");
         }
-        if("L1001-1".equals(agvQueue.getPositionCode2())){
+        if ("L1001-1".equals(agvQueue.getPositionCode2())) {
             paramMap.put("stgBinCode", "JT000407001013");
         }
 //        paramMap.put("binName", agvQueue.getPositionCode2());
@@ -444,10 +443,10 @@ public class ApiServiceImpl implements IApiService {
 
         RequestLog requestLog = requestLogService.getRequestLog2(DELETE_BIN_URL, "AGV解绑容器", JSONUtil.toJsonStr(paramMap));
         if ("1".equals(requestLog.getIsSuccessful())) {
-            log.info("站点："+agvQueue.getPositionCode2()+"{}AGV容器解绑成功！");
+            log.info("站点：" + agvQueue.getPositionCode2() + "{}AGV容器解绑成功！");
             return AjaxResult.success();
         } else {
-            log.info("站点："+agvQueue.getPositionCode2()+"{}AGV容器解绑失败！");
+            log.info("站点：" + agvQueue.getPositionCode2() + "{}AGV容器解绑失败！");
             return AjaxResult.error();
         }
     }
@@ -484,9 +483,9 @@ public class ApiServiceImpl implements IApiService {
     @Override
     public AjaxResult updateWcsPort(WcsPort wcsPort) {
         int i = wcsPortService.updateWcsPort(wcsPort);
-        if(i>0){
+        if (i > 0) {
             return AjaxResult.success();
-        }else{
+        } else {
             return AjaxResult.error();
         }
     }

ruoyi-admin/src/main/java/com/ruoyi/bas/sysDateConfig/domain/SysDateConfig.java

@@ -0,0 +1,40 @@
+package com.ruoyi.bas.sysDateConfig.domain;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class SysDateConfig implements Serializable {
+    private static final long serialVersionUID = 1L;
+    private String configId;
+    private String sysDate;
+
+    public String getConfigId() {
+        return configId;
+    }
+
+    public void setConfigId(String configId) {
+        this.configId = configId;
+    }
+
+    public String getSysDate() {
+        return sysDate;
+    }
+
+    public void setSysDate(String sysDate) {
+        this.sysDate = sysDate;
+    }
+
+    @Override
+    public String toString() {
+        return "SysDateConfig{" +
+                "configId='" + configId + '\'' +
+                ", sysDate='" + sysDate + '\'' +
+                '}';
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/bas/sysDateConfig/mapper/SysDateConfigMapper.java

@@ -0,0 +1,8 @@
+package com.ruoyi.bas.sysDateConfig.mapper;
+
+import com.ruoyi.bas.sysDateConfig.domain.SysDateConfig;
+
+public interface SysDateConfigMapper {
+
+    SysDateConfig getMsgById(String configId);
+}

ruoyi-admin/src/main/java/com/ruoyi/bas/sysDateConfig/service/SysDateConfigService.java

@@ -0,0 +1,8 @@
+package com.ruoyi.bas.sysDateConfig.service;
+
+import com.ruoyi.bas.sysDateConfig.domain.SysDateConfig;
+
+public interface SysDateConfigService {
+
+    SysDateConfig getMsgById(String number);
+}

ruoyi-admin/src/main/java/com/ruoyi/bas/sysDateConfig/service/impl/SysDateConfigServiceImpl.java

@@ -0,0 +1,19 @@
+package com.ruoyi.bas.sysDateConfig.service.impl;
+
+import com.ruoyi.bas.sysDateConfig.domain.SysDateConfig;
+import com.ruoyi.bas.sysDateConfig.mapper.SysDateConfigMapper;
+import com.ruoyi.bas.sysDateConfig.service.SysDateConfigService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class SysDateConfigServiceImpl implements SysDateConfigService {
+
+    @Autowired
+    private SysDateConfigMapper sysDateConfigMapper;
+
+    @Override
+    public SysDateConfig getMsgById(String configId) {
+        return sysDateConfigMapper.getMsgById(configId);
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/job/controller/MydoJobController.java

@@ -114,4 +114,15 @@ public class MydoJobController extends BaseController
     {
         return mydoJobService.OuthandFinish(jobIds);
     }
+
+    @PreAuthorize("@ss.hasAnyPermi('job:mydoJob:confirmOut')")
+    @Log(title = "手动出库", businessType = BusinessType.INSERT)
+    @RequestMapping("/confirmOut")
+    public AjaxResult confirmOut(@RequestParam("thePlatoon")String thePlatoon,
+                                 @RequestParam("theColumn") String theColumn,
+                                 @RequestParam("theFloor") String theFloor,
+                                 @RequestParam("exitId") String exitId)
+    {
+        return mydoJobService.confirmOut(thePlatoon,theColumn,theFloor,exitId);
+    }
 }

ruoyi-admin/src/main/java/com/ruoyi/job/mapper/MydoJobMapper.java

@@ -92,4 +92,10 @@ public interface MydoJobMapper
     List<MydoJob> getInJobByEntranceId(@Param("entranceId") String exitId);
 
     MydoJob selectMydoJobByExitId(@Param("exitId") String exitId);
+
+    List<MydoJob> getJobById(@Param("jobId") String jobId);
+
+    void confirmOutJob(HashMap<String, Object> map);
+
+    List<MydoJob> getInJobByRoadAndFloor(@Param("entranceId") String entranceId, @Param("roadwayId") String roadwayId);
 }

ruoyi-admin/src/main/java/com/ruoyi/job/service/IMydoJobService.java

@@ -91,4 +91,10 @@ public interface IMydoJobService
     List<MydoJob> getInJobByEntranceId(String exitId);
 
     MydoJob selectMydoJobByExitId(String exitId);
+
+    List<MydoJob> getJobById(String jobId);
+
+    AjaxResult confirmOut(String thePlatoon, String theColumn, String theFloor,String exitId);
+
+    List<MydoJob> getInJobByRoadAndFloor(String entranceId, String roadwayId);
 }

ruoyi-admin/src/main/java/com/ruoyi/job/service/impl/JobCallBackServiceImpl.java

@@ -124,7 +124,7 @@ public class JobCallBackServiceImpl implements IJobCallBackService
             param.put("taskNo", jobCallBack.getTaskNo());
             param.put("wmsType", jobCallBack.getType());
             RequestLog requestLog = apiService.finishMydoJob(param);
-            if ("0".equals(requestLog.getIsSuccessful())){
+            if ("1".equals(requestLog.getIsSuccessful())){
                 jobCallBack.setStatus("1");
                 jobCallBackMapper.updateJobCallBack(jobCallBack);
             }else{

ruoyi-admin/src/main/java/com/ruoyi/job/service/impl/MydoJobServiceImpl.java

@@ -202,6 +202,31 @@ public class MydoJobServiceImpl implements IMydoJobService
         return mydoJobMapper.selectMydoJobByExitId(exitId);
     }
 
+    @Override
+    public List<MydoJob> getJobById(String jobId) {
+        return mydoJobMapper.getJobById(jobId);
+    }
+
+    @Override
+    public AjaxResult confirmOut(String thePlatoon, String theColumn, String theFloor,String exitId) {
+        HashMap<String, Object> map = new HashMap<>();
+        map.put("v_the_platoon", thePlatoon);
+        map.put("v_the_column", theColumn);
+        map.put("v_the_floor", theFloor);
+        map.put("v_exit_id", exitId);
+        mydoJobMapper.confirmOutJob(map);
+        if (Convert.toInt(map.get("v_result"))==10){
+            return AjaxResult.success("出库成功！");
+        }else {
+            return AjaxResult.error(map.get("v_resultMsg").toString());
+        }
+    }
+
+    @Override
+    public List<MydoJob> getInJobByRoadAndFloor(String entranceId, String roadwayId) {
+        return mydoJobMapper.getInJobByRoadAndFloor(entranceId,roadwayId);
+    }
+
     @Override
     public List<MydoJob> selectMydoJobFinishList(MydoJob mydoJob) {
         return mydoJobMapper.selectMydoJobFinishList(mydoJob);

ruoyi-admin/src/main/java/com/ruoyi/queue/ddj/mapper/DdjDeviceExecutionQueueMapper.java

@@ -64,4 +64,8 @@ public interface DdjDeviceExecutionQueueMapper
     List<DdjDeviceExecutionQueue> selectDdjDeviceExecutionQueueListByRwlx(@Param("rwlx")Integer rwlx,@Param("devId") Integer devId);
 
     DdjDeviceExecutionQueue selectDdjDeviceExecutionQueueByRwhAndXd(@Param("rwh") Long rwh, @Param("devId") Integer devId);
+
+    void insertFinish(DdjDeviceExecutionQueue ddjDeviceExecutionQueue);
+
+    void deleteQueue(DdjDeviceExecutionQueue ddjDeviceExecutionQueue);
 }

ruoyi-admin/src/main/java/com/ruoyi/queue/ddj/service/IDdjDeviceExecutionQueueService.java

@@ -62,4 +62,6 @@ public interface IDdjDeviceExecutionQueueService
     DdjDeviceExecutionQueue selectDdjDeviceExecutionQueueByRwh(Long rwh,Integer devId);
 
     List<DdjDeviceExecutionQueue> selectDdjDeviceExecutionQueueListByRwlx(Integer rwlx,Integer devId);
+
+    void delQueue(DdjDeviceExecutionQueue ddjDeviceExecutionQueue);
 }

ruoyi-admin/src/main/java/com/ruoyi/queue/ddj/service/impl/DdjDeviceExecutionQueueServiceImpl.java

@@ -1,5 +1,7 @@
 package com.ruoyi.queue.ddj.service.impl;
 
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -102,4 +104,13 @@ public class DdjDeviceExecutionQueueServiceImpl implements IDdjDeviceExecutionQu
     public List<DdjDeviceExecutionQueue> selectDdjDeviceExecutionQueueListByRwlx(Integer rwlx,Integer devId) {
         return ddjDeviceExecutionQueueMapper.selectDdjDeviceExecutionQueueListByRwlx(rwlx,devId);
     }
+
+    @Override
+    public void delQueue(DdjDeviceExecutionQueue ddjDeviceExecutionQueue) {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        ddjDeviceExecutionQueue.setRwzt(5);
+        ddjDeviceExecutionQueue.setJssj(sdf.format(new Date()));
+        ddjDeviceExecutionQueueMapper.insertFinish(ddjDeviceExecutionQueue);
+        ddjDeviceExecutionQueueMapper.deleteQueue(ddjDeviceExecutionQueue);
+    }
 }

ruoyi-admin/src/main/java/com/ruoyi/schedule/ScheduleThread.java

@@ -69,8 +69,8 @@ public class ScheduleThread {
         scheduleInit();
         log.info("调度服务执行成功");
 
-        startAllThread();
+        //startAllThread();
-        startAllThread2();
+        //startAllThread2();
     }
 
     /**

ruoyi-admin/src/main/java/com/ruoyi/schedule/plcRead/ddj/PlcDdj1Read.java

@@ -114,8 +114,8 @@ public class PlcDdj1Read extends Thread {
     }
 
     void closeServer() {
-        if (readWriteNet != null) {
+        if (siemensS7Net != null) {
-            readWriteNet.ConnectClose();
+            siemensS7Net.ConnectClose();
         }
         setIsConnect(false);
     }

ruoyi-admin/src/main/java/com/ruoyi/schedule/plcRead/ddj/PlcDdj2Read.java

@@ -114,8 +114,8 @@ public class PlcDdj2Read extends Thread {
     }
 
     void closeServer() {
-        if (readWriteNet != null) {
+        if (siemensS7Net != null) {
-            readWriteNet.ConnectClose();
+            siemensS7Net.ConnectClose();
         }
         setIsConnect(false);
     }

ruoyi-admin/src/main/java/com/ruoyi/schedule/plcRead/ssj/PlcSsjRead.java

@@ -190,11 +190,6 @@ public class PlcSsjRead implements Runnable {
                     byte[] content = trayCodeRead.Content;
                     //去除bytes中
                     ssjDevice.setTrayCode(ParseUtil.filterAndConvert(trayCodeRead.Content));
-//                    if("L2004".equals(ssjDevice.getDeviceCode())){
-//                        ssjDevice.setTrayCode("gMODEL:1 COLOR:1 SERIAL:2 V:1 Hz:1 PH:1 N.W.:1 G.W.:1 ITEM_CODE:12345 @:1$S0T0S1T0S1T0S1T0$40001015202@");
-//                    }else{
-//                        ssjDevice.setTrayCode("gMODEL:1 COLOR:1 SERIAL:1 V:1 Hz:1 PH:1 N.W.:1 G.W.:1 ITEM_CODE:123456 @:1$S0T0S1T0S1T0S1T0$40001015202@");
-//                    }
                 }
             }
             OperateResultExOne<byte[]> agvSsjTask = readWriteNet.Read("DB501.280", Short.parseShort("16"));
@@ -258,8 +253,8 @@ public class PlcSsjRead implements Runnable {
     }
 
     void closeServer() {
-        if (readWriteNet != null) {
+        if (siemensS7Net != null) {
-            readWriteNet.ConnectClose();
+            siemensS7Net.ConnectClose();
         }
         setIsConnect(false);
     }

ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ddj/DdjThread.java

@@ -8,6 +8,8 @@ import com.ruoyi.api.domain.wcs2wms.JobParam;
 import com.ruoyi.api.service.IApiService;
 import com.ruoyi.bas.cargospace.domain.BasCargoSpace;
 import com.ruoyi.bas.cargospace.service.IBasCargoSpaceService;
+import com.ruoyi.bas.sysDateConfig.domain.SysDateConfig;
+import com.ruoyi.bas.sysDateConfig.service.SysDateConfigService;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.spring.SpringUtils;
 import com.ruoyi.device.ddj.domain.MsgDdj;
@@ -21,7 +23,10 @@ import com.ruoyi.schedule.plcRead.ddj.PlcDdj2Read;
 import com.ruoyi.schedule.plcRead.util.Tools;
 import lombok.extern.slf4j.Slf4j;
 
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 
@@ -36,6 +41,7 @@ public class DdjThread implements Runnable {
     private IDdjDeviceExecutionQueueFinishService ddjDeviceExecutionQueueFinishService;
     private IMydoJobService mydoJobService;
     private IBasCargoSpaceService basCargoSpaceService;
+    private SysDateConfigService sysDateConfigService;
 
     public boolean isRun = true;
 
@@ -53,6 +59,7 @@ public class DdjThread implements Runnable {
         ddjDeviceExecutionQueueFinishService = SpringUtils.getBean(IDdjDeviceExecutionQueueFinishService.class);
         basCargoSpaceService = SpringUtils.getBean(IBasCargoSpaceService.class);
         mydoJobService = SpringUtils.getBean(IMydoJobService.class);
+        sysDateConfigService = SpringUtils.getBean(SysDateConfigService.class);
         log.info("初始化服务 {}，{},{},{}", apiService, ddjDeviceExecutionQueueService, ddjDeviceExecutionQueueFinishService,mydoJobService);
     }
 
@@ -62,20 +69,35 @@ public class DdjThread implements Runnable {
         while (isRun) {
             for (String type : ddjCodeList.keySet()) {
 
-                if ("ddj".equals(type)) {
+                SysDateConfig sysDateConfig = sysDateConfigService.getMsgById("1");
-                    for (String ddjCode : ddjCodeList.get(type)) {
+                if(sysDateConfig != null){
-                        try {
+                    String configDate = sysDateConfig.getSysDate();
-                            if ("ddj1".equals(ddjCode)) {
+                    SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-                                ddjTask(PlcDdj1Read.deviceDdjMap.get(ddjCode));
+                    Date inputDate = null;
-                            }
+                    try {
-                            //PlcDdj2Read.deviceDdjMap.containsKey(ddjCode)
+                        inputDate = sdf.parse(configDate);
-                            if ("ddj2".equals(ddjCode)) {
+                    } catch (ParseException e) {
-                                ddjTask(PlcDdj2Read.deviceDdjMap.get(ddjCode));
+                        throw new RuntimeException(e);
-                            }
+                    }
-                        } catch (RuntimeException e) {
+                    Date currentDate = new Date(); // 当前时间
-                            log.error(e.getMessage(), e);
+                    int comparison = inputDate.compareTo(currentDate);
-                        }
+                    if(comparison > 0) {
+                        if ("ddj".equals(type)) {
+                            for (String ddjCode : ddjCodeList.get(type)) {
+                                try {
+                                    if ("ddj1".equals(ddjCode)) {
+                                        ddjTask(PlcDdj1Read.deviceDdjMap.get(ddjCode));
+                                    }
+                                    //PlcDdj2Read.deviceDdjMap.containsKey(ddjCode)
+                                    if ("ddj2".equals(ddjCode)) {
+                                        ddjTask(PlcDdj2Read.deviceDdjMap.get(ddjCode));
+                                    }
+                                } catch (RuntimeException e) {
+                                    log.error(e.getMessage(), e);
+                                }
 
+                            }
+                        }
                     }
                 }
             }
@@ -99,9 +121,14 @@ public class DdjThread implements Runnable {
             //完成作业
             MydoJob mydoJob = mydoJobService.selectMydoJobByTaskNo(rwh);
             DdjDeviceExecutionQueue ddjDeviceExecutionQueue = ddjDeviceExecutionQueueService.selectDdjDeviceExecutionQueueByRwh(rwh,ddj.getId());
-            if (mydoJob != null && ddjDeviceExecutionQueue != null) {
+            if (ddjDeviceExecutionQueue != null) {
                 //回传完成信号
-                ddjTaskFinish(rwh, ddj.getId());
+                if(mydoJob != null){
+                    ddjTaskFinish(rwh, ddj.getId());
+                }else{
+                    ddjDeviceExecutionQueueService.delQueue(ddjDeviceExecutionQueue);
+                }
+
                 log.info("堆垛机："+ddj.getId()+"任务完成，任务号："+ddj.getRwh());
             }
         }
@@ -131,24 +158,25 @@ public class DdjThread implements Runnable {
             Long rwh = ddj.getRwh();
             MydoJob mydoJob = mydoJobService.selectMydoJobByTaskNo(rwh);
             DdjDeviceExecutionQueue ddjDeviceExecutionQueue = ddjDeviceExecutionQueueService.selectDdjDeviceExecutionQueueByRwh(rwh, ddj.getId());
-            if ("0".equals(mydoJob.getFaultFlag()) && "1".equals(ddjDeviceExecutionQueue.getSpare1())) {
+            if(mydoJob != null && Integer.parseInt(mydoJob.getInOrOut()) < 20){
-                mydoJob.setStatus("1");
+                if ("0".equals(mydoJob.getFaultFlag()) && "1".equals(ddjDeviceExecutionQueue.getSpare1())) {
-                mydoJobService.updateMydoJob(mydoJob);
+                    mydoJob.setStatus("1");
-                AjaxResult ajaxResult = apiService.reAssign(new JobParam(mydoJob.getJobId(), mydoJob.getTrayCode(), mydoJob.getTaskNo()));
-                if (ajaxResult.isSuccess()){
-                    mydoJob = mydoJobService.selectMydoJobByTaskNo(rwh);
-                    mydoJob.setFaultFlag("2");
                     mydoJobService.updateMydoJob(mydoJob);
-                    BasCargoSpace basCargoSpace = basCargoSpaceService.selectBasCargoSpaceByWmsCargoSpaceId(mydoJob.getCargoSpaceId());
+                    AjaxResult ajaxResult = apiService.reAssign(new JobParam(mydoJob.getJobId(), mydoJob.getTrayCode(), mydoJob.getTaskNo()));
-                    ddjDeviceExecutionQueue.setMbph(basCargoSpace.getThePlatoon());
+                    if (ajaxResult.isSuccess()){
-                    ddjDeviceExecutionQueue.setMblh(basCargoSpace.getTheColumn());
+                        mydoJob = mydoJobService.selectMydoJobByTaskNo(rwh);
-                    ddjDeviceExecutionQueue.setMbch(basCargoSpace.getTheFloor());
+                        mydoJob.setFaultFlag("2");
-                    ddjDeviceExecutionQueue.setDdjxf("0");
+                        mydoJobService.updateMydoJob(mydoJob);
-                    ddjDeviceExecutionQueueService.updateDdjDeviceExecutionQueue(ddjDeviceExecutionQueue);
+                        BasCargoSpace basCargoSpace = basCargoSpaceService.selectBasCargoSpaceByWmsCargoSpaceId(mydoJob.getCargoSpaceId());
+                        ddjDeviceExecutionQueue.setMbph(basCargoSpace.getThePlatoon());
+                        ddjDeviceExecutionQueue.setMblh(basCargoSpace.getTheColumn());
+                        ddjDeviceExecutionQueue.setMbch(basCargoSpace.getTheFloor());
+                        ddjDeviceExecutionQueue.setDdjxf("0");
+                        ddjDeviceExecutionQueueService.updateDdjDeviceExecutionQueue(ddjDeviceExecutionQueue);
+                    }
                 }
             }
         }
-
         /*
           第四部分
            取货无货，重新分配单据
@@ -201,7 +229,6 @@ public class DdjThread implements Runnable {
             Long rwh = ddj.getRwh();
             DdjDeviceExecutionQueue ddjDeviceExecutionQueueRunningParam = new DdjDeviceExecutionQueue();
             ddjDeviceExecutionQueueRunningParam.setDdjxf("1");
-            //ddjDeviceExecutionQueueRunningParam.setSpare1("1");
             ddjDeviceExecutionQueueRunningParam.setDevId(ddj.getId());
             List<DdjDeviceExecutionQueue> ddjDeviceExecutionRunningQueues = ddjDeviceExecutionQueueService.selectDdjDeviceExecutionQueueList(ddjDeviceExecutionQueueRunningParam);
             if (CollUtil.isNotEmpty(ddjDeviceExecutionRunningQueues)) {
@@ -268,7 +295,16 @@ public class DdjThread implements Runnable {
         int mbch = Convert.toInt(queue.getMbch());
         int mlfs = 5;
         int xfwc = 1;
-        int hwlx = Convert.toInt(queue.getSpare1());
+        int hwlx = 4;
+        if(queue.getSpare1() != null && !"".equals(queue.getSpare1())){
+            hwlx = Convert.toInt(queue.getSpare1());
+        }else{
+            if(devId == 1){
+                hwlx = 4;
+            }else{
+                hwlx = 1;
+            }
+        }
         int jym = Tools.getJYM(taskNo, yph, ylh, ych, mbph, mblh, mbch, mlfs, hwlx);
         byte[] sendData = Tools.sendDataToDevice(taskNo, null, yph, ylh, ych, mbph, mblh, mbch, mlfs, hwlx, xfwc, jym);
         if (devId==1){

ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/floor2/Floor2InOutSsjThread.java

@@ -141,6 +141,14 @@ public class Floor2InOutSsjThread implements Runnable {
                     agvQueueService.updateAgvQueue(agvQueue1);
                 }
 
+                try {
+                    log.info("AGV放货完成，等待AGV退出输送机！");
+                    Thread.sleep(5000);
+                    log.info("AGV放货完成，AGV退出输送机结束！");
+                } catch (InterruptedException e) {
+                    log.info("AGV放货完成，等待AGV退出输送机异常！");
+                    throw new RuntimeException(e);
+                }
                 if("L1001".equals(inSsjDevice.getDeviceCode())) {
                     int i = writeToSsj("DB802.100", agvQueues.get(0).getWmsTaskNo(), 2,Integer.parseInt(agvQueues.get(0).getCtnrCode()));
                     if (i == 1) {

ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/floor2/Floor2RoadWaySsjThread.java

@@ -146,27 +146,22 @@ public class Floor2RoadWaySsjThread implements Runnable {
         }
 
         if(roadSsjDevice.getKx()==1 && roadSsjDevice.getTaskNo() == 0){
-//            List<String> exitList = new ArrayList<>();
-//            if("L1002".equals(roadSsjDevice.getDeviceCode())){
-//                exitList.add("L1001");
-//            }
-//            if("L1004".equals(roadSsjDevice.getDeviceCode())){
-//                exitList.add("L1003");
-//            }
-//            List<MydoJob> inList = mydoJobService.getInJobByEntrance(exitList);
             String exitId = "";
+            String roadwayId = "";
+            String entranceId = "G1005";
             if("L1002".equals(roadSsjDevice.getDeviceCode())){
                 exitId = "L1001";
+                roadwayId = "1";
             }
             if("L1004".equals(roadSsjDevice.getDeviceCode())){
                 exitId = "L1003";
+                roadwayId = "2";
             }
-
+            List<MydoJob> inList1 = mydoJobService.getInJobByRoadAndFloor(entranceId,roadwayId);
-            List<MydoJob> inList = mydoJobService.getInJobByEntranceId(exitId);
+            List<MydoJob> inList2 = mydoJobService.getInJobByEntranceId(exitId);
-            if(inList.size() == 0){
+            MydoJob mydoJob = mydoJobService.selectMydoJobByExitId(exitId);
-//                MydoJob mydoJob = mydoJobService.selectMydoJobByExitList(exitList);
+            if (ObjUtil.isNotNull(mydoJob)) {
-                MydoJob mydoJob = mydoJobService.selectMydoJobByExitId(exitId);
+                if(inList1.size() == 0 && inList2.size() == 0){
-                if (ObjUtil.isNotNull(mydoJob)) {
                     BasCargoSpace basCargoSpace = basCargoSpaceService.selectBasCargoSpaceByWmsCargoSpaceId(mydoJob.getCargoSpaceId());
                     if (ObjUtil.isNull(basCargoSpace)) {
                         log.error("货位不存在 cargoSpaceId{}", mydoJob.getCargoSpaceId());
@@ -201,11 +196,10 @@ public class Floor2RoadWaySsjThread implements Runnable {
                             mydoJobService.updateMydoJob(mydoJob);
                         }
                     }
+                }else{
+                    log.info("当前出口"+ exitId+"存在入库任务，无法出库！");
                 }
-            }else{
-                log.info("当前出口"+ exitId+"存在入库任务，无法出库！");
             }
-
         }
     }
 

ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/floor2/LineSsjThread.java

@@ -105,7 +105,6 @@ public class LineSsjThread implements Runnable {
             mydoJob.setTrayCode(serial);
             mydoJob.setEntranceId("G1005");
             mydoJob.setFlag("0");
-            mydoJob.setStatus("1");
             List<MydoJob> mydoJobs = mydoJobService.selectInOrOutMydoJobList(mydoJob);
             //有作业，下发输送机任务号，覆盖任务号
             if (!mydoJobs.isEmpty()) {

ruoyi-admin/src/main/resources/application-druid.yml

@@ -6,12 +6,12 @@ spring:
         druid:
             #主数据信息
             master:
-#                url: jdbc:sqlserver://172.16.2.170:1433;databaseName=FT517-WCS;
+                url: jdbc:sqlserver://172.16.4.12:1433;databaseName=FT517-wcs;encrypt=true;trustServerCertificate=true;
-#                username: sa
-#                password: Flrd0914.
-                url: jdbc:sqlserver://192.168.58.10:1433;databaseName=FT517-wcs;;encrypt=true;trustServerCertificate=true;
                 username: sa
-                password: www.123.com
+                password: Flrd0914.
+#                url: jdbc:sqlserver://192.168.58.10:1433;databaseName=FT517-wcs;;encrypt=true;trustServerCertificate=true;
+#                username: sa
+#                password: www.123.com
 
             # 从库数据源
             slave:

ruoyi-admin/src/main/resources/application.yml

@@ -68,7 +68,8 @@ spring:
   # redis 配置
   redis:
     # 地址
-    host: 192.168.58.10
+#    host: 192.168.58.10
+    host: 172.16.4.12
     # 端口，默认为6379
     port: 6379
     # 数据库索引

ruoyi-admin/src/main/resources/mapper/bas/SysDateConfigMapper.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.bas.sysDateConfig.mapper.SysDateConfigMapper">
+
+    <resultMap type="SysDateConfig" id="SysDateConfigResult">
+        <result property="configId"    column="config_id"    />
+        <result property="sysDate"    column="sys_date"    />
+    </resultMap>
+
+    <select id="getMsgById" parameterType="java.lang.String" resultType="SysDateConfig">
+        select * from sys_date_config where config_id=#{configId}
+    </select>
+</mapper>

ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml

@@ -306,7 +306,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="getInJobByEntrance" resultMap="MydoJobResult">
-        select job_id, status, task_no, roadway_id, cargo_space_id, target_roadway_id, target_cargo_space_id, priority, execution_phase, in_or_out, create_time, start_time, finish_time, entrance_id, exit_id, warehouse_id, fault_flag,flag,tray_size,tray_code from mydo_job_wcs
+        select job_id, status, task_no, roadway_id, cargo_space_id, target_roadway_id, target_cargo_space_id,
+               priority, execution_phase, in_or_out, create_time, start_time, finish_time, entrance_id,
+               exit_id, warehouse_id, fault_flag,flag,tray_size,tray_code from mydo_job_wcs
         where entrance_id in
         <foreach item="item" index="index" collection="exitList" separator="," open="(" close=")">
             #{item}
@@ -314,4 +316,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         and in_or_out &lt; 20
         and status in (1,3)
     </select>
+
+    <select id="getJobById" parameterType="java.lang.String" resultMap="MydoJobResult">
+        select * from mydo_job_wcs where job_id=#{jobId}
+    </select>
+
+    <select id="confirmOutJob" parameterType="java.util.Map" statementType="CALLABLE">
+        {call proc_add_mydojob_hand(
+                #{v_the_platoon,mode=IN,jdbcType=VARCHAR},
+                #{v_the_column,mode=IN,jdbcType=VARCHAR},
+                #{v_the_floor,mode=IN,jdbcType=VARCHAR},
+                #{v_exit_id,mode=IN,jdbcType=VARCHAR},
+                #{v_result,mode=OUT,jdbcType=INTEGER},
+                #{v_resultMsg,mode=OUT,jdbcType=VARCHAR}
+              )}
+    </select>
+
+    <select id="getInJobByRoadAndFloor" parameterType="java.lang.String" resultMap="MydoJobResult">
+        select * from mydo_job_wcs where in_or_out &lt; 20 and entrance_id=#{entranceId} and roadway_id=#{roadwayId}
+    </select>
 </mapper>

ruoyi-admin/src/main/resources/mapper/queue/DdjDeviceExecutionQueueMapper.xml

@@ -159,4 +159,56 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{uuid}
         </foreach>
     </delete>
+
+    <insert id="insertFinish" parameterType="DdjDeviceExecutionQueue">
+        insert into ddj_device_execution_queue_finish
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="uuid != null">uuid,</if>
+            <if test="rwh != null">rwh,</if>
+            <if test="devName != null and devName != ''">dev_name,</if>
+            <if test="devId != null">dev_id,</if>
+            <if test="rwzt != null">rwzt,</if>
+            <if test="yph != null">yph,</if>
+            <if test="ylh != null">ylh,</if>
+            <if test="ych != null">ych,</if>
+            <if test="mbph != null">mbph,</if>
+            <if test="mblh != null">mblh,</if>
+            <if test="mbch != null">mbch,</if>
+            <if test="ddjxf != null">ddjxf,</if>
+            <if test="rwlx != null">rwlx,</if>
+            <if test="scsj != null">scsj,</if>
+            <if test="xfsj != null">xfsj,</if>
+            <if test="jssj != null">jssj,</if>
+            <if test="mlfs != null">mlfs,</if>
+            <if test="spare1 != null">spare1,</if>
+            <if test="spare2 != null">spare2,</if>
+            <if test="spare3 != null">spare3,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="uuid != null">#{uuid},</if>
+            <if test="rwh != null">#{rwh},</if>
+            <if test="devName != null and devName != ''">#{devName},</if>
+            <if test="devId != null">#{devId},</if>
+            <if test="rwzt != null">#{rwzt},</if>
+            <if test="yph != null">#{yph},</if>
+            <if test="ylh != null">#{ylh},</if>
+            <if test="ych != null">#{ych},</if>
+            <if test="mbph != null">#{mbph},</if>
+            <if test="mblh != null">#{mblh},</if>
+            <if test="mbch != null">#{mbch},</if>
+            <if test="ddjxf != null">#{ddjxf},</if>
+            <if test="rwlx != null">#{rwlx},</if>
+            <if test="scsj != null">#{scsj},</if>
+            <if test="xfsj != null">#{xfsj},</if>
+            <if test="jssj != null">#{jssj},</if>
+            <if test="mlfs != null">#{mlfs},</if>
+            <if test="spare1 != null">#{spare1},</if>
+            <if test="spare2 != null">#{spare2},</if>
+            <if test="spare3 != null">#{spare3},</if>
+        </trim>
+    </insert>
+
+    <delete id="deleteQueue" parameterType="DdjDeviceExecutionQueue">
+        delete from ddj_device_execution_queue where uuid = #{uuid}
+    </delete>
 </mapper>

ruoyi-ui/src/api/job/mydoJob.js

@@ -60,4 +60,12 @@ export function handFinish(jobIds) {
   })
 }
 
+export function confirmOut(thePlatoon,theColumn,theFloor,exitId) {
+  return request({
+    url: '/job/mydoJob/confirmOut',
+    method: 'post',
+    params: { thePlatoon: thePlatoon, theColumn:theColumn,theFloor:theFloor,exitId:exitId}
+  })
+}
+
 

ruoyi-ui/src/layout/components/Navbar.vue

@@ -7,17 +7,17 @@
 
     <div class="right-menu">
       <template v-if="device!=='mobile'">
-        <el-tooltip :content="$t('top.read')" effect="dark" placement="bottom">
+<!--        <el-tooltip :content="$t('top.read')" effect="dark" placement="bottom">-->
-          <el-button class="right-menu-item hover-effect" :type="plcReadStatus ? 'success' : 'info'" size="mini" @click="togglePlcRead">
+<!--          <el-button class="right-menu-item hover-effect" :type="plcReadStatus ? 'success' : 'info'" size="mini" @click="togglePlcRead">-->
-            {{ plcReadStatus ?  $t('top.stopRead')  : $t('top.startRead') }}
+<!--            {{ plcReadStatus ?  $t('top.stopRead')  : $t('top.startRead') }}-->
-          </el-button>
+<!--          </el-button>-->
-        </el-tooltip>
+<!--        </el-tooltip>-->
 
-        <el-tooltip :content="$t('top.task')" effect="dark" placement="bottom">
+<!--        <el-tooltip :content="$t('top.task')" effect="dark" placement="bottom">-->
-          <el-button class="right-menu-item hover-effect" :type="plcScheduleStatus ? 'success' : 'info'" size="mini" @click="togglePlcSchedule">
+<!--          <el-button class="right-menu-item hover-effect" :type="plcScheduleStatus ? 'success' : 'info'" size="mini" @click="togglePlcSchedule">-->
-            {{ plcScheduleStatus ? $t('top.stopTask') : $t('top.startTask') }}
+<!--            {{ plcScheduleStatus ? $t('top.stopTask') : $t('top.startTask') }}-->
-          </el-button>
+<!--          </el-button>-->
-        </el-tooltip>
+<!--        </el-tooltip>-->
 
 
         <search id="header-search" class="right-menu-item" />

ruoyi-ui/src/views/job/mydoJob/index.vue

@@ -27,102 +27,15 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-<!--      <el-form-item label="货位ID" prop="cargoSpaceId">-->
+      <el-form-item label="货位-排" prop="thePlatoon">
-<!--        <el-input-->
+        <el-input v-model="queryParams.thePlatoon" placeholder="请输入货位-排" clearable/>
-<!--          v-model="queryParams.cargoSpaceId"-->
+      </el-form-item>
-<!--          placeholder="请输入货位ID"-->
+      <el-form-item label="货位-列" prop="theColumn">
-<!--          clearable-->
+        <el-input v-model="queryParams.theColumn" placeholder="请输入货位-列" clearable/>
-<!--          @keyup.enter.native="handleQuery"-->
+      </el-form-item>
-<!--        />-->
+      <el-form-item label="货位-层" prop="theFloor">
-<!--      </el-form-item>-->
+        <el-input v-model="queryParams.theFloor" placeholder="请输入货位-层" clearable/>
-<!--      <el-form-item label="去向" prop="targetRoadwayId">-->
+      </el-form-item>
-<!--        <el-input-->
-<!--          v-model="queryParams.targetRoadwayId"-->
-<!--          placeholder="请输入去向"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="目标货位ID" prop="targetCargoSpaceId">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.targetCargoSpaceId"-->
-<!--          placeholder="请输入目标货位ID"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="优先级" prop="priority">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.priority"-->
-<!--          placeholder="请输入优先级"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="执行阶段" prop="executionPhase">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.executionPhase"-->
-<!--          placeholder="请输入执行阶段"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="任务类型" prop="inOrOut">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.inOrOut"-->
-<!--          placeholder="请输入任务类型"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="开始时间" prop="startTime">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.startTime"-->
-<!--          placeholder="请输入开始时间"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="结束时间" prop="finishTime">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.finishTime"-->
-<!--          placeholder="请输入结束时间"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="入口ID" prop="entranceId">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.entranceId"-->
-<!--          placeholder="请输入入口ID"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="出口ID" prop="exitId">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.exitId"-->
-<!--          placeholder="请输入出口ID"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--&lt;!&ndash;      <el-form-item label="仓库ID" prop="warehouseId">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.warehouseId"-->
-<!--          placeholder="请输入仓库ID"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="重分标志" prop="faultFlag">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.faultFlag"-->
-<!--          placeholder="请输入重分标志"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>&ndash;&gt;-->
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -141,6 +54,17 @@
           v-hasPermi="['job:mydoJob:OuthandFinish']"
         >手动完成</el-button>
       </el-col>
+
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="confirmOut"
+          v-hasPermi="['job:mydoJob:confirmOut']"
+        >手动出库</el-button>
+      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -226,17 +150,39 @@
         <el-form-item label="优先级" prop="priority">
           <el-input v-model="form.priority" placeholder="请输入优先级" type="number" style="width: 220px"/>
         </el-form-item>
+
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+
+    <!-- 出口选择弹窗 -->
+    <el-dialog title="选择出口" :visible.sync="exitDialogVisible" width="400px" append-to-body>
+      <el-form ref="exitForm" :model="exitForm" :rules="exitRules" label-width="80px">
+        <el-form-item label="选择出口" prop="exitId">
+          <el-select v-model="exitForm.exitId" placeholder="请选择出口" clearable>
+            <el-option
+              v-for="item in exitOptions"
+              :key="item.exitId"
+              :label="item.exitName"
+              :value="item.exitId"
+            />
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitPointOut">确定</el-button>
+        <el-button @click="cancelExit">取消</el-button>
+      </div>
+    </el-dialog>
+
   </div>
 </template>
 
 <script>
-import {listMydoJob, getMydoJob, delMydoJob, addMydoJob, updateMydoJob, listMydoJobFinish,handFinish} from "@/api/job/mydoJob"
+import {listMydoJob, getMydoJob, delMydoJob, addMydoJob, updateMydoJob, listMydoJobFinish,handFinish,confirmOut} from "@/api/job/mydoJob"
 
 export default {
   name: "MydoJob",
@@ -280,7 +226,10 @@ export default {
         exitId: null,
         warehouseId: null,
         faultFlag: null,
-        trayCode: null
+        trayCode: null,
+        thePlatoon: null,
+        theColumn: null,
+        theFloor: null
       },
       // 表单参数
       form: {},
@@ -292,7 +241,25 @@ export default {
         taskNo: [
           { required: true, message: "任务号不能为空", trigger: "blur" }
         ],
-      }
+      },
+      // 出口选择弹窗显示状态
+      exitDialogVisible: false,
+      // 出口表单数据
+      exitForm: {
+        exitId: null
+      },
+      // 出口表单验证规则
+      exitRules: {
+        exitId: [
+          {required: true, message: "请选择出口", trigger: 'change'}
+        ]
+      },
+      // 出口选项
+      exitOptions: [
+        {exitId: '1', exitName: '一楼'},
+        {exitId: '2', exitName: '二楼'},
+
+      ],
     }
   },
   created() {
@@ -424,6 +391,44 @@ export default {
         this.getList();
       }).catch(() => {});
     },
+    confirmOut() {
+      this.loading = true
+      var thePlatoon = this.queryParams.thePlatoon;
+      var theColumn = this.queryParams.theColumn;
+      var theFloor = this.queryParams.theFloor;
+      // 显示出口选择弹窗
+      this.exitDialogVisible = true;
+      this.exitForm.exitId = null;
+
+      if (thePlatoon == null || theColumn == null || theFloor == null) {
+        this.$modal.msgError("请输入货位排列层");
+        return;
+      }
+    },
+    /** 提交指定货位出库 */
+    submitPointOut() {
+      this.$refs["exitForm"].validate(valid => {
+        if (valid) {
+          var thePlatoon = this.queryParams.thePlatoon;
+          var theColumn = this.queryParams.theColumn;
+          var theFloor = this.queryParams.theFloor;
+
+          this.$modal.confirm('是否确认手动出库该货位？').then(() => {
+            return confirmOut(thePlatoon,theColumn,theFloor,this.exitForm.exitId);
+          }).then(() => {
+            this.$modal.msgSuccess("手动出库成功");
+            this.getList();
+            this.exitDialogVisible = false;
+          }).catch(() => {});
+        }
+      })
+    },
+
+    /** 取消出口选择 */
+    cancelExit() {
+      this.exitDialogVisible = false;
+      this.exitForm.exitId = null;
+    },
     /** 导出按钮操作 */
     handleExport() {
       this.download('job/mydoJob/export', {