md
This commit is contained in:
parent
52a345db94
commit
4f2260b237
@ -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;
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user