diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisProblemType.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisProblemType.java index e60fbf97f..1aca1e205 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisProblemType.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisProblemType.java @@ -43,7 +43,7 @@ public class EmisProblemType extends BaseEntity private String typeNameEn; /* 是否发送短信 */ private Integer isSendSms; - /* 对象类型 all-全部 in-内部 out-外部 */ + /* 对象类型 0-全部 1-内部 2-外部 */ private String objectType; /* 顺延天数 */ private Integer delayDay; 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 734be360b..da960642b 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 @@ -737,10 +737,17 @@ public class EmisBaseService { EmisWaybill waybill = getWaybillByBillCode(scanRecord.getMainBillCode()); - content="问题件 "+waybill.getProblemTypeName()+"("+waybill.getProblemCause()+")"; - if(isInner){ - content=scanRecord.getScanSite()+","+scanRecord.getScanMan()+",问题件,"+scanDateStr+","+content; + // 判断问题件类型,外部可以查看,内部不能查看 1-内部 + EmisProblemType promType=getEmisProblemTypeByType(waybill.getProblemType()); + if("1".equals(promType.getObjectType()) ) { + return null; } + + content = "问题件 " + waybill.getProblemTypeName() + "(" + waybill.getProblemCause() + ")"; + if (isInner) { + content = scanRecord.getScanSite() + "," + scanRecord.getScanMan() + ",问题件," + scanDateStr + "," + content; + } + } // 合包