From a13a93a493e7e94e28b2225c26e7e13b52d3288c Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 12 Apr 2021 19:48:45 +0800
Subject: [PATCH] 20210412 tqq环境
---
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjServicesServiceImpl.java | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjServicesServiceImpl.java b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjServicesServiceImpl.java
index a1f0b08..201fd5c 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjServicesServiceImpl.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjServicesServiceImpl.java
@@ -14,6 +14,7 @@
import com.matrix.system.app.vo.ServiceOrderListVo;
import com.matrix.system.common.bean.BusParameterSettings;
import com.matrix.system.common.bean.SysUsers;
+import com.matrix.system.common.constance.AppConstance;
import com.matrix.system.common.dao.BusParameterSettingsDao;
import com.matrix.system.common.dao.SysUsersDao;
import com.matrix.system.constance.Dictionary;
@@ -498,7 +499,7 @@
sysOutStoreItemDao.deleteByOrderId(sysOutStore.getId());
}
//删除积分
- scoreVipDetailService.removeByBusinessId(null,checkProjServices.getVipId(), checkProjServices.getId());
+ scoreVipDetailService.removeByBusinessId(checkProjServices.getVipId(), checkProjServices.getId());
//更新服务单状态
return sysProjServicesDao.update(checkProjServices);
@@ -698,7 +699,7 @@
//添加自己的积分
if (selfScore > 0) {
- scoreVipDetailService.addScore(null,
+ scoreVipDetailService.addScore(
vipInfo.getId(),
projServices.getCreateStaffId(),
projServices.getShopId(),
@@ -713,7 +714,7 @@
//推荐注册老带新积分奖励
SysVipInfo referrerVip = sysVipInfoDao.selectById(vipInfo.getRecommendId());
if (parentScore > 0) {
- scoreVipDetailService.addScore(null,
+ scoreVipDetailService.addScore(
referrerVip.getId(),
projServices.getCreateStaffId(),
projServices.getShopId(),
@@ -727,7 +728,7 @@
if (referrerVip.getRecommendId() != null) {
SysVipInfo topVipInfo = sysVipInfoDao.selectById(referrerVip.getRecommendId());
if (topParentScore > 0) {
- scoreVipDetailService.addScore(null,
+ scoreVipDetailService.addScore(
topVipInfo.getId(),
projServices.getCreateStaffId(),
projServices.getShopId(),
@@ -776,6 +777,7 @@
if (!projServices.getState().equals(Dictionary.SERVICE_STATU_XPL)) {
throw new GlobleException("该服务单状态为" + projServices.getState() + ",不可以进行当前操作!");
}
+ projServicesVo.setCompanyId(projServices.getCompanyId());
if (isNeedOutStore(projServicesVo)) {
// 生成出库单
@@ -879,10 +881,14 @@
* @return
*/
private boolean isNeedOutStore(SysProjServices projServicesVo) {
+
if (CollectionUtils.isNotEmpty(projServicesVo.getOutStoreItem())) {
- for (SysOutStoreItem item : projServicesVo.getOutStoreItem()) {
- if (item.getAmount() != null && item.getAmount() > 0) {
- return true;
+ BusParameterSettings manageStockSetting = busParameterSettingsDao.selectCompanyParamByCode(AppConstance.WAREHOUSE_MANAGE_STOCK, projServicesVo.getCompanyId());
+ if(AppConstance.IS_Y.equals(manageStockSetting.getParamValue())){
+ for (SysOutStoreItem item : projServicesVo.getOutStoreItem()) {
+ if (item.getAmount() != null && item.getAmount() > 0) {
+ return true;
+ }
}
}
}
--
Gitblit v1.9.1