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

出库单据

Browse Source
This commit is contained in:
张怡蓉
2025-09-25 16:53:43 +08:00
parent 5ef1851f03
commit 245a2e36f6
3 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-admin/src/main/java/com/ruoyi/api/domain/RequestEnter.java
View File

@@ -16,4 +16,6 @@ public class RequestEnter {
private String entranceId; private String entranceId;
//入库楼层 1-一楼 2-二楼 //入库楼层 1-一楼 2-二楼
private String floor; private String floor;
private String type;
} }

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

@@ -92,6 +92,7 @@ public class ToWmsServiceImpl implements IToWmsService {
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public AjaxResult requestEnterByTrayCode(RequestEnter requestEnter) { public AjaxResult requestEnterByTrayCode(RequestEnter requestEnter) {
if (StrUtil.isEmpty(requestEnter.getTrayCode())) { if (StrUtil.isEmpty(requestEnter.getTrayCode())) {
return AjaxResult.error("托盘条码不能为空"); return AjaxResult.error("托盘条码不能为空");
} }
@@ -147,7 +148,8 @@ public class ToWmsServiceImpl implements IToWmsService {
return new AjaxResult(3, "超大托盘"); return new AjaxResult(3, "超大托盘");
} }
//托盘大小与电气返回不匹配 //托盘大小与电气返回不匹配
if (size != Integer.parseInt(requestEnter.getSize())) {
if (StrUtil.isNotBlank(requestEnter.getSize()) && !"1".equals(requestEnter.getType()) && size != Integer.parseInt(requestEnter.getSize())) {
return new AjaxResult(4, "托盘大小不匹配"); return new AjaxResult(4, "托盘大小不匹配");
} }
@@ -244,6 +246,11 @@ public class ToWmsServiceImpl implements IToWmsService {
//修改货位状态 //修改货位状态
basCargoSpace.setStatus("3"); basCargoSpace.setStatus("3");
basCargoSpaceService.updateBasCargoSpace(basCargoSpace); basCargoSpaceService.updateBasCargoSpace(basCargoSpace);
//type=1是手持机调用
if(!"1".equals(requestEnter.getType())){
mydoJob.setStatus("3");
mydoJobService.updateMydoJob(mydoJob);
}
if ("1".equals(mydoJob.getInOrOut())) { if ("1".equals(mydoJob.getInOrOut())) {
//存入调拨单数据 已生成 //存入调拨单数据 已生成

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

@@ -49,6 +49,15 @@ public class PdaServiceImp implements PdaService {
@Override @Override
public AjaxResult addInJob(RequestEnter requestEnter) { public AjaxResult addInJob(RequestEnter requestEnter) {
if(requestEnter.getEntranceId()!=null && "G1005".equals(requestEnter.getEntranceId())){
MydoJob mydoJob = new MydoJob();
mydoJob.setEntranceId(requestEnter.getEntranceId());
mydoJob.setStatus("1");
MydoJob mydoJob1 = mydoJobService.selectMydoJobByEntranceId(mydoJob);
if(mydoJob1!=null){
return AjaxResult.error("该入口已有补码作业");
}
}
AjaxResult ajaxResult = iToWmsService.requestEnterByTrayCode(requestEnter); AjaxResult ajaxResult = iToWmsService.requestEnterByTrayCode(requestEnter);
return ajaxResult; return ajaxResult;
@@ -98,19 +107,6 @@ public class PdaServiceImp implements PdaService {
//@Transactional(rollbackFor = Exception.class) //@Transactional(rollbackFor = Exception.class)
public AjaxResult checkMakeSure(TrayCodeMakeSure trayCodeMakeSure) { public AjaxResult checkMakeSure(TrayCodeMakeSure trayCodeMakeSure) {
String trayCode = trayCodeMakeSure.getTrayCode();
String[] split = trayCode.split(" ");
String productId = split[8].substring(10);
MydoJob mydoJob = new MydoJob();
mydoJob.setExitId(trayCodeMakeSure.getExitId());
mydoJob.setProductId(productId);
mydoJob.setStatus("3");
List<MydoJobDetail> mydoJobDetails = mydoJobDetailService.selectMydoJobDetailListByExit(mydoJob);
// MydoJob mydoJob = mydoJobService.selectMydoJobByTrayCode(trayCodeMakeSure.getTrayCode());
if (mydoJob == null) {
return AjaxResult.warn(MessageUtils.message("warn.message"));
}
List<MydoJobDetail> mydoJobDetailList = trayCodeMakeSure.getMaterials(); List<MydoJobDetail> mydoJobDetailList = trayCodeMakeSure.getMaterials();
if (CollUtil.isNotEmpty(mydoJobDetailList)) { if (CollUtil.isNotEmpty(mydoJobDetailList)) {
boolean flag = mydoJobDetailList.stream().anyMatch(x -> StrUtil.isEmpty(x.getStockId()) && "0".equals(x.getInQuantity())); boolean flag = mydoJobDetailList.stream().anyMatch(x -> StrUtil.isEmpty(x.getStockId()) && "0".equals(x.getInQuantity()));