aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-08-01 07:04:51 +08:00
parent ada0aaf330
commit db66fbf903
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisProblemType.java
View File

@ -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;

13
emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
View File

@ -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;
}
}
// 合包