From e1ce0e3daafabaa62edca0d8b9ff01c710fc69ea Mon Sep 17 00:00:00 2001 From: liuxy Date: Thu, 20 Jun 2024 15:01:11 +0800 Subject: [PATCH] =?UTF-8?q?rev:=E5=90=88=E5=90=8C=E5=8F=B0=E8=B4=A6?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/PcsIfPurchaseorderprocServiceImpl.java | 14 +++++++++++--- .../src/views/wms/statistics/ledgerQuery/index.vue | 7 ++++--- 2 files changed, 15 insertions(+), 6 deletions(-) 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 ea9ea288..2db9ae0b 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 @@ -14,6 +14,7 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.exception.BadRequestException; import org.nl.ext.erp.service.WmsToErpService; +import org.nl.utils.PageUtil; import org.nl.utils.SecurityUtils; import org.nl.wms.basedata.master.constant.MaterOptTypeEnum; import org.nl.wms.basedata.master.service.ClassstandardService; @@ -216,9 +217,9 @@ public class PcsIfPurchaseorderprocServiceImpl implements PcsIfPurchaseorderproc if (!ObjectUtil.isEmpty(supp_name)) { map.put("supp_name", "%" + supp_name + "%"); } - if (!ObjectUtil.isEmpty(iszero)) { + /* if (!ObjectUtil.isEmpty(iszero)) { map.put("iszero", "true".equals(iszero)?"= 0":"<> 0"); - } + }*/ String classIds = classstandardService.getAllChildIdStr(MaterOptTypeEnum.ZLFL.getClass_idStr()); map.put("classIds",classIds); @@ -232,7 +233,7 @@ public class PcsIfPurchaseorderprocServiceImpl implements PcsIfPurchaseorderproc .map(row -> row.getString("contract_no")) .collect(Collectors.joining("','")); - // 查询erp视图 + // 查询erp视图 QTY_HT 重量 ，QTY_ZT 未到货重量，NORIGTAXMNY 合同金额 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++) { @@ -242,8 +243,15 @@ public class PcsIfPurchaseorderprocServiceImpl implements PcsIfPurchaseorderproc .filter(row -> row.getString("vbillcode").equals(jsonObject.getString("contract_no")) && row.getString("item_code").equals(jsonObject.getString("material_code"))).findAny(); jsonObject.put("subscribedate",first.isPresent() ? first.get().get("subscribedate"): ""); + // 合同重量 + jsonObject.put("qty_ht",first.isPresent() ? first.get().get("QTY_HT"): 0); + // 合同未到货重量 + jsonObject.put("qty_zt",first.isPresent() ? first.get().get("QTY_ZT"): 0); + // 合同金额 + jsonObject.put("norigtaxmny",first.isPresent() ? first.get().get("NORIGTAXMNY"): 0); } + json.put("content",content); return json; } diff --git a/mes/qd/src/views/wms/statistics/ledgerQuery/index.vue b/mes/qd/src/views/wms/statistics/ledgerQuery/index.vue index 592fe5e3..214a00e0 100644 --- a/mes/qd/src/views/wms/statistics/ledgerQuery/index.vue +++ b/mes/qd/src/views/wms/statistics/ledgerQuery/index.vue @@ -113,9 +113,9 @@ - - - + + + @@ -124,6 +124,7 @@ +