wms / wms_shandonghaiwang · Commits

Commit 94c62b8fafd2176e3460298613c44c880a1aa097

Authored by 易文鹏
1 parent 85c60d06

feat:pda完成出库任务时，扫描原单据时提示：请扫描合并单据号

Inline Side-by-side
Showing 2 changed files with 11 additions and 5 deletions
src/main/java/com/huaheng/framework/config/ShiroConfig.java
  View file @94c62b8
... ... @@ -276,11 +276,11 @@ public class ShiroConfig {
276 276 filterChainDefinitionMap.put("/mobile/receipt/batch/**", "anon");
277 277  
278 278 //todo pda出入库查询，测试后注释
279   - //filterChainDefinitionMap.put("/receipt/receiptHeader/listPda", "anon");
280   - //filterChainDefinitionMap.put("/receipt/receiptDetail/list", "anon");
281   - //filterChainDefinitionMap.put("/task/taskHeader/getTaskByTaskId", "anon");
282   - //filterChainDefinitionMap.put("/task/taskHeader/getTaskByShipmentCode", "anon");
283   - //filterChainDefinitionMap.put("/mobile/inventory/completeTaskListByWMS", "anon");
  279 + filterChainDefinitionMap.put("/receipt/receiptHeader/listPda", "anon");
  280 + filterChainDefinitionMap.put("/receipt/receiptDetail/list", "anon");
  281 + filterChainDefinitionMap.put("/task/taskHeader/getTaskByTaskId", "anon");
  282 + filterChainDefinitionMap.put("/task/taskHeader/getTaskByShipmentCode", "anon");
  283 + filterChainDefinitionMap.put("/mobile/inventory/completeTaskListByWMS", "anon");
284 284  
285 285  
286 286 // 系统权限列表
... ...
src/main/java/com/huaheng/pc/task/taskHeader/controller/TaskHeaderController.java
  View file @94c62b8
... ... @@ -383,6 +383,12 @@ public class TaskHeaderController extends BaseController {
383 383 if (StringUtils.isEmpty(shipmentCode)) {
384 384 return AjaxResult.error("单据号为空！");
385 385 }
  386 + List<TaskDetail> RecordCodeTaskDetails = taskDetailService.list(new LambdaQueryWrapper<TaskDetail>()
  387 + .eq(StringUtils.isNotEmpty(zoneCode), TaskDetail::getZoneCode, zoneCode).eq(TaskDetail::getRecordCode, shipmentCode));
  388 + if (!RecordCodeTaskDetails.isEmpty()) {
  389 + return AjaxResult.error("请扫描合并单据号:" + shipmentCode);
  390 + }
  391 +
386 392 List<TaskDetail> taskDetails = taskDetailService.list(new LambdaQueryWrapper<TaskDetail>()
387 393 .eq(StringUtils.isNotEmpty(zoneCode), TaskDetail::getZoneCode, zoneCode).eq(TaskDetail::getBillCode, shipmentCode));
388 394 if (taskDetails.isEmpty()) {
... ...