From 05652eb8967967111503cc7d72be0425e1b47fad Mon Sep 17 00:00:00 2001 From: icewint Date: Thu, 6 Mar 2025 09:02:59 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=87=BA=E5=BA=93?= =?UTF-8?q?=E6=88=96=E7=A7=BB=E5=BA=93=E5=AE=8C=E6=88=90=E5=90=8E=E9=87=8A?= =?UTF-8?q?=E6=94=BE=E8=B4=A7=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/quartz/task/TaskExecutor.java | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/TaskExecutor.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/TaskExecutor.java index 492a18a4..0dd79481 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/TaskExecutor.java +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/TaskExecutor.java @@ -2,6 +2,7 @@ package com.ruoyi.quartz.task; import com.alibaba.fastjson2.JSON; import com.ruoyi.app.domain.*; +import com.ruoyi.app.mapper.AppLocationMapper; import com.ruoyi.quartz.domain.app.*; import com.ruoyi.app.service.*; import com.ruoyi.common.utils.StringUtils; @@ -43,6 +44,8 @@ public class TaskExecutor { put(2, 2);// 出库 put(3, 3);// 移库 }}; + @Autowired + private AppLocationMapper appLocationMapper; /** * 解析wms任务 @@ -307,6 +310,19 @@ public class TaskExecutor { PmsCommonRes pmsCommonRes = JSON.parseObject(HttpUtils.sendPost(url, JSON.toJSONString(recordList)), PmsCommonRes.class); logger.info("pms出库反馈请求信息：{}，结果：{}", JSON.toJSONString(recordList), JSON.toJSONString(pmsCommonRes)); } + AppStock appStockCheck = new AppStock(); + appStockCheck.setLocationId(task.getOrigin()); + List appStockCheckData = appStockService.selectAppStockList(appStockCheck); + if(appStockCheckData == null) { + return; + } + if(appStockCheckData.isEmpty()) { + // 这个位置没有库存了，直接释放货位 + AppLocation location = new AppLocation(); + location.setLocationId(task.getOrigin()); + location.setLocationStatus(0); + appLocationMapper.updateAppLocation(location); + } } // 如果小于的话就不做处理 return; @@ -314,6 +330,12 @@ public class TaskExecutor { if (task.getTaskType().compareTo(9) == 0) { // 移库任务 int updateNewLocation = appStockService.updateNewLocation(task.getOrigin(), task.getDestination()); if(updateNewLocation > 0) { + // 释放原库位 + AppLocation location = new AppLocation(); + location.setLocationId(task.getOrigin()); + location.setLocationStatus(0); + appLocationMapper.updateAppLocation(location); + AppTask updateRemark = new AppTask(); updateRemark.setTaskId(task.getTaskId()); updateRemark.setRemark("移库完成"); From 8b5c20c989798a958969926a5c75feccb6fb1f42 Mon Sep 17 00:00:00 2001 From: icewint Date: Thu, 6 Mar 2025 09:05:35 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AD=98=E5=9C=A8?= =?UTF-8?q?=E7=9A=84=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ruoyi/quartz/task/TaskExecutor.java | 6 +++--- .../java/com/ruoyi/app/mapper/AppPmsOrderOutMapper.java | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/TaskExecutor.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/TaskExecutor.java index a33f3679..1e191cb3 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/TaskExecutor.java +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/TaskExecutor.java @@ -212,8 +212,8 @@ public class TaskExecutor { appStock.setOriginNum(pendingStorage.getGoodsNum()); appStock.setBatchNo("-"); appStock.setInvAge(0L); - appStock.setGoodsStatus(0L); - appStock.setStockStatus(0L); + appStock.setGoodsStatus(0); + appStock.setStockStatus(0); appStock.setCreateTime(new Date()); appStock.setUpdateTime(new Date()); appStock.setCreateUser(pendingStorage.getCreatePerson()); @@ -338,7 +338,7 @@ public class TaskExecutor { location.setLocationId(task.getOrigin()); location.setLocationStatus(0); appLocationMapper.updateAppLocation(location); - + AppTask updateRemark = new AppTask(); updateRemark.setTaskId(task.getTaskId()); updateRemark.setRemark("移库完成"); diff --git a/ruoyi-system/src/main/java/com/ruoyi/app/mapper/AppPmsOrderOutMapper.java b/ruoyi-system/src/main/java/com/ruoyi/app/mapper/AppPmsOrderOutMapper.java index a74c08ea..4ee3036b 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/app/mapper/AppPmsOrderOutMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/app/mapper/AppPmsOrderOutMapper.java @@ -60,4 +60,6 @@ public interface AppPmsOrderOutMapper */ public int deleteAppPmsOrderOutByListIds(String[] recordIds); public int deleteAppPmsOrderOutByOrderId(AppPmsOrderOut appPmsOrderOut); + + int updatePickNum(AppPmsOrderOut appPmsOrderOut); } From 4d6ac1504b67565aff8de80a1c0a0f2b49e7a016 Mon Sep 17 00:00:00 2001 From: icewint Date: Thu, 6 Mar 2025 09:07:25 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0pms=E7=A0=81=E7=9B=98?= =?UTF-8?q?=E5=90=8E=E7=A0=81=E7=9B=98=E6=A8=A1=E5=BC=8F=E7=9A=84=E6=A0=87?= =?UTF-8?q?=E8=AE=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/app/service/impl/AppPmsOrderInServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/ruoyi-system/src/main/java/com/ruoyi/app/service/impl/AppPmsOrderInServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/app/service/impl/AppPmsOrderInServiceImpl.java index 8076b31a..842e6e15 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/app/service/impl/AppPmsOrderInServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/app/service/impl/AppPmsOrderInServiceImpl.java @@ -135,6 +135,7 @@ public class AppPmsOrderInServiceImpl implements IAppPmsOrderInService appPendingStorage.setVehicleNo(request.getVehicleNo()); appPendingStorage.setGoodsNum(pmsInDatum.getGoodsNum()); appPendingStorage.setStatus(1); + appPendingStorage.setStorageType(2); appPendingStorage.setCreateTime(DateUtils.getNowDate()); appPendingStorage.setUpdateTime(DateUtils.getNowDate()); appPendingStorage.setCreatePerson("PDA");