From 9011cdd9389ecfb3be1d2da1ac686b5b67a1ce3c Mon Sep 17 00:00:00 2001 From: liuhanqing Date: Tue, 15 Jul 2025 14:45:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E8=B4=A7=E6=97=A0=E8=B4=A7=20?= =?UTF-8?q?=E4=BD=9C=E5=BA=9F=E4=BD=9C=E4=B8=9A=E8=87=AA=E5=8A=A8=E5=88=86?= =?UTF-8?q?=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/service/impl/ToWmsServiceImpl.java | 25 ++++++++++++------- .../com/ruoyi/pda/service/PdaServiceImp.java | 2 +- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java index c7710b4..08cd0d3 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java @@ -19,6 +19,7 @@ import com.ruoyi.bas.taskNo.service.IBasTaskNoService; import com.ruoyi.bas.warehouse.domain.BasWarehouse; import com.ruoyi.bas.warehouse.service.IBasWarehouseService; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.text.Convert; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.job.mydojob.domain.MydoJob; import com.ruoyi.job.mydojob.mapper.MydoJobMapper; @@ -27,6 +28,9 @@ import com.ruoyi.job.mydojobdetail.domain.MydoJobDetail; import com.ruoyi.job.mydojobdetail.service.IMydoJobDetailService; import com.ruoyi.log.domain.RequestLog; import com.ruoyi.log.service.IRequestLogService; +import com.ruoyi.out.outStockout.service.IOutStockoutService; +import com.ruoyi.out.outStockoutDetail.domain.OutStockoutDetail; +import com.ruoyi.out.outStockoutDetail.service.IOutStockoutDetailService; import com.ruoyi.out.tagTask.domain.TagTask; import com.ruoyi.out.tagTask.service.ITagTaskService; import org.aspectj.weaver.loadtime.Aj; @@ -59,6 +63,10 @@ public class ToWmsServiceImpl implements IToWmsService { private IBasTagService iBasTagService; @Autowired private IBasCargoSpaceService basCargoSpaceService; + @Autowired + private IOutStockoutDetailService outStockoutDetailService; + @Autowired + private IOutStockoutService outStockoutService; @@ -183,17 +191,16 @@ public class ToWmsServiceImpl implements IToWmsService { } @Override - public AjaxResult reMaterial(MydoJob mydoJob) { + public AjaxResult reMaterial(MydoJob param) { //重新分配物料 - //标记原货位为出库待盘点 - BasCargoSpace basCargoSpace = basCargoSpaceService.selectBasCargoSpaceByCargoSpaceId(mydoJob.getCargoSpaceId()); - basCargoSpace.setStatus("6"); - basCargoSpaceService.updateBasCargoSpace(basCargoSpace); - //减少单据分配数量 - + MydoJob mydoJob = mydoJobService.selectMydoJobByJobId(param.getJobId()); + MydoJobDetail mydoJobDetailParam = new MydoJobDetail(); + mydoJobDetailParam.setJobId(mydoJob.getJobId()); + List mydoJobDetails = mydoJobDetailService.selectMydoJobDetailList(mydoJobDetailParam); + String stockOutId = mydoJobDetails.get(0).getInOrOutId(); // 作废作业 - + mydoJobService.OuthandInvalidation(new String[]{mydoJob.getJobId()}); //调用自动分配 - return AjaxResult.success(); + return outStockoutService.autoAllot(stockOutId); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java b/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java index a48f084..a93fdb6 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java @@ -245,7 +245,7 @@ public class PdaServiceImp implements PdaService { switch (billType) { case "1": - //销售单据 + //拣选单据 return handleOutType1(trayCodeMakeSure,mydoJobDetailList,mydoJobList.get(0)); case "2": //退货单据 不绑定容器