From 4f2260b237cd534df5b5ec847e736197c98f97a0 Mon Sep 17 00:00:00 2001 From: linfso Date: Wed, 13 Nov 2024 15:43:03 +0800 Subject: [PATCH] md --- .../xdadan/erp/emis/service/EmisBaseService.java | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java index 5e964509a..43d54e4c5 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java @@ -738,15 +738,25 @@ public class EmisBaseService { // 问题件 else if(ScanType.ISSUE.opCode.equals(scanType)){ - EmisWaybill waybill = getWaybillByBillCode(scanRecord.getMainBillCode()); + // 获取问题件类型 + if( StringUtils.isEmpty(scanRecord.getRelId()) ){ + return null; + } + + EmisWaybillProblemInfo problemInfo=emisWaybillProblemInfoMapper.selectEmisWaybillProblemInfoById(Long.valueOf( scanRecord.getRelId())); + if("1".equals(problemInfo.getDelFlag())){ + return null; + } + +// EmisWaybill waybill = getWaybillByBillCode(scanRecord.getMainBillCode()); // 判断问题件类型，外部可以查看，内部不能查看 1-内部 - EmisProblemType promType=getEmisProblemTypeByType(waybill.getProblemType()); + EmisProblemType promType=getEmisProblemTypeByType(problemInfo.getProblemType()); if("1".equals(promType.getObjectType()) && !isInner ) { return null; } - content = "问题件 " + waybill.getProblemTypeName() + "(" + waybill.getProblemCause() + ")"; + content = "问题件 " + promType.getTypeName() + "(" + problemInfo.getProblemCause() + ")"; if (isInner) { content = scanRecord.getScanSite() + "," + scanRecord.getScanMan() + ",问题件," + scanDateStr + "," + content; }