From c913a335643619ac7d1943d75ce06f71a31b8185 Mon Sep 17 00:00:00 2001
From: 2369059705@qq.com <2369059705@qq.com>
Date: 星期五, 07 七月 2023 15:45:27 +0800
Subject: [PATCH] Merge branch 'master' of http://nonxin.cn:8090/r/project/qxlw
---
product-server-project-base/src/main/java/com/product/base/service/MaterialManagerService.java | 35 +++++++++++++++++------------------
1 files changed, 17 insertions(+), 18 deletions(-)
diff --git a/product-server-project-base/src/main/java/com/product/base/service/MaterialManagerService.java b/product-server-project-base/src/main/java/com/product/base/service/MaterialManagerService.java
index 6b035b3..0085d06 100644
--- a/product-server-project-base/src/main/java/com/product/base/service/MaterialManagerService.java
+++ b/product-server-project-base/src/main/java/com/product/base/service/MaterialManagerService.java
@@ -1,12 +1,17 @@
package com.product.base.service;
+import java.util.ArrayList;
+import java.util.List;
+
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+import com.product.base.config.BaseErrorCode;
import com.product.base.config.CmnConst;
import com.product.core.dao.BaseDao;
import com.product.core.entity.DataTableEntity;
import com.product.core.entity.FieldSetEntity;
+import com.product.core.exception.BaseException;
import com.product.core.service.support.AbstractBaseService;
import com.product.core.spring.context.SpringMVCContextHolder;
import com.product.module.sys.entity.SystemUser;
@@ -48,14 +53,6 @@
return dt;
}
- /**
- * 鑾峰彇鏉愭枡淇℃伅
- * @param uuid
- * @return
- */
- public FieldSetEntity getMaterialInfo(String uuid) {
- return baseDao.getFieldSet(CmnConst.PRODUCT_PROJECT_BASE_MATERIAL, uuid, false);
- }
/**
* 淇濆瓨鏉愭枡淇℃伅
@@ -63,22 +60,24 @@
* @return
*/
public boolean saveMaterialInfo(FieldSetEntity fse) {
+
+ //楠岄噸鏉′欢
+ String filter = "material_code=?";
+ List<String> param = new ArrayList<>();
+ param.add(fse.getString(CmnConst.MATERIAL_CODE));
+
SystemUser sysUser = SpringMVCContextHolder.getCurrentUser();
if (BaseUtil.strIsNull(fse.getUUID())) {
BaseUtil.createCreatorAndCreationTime(sysUser, fse);
}else {
+ filter += " AND uuid !=?";
+ param.add(fse.getUUID());
BaseUtil.updatedRegeneratorAndUpdateTime(sysUser, fse);
}
+ FieldSetEntity fseExistMaterialCode = baseDao.getFieldSetEntityByFilter(CmnConst.PRODUCT_PROJECT_BASE_MATERIAL, filter, param.toArray(), false);
+ if (fseExistMaterialCode!=null) {
+ throw new BaseException(BaseErrorCode.PROJECT_BASE_MATERIAL_CODE_REPEAT.getValue(), BaseErrorCode.PROJECT_BASE_MATERIAL_CODE_REPEAT.getText());
+ }
return baseDao.saveFieldSetEntity(fse);
- }
-
- /**
- * 鍒犻櫎鏉愭枡淇℃伅
- * @param uuid
- * @return
- */
- public boolean deleteMaterialInfo(String uuid) {
- Object [] uuids= uuid.split(",");
- return baseDao.delete(CmnConst.PRODUCT_PROJECT_BASE_MATERIAL, "uuid=?", uuids);
}
}
--
Gitblit v1.9.2