huojin
/
Byd_Dg_Java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

no message

main
HUOJIN\92525 2024-12-12 16:47:55 +08:00
parent 16313cb403
commit 49ce14dc32
4 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
youchain-system/src/main/java/com/youchain/businessdata/repository/PickRepository.java
View File

@ -30,8 +30,8 @@ import java.util.List;
**/ **/
public interface PickRepository extends JpaRepository<Pick, Long>, JpaSpecificationExecutor<Pick> { public interface PickRepository extends JpaRepository<Pick, Long>, JpaSpecificationExecutor<Pick> {
@Query(value = " FROM Pick p WHERE p.status in :status and p.isCall=:isCall order by p.createTime,p.lineNo ") @Query(value = " FROM Pick p WHERE p.status in :status and (:isCall is null or p.isCall=:isCall) order by p.createTime,p.lineNo ")
List<Pick> findByPickStatus(List<String> status,Boolean isCall); List<Pick> findByPickStatus(List<String> status, Boolean isCall);
@Query(value = " FROM Pick p WHERE p.gdCode=:gdNo and p.cpCodeOrDpCode=:completeCode and p.station=:station ") @Query(value = " FROM Pick p WHERE p.gdCode=:gdNo and p.cpCodeOrDpCode=:completeCode and p.station=:station ")
Pick findByPick(String gdNo, String completeCode, String station); Pick findByPick(String gdNo, String completeCode, String station);

2
youchain-system/src/main/java/com/youchain/businessdata/service/PickService.java
View File

@ -103,7 +103,7 @@ public interface PickService {
* @param statuses 状态集合 * @param statuses 状态集合
* @param isCall 是否叫料 * @param isCall 是否叫料
*/ */
List<Pick> findByPickStatus(List<String> statuses, boolean isCall); List<Pick> findByPickStatus(List<String> statuses, Boolean isCall);
/** /**
* 刷新出库单拣货状态 * 刷新出库单拣货状态

2
youchain-system/src/main/java/com/youchain/businessdata/service/impl/PickServiceImpl.java
View File

@ -121,7 +121,7 @@ public class PickServiceImpl implements PickService {
} }
@Override @Override
public List<Pick> findByPickStatus(List<String> statuses, boolean isCall) { public List<Pick> findByPickStatus(List<String> statuses, Boolean isCall) {
return pickRepository.findByPickStatus(statuses, isCall); return pickRepository.findByPickStatus(statuses, isCall);
} }

7
youchain-system/src/main/java/com/youchain/modules/quartz/task/pickTask.java
View File

@ -38,7 +38,7 @@ public class pickTask {
public KMReService kmReService; public KMReService kmReService;
/** /**
* 轮询打开和分配中的成品出库单，分配库存 * 分配出库单
*/ */
public void allocatePick() { public void allocatePick() {
List<String> statuses = Arrays.asList(BizStatus.OPEN, BizStatus.ASSIGN); List<String> statuses = Arrays.asList(BizStatus.OPEN, BizStatus.ASSIGN);
@ -58,11 +58,10 @@ public class pickTask {
public void pickAgvTask() { public void pickAgvTask() {
/*查询分配完成的出库单*/ /*查询分配完成的出库单*/
List<String> statuses = Arrays.asList(BizStatus.ALLOCATE); List<String> statuses = Arrays.asList(BizStatus.ALLOCATE);
List<Pick> pickList = pickService.findByPickStatus(statuses, false); List<Pick> pickList = pickService.findByPickStatus(statuses, null);
if (pickList.isEmpty()) { if (pickList.isEmpty()) {
throw new BadRequestException("无已分配的出库单,下发任务失败!"); throw new BadRequestException("无已分配的出库单,下发任务失败!");
} }
for (Pick pick : pickList) { for (Pick pick : pickList) {
taskService.materialPick(pick); taskService.materialPick(pick);
} }
@ -76,7 +75,7 @@ public class pickTask {
List<String> statuses = Arrays.asList(BizStatus.PICK_ALL); List<String> statuses = Arrays.asList(BizStatus.PICK_ALL);
List<Pick> pickList = pickService.findByPickStatus(statuses, true); List<Pick> pickList = pickService.findByPickStatus(statuses, true);
if (pickList.isEmpty()) { if (pickList.isEmpty()) {
throw new BadRequestException("无拣货完成的出库单或出库单未叫料,叫料失败!"); throw new BadRequestException("无拣货完成的出库单或出库单未叫料!");
} }
for (Pick pick : pickList) { for (Pick pick : pickList) {
taskService.callJlTask(pick); taskService.callJlTask(pick);