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/service/ProjectInfoService.java | 49 +++++++++++++++++++++++++++++++++++++------------
1 files changed, 37 insertions(+), 12 deletions(-)
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 ef04c1d..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
@@ -93,12 +93,13 @@
//鑾峰彇鏁版嵁搴撳師濮嬫暟鎹�
StringBuilder sb = new StringBuilder();
sb.append("WITH outbound AS(")
- .append(" SELECT A.project_uuid,A.project_itemize,C.material_type,B.material_code,SUM(B.outbound_weight)outbound_weight ")
+ .append(" SELECT A.project_uuid,D.itemize project_itemize,C.material_type,B.material_code,SUM(B.outbound_weight)outbound_weight ")
.append(" FROM product_project_outbound A ")
.append(" LEFT JOIN product_project_outbound_sub B ON A.uuid=B.outbound_uuid ")
.append(" LEFT JOIN product_project_base_material C ON B.material_uuid = C.uuid ")
- .append(" WHERE project_uuid = ? ")
- .append(" GROUP BY A.project_uuid,A.project_itemize,C.material_type,B.material_code ")
+ .append(" LEFT JOIN product_project_item D ON A.project_itemize = D.uuid ")
+ .append(" WHERE A.flow_flag=2 AND A.project_uuid = ? ")
+ .append(" GROUP BY A.project_uuid,D.itemize,C.material_type,B.material_code ")
.append(" ) ")
.append(" SELECT A.project_uuid,A.project_itemize,A.total_outbound_weight,B.material_type,B.material_code,B.outbound_weight ")
.append(" FROM ( ")
@@ -106,7 +107,8 @@
.append(" FROM outbound ")
.append(" GROUP BY project_uuid,project_itemize ")
.append(" )A ")
- .append(" RIGHT JOIN outbound B ON A.project_uuid=B.project_uuid AND A.project_itemize=B.project_itemize ");
+ .append(" RIGHT JOIN outbound B ON A.project_uuid=B.project_uuid AND A.project_itemize=B.project_itemize ")
+ .append(" ORDER BY project_itemize,material_code");
DataTableEntity dtItemizeInfo = baseDao.listTable(sb.toString(), new Object[]{project_uuid});
if (!BaseUtil.dataTableIsEmpty(dtItemizeInfo)) {
@@ -126,7 +128,9 @@
if (BaseUtil.strIsNull(materialTypes[materialType])) {
materialTypes[materialType] = materialCode;
} else {
- materialTypes[fseItemize.getInteger(Cmnconst.MATERIAL_TYPE)] += "," + materialCode;
+ if(materialTypes[fseItemize.getInteger(Cmnconst.MATERIAL_TYPE)].indexOf(materialCode)<0) {
+ materialTypes[fseItemize.getInteger(Cmnconst.MATERIAL_TYPE)] += "," + materialCode;
+ }
}
//鏀堕泦琛岃浆鍒楁暟鎹�
@@ -198,18 +202,39 @@
return dtItemizeBudget;
}
+ /**
+ * 鏇村叿椤圭洰鍒嗛」uuid鑾峰彇椤圭洰鍒嗛」涓嬬殑鏉愭枡
+ * @param uuid
+ * @param capge
+ * @param pageSize
+ * @return
+ */
+ 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
+ * @return
+ */
+
public JSONArray getTreeProjectItem(String uuid) {
- FieldSetEntity fseProject = baseDao.getFieldSetEntity(Cmnconst.PRODUCT_PROJECT_QXLW, uuid, true);
- DataTableEntity newDtProjectItem = BaseUtil.dataTableToTreeTable(fseProject.getSubDataTable(Cmnconst.PRODUCT_PROJECT_ITEM), Cmnconst.ITEMIZE_CODE, Cmnconst.ITEMIZE_PARENT_CODE, null);
+ DataTableEntity dtProjectItemize = baseDao.listTable(Cmnconst.PRODUCT_PROJECT_ITEM, "project_uuid=?", new Object[]{uuid}, new Object[]{CoreConst.UUID, Cmnconst.ITEMIZE, Cmnconst.ITEMIZE_CODE, Cmnconst.ITEMIZE_PARENT_CODE});
+ DataTableEntity newDtProjectItem = BaseUtil.dataTableToTreeTable(dtProjectItemize, Cmnconst.ITEMIZE_CODE, Cmnconst.ITEMIZE_PARENT_CODE, null);
JSONArray objects = BaseUtil.dataTableEntityToJson(newDtProjectItem);
JSONObject json = new JSONObject();
- json.put("itemize", "椤圭洰鍒嗛儴鍒嗛」");
- json.put("children", objects);
- json.put("type", 1);
-
+ json.set("itemize", "椤圭洰鍒嗛儴鍒嗛」");
+ json.set("children", objects);
+ json.set("type", 1);
JSONArray array = new JSONArray();
array.add(json);
-
return array;
}
}
--
Gitblit v1.9.2