From 25b96182ecf21d325ce560a9b9d1f4f3e0ef55b2 Mon Sep 17 00:00:00 2001 From: 354798ggg <1074825718@qq.com> Date: 星期日, 06 八月 2023 21:25:39 +0800 Subject: [PATCH] 材料信息调整 --- product-server-project-base/src/main/java/com/product/base/controller/MaterialManagerController.java | 38 +++++++++++++++++++++----------------- 1 files changed, 21 insertions(+), 17 deletions(-) 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 eb88597..ed6ff1a 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 @@ -11,10 +11,8 @@ import com.product.base.config.BaseErrorCode; import com.product.base.config.CmnConst; import com.product.base.service.MaterialManagerService; -import com.product.core.config.CoreConst; import com.product.core.controller.support.AbstractBaseController; import com.product.core.entity.FieldSetEntity; -import com.product.core.entity.RequestParameterEntity; import com.product.module.sys.version.ApiVersion; import com.product.util.BaseUtil; @@ -42,21 +40,6 @@ @ApiVersion(1) public String getMaterialTypeTree(HttpServletRequest request, HttpServletResponse response) { try { - //鑾峰彇鍙傛暟 - FieldSetEntity fse = null; - Object bean=request.getAttribute(CoreConst.API_POST_REQUEST_DATA); - if(bean != null){ - RequestParameterEntity reqp=(RequestParameterEntity)bean; - fse = reqp.getFormData(); - } - //鍒ゆ柇涓婁紶鍙傛暟鏄惁涓虹┖ - if(bean == null || fse == null) { - return error(BaseErrorCode.SYSTEM_FORM_NODATA.getValue(), BaseErrorCode.SYSTEM_FORM_NODATA.getText()); - } - //鍒ゆ柇琛ㄥ悕鏄惁姝g‘ - if(!CmnConst.PRODUCT_PROJECT_BASE_MATERIAL.equals(fse.getTableName())) { - return error(BaseErrorCode.SYSTEM_TABLE_NODATA.getValue(), BaseErrorCode.SYSTEM_TABLE_NODATA.getText()); - } return OK_List(materialManagerService.getMaterialTypeTree()); } catch (Exception e) { return this.error(BaseErrorCode.PROJECT_BASE_MATERIAL_OPERATE_FAIL.getValue(), BaseErrorCode.PROJECT_BASE_MATERIAL_OPERATE_FAIL.getText()+e.getMessage()); @@ -64,6 +47,27 @@ } /** + * 淇濆瓨鏉愭枡绫诲瀷 + * @param request + * @param response + * @return + */ + @RequestMapping(value="/save-material-type/{version}", method = RequestMethod.POST) + @ApiVersion(1) + public String saveMaterialType(HttpServletRequest request, HttpServletResponse response) { + try { + //鑾峰彇鍙傛暟 + FieldSetEntity fse = BaseUtil.getFieldSetEntity(request, CmnConst.PRODUCT_PROJECT_BASE_MATERIAL_TYPE); + if (BaseUtil.strIsNull(fse.getString(CmnConst.MATERIAL_TYPE_NAME))) { + return error(BaseErrorCode.SYSTEM_FORM_COUNT.getValue(), BaseErrorCode.SYSTEM_FORM_COUNT.getText()); + } + return OK_Add(materialManagerService.saveMaterialType(fse)); + } 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 -- Gitblit v1.9.2