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 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 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();