From 4b51f1ca9d2c34664e93bdb3e4c3430fdcde1d83 Mon Sep 17 00:00:00 2001 From: zhangzq Date: Thu, 17 Oct 2024 20:04:34 +0800 Subject: [PATCH] =?UTF-8?q?rev:=E6=89=8B=E6=8C=81=E6=97=A0=E8=A2=8B?= =?UTF-8?q?=E7=BB=84=E7=9B=98=E5=8A=9F=E8=83=BD=EF=BC=9Badd:=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E7=B2=89=E6=96=99=E8=AE=A1=E5=88=92=E6=97=A5=E8=A1=A8?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../set/rest/PdaBucketNotBagController.java | 25 ++++++++++++++++- .../impl/PdaBucketNoBagServiceImpl.java | 2 +- .../service/impl/MaterialbaseServiceImpl.java | 4 +-- .../impl/StatisticalReportServiceImpl.java | 28 +++++++++++++++++-- .../wql/statistical_report_query_01.wql | 1 + 5 files changed, 53 insertions(+), 7 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/set/rest/PdaBucketNotBagController.java b/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/set/rest/PdaBucketNotBagController.java index cfa329a8..f42628be 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/set/rest/PdaBucketNotBagController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/set/rest/PdaBucketNotBagController.java @@ -2,13 +2,19 @@ package org.nl.pda.st.set.rest; +import cn.hutool.core.util.ObjectUtil; +import com.alibaba.fastjson.JSONObject; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.annotation.Log; +import org.nl.exception.BadRequestException; +import org.nl.modules.system.util.MapOf; import org.nl.pda.st.set.service.PdaBucketNoBagService; import org.nl.pda.st.set.service.PdaBucketService; +import org.nl.wms.basedata.master.service.MaterialbaseService; +import org.nl.wms.basedata.master.service.dto.MaterialbaseDto; import org.nl.wql.core.content.HttpContext; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -32,6 +38,8 @@ public class PdaBucketNotBagController { private final PdaBucketNoBagService bucketNoBagService; + private final MaterialbaseService materialbaseService; + @PostMapping("/queryInfoBybucket") @Log("根据桶码查询信息") @ApiOperation("根据桶码查询信息") @@ -40,7 +48,22 @@ public class PdaBucketNotBagController { } - @PostMapping("/confirmGroupBucket") + @PostMapping("/queryErpId") + @Log("根据ERPID查询物料编码") + public ResponseEntity queryErpId(@RequestBody Map whereJson) { + String materialCode = whereJson.get("material_code"); + MaterialbaseDto materDto = materialbaseService.findByErpId(materialCode); + if (materDto==null){ + throw new BadRequestException(materialCode+"ERP_ID对应MES物料信息不存在"); + } + JSONObject result = new JSONObject(); + result.put("code", "1"); + result.put("desc", "查询成功！"); + result.put("result", MapOf.of("material_code",materDto.getMaterial_code())); + return new ResponseEntity<>(result, HttpStatus.OK); + } + + @PostMapping("confirmGroupBucket") @Log("确定组桶") @ApiOperation("确定组桶") public ResponseEntity confirmGroupBucket( @RequestBody Map whereJson) { diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/set/service/impl/PdaBucketNoBagServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/set/service/impl/PdaBucketNoBagServiceImpl.java index b8f23776..fd402cc6 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/set/service/impl/PdaBucketNoBagServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/set/service/impl/PdaBucketNoBagServiceImpl.java @@ -139,7 +139,7 @@ public class PdaBucketNoBagServiceImpl implements PdaBucketNoBagService { String is_active = mst.getString("is_active"); String material_code = mst.getString("material_code"); //从ERP查物料 - MaterialbaseDto materDto = materialbaseService.findByErpId(material_code); + MaterialbaseDto materDto = materialbaseService.findByCode(material_code); if (materDto==null){ throw new BadRequestException(material_code+"ERP_ID对应MES物料信息不存在"); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/MaterialbaseServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/MaterialbaseServiceImpl.java index 5dd77c0f..0844d551 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/MaterialbaseServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/MaterialbaseServiceImpl.java @@ -141,9 +141,7 @@ public class MaterialbaseServiceImpl implements MaterialbaseService { throw new BadRequestException("ERPID编码不能为空"); } WQLObject wo = WQLObject.getWQLObject("md_me_materialbase"); - JSONObject json = wo.query("ext_id =" + erpId + "").uniqueResult(0); - String unit_name = WQLObject.getWQLObject("md_pb_measureunit").query("measure_unit_id= '" + json.getString("base_unit_id") + "'").uniqueResult(0).getString("unit_name"); - json.put("base_unit_name", unit_name); + JSONObject json = wo.query("ext_id = '" + erpId + "'").uniqueResult(0); final MaterialbaseDto obj = json.toJavaObject(MaterialbaseDto.class); return obj; } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/StatisticalReportServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/StatisticalReportServiceImpl.java index b4a5e89a..d996a26c 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/StatisticalReportServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/StatisticalReportServiceImpl.java @@ -17,10 +17,12 @@ import org.nl.modules.system.repository.DeptRepository; import org.nl.modules.system.service.DeptService; import org.nl.modules.system.service.UserService; import org.nl.modules.system.service.dto.UserDto; +import org.nl.modules.system.service.impl.ParamServiceImpl; import org.nl.modules.system.util.MapOf; import org.nl.pda.exception.PdaRequestException; import org.nl.utils.FileUtil; import org.nl.utils.SecurityUtils; +import org.nl.utils.SpringContextHolder; import org.nl.wms.common.util.DataAuthUtil; import org.nl.wms.statistics.service.StatisticalReportService; import org.nl.wql.WQL; @@ -43,6 +45,7 @@ import java.nio.file.Paths; import java.util.*; import java.util.function.Consumer; import java.util.function.Function; +import java.util.function.Predicate; import java.util.function.ToDoubleFunction; import java.util.stream.Collectors; @@ -556,6 +559,11 @@ public class StatisticalReportServiceImpl implements StatisticalReportService { @Override public JSONArray getHeader() { + List header = new ArrayList(); + String headerFilter = SpringContextHolder.getBean(ParamServiceImpl.class).findByCode("Header_Filter").getValue(); + if (StringUtils.isNotEmpty(headerFilter)){ + header = JSONArray.parseArray(headerFilter, String.class); + } JSONArray jsonArr = WQL.getWO("statistical_report_query_01").addParam("flag", "3").process().getResultJSONArray(0); JSONArray jonsResuftArr = new JSONArray(); JSONObject jsonResuft1 = new JSONObject(); @@ -565,8 +573,13 @@ public class StatisticalReportServiceImpl implements StatisticalReportService { for (int i = 0; i < jsonArr.size(); i++) { JSONObject json = jsonArr.getJSONObject(i); JSONObject jsonResuft2 = new JSONObject(); + String materialName = json.getString("material_name"); + boolean present = header.stream().filter(s -> materialName.contains(s)).findAny().isPresent(); + if (present){ + continue; + } jsonResuft2.put("prop", json.getString("material_id")); - jsonResuft2.put("label", json.getString("material_name")); + jsonResuft2.put("label", materialName); jonsResuftArr.add(jsonResuft2); } return jonsResuftArr; @@ -574,6 +587,11 @@ public class StatisticalReportServiceImpl implements StatisticalReportService { @Override public JSONArray getHeader2() { + List header = new ArrayList(); + String headerFilter = SpringContextHolder.getBean(ParamServiceImpl.class).findByCode("Header_Filter").getValue(); + if (StringUtils.isNotEmpty(headerFilter)){ + header = JSONArray.parseArray(headerFilter, String.class); + } JSONArray jsonArr = WQL.getWO("statistical_report_query_01").addParam("flag", "3").process().getResultJSONArray(0); JSONArray jonsResuftArr = new JSONArray(); JSONObject jsonResuft1 = new JSONObject(); @@ -599,9 +617,15 @@ public class StatisticalReportServiceImpl implements StatisticalReportService { for (int i = 0; i < jsonArr.size(); i++) { JSONObject json = jsonArr.getJSONObject(i); JSONObject jsonResuft4 = new JSONObject(); + String materialName = json.getString("material_name"); + boolean present = header.stream().filter(s -> materialName.contains(s)).findAny().isPresent(); + if (present){ + continue; + } jsonResuft4.put("prop", json.getString("material_id")); - jsonResuft4.put("label", json.getString("material_name")); + jsonResuft4.put("label", materialName); jonsResuftArr.add(jsonResuft4); + } return jonsResuftArr; } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/wql/statistical_report_query_01.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/wql/statistical_report_query_01.wql index 8d34b770..0dcbeeb4 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/wql/statistical_report_query_01.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/wql/statistical_report_query_01.wql @@ -365,6 +365,7 @@ INNER JOIN md_pb_classstandard class ON class.class_id = mb.material_type_id ORDER BY order_no, + material_name, material_code ENDSELECT ENDQUERY