From 3f4d70ff9ba7e22bf165a124d860327a92ccdfd0 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 14 Dec 2020 16:12:39 +0800
Subject: [PATCH] fix instore two bugs
---
zq-erp/src/main/resources/templates/views/admin/hive/instore/instoreinfo-list.html | 2 ++
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysInstoreInfoServiceImpl.java | 3 ++-
2 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysInstoreInfoServiceImpl.java b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysInstoreInfoServiceImpl.java
index f1ca701..6ca75ad 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysInstoreInfoServiceImpl.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysInstoreInfoServiceImpl.java
@@ -69,9 +69,10 @@
Long id = sysInstoreInfo.getId();
SysInstoreInfo getInstoreInfo = sysInstoreInfoDao.selectById(id);
// 已经审核过的单据不能在修改
- if (!getInstoreInfo.getCheckStatus().equals(Dictionary.CHECK_STATUS_DSH)) {
+ if (!getInstoreInfo.getCheckStatus().equals(Dictionary.CHECK_STATUS_DSH) && !getInstoreInfo.getCheckStatus().equals(Dictionary.CHECK_STATUS_SHWTG)) {
throw new GlobleException("已审核，不能再修改");
}
+ sysInstoreInfo.setCheckStatus(Dictionary.CHECK_STATUS_DSH);
// 设置总金额
sysInstoreInfo.setSumall(savevDetatil(sysInstoreInfo));
return sysInstoreInfoDao.update(sysInstoreInfo);
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/instore/instoreinfo-list.html b/zq-erp/src/main/resources/templates/views/admin/hive/instore/instoreinfo-list.html
index 6bc7c70..a7befd8 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/instore/instoreinfo-list.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/instore/instoreinfo-list.html
@@ -244,7 +244,9 @@
if (checkStatus == "待审核" || checkStatus == "审核未通过") {
//没有审核并且登入者是审核者才显示审核的按钮，
// if ((staffId == row.appmanId)) {
+ if (checkStatus == "待审核") {
html += btns[2].replace('VALUE', value);
+ }
// }
if (isSame) {
html += btns[1].replace('VALUE', value);
--
Gitblit v1.9.1