diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/controller/PdaNotCarController.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/controller/PdaNotCarController.java index 001405f..95386e6 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/controller/PdaNotCarController.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/controller/PdaNotCarController.java @@ -129,4 +129,11 @@ public class PdaNotCarController { public ResponseEntity queryIvt(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(notCarService.queryIvt(whereJson), HttpStatus.OK); } + + @PostMapping("/cleanTask") + @Log("仓库送料 - 清除任务") + @SaIgnore + public ResponseEntity cleanTask(@RequestBody JSONObject whereJson) { + return new ResponseEntity<>(notCarService.cleanTask(whereJson), HttpStatus.OK); + } } diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/PdaNotCarService.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/PdaNotCarService.java index d6ab0e0..9362e04 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/PdaNotCarService.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/PdaNotCarService.java @@ -164,4 +164,12 @@ public interface PdaNotCarService { */ void publicLoadingConfirm(); + /** + * 仓库送料 - 清除任务 + * + * @param whereJson { + * } + * @return PdaResponse + */ + PdaResponse cleanTask(JSONObject whereJson); } diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/impl/PdaNotCarServiceImpl.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/impl/PdaNotCarServiceImpl.java index 0d20aac..e673d3d 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/impl/PdaNotCarServiceImpl.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/impl/PdaNotCarServiceImpl.java @@ -506,4 +506,16 @@ public class PdaNotCarServiceImpl implements PdaNotCarService { param.put("data", data); wmsToNotCarService.continueTask(param); } + + @Override + public PdaResponse cleanTask(JSONObject whereJson) { + Param sysParamService = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("NO_CAR_TASK"); + sysParamService.setValue(IOSConstant.ZERO); + iSysParamService.updateById(sysParamService); + + Param sysParamService1 = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("IS_ARRIVE"); + sysParamService1.setValue(IOSConstant.ZERO); + iSysParamService.updateById(sysParamService1); + return PdaResponse.requestOk(); + } }