From 59522e7efd847955c29e31598780664e375d8151 Mon Sep 17 00:00:00 2001 From: liuxy Date: Fri, 2 Sep 2022 17:11:26 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/InspectionsheetmstServiceImpl.java | 24 +++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/impl/InspectionsheetmstServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/impl/InspectionsheetmstServiceImpl.java index a19d70ed..1eada980 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/impl/InspectionsheetmstServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/impl/InspectionsheetmstServiceImpl.java @@ -740,19 +740,23 @@ public class InspectionsheetmstServiceImpl implements InspectionsheetmstService */ String is_sendLK = SpringContextHolder.getBean(ParamServiceImpl.class).findByCode("IS_SENDLK").getValue(); if (StrUtil.equals(is_sendLK, "1")) { - WmsToLkServiceImpl wmsToLkService = new WmsToLkServiceImpl(); + boolean is_pgf = materialBaseService.isAlongMaterType(MaterOptTypeEnum.PGF.getCode(), material_id, null); - JSONObject param = new JSONObject(); - param.put("material_uuid", jsonMater.getString("ext_id")); - param.put("material_id", jsonMater.getString("material_id")); - param.put("material_code", jsonMater.getString("material_code")); - param.put("material_name", jsonMater.getString("material_name")); - param.put("status", jsonDtl.getString("result")); + if (is_pgf) { + WmsToLkServiceImpl wmsToLkService = new WmsToLkServiceImpl(); - JSONObject result = wmsToLkService.qualityResult(param); + JSONObject param = new JSONObject(); + param.put("material_uuid", jsonMater.getString("ext_id")); + param.put("material_id", jsonMater.getString("material_id")); + param.put("material_code", jsonMater.getString("material_code")); + param.put("material_name", jsonMater.getString("material_name")); + param.put("status", jsonDtl.getString("result")); - if (StrUtil.equals(result.getString("result"), "2")) { - throw new BadRequestException("发送立库失败："+result.getString("messsage")); + JSONObject result = wmsToLkService.qualityResult(param); + + if (StrUtil.equals(result.getString("result"), "2")) { + throw new BadRequestException("发送立库失败："+result.getString("messsage")); + } } }