From 8a338dfe8f0f09335a361aea9e3a914497675682 Mon Sep 17 00:00:00 2001
From: 354798ggg <1074825718@qq.com>
Date: 星期一, 10 七月 2023 16:08:35 +0800
Subject: [PATCH] Merge branch 'master' of http://nonxin.cn:8090/r/project/qxlw
---
product-server-project-management/src/main/java/com/product/project/management/controller/ProjectInfoController.java | 146 ++++++++++++++++++++++++++++++------------------
product-server-project-management/src/main/java/com/product/project/management/service/ProjectInfoService.java | 9 ++
2 files changed, 99 insertions(+), 56 deletions(-)
diff --git a/product-server-project-management/src/main/java/com/product/project/management/controller/ProjectInfoController.java b/product-server-project-management/src/main/java/com/product/project/management/controller/ProjectInfoController.java
index eaa6c84..4bf7bab 100644
--- a/product-server-project-management/src/main/java/com/product/project/management/controller/ProjectInfoController.java
+++ b/product-server-project-management/src/main/java/com/product/project/management/controller/ProjectInfoController.java
@@ -20,19 +20,20 @@
@RequestMapping("/api/qxlw-project")
@RestController("qxlw-project-controller")
-public class ProjectInfoController extends AbstractBaseController{
+public class ProjectInfoController extends AbstractBaseController {
- @Autowired
- ProjectInfoService projectInfoService;
+ @Autowired
+ ProjectInfoService projectInfoService;
- /**
- * 鑾峰彇妯℃澘椤圭洰鍒嗛」
+ /**
+ * 鑾峰彇妯℃澘椤圭洰鍒嗛」
+ *
* @param request
* @return
*/
@RequestMapping(value = "/get-projectTypeItem/{version}", method = RequestMethod.POST)
@ApiVersion(1)
- public String getProjectTypeItem(HttpServletRequest request){
+ public String getProjectTypeItem(HttpServletRequest request) {
try {
// 鑾峰彇鍙傛暟
FieldSetEntity fse = BaseUtil.getFieldSetEntity(request);
@@ -54,12 +55,13 @@
/**
* 鑾峰彇椤圭洰淇℃伅锛堥」鐩垎椤瑰涓爲锛�
+ *
* @param request
* @return
*/
@RequestMapping(value = "/get-projectItem/{version}", method = RequestMethod.POST)
@ApiVersion(1)
- public String getProjectItem(HttpServletRequest request){
+ public String getProjectItem(HttpServletRequest request) {
try {
// 鑾峰彇鍙傛暟
FieldSetEntity fse = BaseUtil.getFieldSetEntity(request);
@@ -80,13 +82,14 @@
}
/**
- * 鑾峰彇椤圭洰瀛愯〃鍒嗛」锛堝崟涓爲锛�
+ * 鑾峰彇椤圭洰瀛愯〃鍒嗛」锛堝崟涓爲锛�
+ *
* @param request
* @return
*/
@RequestMapping(value = "/get-projectAllItem/{version}", method = RequestMethod.POST)
@ApiVersion(1)
- public String getProjectAllItem(HttpServletRequest request){
+ public String getProjectAllItem(HttpServletRequest request) {
try {
// 鑾峰彇鍙傛暟
FieldSetEntity fse = BaseUtil.getFieldSetEntity(request);
@@ -107,114 +110,120 @@
}
/**
- * 鑾峰彇椤圭洰淇℃伅(鏃犲垎椤靛弬鏁�)
+ * 鑾峰彇椤圭洰淇℃伅(鏃犲垎椤靛弬鏁�)
+ *
* @param request
* @return
*/
@RequestMapping(value = "/list-project/{version}", method = RequestMethod.POST)
@ApiVersion(1)
public String listProject(HttpServletRequest request) {
- try {
- return OK_List(projectInfoService.listProject());
- } catch (BaseException e) {
+ try {
+ return OK_List(projectInfoService.listProject());
+ } catch (BaseException e) {
e.printStackTrace();
return this.error(e);
} catch (Exception e) {
e.printStackTrace();
return this.error(SystemCode.PROJECT_MAMAGERENT_ITEMIZE_GENERAL_ERROR.getValue(),
- SystemCode.PROJECT_MAMAGERENT_ITEMIZE_GENERAL_ERROR.getText() + e.getMessage());
+ SystemCode.PROJECT_MAMAGERENT_ITEMIZE_GENERAL_ERROR.getText() + e.getMessage());
}
}
/**
- * 鑾峰彇椤圭洰鍒嗘瀽鏁版嵁
+ * 鑾峰彇椤圭洰鍒嗘瀽鏁版嵁
+ *
* @param request
* @return
*/
@RequestMapping(value = "/statist-analysis-report/{version}", method = RequestMethod.POST)
@ApiVersion(1)
public String statistAnalysis(HttpServletRequest request) {
- try {
- //鑾峰彇鍙傛暟
- FieldSetEntity fse = BaseUtil.getFieldSetEntity(request);
+ try {
+ //鑾峰彇鍙傛暟
+ FieldSetEntity fse = BaseUtil.getFieldSetEntity(request);
- //鍒ゆ柇uuid鏄惁涓虹┖
- if (BaseUtil.strIsNull(fse.getString(Cmnconst.PROJECT_UUID))) {
- return this.error(SystemCode.SYSTEM_FORM_COUNT.getValue(), SystemCode.SYSTEM_FORM_COUNT.getText());
- }
- return ResultInfo.success(projectInfoService.statistAnalysis(fse.getString(Cmnconst.PROJECT_UUID)));
+ //鍒ゆ柇uuid鏄惁涓虹┖
+ if (BaseUtil.strIsNull(fse.getString(Cmnconst.PROJECT_UUID))) {
+ return this.error(SystemCode.SYSTEM_FORM_COUNT.getValue(), SystemCode.SYSTEM_FORM_COUNT.getText());
+ }
+ return ResultInfo.success(projectInfoService.statistAnalysis(fse.getString(Cmnconst.PROJECT_UUID)));
// return OK_List(projectInfoService.statistAnalysis(fse.getString(Cmnconst.PROJECT_UUID)));
- } catch (BaseException e) {
+ } catch (BaseException e) {
e.printStackTrace();
return this.error(e);
} catch (Exception e) {
e.printStackTrace();
return this.error(SystemCode.PROJECT_MAMAGERENT_ITEMIZE_GENERAL_ERROR.getValue(),
- SystemCode.PROJECT_MAMAGERENT_ITEMIZE_GENERAL_ERROR.getText() + e.getMessage());
+ SystemCode.PROJECT_MAMAGERENT_ITEMIZE_GENERAL_ERROR.getText() + e.getMessage());
}
}
/**
- * 鍒犻櫎鍗曚釜椤圭洰鍒嗛」楠岃瘉锛堟牴鎹绠楅獙璇佹槸鍚﹀垹闄わ級
+ * 鍒犻櫎鍗曚釜椤圭洰鍒嗛」楠岃瘉锛堟牴鎹绠楅獙璇佹槸鍚﹀垹闄わ級
+ *
* @param request
* @return
*/
@RequestMapping(value = "/del-itemize-valdate/{version}", method = RequestMethod.POST)
@ApiVersion(1)
public String deleteItemizeValidate(HttpServletRequest request) {
- try {
- //鑾峰彇鍙傛暟
- FieldSetEntity fse = BaseUtil.getFieldSetEntity(request);
+ try {
+ //鑾峰彇鍙傛暟
+ FieldSetEntity fse = BaseUtil.getFieldSetEntity(request);
- //鍒ゆ柇uuid鏄惁涓虹┖
- if (BaseUtil.strIsNull(fse.getUUID())) {
- return this.error(SystemCode.SYSTEM_FORM_COUNT.getValue(), SystemCode.SYSTEM_FORM_COUNT.getText());
- }
- projectInfoService.deleteItemizeValidate(fse.getUUID());
- return OK();
- } catch (BaseException e) {
+ //鍒ゆ柇uuid鏄惁涓虹┖
+ if (BaseUtil.strIsNull(fse.getUUID())) {
+ return this.error(SystemCode.SYSTEM_FORM_COUNT.getValue(), SystemCode.SYSTEM_FORM_COUNT.getText());
+ }
+ projectInfoService.deleteItemizeValidate(fse.getUUID());
+ return OK();
+ } catch (BaseException e) {
e.printStackTrace();
return this.error(e);
} catch (Exception e) {
e.printStackTrace();
return this.error(SystemCode.PROJECT_MAMAGERENT_ITEMIZE_GENERAL_ERROR.getValue(),
- SystemCode.PROJECT_MAMAGERENT_ITEMIZE_GENERAL_ERROR.getText() + e.getMessage());
+ SystemCode.PROJECT_MAMAGERENT_ITEMIZE_GENERAL_ERROR.getText() + e.getMessage());
}
}
/**
- * 鑾峰彇椤圭洰棰勭畻淇℃伅
+ * 鑾峰彇椤圭洰棰勭畻淇℃伅
+ *
* @param request
* @return
*/
@RequestMapping(value = "/list-itemize-budget/{version}", method = RequestMethod.POST)
@ApiVersion(1)
public String listItemizeBudget(HttpServletRequest request) {
- try {
- //鑾峰彇鍙傛暟
- FieldSetEntity fse = BaseUtil.getFieldSetEntity(request);
+ try {
+ //鑾峰彇鍙傛暟
+ FieldSetEntity fse = BaseUtil.getFieldSetEntity(request);
- //鍒ゆ柇uuid鏄惁涓虹┖
- if (BaseUtil.strIsNull(fse.getString(Cmnconst.PROJECT_UUID))) {
- return this.error(SystemCode.SYSTEM_FORM_COUNT.getValue(), SystemCode.SYSTEM_FORM_COUNT.getText());
- }
+ //鍒ゆ柇uuid鏄惁涓虹┖
+ if (BaseUtil.strIsNull(fse.getString(Cmnconst.PROJECT_UUID))) {
+ return this.error(SystemCode.SYSTEM_FORM_COUNT.getValue(), SystemCode.SYSTEM_FORM_COUNT.getText());
+ }
- //鍒ゆ柇鍒嗛〉鍙傛暟鏄惁涓虹┖
- if (BaseUtil.strIsNull(fse.getString(CoreConst.CPAGE)) || BaseUtil.strIsNull(fse.getString(CoreConst.PAGESIZE))) {
- return this.error(SystemCode.SYSTEM_CPAGES_NOT_NULL.getValue(), SystemCode.SYSTEM_CPAGES_NOT_NULL.getText());
- }
- return OK_List(projectInfoService.listItemizeBudget(fse.getString(Cmnconst.PROJECT_UUID), fse.getString(Cmnconst.ITEMIZE_CODE), fse.getInteger(CoreConst.CPAGE), fse.getInteger(CoreConst.PAGESIZE)));
- } catch (BaseException e) {
+ //鍒ゆ柇鍒嗛〉鍙傛暟鏄惁涓虹┖
+ if (BaseUtil.strIsNull(fse.getString(CoreConst.CPAGE)) || BaseUtil.strIsNull(fse.getString(CoreConst.PAGESIZE))) {
+ return this.error(SystemCode.SYSTEM_CPAGES_NOT_NULL.getValue(), SystemCode.SYSTEM_CPAGES_NOT_NULL.getText());
+ }
+ return OK_List(projectInfoService.listItemizeBudget(fse.getString(Cmnconst.PROJECT_UUID), fse.getString(Cmnconst.ITEMIZE_CODE), fse.getInteger(CoreConst.CPAGE), fse.getInteger(CoreConst.PAGESIZE)));
+ } catch (BaseException e) {
e.printStackTrace();
return this.error(e);
} catch (Exception e) {
e.printStackTrace();
return this.error(SystemCode.PROJECT_MAMAGERENT_ITEMIZE_GENERAL_ERROR.getValue(),
- SystemCode.PROJECT_MAMAGERENT_ITEMIZE_GENERAL_ERROR.getText() + e.getMessage());
+ SystemCode.PROJECT_MAMAGERENT_ITEMIZE_GENERAL_ERROR.getText() + e.getMessage());
}
}
+
/**
- * 鑾峰彇椤圭洰鍒嗛」鏉愭枡
+ * 鑾峰彇椤圭洰鍒嗛」鏉愭枡
+ *
* @param request
* @return
*/
@@ -244,14 +253,43 @@
SystemCode.PROJECT_MAMAGERENT_ITEMIZE_GENERAL_ERROR.getText() + e.getMessage());
}
}
+
+ /**
+ * 鑾峰彇椤圭洰鍒嗛」鏉愭枡
+ *
+ * @param request
+ * @return
+ */
+ @RequestMapping(value = "/find-inventory_v/{version}", method = RequestMethod.POST)
+ @ApiVersion(1)
+ public String findInventoryV(HttpServletRequest request) {
+ try {
+ //鑾峰彇鍙傛暟
+ FieldSetEntity fse = BaseUtil.getFieldSetEntity(request);
+ //鍒ゆ柇浠撳簱鍜屾潗鏂欐槸鍚︿负绌�
+ if (BaseUtil.strIsNull(fse.getString("warehouse_uuid"))||BaseUtil.strIsNull(fse.getString("material_uuid"))) {
+ return this.error(SystemCode.SYSTEM_FORM_COUNT.getValue(), SystemCode.SYSTEM_FORM_COUNT.getText());
+ }
+ return OK_List(projectInfoService.findInventoryV(fse.getString("warehouse_uuid"), fse.getString("material_uuid")));
+ } catch (BaseException e) {
+ e.printStackTrace();
+ return this.error(e);
+ } catch (Exception e) {
+ e.printStackTrace();
+ return this.error(SystemCode.PROJECT_MAMAGERENT_ITEMIZE_GENERAL_ERROR.getValue(),
+ SystemCode.PROJECT_MAMAGERENT_ITEMIZE_GENERAL_ERROR.getText() + e.getMessage());
+ }
+ }
+
/**
* 鏍规嵁uuid鑾峰彇椤圭洰鍒嗛」鏍戠粨鏋勮鎯�
+ *
* @param request
* @return
*/
@RequestMapping(value = "/get-treeProjectItem/{version}", method = RequestMethod.POST)
@ApiVersion(1)
- public String getTreeProjectItem(HttpServletRequest request){
+ public String getTreeProjectItem(HttpServletRequest request) {
try {
// 鑾峰彇鍙傛暟
FieldSetEntity fse = BaseUtil.getFieldSetEntity(request);
diff --git a/product-server-project-management/src/main/java/com/product/project/management/service/ProjectInfoService.java b/product-server-project-management/src/main/java/com/product/project/management/service/ProjectInfoService.java
index a7489f0..7b38697 100644
--- a/product-server-project-management/src/main/java/com/product/project/management/service/ProjectInfoService.java
+++ b/product-server-project-management/src/main/java/com/product/project/management/service/ProjectInfoService.java
@@ -6,7 +6,6 @@
import java.util.Map;
import com.alibaba.fastjson.JSONArray;
-import com.product.core.websocket.config.CmnConst;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -213,7 +212,13 @@
public DataTableEntity listMaterialV(String uuid, Integer capge, Integer pageSize) {
return baseDao.listTable("product_project_base_material_v","project_itemize_uuid=?",new String[]{uuid},null,null,pageSize, capge);
}
-
+ /**
+ * 鏇村叿浠撳簱鍜屾潗鏂欒幏鍙栧簱瀛�
+ * @return
+ */
+ public FieldSetEntity findInventoryV(String warehouse_uuid, String material_uuid) {
+ return baseDao.getFieldSetByFilter("product_project_inventory_v","warehouse_uuid=? and uuid=?",new String[]{warehouse_uuid,material_uuid},false);
+ }
/**
* 鏍规嵁椤圭洰uuid鑾峰彇椤圭洰鍒嗛」鏍戠粨鏋�
* @param uuid
--
Gitblit v1.9.2