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/controller/MaterialManagerController.java | 54 +++---------------------------------------------------
1 files changed, 3 insertions(+), 51 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 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());
}
--
Gitblit v1.9.2