From 3e994bfa17440f9536123a74720d2062a6c9f196 Mon Sep 17 00:00:00 2001 From: liuhanqing Date: Tue, 23 Sep 2025 14:51:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E6=A5=BC=E5=8D=95=E5=90=91=E5=87=BA?= =?UTF-8?q?=E5=BA=93=E5=8F=A3-=E7=94=9F=E6=88=90=E5=A0=86=E5=9E=9B?= =?UTF-8?q?=E6=9C=BA=E9=98=9F=E5=88=97=20=20=E5=88=B0=E8=BE=BE=E5=87=BA?= =?UTF-8?q?=E5=8F=A3=E5=AE=8C=E6=88=90mydojob=E4=BB=BB=E5=8A=A1=EF=BC=8C?= =?UTF-8?q?=E5=B9=B6=E9=80=9A=E7=9F=A5wms?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/api/service/IApiService.java | 4 +- .../api/service/impl/ApiServiceImpl.java | 4 +- .../mapper/BasCargoSpaceMapper.java | 2 + .../service/IBasCargoSpaceService.java | 2 + .../impl/BasCargoSpaceServiceImpl.java | 21 +-- .../main/java/com/ruoyi/common/TaskType.java | 23 +--- .../com/ruoyi/job/mapper/MydoJobMapper.java | 2 + .../ruoyi/job/service/IMydoJobService.java | 2 + .../job/service/impl/MydoJobServiceImpl.java | 5 + .../mapper/DdjDeviceExecutionQueueMapper.java | 18 +-- .../IDdjDeviceExecutionQueueService.java | 2 + .../DdjDeviceExecutionQueueServiceImpl.java | 5 + .../ssj/floor1/Floor1SingleSsjThread.java | 126 +++++++++++++++--- .../mapper/bas/BasCargoSpaceMapper.xml | 15 ++- .../resources/mapper/job/MydoJobMapper.xml | 4 + .../queue/DdjDeviceExecutionQueueMapper.xml | 7 + 16 files changed, 180 insertions(+), 62 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/service/IApiService.java b/ruoyi-admin/src/main/java/com/ruoyi/api/service/IApiService.java index 27ea67ee..407da1bd 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/api/service/IApiService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/api/service/IApiService.java @@ -98,12 +98,10 @@ public interface IApiService /** * 任务到达拣选口 - * @param agvFinishUrl - * @param point * @param param * @return */ - RequestLog finishMydoJob(String agvFinishUrl, String point, Map param); + RequestLog finishMydoJob(Map param); /** * 发送agv开始状态 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ApiServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ApiServiceImpl.java index 678b449b..99885ce5 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ApiServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ApiServiceImpl.java @@ -178,13 +178,11 @@ public class ApiServiceImpl implements IApiService { /** * 出库到达拣选口 - * @param agvFinishUrl - * @param endPoint * @param param * @return */ @Override - public RequestLog finishMydoJob(String agvFinishUrl, String endPoint, Map param) { + public RequestLog finishMydoJob( Map param) { return requestLogService.getRequestLog(JOB_FINISH_URL, "agv任务完成", JSONUtil.toJsonStr(param)); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/cargospace/mapper/BasCargoSpaceMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/cargospace/mapper/BasCargoSpaceMapper.java index aa75868a..0d7ee0c1 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/bas/cargospace/mapper/BasCargoSpaceMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/cargospace/mapper/BasCargoSpaceMapper.java @@ -58,4 +58,6 @@ public interface BasCargoSpaceMapper * @return 结果 */ public int deleteBasCargoSpaceByCargoSpaceIds(String[] cargoSpaceIds); + + BasCargoSpace selectBasCargoSpaceByWmsCargoSpaceId(String cargoSpaceId); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/cargospace/service/IBasCargoSpaceService.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/cargospace/service/IBasCargoSpaceService.java index 62bdd06d..3f0e9c37 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/bas/cargospace/service/IBasCargoSpaceService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/cargospace/service/IBasCargoSpaceService.java @@ -58,4 +58,6 @@ public interface IBasCargoSpaceService * @return 结果 */ public int deleteBasCargoSpaceByCargoSpaceId(String cargoSpaceId); + + BasCargoSpace selectBasCargoSpaceByWmsCargoSpaceId(String cargoSpaceId); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/cargospace/service/impl/BasCargoSpaceServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/cargospace/service/impl/BasCargoSpaceServiceImpl.java index 284d8e9c..b1be1400 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/bas/cargospace/service/impl/BasCargoSpaceServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/cargospace/service/impl/BasCargoSpaceServiceImpl.java @@ -9,19 +9,19 @@ import com.ruoyi.bas.cargospace.service.IBasCargoSpaceService; /** * 库存信息Service业务层处理 - * + * * @author ruoyi * @date 2025-09-23 */ @Service -public class BasCargoSpaceServiceImpl implements IBasCargoSpaceService +public class BasCargoSpaceServiceImpl implements IBasCargoSpaceService { @Autowired private BasCargoSpaceMapper basCargoSpaceMapper; /** * 查询库存信息 - * + * * @param cargoSpaceId 库存信息主键 * @return 库存信息 */ @@ -33,7 +33,7 @@ public class BasCargoSpaceServiceImpl implements IBasCargoSpaceService /** * 查询库存信息列表 - * + * * @param basCargoSpace 库存信息 * @return 库存信息 */ @@ -45,7 +45,7 @@ public class BasCargoSpaceServiceImpl implements IBasCargoSpaceService /** * 新增库存信息 - * + * * @param basCargoSpace 库存信息 * @return 结果 */ @@ -57,7 +57,7 @@ public class BasCargoSpaceServiceImpl implements IBasCargoSpaceService /** * 修改库存信息 - * + * * @param basCargoSpace 库存信息 * @return 结果 */ @@ -69,7 +69,7 @@ public class BasCargoSpaceServiceImpl implements IBasCargoSpaceService /** * 批量删除库存信息 - * + * * @param cargoSpaceIds 需要删除的库存信息主键 * @return 结果 */ @@ -81,7 +81,7 @@ public class BasCargoSpaceServiceImpl implements IBasCargoSpaceService /** * 删除库存信息信息 - * + * * @param cargoSpaceId 库存信息主键 * @return 结果 */ @@ -90,4 +90,9 @@ public class BasCargoSpaceServiceImpl implements IBasCargoSpaceService { return basCargoSpaceMapper.deleteBasCargoSpaceByCargoSpaceId(cargoSpaceId); } + + @Override + public BasCargoSpace selectBasCargoSpaceByWmsCargoSpaceId(String cargoSpaceId) { + return basCargoSpaceMapper.selectBasCargoSpaceByWmsCargoSpaceId(cargoSpaceId); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/common/TaskType.java b/ruoyi-admin/src/main/java/com/ruoyi/common/TaskType.java index 0569a3e5..614398f9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/common/TaskType.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/common/TaskType.java @@ -3,22 +3,13 @@ package com.ruoyi.common; public class TaskType { /** - * 输送线入库（PTL出口） + * 堆垛机任务类型 */ - public static final String CONV_STOCKIN = "1"; + //1-二楼双向 + public static final int DDJ_RWLX_1 = 1; + //2-一楼单向 + public static final int DDJ_RWLX_2 = 2; + //3-一楼双向 + public static final int DDJ_RWLX_3 = 3; - /** - * 出库至输送线（PTL入口）---单个或组出库 - */ - public static final String CONV_STOCKOUT_SINGLE_GROUP = "21"; - - /** - * 出库至输送线（PTL入口）---顺序出 - */ - public static final String CONV_STOCKOUT_SEQUENCE = "22"; - - /** - * AGV点到点搬运 - */ - public static final String AGV_MOVE = "3"; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/mapper/MydoJobMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/job/mapper/MydoJobMapper.java index 95397bfb..e9bbeab0 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/job/mapper/MydoJobMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/job/mapper/MydoJobMapper.java @@ -66,4 +66,6 @@ public interface MydoJobMapper void InvalidMydoJob(HashMap map); MydoJob selectMydoJobByExitList(@Param("exitList") List exitList); + + void insertHistory(String jobId); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/service/IMydoJobService.java b/ruoyi-admin/src/main/java/com/ruoyi/job/service/IMydoJobService.java index 63062808..b09b726f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/job/service/IMydoJobService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/job/service/IMydoJobService.java @@ -66,4 +66,6 @@ public interface IMydoJobService boolean InvalidMydoJob(Long rwh, Integer id); MydoJob selectMydoJobByExitList(List exitList); + + void insertHistory(String jobId); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/service/impl/MydoJobServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/job/service/impl/MydoJobServiceImpl.java index 90d2cea5..ee4b8902 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/job/service/impl/MydoJobServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/job/service/impl/MydoJobServiceImpl.java @@ -131,4 +131,9 @@ public class MydoJobServiceImpl implements IMydoJobService public MydoJob selectMydoJobByExitList(List exitList) { return mydoJobMapper.selectMydoJobByExitList(exitList); } + + @Override + public void insertHistory(String jobId) { + mydoJobMapper.insertHistory(jobId); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/queue/ddj/mapper/DdjDeviceExecutionQueueMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/queue/ddj/mapper/DdjDeviceExecutionQueueMapper.java index b783bbe2..eb4f6de9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/queue/ddj/mapper/DdjDeviceExecutionQueueMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/queue/ddj/mapper/DdjDeviceExecutionQueueMapper.java @@ -5,15 +5,15 @@ import com.ruoyi.queue.ddj.domain.DdjDeviceExecutionQueue; /** * 堆垛机执行队列Mapper接口 - * + * * @author ruoyi * @date 2025-09-22 */ -public interface DdjDeviceExecutionQueueMapper +public interface DdjDeviceExecutionQueueMapper { /** * 查询堆垛机执行队列 - * + * * @param uuid 堆垛机执行队列主键 * @return 堆垛机执行队列 */ @@ -21,7 +21,7 @@ public interface DdjDeviceExecutionQueueMapper /** * 查询堆垛机执行队列列表 - * + * * @param ddjDeviceExecutionQueue 堆垛机执行队列 * @return 堆垛机执行队列集合 */ @@ -29,7 +29,7 @@ public interface DdjDeviceExecutionQueueMapper /** * 新增堆垛机执行队列 - * + * * @param ddjDeviceExecutionQueue 堆垛机执行队列 * @return 结果 */ @@ -37,7 +37,7 @@ public interface DdjDeviceExecutionQueueMapper /** * 修改堆垛机执行队列 - * + * * @param ddjDeviceExecutionQueue 堆垛机执行队列 * @return 结果 */ @@ -45,7 +45,7 @@ public interface DdjDeviceExecutionQueueMapper /** * 删除堆垛机执行队列 - * + * * @param uuid 堆垛机执行队列主键 * @return 结果 */ @@ -53,9 +53,11 @@ public interface DdjDeviceExecutionQueueMapper /** * 批量删除堆垛机执行队列 - * + * * @param uuids 需要删除的数据主键集合 * @return 结果 */ public int deleteDdjDeviceExecutionQueueByUuids(String[] uuids); + + List selectDdjDeviceExecutionQueueListByRwlx(Integer rwlx); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/queue/ddj/service/IDdjDeviceExecutionQueueService.java b/ruoyi-admin/src/main/java/com/ruoyi/queue/ddj/service/IDdjDeviceExecutionQueueService.java index 0475e952..965fcbb1 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/queue/ddj/service/IDdjDeviceExecutionQueueService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/queue/ddj/service/IDdjDeviceExecutionQueueService.java @@ -60,4 +60,6 @@ public interface IDdjDeviceExecutionQueueService public int deleteDdjDeviceExecutionQueueByUuid(String uuid); DdjDeviceExecutionQueue selectDdjDeviceExecutionQueueByRwh(Long rwh); + + List selectDdjDeviceExecutionQueueListByRwlx(Integer rwlx); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/queue/ddj/service/impl/DdjDeviceExecutionQueueServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/queue/ddj/service/impl/DdjDeviceExecutionQueueServiceImpl.java index 69309a59..45d20e33 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/queue/ddj/service/impl/DdjDeviceExecutionQueueServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/queue/ddj/service/impl/DdjDeviceExecutionQueueServiceImpl.java @@ -95,4 +95,9 @@ public class DdjDeviceExecutionQueueServiceImpl implements IDdjDeviceExecutionQu public DdjDeviceExecutionQueue selectDdjDeviceExecutionQueueByRwh(Long rwh) { return null; } + + @Override + public List selectDdjDeviceExecutionQueueListByRwlx(Integer rwlx) { + return ddjDeviceExecutionQueueMapper.selectDdjDeviceExecutionQueueListByRwlx(rwlx); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/floor1/Floor1SingleSsjThread.java b/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/floor1/Floor1SingleSsjThread.java index 1df3421e..e15c6986 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/floor1/Floor1SingleSsjThread.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/floor1/Floor1SingleSsjThread.java @@ -1,19 +1,28 @@ package com.ruoyi.schedule.scheduleTask.ssj.floor1; +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.ArrayUtil; +import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjUtil; +import com.ruoyi.api.domain.RequestLog; import com.ruoyi.api.service.IApiService; +import com.ruoyi.bas.cargospace.domain.BasCargoSpace; +import com.ruoyi.bas.cargospace.service.IBasCargoSpaceService; import com.ruoyi.common.utils.spring.SpringUtils; import com.ruoyi.job.domain.MydoJob; import com.ruoyi.job.service.IMydoJobService; import com.ruoyi.queue.agv.service.IAgvQueueService; import com.ruoyi.device.ssj.domain.DeviceSsj; +import com.ruoyi.queue.ddj.domain.DdjDeviceExecutionQueue; +import com.ruoyi.queue.ddj.service.IDdjDeviceExecutionQueueService; import com.ruoyi.schedule.plcRead.ssj.PlcSsjRead; import lombok.extern.slf4j.Slf4j; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; + +import static com.ruoyi.common.TaskType.DDJ_RWLX_2; /** * 一楼单向出库线程 循环出库作业+巷道口空闲 生成堆垛机出库队列 @@ -22,28 +31,41 @@ import java.util.Map; public class Floor1SingleSsjThread implements Runnable { public HashMap> ssjCodeList; - private IApiService apiService; - private IMydoJobService mydoJobService; - public boolean isRun = true; - - private Map exitRoadwayMap = new HashMap<>(); + private final Map exitRoadwayMap = new HashMap<>(); + private IDdjDeviceExecutionQueueService ddjDeviceExecutionQueueService; + private IBasCargoSpaceService basCargoSpaceService; + private Map> roadwayMap = new HashMap<>(); public void init() { + //设置要循环的输送机 ssjCodeList = new HashMap<>(); - ArrayList ssjCodes = new ArrayList<>(); - ssjCodes.add("L2001"); - ssjCodes.add("L2007"); - ssjCodeList.put("outRoadwaySsj", ssjCodes); + ArrayList outRoadwaySsjList = new ArrayList<>(); + outRoadwaySsjList.add("L2001"); + outRoadwaySsjList.add("L2007"); + ssjCodeList.put("outRoadwaySsj", outRoadwaySsjList); + ArrayList outSsjList = new ArrayList<>(); + outSsjList.add("L2002"); + outSsjList.add("L2008"); + ssjCodeList.put("outSsj", outSsjList); + + + //初始化服务 apiService = SpringUtils.getBean(IApiService.class); mydoJobService = SpringUtils.getBean(IMydoJobService.class); - exitRoadwayMap.put("L2001","L2011"); - exitRoadwayMap.put("L2007","L2014"); - log.info("初始化服务 {}，{}", apiService, mydoJobService); + ddjDeviceExecutionQueueService = SpringUtils.getBean(IDdjDeviceExecutionQueueService.class); + basCargoSpaceService = SpringUtils.getBean(IBasCargoSpaceService.class); + //初始化出口和巷道口映射关系 + exitRoadwayMap.put("L2001","L2002"); + exitRoadwayMap.put("L2007","L2008"); + + //初始化巷道口 排 列 层 + roadwayMap.put("L2001",Arrays.asList(1,1,1)); + roadwayMap.put("L2007",Arrays.asList(1,1,1)); } @Override @@ -51,7 +73,7 @@ public class Floor1SingleSsjThread implements Runnable { init(); while (isRun){ for (String type : ssjCodeList.keySet()) { - //一楼单向出库口 + //一楼单向巷道口 if ("outRoadwaySsj".equals(type)) { for (String ssjCode : ssjCodeList.get(type)) { try { @@ -66,6 +88,19 @@ public class Floor1SingleSsjThread implements Runnable { } } + if ("outSsj".equals(type)){ + for (String ssjCode : ssjCodeList.get(type)) { + try { + if (PlcSsjRead.deviceSsjMap.containsKey(ssjCode)) { + dispatch2(PlcSsjRead.deviceSsjMap.get(ssjCode)); + } else { + log.error("设备不存在 ssjCode{}", ssjCode); + } + } catch (RuntimeException e) { + log.error(e.getMessage(), e); + } + } + } } try { Thread.sleep(1500); @@ -76,14 +111,67 @@ public class Floor1SingleSsjThread implements Runnable { } + /** + * 一楼单向出库口调度 + * + * @param ssj 输送机 + */ + private void dispatch2(DeviceSsj ssj) { + if (ssj.getDw()==1 && ssj.getTaskNo()>0){ + MydoJob mydoJob = mydoJobService.selectMydoJobByTaskNo(Convert.toLong(ssj.getTaskNo())); + if (ObjUtil.isNotNull(mydoJob)) { + HashMap param = new HashMap<>(); + param.put("taskNo",mydoJob.getTaskNo()); + param.put("jobId",mydoJob.getJobId()); + RequestLog result = apiService.finishMydoJob(param); + if ("1".equals(result.getIsSuccessful())){ + log.info("完成任务 taskNo{} ",mydoJob.getTaskNo()); + mydoJobService.insertHistory(mydoJob.getJobId()); + mydoJobService.deleteMydoJobByJobId(mydoJob.getJobId()); + } + } + } + } + /** + * 一楼单向巷道口调度 + * @param ssj 输送机 + */ public void dispatch(DeviceSsj ssj) { //如果入库请求1 并且 托盘码不为空 if (ssj.getKx()==1){ String exitId = exitRoadwayMap.get(ssj.getDeviceCode()); - MydoJob mydoJob = mydoJobService.selectMydoJobByExitList(List.of(exitId)); + List exitList = new ArrayList<>(); + exitList.add(exitId); + MydoJob mydoJob = mydoJobService.selectMydoJobByExitList(exitList); if (ObjUtil.isNotNull(mydoJob)){ - //生成队列 + BasCargoSpace basCargoSpace = basCargoSpaceService.selectBasCargoSpaceByWmsCargoSpaceId(mydoJob.getCargoSpaceId()); + if (ObjUtil.isNull(basCargoSpace)){ + log.error("货位不存在 cargoSpaceId{}",mydoJob.getCargoSpaceId()); + }else { + //生成队列 + List list = ddjDeviceExecutionQueueService.selectDdjDeviceExecutionQueueListByRwlx(DDJ_RWLX_2); + List pclList = roadwayMap.get(ssj.getDeviceCode()); + if (CollUtil.isEmpty(list) && CollUtil.isNotEmpty(pclList)){ + DdjDeviceExecutionQueue ddjDeviceExecutionQueue = new DdjDeviceExecutionQueue(); + ddjDeviceExecutionQueue.setUuid(IdUtil.simpleUUID()); + ddjDeviceExecutionQueue.setRwh(Convert.toLong(mydoJob.getTaskNo())); + ddjDeviceExecutionQueue.setDevName(mydoJob.getRoadwayId()); + ddjDeviceExecutionQueue.setDevId(Convert.toInt(mydoJob.getRoadwayId())); + ddjDeviceExecutionQueue.setRwzt(0); + ddjDeviceExecutionQueue.setYph(Convert.toInt(basCargoSpace.getThePlatoon())); + ddjDeviceExecutionQueue.setYlh(Convert.toInt(basCargoSpace.getTheColumn())); + ddjDeviceExecutionQueue.setYch(Convert.toInt(basCargoSpace.getTheFloor())); + ddjDeviceExecutionQueue.setMbph(pclList.get(0)); + ddjDeviceExecutionQueue.setMblh(pclList.get(1)); + ddjDeviceExecutionQueue.setMbch(pclList.get(2)); + ddjDeviceExecutionQueue.setDdjxf("0"); + ddjDeviceExecutionQueue.setMlfs(5); + ddjDeviceExecutionQueue.setScsj(DateUtil.formatDateTime(DateUtil.date())); + ddjDeviceExecutionQueue.setRwlx(DDJ_RWLX_2); + ddjDeviceExecutionQueueService.insertDdjDeviceExecutionQueue(ddjDeviceExecutionQueue); + } + } } } } diff --git a/ruoyi-admin/src/main/resources/mapper/bas/BasCargoSpaceMapper.xml b/ruoyi-admin/src/main/resources/mapper/bas/BasCargoSpaceMapper.xml index 75644cbb..e7f05030 100644 --- a/ruoyi-admin/src/main/resources/mapper/bas/BasCargoSpaceMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/bas/BasCargoSpaceMapper.xml @@ -3,7 +3,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -33,7 +33,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + + insert into bas_cargo_space @@ -140,9 +145,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from bas_cargo_space where cargo_space_id in + delete from bas_cargo_space where cargo_space_id in #{cargoSpaceId} - \ No newline at end of file + diff --git a/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml b/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml index 9b1cd689..f2092bf1 100644 --- a/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml @@ -120,6 +120,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{faultFlag}, + + insert into mydo_job_wcs_history + select * from mydo_job_wcs where job_id = #{jobId} + update mydo_job_wcs diff --git a/ruoyi-admin/src/main/resources/mapper/queue/DdjDeviceExecutionQueueMapper.xml b/ruoyi-admin/src/main/resources/mapper/queue/DdjDeviceExecutionQueueMapper.xml index 9d88fd81..32db7700 100644 --- a/ruoyi-admin/src/main/resources/mapper/queue/DdjDeviceExecutionQueueMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/queue/DdjDeviceExecutionQueueMapper.xml @@ -61,6 +61,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where uuid = #{uuid} + + insert into ddj_device_execution_queue