lhq/FT501-WMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

取货无货 作废作业自动分配

Browse Source
This commit is contained in:
liuhanqing
2025-07-15 14:45:00 +08:00
parent fafd2d146a
commit 9011cdd938
2 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java
View File

@@ -19,6 +19,7 @@ import com.ruoyi.bas.taskNo.service.IBasTaskNoService;
import com.ruoyi.bas.warehouse.domain.BasWarehouse; import com.ruoyi.bas.warehouse.domain.BasWarehouse;
import com.ruoyi.bas.warehouse.service.IBasWarehouseService; import com.ruoyi.bas.warehouse.service.IBasWarehouseService;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.text.Convert;
import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.job.mydojob.domain.MydoJob; import com.ruoyi.job.mydojob.domain.MydoJob;
import com.ruoyi.job.mydojob.mapper.MydoJobMapper; 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.job.mydojobdetail.service.IMydoJobDetailService;
import com.ruoyi.log.domain.RequestLog; import com.ruoyi.log.domain.RequestLog;
import com.ruoyi.log.service.IRequestLogService; 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.domain.TagTask;
import com.ruoyi.out.tagTask.service.ITagTaskService; import com.ruoyi.out.tagTask.service.ITagTaskService;
import org.aspectj.weaver.loadtime.Aj; import org.aspectj.weaver.loadtime.Aj;
@@ -59,6 +63,10 @@ public class ToWmsServiceImpl implements IToWmsService {
private IBasTagService iBasTagService; private IBasTagService iBasTagService;
@Autowired @Autowired
private IBasCargoSpaceService basCargoSpaceService; private IBasCargoSpaceService basCargoSpaceService;
@Autowired
private IOutStockoutDetailService outStockoutDetailService;
@Autowired
private IOutStockoutService outStockoutService;
@@ -183,17 +191,16 @@ public class ToWmsServiceImpl implements IToWmsService {
} }
@Override @Override
public AjaxResult reMaterial(MydoJob mydoJob) { public AjaxResult reMaterial(MydoJob param) {
//重新分配物料 //重新分配物料
//标记原货位为出库待盘点 MydoJob mydoJob = mydoJobService.selectMydoJobByJobId(param.getJobId());
BasCargoSpace basCargoSpace = basCargoSpaceService.selectBasCargoSpaceByCargoSpaceId(mydoJob.getCargoSpaceId()); MydoJobDetail mydoJobDetailParam = new MydoJobDetail();
basCargoSpace.setStatus("6"); mydoJobDetailParam.setJobId(mydoJob.getJobId());
basCargoSpaceService.updateBasCargoSpace(basCargoSpace); List<MydoJobDetail> mydoJobDetails = mydoJobDetailService.selectMydoJobDetailList(mydoJobDetailParam);
//减少单据分配数量 String stockOutId = mydoJobDetails.get(0).getInOrOutId();
// 作废作业 // 作废作业
mydoJobService.OuthandInvalidation(new String[]{mydoJob.getJobId()});
//调用自动分配 //调用自动分配
return AjaxResult.success(); return outStockoutService.autoAllot(stockOutId);
} }
} }

2
ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java
View File

@@ -245,7 +245,7 @@ public class PdaServiceImp implements PdaService {
switch (billType) { switch (billType) {
case "1": case "1":
//销售单据 //拣选单据
return handleOutType1(trayCodeMakeSure,mydoJobDetailList,mydoJobList.get(0)); return handleOutType1(trayCodeMakeSure,mydoJobDetailList,mydoJobList.get(0));
case "2": case "2":
//退货单据 不绑定容器 //退货单据 不绑定容器