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-management/src/main/java/com/product/project/management/service/ProjectInfoService.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 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 a331ef5..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;
+ }
}
//鏀堕泦琛岃浆鍒楁暟鎹�
--
Gitblit v1.9.2