From e0eaf1775d34c4eb66fd557aeb5e71ab8eec2913 Mon Sep 17 00:00:00 2001 From: zhangzq Date: Tue, 15 Oct 2024 18:02:52 +0800 Subject: [PATCH] =?UTF-8?q?rev:=E6=97=A0=E8=A2=8B=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../set/service/impl/PdaBucketNoBagServiceImpl.java | 5 +++-- .../master/service/MaterialbaseService.java | 1 + .../service/impl/MaterialbaseServiceImpl.java | 13 +++++++++++++ 3 files changed, 17 insertions(+), 2 deletions(-) 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 add4814a..b8f23776 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 @@ -138,9 +138,10 @@ public class PdaBucketNoBagServiceImpl implements PdaBucketNoBagService { String bucketunique = mst.getString("bucketunique"); String is_active = mst.getString("is_active"); String material_code = mst.getString("material_code"); - MaterialbaseDto materDto = materialbaseService.findByCode(material_code); + //从ERP查物料 + MaterialbaseDto materDto = materialbaseService.findByErpId(material_code); if (materDto==null){ - throw new BadRequestException(material_code+"物料信息不存在"); + throw new BadRequestException(material_code+"ERP_ID对应MES物料信息不存在"); } String input_optid = mst.getString("accountId"); String input_optname = mst.getString("user"); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/MaterialbaseService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/MaterialbaseService.java index 0e2f2eef..a966dc95 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/MaterialbaseService.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/MaterialbaseService.java @@ -47,6 +47,7 @@ public interface MaterialbaseService { * @return Materialbase */ MaterialbaseDto findByCode(String code); + MaterialbaseDto findByErpId(String erpId); /** 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 4d5c686b..5dd77c0f 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 @@ -135,6 +135,19 @@ public class MaterialbaseServiceImpl implements MaterialbaseService { return obj; } + @Override + public MaterialbaseDto findByErpId(String erpId) { + if (StringUtils.isEmpty(erpId)){ + 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); + final MaterialbaseDto obj = json.toJavaObject(MaterialbaseDto.class); + return obj; + } + @Override public MaterialbaseDto findByCode(String code) { if (StringUtils.isEmpty(code)){