huojin
/
kcw-wx-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

制造叫料数据显示

main
FOAM 2025-10-15 13:44:04 +08:00
parent 1eb8972a6a
commit c89fc2449a
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
youchain-system/src/main/java/com/youchain/businessdata/rest/PickDetailController.java
View File

@ -114,21 +114,21 @@ public class PickDetailController {
} }
@GetMapping(value = "/queryPickDetailZzjl") @GetMapping(value = "/queryPickDetailZzjl")
@Log("查询pickDetail") @Log("查询制造叫料数据")
@ApiOperation("查询pickDetail") @ApiOperation("查询制造叫料数据")
@AnonymousAccess @AnonymousAccess
public ResponseEntity<Object> queryPickDetailZzjl(PickDetailQueryCriteria criteria, Pageable pageable) { public ResponseEntity<Object> queryPickDetailZzjl(PickDetailQueryCriteria criteria, Pageable pageable) {
criteria.setType("ZCZS"); criteria.setType(BaseStatus.ZZJL);
return new ResponseEntity<>(pickDetailService.queryAll(criteria, pageable), HttpStatus.OK); return new ResponseEntity<>(pickDetailService.queryAll(criteria, pageable), HttpStatus.OK);
} }
@GetMapping(value = "/queryPickDetailZsc") @GetMapping(value = "/queryPickDetailZsc")
@Log("查询制造叫料数据") @Log("查询指示残")
@ApiOperation("查询制造叫料数据") @ApiOperation("查询指示残")
@AnonymousAccess @AnonymousAccess
public ResponseEntity<Object> queryPickDetailZsc(PickDetailQueryCriteria criteria, Pageable pageable) { public ResponseEntity<Object> queryPickDetailZsc(PickDetailQueryCriteria criteria, Pageable pageable) {
criteria.setType(BaseStatus.ZZJL); criteria.setPageType("ZSC");
return new ResponseEntity<>(pickDetailService.queryAll(criteria, pageable), HttpStatus.OK); return new ResponseEntity<>(pickDetailService.queryPickDetailAll(criteria, pageable), HttpStatus.OK);
} }
@GetMapping(value = "/queryPickDetailAll") @GetMapping(value = "/queryPickDetailAll")

9
youchain-system/src/main/java/com/youchain/businessdata/rest/XppRecordController.java
View File

@ -739,10 +739,11 @@ public class XppRecordController {
return new ResponseEntity<>(dstPoint + "库位不存在", BAD_REQUEST); return new ResponseEntity<>(dstPoint + "库位不存在", BAD_REQUEST);
} }
Area dstArea=dstPoint.getArea(); Area dstArea=dstPoint.getArea();
Point zzkw=pointService.getPoint(BaseStatus.ZZKW,null,null,null); Point zzkw=null;
if(zzkw==null){ // Point zzkw=pointService.getPoint(BaseStatus.ZZKW,null,null,null);
return new ResponseEntity<>(BaseStatus.ZZKW + "默认制造库位不存在", BAD_REQUEST); // if(zzkw==null){
} // return new ResponseEntity<>(BaseStatus.ZZKW + "默认制造库位不存在", BAD_REQUEST);
// }
for(Long id:ids){ for(Long id:ids){
XppRecord xppRecord = xppRecordRepository.getById(id); XppRecord xppRecord = xppRecordRepository.getById(id);
String itemCode=xppRecord.getItem().getCode(); String itemCode=xppRecord.getItem().getCode();