From c89fc2449a2f4fab0277adafa15d493acfe966db Mon Sep 17 00:00:00 2001
From: FOAM <491460741@qq.com>
Date: Wed, 15 Oct 2025 13:44:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=B6=E9=80=A0=E5=8F=AB=E6=96=99=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../businessdata/rest/PickDetailController.java    | 14 +++++++-------
 .../businessdata/rest/XppRecordController.java     |  9 +++++----
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/youchain-system/src/main/java/com/youchain/businessdata/rest/PickDetailController.java b/youchain-system/src/main/java/com/youchain/businessdata/rest/PickDetailController.java
index 2d08d90..756d296 100644
--- a/youchain-system/src/main/java/com/youchain/businessdata/rest/PickDetailController.java
+++ b/youchain-system/src/main/java/com/youchain/businessdata/rest/PickDetailController.java
@@ -114,21 +114,21 @@ public class PickDetailController {
     }
 
     @GetMapping(value = "/queryPickDetailZzjl")
-    @Log("查询pickDetail")
-    @ApiOperation("查询pickDetail")
+    @Log("查询制造叫料数据")
+    @ApiOperation("查询制造叫料数据")
     @AnonymousAccess
     public ResponseEntity<Object> queryPickDetailZzjl(PickDetailQueryCriteria criteria, Pageable pageable) {
-        criteria.setType("ZCZS");
+        criteria.setType(BaseStatus.ZZJL);
         return new ResponseEntity<>(pickDetailService.queryAll(criteria, pageable), HttpStatus.OK);
     }
 
     @GetMapping(value = "/queryPickDetailZsc")
-    @Log("查询制造叫料数据")
-    @ApiOperation("查询制造叫料数据")
+    @Log("查询指示残")
+    @ApiOperation("查询指示残")
     @AnonymousAccess
     public ResponseEntity<Object> queryPickDetailZsc(PickDetailQueryCriteria criteria, Pageable pageable) {
-        criteria.setType(BaseStatus.ZZJL);
-        return new ResponseEntity<>(pickDetailService.queryAll(criteria, pageable), HttpStatus.OK);
+        criteria.setPageType("ZSC");
+        return new ResponseEntity<>(pickDetailService.queryPickDetailAll(criteria, pageable), HttpStatus.OK);
     }
 
     @GetMapping(value = "/queryPickDetailAll")
diff --git a/youchain-system/src/main/java/com/youchain/businessdata/rest/XppRecordController.java b/youchain-system/src/main/java/com/youchain/businessdata/rest/XppRecordController.java
index 9cf6f5a..f596c24 100644
--- a/youchain-system/src/main/java/com/youchain/businessdata/rest/XppRecordController.java
+++ b/youchain-system/src/main/java/com/youchain/businessdata/rest/XppRecordController.java
@@ -739,10 +739,11 @@ public class XppRecordController {
             return new ResponseEntity<>(dstPoint + "库位不存在", BAD_REQUEST);
         }
         Area dstArea=dstPoint.getArea();
-        Point zzkw=pointService.getPoint(BaseStatus.ZZKW,null,null,null);
-        if(zzkw==null){
-            return new ResponseEntity<>(BaseStatus.ZZKW + "默认制造库位不存在", BAD_REQUEST);
-        }
+        Point zzkw=null;
+//        Point zzkw=pointService.getPoint(BaseStatus.ZZKW,null,null,null);
+//        if(zzkw==null){
+//            return new ResponseEntity<>(BaseStatus.ZZKW + "默认制造库位不存在", BAD_REQUEST);
+//        }
         for(Long id:ids){
             XppRecord xppRecord = xppRecordRepository.getById(id);
             String itemCode=xppRecord.getItem().getCode();