From e9ed17ca2d5eaafe69704ee817817a539d847e78 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 20 七月 2023 09:04:44 +0800
Subject: [PATCH] 登录页面
---
src/main/java/com/zy/asrs/controller/WmsWrkController.java | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 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..f01e2f0 100644
--- a/src/main/java/com/zy/asrs/controller/WmsWrkController.java
+++ b/src/main/java/com/zy/asrs/controller/WmsWrkController.java
@@ -1,6 +1,5 @@
package com.zy.asrs.controller;
-import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
@@ -8,7 +7,6 @@
import com.core.common.DateUtils;
import com.zy.asrs.domain.enums.WmsWrkStatusType;
import com.zy.asrs.entity.WmsWrk;
-import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.service.WmsWrkService;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
@@ -155,9 +153,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 +172,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