From ed2ea2b286ec963970e710a578cdb064cc8650d8 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 22 五月 2023 14:30:49 +0800
Subject: [PATCH] 开放WMS任务创建接口
---
src/main/java/com/zy/asrs/controller/WmsWrkController.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WmsWrkController.java b/src/main/java/com/zy/asrs/controller/WmsWrkController.java
index dbb1bd2..b476551 100644
--- a/src/main/java/com/zy/asrs/controller/WmsWrkController.java
+++ b/src/main/java/com/zy/asrs/controller/WmsWrkController.java
@@ -155,9 +155,14 @@
if (wmsWrk == null) {
return R.error();
}
+ if (wmsWrk.getWmsStatus() == WmsWrkStatusType.COMPLETE.id) {
+ return R.error(wmsWrk.getWmsWrkNo() + "宸插畬缁�");
+ }
+ Date now = new Date();
wmsWrk.setWmsStatus(WmsWrkStatusType.COMPLETE.id);
- wmsWrk.setModiTime(new Date());
+ wmsWrk.setModiTime(now);
wmsWrk.setModiUser(getUserId());
+ wmsWrk.setEndTime(now);
wmsWrkService.updateById(wmsWrk);
return R.ok();
}
@@ -169,9 +174,14 @@
if (wmsWrk == null) {
return R.error();
}
+ if (wmsWrk.getWmsStatus() == WmsWrkStatusType.CANCEL.id) {
+ return R.error(wmsWrk.getWmsWrkNo() + "宸茶鍙栨秷");
+ }
+ Date now = new Date();
wmsWrk.setWmsStatus(WmsWrkStatusType.CANCEL.id);
- wmsWrk.setModiTime(new Date());
+ wmsWrk.setModiTime(now);
wmsWrk.setModiUser(getUserId());
+ wmsWrk.setEndTime(now);
wmsWrkService.updateById(wmsWrk);
return R.ok();
}
--
Gitblit v1.9.1