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

盘点测试修改

Browse Source
This commit is contained in:
liuhanqing
2025-10-11 13:14:56 +08:00
parent 327aa69b72
commit d696816415
7 changed files with 69 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWcsServiceImpl.java
View File

@@ -47,6 +47,7 @@ public class ToWcsServiceImpl implements IToWcsService {
mydoJobParam.setStatus("1");
List<String> list = new ArrayList<>();
list.add("21");
list.add("26");
mydoJobParam.setInOutIds(list);
List<MydoJob> outMydoJobs = mydoJobService.selectMydoJobListApi(mydoJobParam);
for (MydoJob outMydoJob : outMydoJobs) {

2
ruoyi-admin/src/main/java/com/ruoyi/check/difference/service/impl/CheckDifferenceRecordServiceImpl.java
View File

@@ -61,7 +61,7 @@ public class CheckDifferenceRecordServiceImpl implements ICheckDifferenceRecordS
* @return 盘点差异
*/
@Override
@DataScope(warehouseAlias = "w")
//@DataScope(warehouseAlias = "w")
public List<CheckDifferenceRecord> selectCheckDifferenceRecordList(CheckDifferenceRecord checkDifferenceRecord)
{
return checkDifferenceRecordMapper.selectCheckDifferenceRecordList(checkDifferenceRecord);

2
ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetail/mapper/MydoJobDetailMapper.java
View File

@@ -68,4 +68,6 @@ public interface MydoJobDetailMapper
List<MydoJobDetail> selectMydoJobDetailListByJobId(String jobId);
List<MydoJobDetail> selectMydoJobDetailListByExit(MydoJob mydoJob);
List<MydoJobDetail> selectPdMydoJobDetailListByExit(MydoJob mydoJob);
}

2
ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetail/service/IMydoJobDetailService.java
View File

@@ -69,4 +69,6 @@ public interface IMydoJobDetailService
List<MydoJobDetail> selectMydoJobDetailListByJobId(String jobId);
List<MydoJobDetail> selectMydoJobDetailListByExit(MydoJob mydoJob);
List<MydoJobDetail> selectPdMydoJobDetailListByExit(MydoJob mydoJob);
}

5
ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetail/service/impl/MydoJobDetailServiceImpl.java
View File

@@ -119,4 +119,9 @@ public class MydoJobDetailServiceImpl implements IMydoJobDetailService
public List<MydoJobDetail> selectMydoJobDetailListByExit(MydoJob mydoJob) {
return mydoJobDetailMapper.selectMydoJobDetailListByExit(mydoJob);
}
@Override
public List<MydoJobDetail> selectPdMydoJobDetailListByExit(MydoJob mydoJob) {
return mydoJobDetailMapper.selectPdMydoJobDetailListByExit(mydoJob);
}
}

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

@@ -108,6 +108,15 @@ public class PdaServiceImp implements PdaService {
//@Transactional(rollbackFor = Exception.class)
public AjaxResult checkMakeSure(TrayCodeMakeSure trayCodeMakeSure) {
MydoJob mydoJob = new MydoJob();
mydoJob.setExitId(trayCodeMakeSure.getExitId());
mydoJob.setStatus("3");
mydoJob.setInOrOut("26");
List<MydoJobDetail> mydoJobDetails = mydoJobDetailService.selectPdMydoJobDetailListByExit(mydoJob);
if(mydoJobDetails.isEmpty()){
return AjaxResult.error("该物料没有盘点出库作业，请检查");
}
List<MydoJobDetail> mydoJobDetailList = trayCodeMakeSure.getMaterials();
if (CollUtil.isNotEmpty(mydoJobDetailList)) {
boolean flag = mydoJobDetailList.stream().anyMatch(x -> StrUtil.isEmpty(x.getStockId()) && "0".equals(x.getInQuantity()));
@@ -118,7 +127,7 @@ public class PdaServiceImp implements PdaService {
//插入盘点提交表
CheckCommitRecord checkCommitRecord = new CheckCommitRecord();
checkCommitRecord.setQuantity(mydoJobDetail.getInQuantity());
checkCommitRecord.setTrayCode(trayCodeMakeSure.getTrayCode());
checkCommitRecord.setTrayCode(mydoJobDetails.get(0).getTrayCode());
checkCommitRecord.setStockId(mydoJobDetail.getStockId());
checkCommitRecord.setSpare1(mydoJobDetail.getInOrOutDId());
checkCommitRecord.setSpare2(mydoJobDetail.getProductId());
@@ -128,7 +137,7 @@ public class PdaServiceImp implements PdaService {
}
}
HashMap<String, Object> map = new HashMap<>();
map.put("v_tray_code", trayCodeMakeSure.getTrayCode());
map.put("v_tray_code", mydoJobDetails.get(0).getTrayCode());
pdaMapper.checkMakeSure(map);
//iToWcsService.pushInMydoJob();
String result = map.get("v_result").toString();