From 49ce14dc32453fdda271503b00b0b94869c0298f Mon Sep 17 00:00:00 2001
From: "HUOJIN\\92525" <jin982011>
Date: Thu, 12 Dec 2024 16:47:55 +0800
Subject: [PATCH] no message

---
 .../youchain/businessdata/repository/PickRepository.java   | 4 ++--
 .../com/youchain/businessdata/service/PickService.java     | 2 +-
 .../businessdata/service/impl/PickServiceImpl.java         | 2 +-
 .../java/com/youchain/modules/quartz/task/pickTask.java    | 7 +++----
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/youchain-system/src/main/java/com/youchain/businessdata/repository/PickRepository.java b/youchain-system/src/main/java/com/youchain/businessdata/repository/PickRepository.java
index a98c965..c56c553 100644
--- a/youchain-system/src/main/java/com/youchain/businessdata/repository/PickRepository.java
+++ b/youchain-system/src/main/java/com/youchain/businessdata/repository/PickRepository.java
@@ -30,8 +30,8 @@ import java.util.List;
  **/
 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  ")
-    List<Pick> findByPickStatus(List<String> status,Boolean isCall);
+    @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);
 
     @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);
diff --git a/youchain-system/src/main/java/com/youchain/businessdata/service/PickService.java b/youchain-system/src/main/java/com/youchain/businessdata/service/PickService.java
index 2b3472d..6d6bf45 100644
--- a/youchain-system/src/main/java/com/youchain/businessdata/service/PickService.java
+++ b/youchain-system/src/main/java/com/youchain/businessdata/service/PickService.java
@@ -103,7 +103,7 @@ public interface PickService {
      * @param statuses 状态集合
      * @param isCall 是否叫料
      */
-    List<Pick> findByPickStatus(List<String> statuses, boolean isCall);
+    List<Pick> findByPickStatus(List<String> statuses, Boolean isCall);
 
     /**
      * 刷新出库单拣货状态
diff --git a/youchain-system/src/main/java/com/youchain/businessdata/service/impl/PickServiceImpl.java b/youchain-system/src/main/java/com/youchain/businessdata/service/impl/PickServiceImpl.java
index cffe5db..513178b 100644
--- a/youchain-system/src/main/java/com/youchain/businessdata/service/impl/PickServiceImpl.java
+++ b/youchain-system/src/main/java/com/youchain/businessdata/service/impl/PickServiceImpl.java
@@ -121,7 +121,7 @@ public class PickServiceImpl implements PickService {
     }
 
     @Override
-    public List<Pick> findByPickStatus(List<String> statuses, boolean isCall) {
+    public List<Pick> findByPickStatus(List<String> statuses, Boolean isCall) {
         return pickRepository.findByPickStatus(statuses, isCall);
     }
 
diff --git a/youchain-system/src/main/java/com/youchain/modules/quartz/task/pickTask.java b/youchain-system/src/main/java/com/youchain/modules/quartz/task/pickTask.java
index 3e2699e..cbbd94c 100644
--- a/youchain-system/src/main/java/com/youchain/modules/quartz/task/pickTask.java
+++ b/youchain-system/src/main/java/com/youchain/modules/quartz/task/pickTask.java
@@ -38,7 +38,7 @@ public class pickTask {
     public KMReService kmReService;
 
     /**
-     * 轮询打开和分配中的成品出库单，分配库存
+     * 分配出库单
      */
     public void allocatePick() {
         List<String> statuses = Arrays.asList(BizStatus.OPEN, BizStatus.ASSIGN);
@@ -58,11 +58,10 @@ public class pickTask {
     public void pickAgvTask() {
         /*查询分配完成的出库单*/
         List<String> statuses = Arrays.asList(BizStatus.ALLOCATE);
-        List<Pick> pickList = pickService.findByPickStatus(statuses, false);
+        List<Pick> pickList = pickService.findByPickStatus(statuses, null);
         if (pickList.isEmpty()) {
             throw new BadRequestException("无已分配的出库单,下发任务失败!");
         }
-
         for (Pick pick : pickList) {
             taskService.materialPick(pick);
         }
@@ -76,7 +75,7 @@ public class pickTask {
         List<String> statuses = Arrays.asList(BizStatus.PICK_ALL);
         List<Pick> pickList = pickService.findByPickStatus(statuses, true);
         if (pickList.isEmpty()) {
-            throw new BadRequestException("无拣货完成的出库单或出库单未叫料,叫料失败!");
+            throw new BadRequestException("无拣货完成的出库单或出库单未叫料!");
         }
         for (Pick pick : pickList) {
             taskService.callJlTask(pick);