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("项目类型删除失败！", ""), 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"; } 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()); } 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); } }
