From 7d79fd22da36087d9f5c5847975842cd6d5a039e Mon Sep 17 00:00:00 2001 From: zhangzq Date: Thu, 18 Apr 2024 13:39:11 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E5=90=88=E5=90=8C=E5=8F=B0=E5=B8=90?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/org/nl/config/DataBaseConfig.java | 7 +++++++ .../impl/PcsIfPurchaseorderprocServiceImpl.java | 8 ++++---- .../nl/wms/pcs/wql/QPCS_IF_PURCHASEORDERPROC02.wql | 8 ++------ .../nl/wms/pf/service/impl/FlourworkServiceImpl.java | 12 ++++++++---- .../src/main/resources/config/application-dev.yml | 2 +- .../src/main/resources/config/application.yml | 2 +- .../src/views/wms/statistics/ledgerQuery/index.vue | 5 +++-- 7 files changed, 26 insertions(+), 18 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/config/DataBaseConfig.java b/mes/hd/nladmin-system/src/main/java/org/nl/config/DataBaseConfig.java index 60e6f2bb..a020000d 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/config/DataBaseConfig.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/config/DataBaseConfig.java @@ -20,6 +20,8 @@ import java.sql.SQLException; public class DataBaseConfig { @Value("${erp.oracle.enabled}") private boolean oracleIsConnect; + @Value("${spring.profiles.active}") + private String active; @Value("${erp.oracle.jdbcurl}") private String oracleJdbcUrl; @Value("${erp.oracle.username}") @@ -46,7 +48,12 @@ public class DataBaseConfig { @Bean(name = "dataSource1") @ConditionalOnExpression("${erp.oracle.enabled:true}") + @ConfigurationProperties(prefix = "spring.datasource.druid") public DataSource dataSource1() { + System.out.println("项目启动环境active"+active); + if ("dev".equals(active)){ + return new DruidDataSource(); + } System.out.println("是否连接oracle:"+oracleIsConnect); System.out.println("erp.oracle.jdbcurl:"+oracleJdbcUrl); System.out.println("erp.oracle.username:"+oracleUserName); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/service/impl/PcsIfPurchaseorderprocServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/service/impl/PcsIfPurchaseorderprocServiceImpl.java index 23a2a872..3859217d 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/service/impl/PcsIfPurchaseorderprocServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/service/impl/PcsIfPurchaseorderprocServiceImpl.java @@ -217,16 +217,16 @@ public class PcsIfPurchaseorderprocServiceImpl implements PcsIfPurchaseorderproc .collect(Collectors.joining("','")); // 查询erp视图 + List ja = WQL.getWO("QERP").setDbname("dataSource1").addParam("flag", "8").addParam("no_ids", "('"+no_ids+"')").process().getResultJSONArray(0).toJavaList(JSONObject.class); for (int i = 0; i < content.size(); i++) { JSONObject jsonObject = content.get(i); - List collect = ja.stream() + Optional first = ja.stream() .filter(row -> row.getString("vbillcode").equals(jsonObject.getString("contract_no")) - && row.getString("material_code").equals("item_code")) - .collect(Collectors.toList()); - jsonObject.put("subscribedate", ObjectUtil.isNotEmpty(collect) ? collect.get(0).getString("subscribedate") : ""); + && row.getString("item_code").equals(jsonObject.getString("material_code"))).findAny(); + jsonObject.put("subscribedate",first.isPresent() ? first.get().get("subscribedate"): ""); } json.put("content",content); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/wql/QPCS_IF_PURCHASEORDERPROC02.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/wql/QPCS_IF_PURCHASEORDERPROC02.wql index 76e8c2f7..8cfbd205 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/wql/QPCS_IF_PURCHASEORDERPROC02.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/wql/QPCS_IF_PURCHASEORDERPROC02.wql @@ -133,6 +133,7 @@ mater.material_name, mater.material_code, oder.PRICE_TAX, + dtl.receive_code, oder.QTY, oder.QTY * oder.PRICE_TAX AS money, oder.QTY - redtl.allqty AS notqty, @@ -163,12 +164,7 @@ a.source_billdtl_id ) AS redtl ON redtl.source_billdtl_id = dtl.source_billdtl_id - LEFT JOIN ( - SELECT - p.input_time,p.receive_id,p.is_delete - FROM - PCS_RC_ReceiveMst p WHERE p.is_delete = '0' ORDER BY p.input_time desc LIMIT 1 - ) AS remst ON remst.receive_id = dtl.receive_id + LEFT JOIN PCS_RC_ReceiveMst remst ON remst.receive_id = dtl.receive_id WHERE oder.dr = '0' diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FlourworkServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FlourworkServiceImpl.java index e38c286a..18c7b0cd 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FlourworkServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FlourworkServiceImpl.java @@ -306,10 +306,14 @@ public class FlourworkServiceImpl implements FlourworkService { List moveForm = new ArrayList<>(); if (!CollectionUtils.isEmpty(need_move)){ Map> collect = need_move.stream().collect(Collectors.groupingBy(move -> move.getString("storagevehicle_code"))); - for (String storagevehicle_code : collect.keySet()) { - String material_id = collect.get(storagevehicle_code).get(0).getString("material_id"); + for (JSONObject move_item : need_move) { + List move_material_collect = collect.remove(move_item.getString("storagevehicle_code")); + if (CollectionUtils.isEmpty(move_material_collect)){ + continue; + } + JSONObject in_point = null; - if (g_material.contains(material_id )){ + if (g_material.contains(move_item.getString("material_id") )){ if (g_points.size()>0){ in_point= g_points.remove(0); } }else if (notG_points.size()>0){ if (notG_points.size()>0){ in_point= notG_points.remove(0); } @@ -326,7 +330,7 @@ public class FlourworkServiceImpl implements FlourworkService { map.put("stor_name", "原材料库"); map.put("tableData",tableData); moveForm.add(map); - for (JSONObject item : collect.get(storagevehicle_code)) { + for (JSONObject item : move_material_collect) { tableData.add(packageMoveForm(item, in_point)); } diff --git a/mes/hd/nladmin-system/src/main/resources/config/application-dev.yml b/mes/hd/nladmin-system/src/main/resources/config/application-dev.yml index 1981c100..5df29026 100644 --- a/mes/hd/nladmin-system/src/main/resources/config/application-dev.yml +++ b/mes/hd/nladmin-system/src/main/resources/config/application-dev.yml @@ -3,7 +3,7 @@ server: #ERP系统相关 erp: oracle: - enabled: false + enabled: true jdbcurl: jdbc:oracle:thin:@192.168.81.251:1522:ORCL2 username: system password: 123456 diff --git a/mes/hd/nladmin-system/src/main/resources/config/application.yml b/mes/hd/nladmin-system/src/main/resources/config/application.yml index 949b17da..30f56233 100644 --- a/mes/hd/nladmin-system/src/main/resources/config/application.yml +++ b/mes/hd/nladmin-system/src/main/resources/config/application.yml @@ -2,7 +2,7 @@ spring: freemarker: check-template-location: false profiles: - active: prod + active: dev jackson: time-zone: GMT+8 data: diff --git a/mes/qd/src/views/wms/statistics/ledgerQuery/index.vue b/mes/qd/src/views/wms/statistics/ledgerQuery/index.vue index 3326939f..7dd24ae9 100644 --- a/mes/qd/src/views/wms/statistics/ledgerQuery/index.vue +++ b/mes/qd/src/views/wms/statistics/ledgerQuery/index.vue @@ -69,7 +69,7 @@ --> - + @@ -77,9 +77,10 @@ - + +