wms / wms_shandonghaiwang · Commits

Commit aa5f9cb38b8b32461da8b6791b5a60cb5bc1fab6

Authored by 易文鹏
1 parent 5e6e1db7

feat: 增加平库入库错误提示和平库出库错误提示

Inline Side-by-side
Showing 2 changed files with 66 additions and 36 deletions
src/main/java/com/huaheng/pc/receipt/receiptHeader/controller/ReceiptHeaderController.java
  View file @aa5f9cb
... ... @@ -139,10 +139,8 @@ public class ReceiptHeaderController extends BaseController {
139 139 /**
140 140 * 查询PDA入库单
141 141 */
142   - @Log(title = "入库-PDA入库单头表", operating = "查看PDA入库单列表", action = BusinessType.GRANT)
143 142 @PostMapping("/listPda")
144 143 @ResponseBody
145   - @ApiOperation("入库单查询接口")
146 144 public TableDataInfo listPda(@ApiParam(name = "receiptHeader", value = "入库头表") ReceiptHeader receiptHeader,
147 145 @ApiParam(name = "createdBegin", value = "起止时间") String createdBegin,
148 146 @ApiParam(name = "createdEnd", value = "结束时间") String createdEnd,
... ... @@ -167,6 +165,35 @@ public class ReceiptHeaderController extends BaseController {
167 165  
168 166  
169 167 /**
  168 + * 查询PDA入库单
  169 + */
  170 + //@PostMapping("/listPda")
  171 + //@ResponseBody
  172 + //public AjaxResult listPda(@ApiParam(name = "receiptHeader", value = "入库头表") ReceiptHeader receiptHeader,
  173 + // @ApiParam(name = "createdBegin", value = "起止时间") String createdBegin,
  174 + // @ApiParam(name = "createdEnd", value = "结束时间") String createdEnd,
  175 + // Integer statusFirst, Integer statusLast) {
  176 + // List<ReceiptHeader> list = new ArrayList<>();
  177 + // //ReceiptHeader receiptHeaderData = new ReceiptHeader();
  178 + // ReceiptDetail receiptDetail = receiptDetailService.getOne(new LambdaQueryWrapper<ReceiptDetail>().eq(ReceiptDetail::getSNNO, receiptHeader.getSNNO()));
  179 + // if (receiptDetail == null) {
  180 + // return AjaxResult.error("该SN不存在：" + receiptHeader.getSNNO());
  181 + // }
  182 + //
  183 + // receiptDetail = receiptDetailService.getOne(new LambdaQueryWrapper<ReceiptDetail>()
  184 + // .eq(ReceiptDetail::getSNNO, receiptHeader.getSNNO()).last("and qty > taskQty"));
  185 + // if (receiptDetail == null) {
  186 + // return AjaxResult.error("该SN已全部入库：" + receiptHeader.getSNNO());
  187 + // }
  188 + //
  189 + // ReceiptHeader receiptHeaderData = receiptHeaderService.getById(receiptDetail.getReceiptId());
  190 + // if (receiptHeaderData == null) {
  191 + // return AjaxResult.error("该入库单头表未找到");
  192 + // }
  193 + // return AjaxResult.success(receiptHeaderData);
  194 + //}
  195 +
  196 + /**
170 197 * 新增入库单
171 198 */
172 199 @GetMapping("/add")
... ...
src/main/java/com/huaheng/pc/task/taskHeader/controller/TaskHeaderController.java
  View file @aa5f9cb
... ... @@ -416,41 +416,44 @@ public class TaskHeaderController extends BaseController {
416 416 }
417 417 }
418 418 VO.setPdaTaskHeader(headerList);
  419 + if (headerList.isEmpty()) {
  420 + return AjaxResult.error("该出库单已全部扫描出库:" + shipmentCode);
  421 + }
419 422 return AjaxResult.success(VO);
420 423 }
421 424  
422   - //@PostMapping("/getTaskByTaskId")
423   - //@ResponseBody
424   - //public AjaxResult getTaskByTaskId(String taskId) {
425   - // if (StringUtils.isEmpty(taskId)) {
426   - // return AjaxResult.error("任务号为空！");
427   - // }
428   - // TaskHeader taskHeader = taskHeaderService.getById(taskId);
429   - // if (taskHeader == null) {
430   - // return AjaxResult.error("任务没找到ID：" + taskId);
431   - // }
432   - // if (!taskHeader.getStatus().equals(QuantityConstant.TASK_STATUS_BUILD)) {
433   - // return AjaxResult.error("任务不是新建状态，可能已完成");
434   - // }
435   - // if (taskHeader.getFlat() == null || taskHeader.getFlat() != 1) {
436   - // return AjaxResult.error("只能扫平库任务");
437   - // }
438   - // List<TaskDetail> taskDetails = taskDetailService.list(new LambdaQueryWrapper<TaskDetail>().eq(TaskDetail::getTaskId, taskId));
439   - // if (taskDetails.isEmpty()) {
440   - // return AjaxResult.error("没有查到对应的任务明细");
441   - // }
442   - // List<TaskDetailDto> DTO = new ArrayList<>();
443   - // for (TaskDetail taskDetail : taskDetails) {
444   - // TaskDetailDto taskDetailDto = new TaskDetailDto();
445   - // taskDetailDto.setTaskId(taskDetail.getTaskId());
446   - // taskDetailDto.setMaterialName(taskDetail.getMaterialName());
447   - // taskDetailDto.setMaterialCode(taskDetail.getMaterialCode());
448   - // taskDetailDto.setZoneCode(taskDetail.getZoneCode());
449   - // taskDetailDto.setZoneName(taskDetail.getZoneName());
450   - // taskDetailDto.setRecordCode(taskDetail.getRecordCode());
451   - // taskDetailDto.setQty(taskDetail.getQty());
452   - // DTO.add(taskDetailDto);
453   - // }
454   - // return AjaxResult.success(DTO);
455   - //}
  425 + @PostMapping("/getTaskByTaskId")
  426 + @ResponseBody
  427 + public AjaxResult getTaskByTaskId(String taskId) {
  428 + if (StringUtils.isEmpty(taskId)) {
  429 + return AjaxResult.error("任务号为空！");
  430 + }
  431 + TaskHeader taskHeader = taskHeaderService.getById(taskId);
  432 + if (taskHeader == null) {
  433 + return AjaxResult.error("任务没找到ID：" + taskId);
  434 + }
  435 + if (!taskHeader.getStatus().equals(QuantityConstant.TASK_STATUS_BUILD)) {
  436 + return AjaxResult.error("任务不是新建状态，可能已完成");
  437 + }
  438 + if (taskHeader.getFlat() == null || taskHeader.getFlat() != 1) {
  439 + return AjaxResult.error("只能扫平库任务");
  440 + }
  441 + List<TaskDetail> taskDetails = taskDetailService.list(new LambdaQueryWrapper<TaskDetail>().eq(TaskDetail::getTaskId, taskId));
  442 + if (taskDetails.isEmpty()) {
  443 + return AjaxResult.error("没有查到对应的任务明细");
  444 + }
  445 + List<TaskDetailDto> DTO = new ArrayList<>();
  446 + for (TaskDetail taskDetail : taskDetails) {
  447 + TaskDetailDto taskDetailDto = new TaskDetailDto();
  448 + taskDetailDto.setTaskId(taskDetail.getTaskId());
  449 + taskDetailDto.setMaterialName(taskDetail.getMaterialName());
  450 + taskDetailDto.setMaterialCode(taskDetail.getMaterialCode());
  451 + taskDetailDto.setZoneCode(taskDetail.getZoneCode());
  452 + taskDetailDto.setZoneName(taskDetail.getZoneName());
  453 + taskDetailDto.setRecordCode(taskDetail.getRecordCode());
  454 + taskDetailDto.setQty(taskDetail.getQty());
  455 + DTO.add(taskDetailDto);
  456 + }
  457 + return AjaxResult.success(DTO);
  458 + }
456 459 }
... ...