From 063d2e89cfa0738eb4d7f94c91583a1891d2a1d1 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 28 Mar 2022 15:21:28 +0800
Subject: [PATCH] 20220324
---
zq-erp/src/main/java/com/matrix/system/hive/service/imp/AchieveNewServiceImpl.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/AchieveNewServiceImpl.java b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/AchieveNewServiceImpl.java
index cb1275f..261aa62 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/AchieveNewServiceImpl.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/AchieveNewServiceImpl.java
@@ -16,6 +16,7 @@
import com.matrix.system.common.dao.BusParameterSettingsDao;
import com.matrix.system.common.dao.SysUsersDao;
import com.matrix.system.constance.Dictionary;
+import com.matrix.system.enums.BooleanEnum;
import com.matrix.system.hive.bean.*;
import com.matrix.system.hive.dao.*;
import com.matrix.system.hive.plugin.util.CollectionUtils;
@@ -380,7 +381,10 @@
if (shopManageJjcpasConsume == null) {
shopManageJjcpasConsume = busParameterSettingsDao.selectCompanyParamByCode(AppConstance.SHOP_MANAGE_JJCPAS_CONSUME, pageOrder.getCompanyId());
}
- if (AppConstance.IS_Y.equals(shopManageJjcpasConsume.getParamValue())) {
+// if (AppConstance.IS_Y.equals(shopManageJjcpasConsume.getParamValue())) {
+// achieveNew.setHisConsume(achieveNew.getGoodsCash());
+// }
+ if (BooleanEnum.TRUE.getValue().equals(shopManageJjcpasConsume.getParamValue())) {
achieveNew.setHisConsume(achieveNew.getGoodsCash());
}
--
Gitblit v1.9.1