From eef41465a2642278042eabb0154f03e8e15f6cdd Mon Sep 17 00:00:00 2001
From: 354798ggg <1074825718@qq.com>
Date: 星期四, 06 七月 2023 15:01:02 +0800
Subject: [PATCH] 材料信息代码调整
---
product-server-project-base/src/main/java/com/product/base/config/BaseErrorCode.java | 3 +
product-server-project-base/src/main/java/com/product/base/service/MaterialManagerService.java | 35 ++++++++---------
product-server-project-base/src/main/java/com/product/base/controller/MaterialManagerController.java | 54 +-------------------------
product-server-project-base/src/main/java/com/product/base/config/CmnConst.java | 1
4 files changed, 23 insertions(+), 70 deletions(-)
diff --git a/product-server-project-base/src/main/java/com/product/base/config/BaseErrorCode.java b/product-server-project-base/src/main/java/com/product/base/config/BaseErrorCode.java
index c9c043e..0f907a8 100644
--- a/product-server-project-base/src/main/java/com/product/base/config/BaseErrorCode.java
+++ b/product-server-project-base/src/main/java/com/product/base/config/BaseErrorCode.java
@@ -23,7 +23,8 @@
PROJECT_BASE_MATERIAL_SAVE_FAIL("鏉愭枡淇℃伅淇濆瓨澶辫触锛�", ""),
PROJECT_BASE_MATERIAL_DELETE_FAIL("鏉愭枡淇℃伅鍒犻櫎澶辫触锛�", ""),
- PROJECT_BASE_MATERIAL_OPERATE_FAIL("鏉愭枡淇℃伅鎿嶄綔澶辫触锛�", ""),
+ PROJECT_BASE_MATERIAL_OPERATE_FAIL("鏉愭枡淇℃伅鎿嶄綔澶辫触锛�", ModuleEnum.SYSTEM.getValue() + "002"),
+ PROJECT_BASE_MATERIAL_CODE_REPEAT("鏉愭枡缂栫爜宸茶鍏朵粬鏉愭枡浣跨敤锛�", ModuleEnum.SYSTEM.getValue() + "003"),
PROJECT_TYPE_SAVE_FAIL("椤圭洰绫诲瀷淇濆瓨澶辫触锛�", ""),
PROJECT_TYPE_DELETE_FAIL("椤圭洰绫诲瀷鍒犻櫎澶辫触锛�", ""),
diff --git a/product-server-project-base/src/main/java/com/product/base/config/CmnConst.java b/product-server-project-base/src/main/java/com/product/base/config/CmnConst.java
index c62a82c..397ca10 100644
--- a/product-server-project-base/src/main/java/com/product/base/config/CmnConst.java
+++ b/product-server-project-base/src/main/java/com/product/base/config/CmnConst.java
@@ -26,6 +26,7 @@
public static final String ITEMIZE_CODE="itemize_code";
public static final String ITEMIZW_PARENT_CODE="itemize_parent_code";
public static final String ITEMIZE_TYPE="itemize_type";
+ public static final String MATERIAL_CODE="material_code";
}
diff --git a/product-server-project-base/src/main/java/com/product/base/controller/MaterialManagerController.java b/product-server-project-base/src/main/java/com/product/base/controller/MaterialManagerController.java
index b196a15..3420da8 100644
--- a/product-server-project-base/src/main/java/com/product/base/controller/MaterialManagerController.java
+++ b/product-server-project-base/src/main/java/com/product/base/controller/MaterialManagerController.java
@@ -20,7 +20,9 @@
/**
* 鏉愭枡淇℃伅
- * @author 86151
+ * 鍖呭惈鎺ュ彛锛氭潗鏂欑被鍨嬫爲鎺ュ彛銆佸垪琛ㄦ帴鍙ｃ�佷繚瀛樻帴鍙�
+ * 涓嶅寘鍚帴鍙ｏ細璇︽儏鎺ュ彛銆佸垹闄ゆ帴鍙�,閲囩敤閫氱敤鎺ュ彛
+ * @author
*
*/
@RequestMapping("/api/material")
@@ -84,28 +86,6 @@
}
}
- /**
- * 鑾峰彇鏉愭枡淇℃伅
- * @param request
- * @param response
- * @return
- */
- @RequestMapping(value="/get/{version}", method = RequestMethod.POST)
- @ApiVersion(1)
- public String getMaterialInfo(HttpServletRequest request, HttpServletResponse response) {
- try {
- //鑾峰彇鍙傛暟
- FieldSetEntity fse = BaseUtil.getFieldSetEntity(request, CmnConst.PRODUCT_PROJECT_BASE_MATERIAL);;
-
- //鍒ゆ柇uuid鏄惁涓虹┖
- if (BaseUtil.strIsNull(fse.getUUID())) {
- return error(BaseErrorCode.SYSTEM_FORM_COUNT.getValue(), BaseErrorCode.SYSTEM_FORM_COUNT.getValue());
- }
- return OK_List(materialManagerService.getMaterialInfo(fse.getUUID()));
- } catch (Exception e) {
- return this.error(BaseErrorCode.PROJECT_BASE_MATERIAL_OPERATE_FAIL.getValue(), BaseErrorCode.PROJECT_BASE_MATERIAL_OPERATE_FAIL.getText()+e.getMessage());
- }
- }
/**
* 淇濆瓨鏉愭枡淇℃伅
@@ -126,34 +106,6 @@
return OK();
}
return error(BaseErrorCode.PROJECT_BASE_MATERIAL_SAVE_FAIL.getValue(), BaseErrorCode.PROJECT_BASE_MATERIAL_DELETE_FAIL.getText());
- } catch (Exception e) {
- return this.error(BaseErrorCode.PROJECT_BASE_MATERIAL_OPERATE_FAIL.getValue(), BaseErrorCode.PROJECT_BASE_MATERIAL_OPERATE_FAIL.getText()+e.getMessage());
- }
- }
-
- /**
- * 鍒犻櫎鏉愭枡淇℃伅
- * @param request
- * @param response
- * @return
- */
- @RequestMapping(value="/delete/{version}",method = RequestMethod.POST)
- @ApiVersion(1)
- public String deleteWarehousrInfo(HttpServletRequest request, HttpServletResponse response) {
- try {
- //鑾峰彇鍙傛暟
- FieldSetEntity fse = BaseUtil.getFieldSetEntity(request, CmnConst.PRODUCT_PROJECT_BASE_MATERIAL);;
-
- //鍒ゆ柇uuid鏄惁涓虹┖
- if (BaseUtil.strIsNull(fse.getUUID())) {
- return error(BaseErrorCode.SYSTEM_FORM_COUNT.getValue(), BaseErrorCode.SYSTEM_FORM_COUNT.getValue());
- }
- //鍒犻櫎
- boolean succ = materialManagerService.deleteMaterialInfo(fse.getUUID());
- if (succ) {
- return OK();
- }
- return error(BaseErrorCode.PROJECT_BASE_MATERIAL_DELETE_FAIL.getValue(), BaseErrorCode.PROJECT_BASE_MATERIAL_DELETE_FAIL.getText());
} catch (Exception e) {
return this.error(BaseErrorCode.PROJECT_BASE_MATERIAL_OPERATE_FAIL.getValue(), BaseErrorCode.PROJECT_BASE_MATERIAL_OPERATE_FAIL.getText()+e.getMessage());
}
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