Merge branch 'master' of http://nonxin.cn:8090/r/project/qxlw

2369059705@qq.com

2023-07-07 c913a335643619ac7d1943d75ce06f71a31b8185

 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());
      }