fix:修复

lh_dev_fifo
chenhc 8 months ago
parent 9670fb2292
commit 86f6f62d0d

@ -1551,6 +1551,7 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService {
// Integer inv_set_enable = Integer.valueOf(systemParamConfigService.selectValueByParamKey("inv_set_enable"));
String highFilter = systemParamConfigService.selectValueByParamKey("fee_out_filter_high");
String cpMutiFilter = systemParamConfigService.selectValueByParamKey("fee_out_filter_cp");
String flag = systemParamConfigService.selectValueByParamKey("is_it_mandatory_to_handle_the_comparison");
if (sourceType == 0) {//直接明细 不走项目组套
thrInvOrder.setSkProject(0);
List<String> thrCodes = list.stream().map(ThrInvResultResponse::getThrCode).collect(Collectors.toList());
@ -1612,23 +1613,40 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService {
} else
exmsg.append(thrCode + "供应商未关联");
//过滤是否高值
if (IntUtil.value(highFilter) > 0) {
UdiRelevanceEntity udiRelevanceEntity = mainIdRelIdMap.get(thrCode);
if (IntUtil.value(udiRelevanceEntity.getHcType()) != 1) {
thrInvOrderDetails.add(thrInvOrderDetail);
if (IntUtil.value(flag) > 0) {
if (relId != null){
//过滤是否高值
if (IntUtil.value(highFilter) > 0) {
UdiRelevanceEntity udiRelevanceEntity = mainIdRelIdMap.get(thrCode);
if (IntUtil.value(udiRelevanceEntity.getHcType()) != 1) {
thrInvOrderDetails.add(thrInvOrderDetail);
}
} else {
thrInvOrderDetails.add(thrInvOrderDetail);
}
}
} else {
thrInvOrderDetails.add(thrInvOrderDetail);
//过滤是否高值
if (IntUtil.value(highFilter) > 0) {
UdiRelevanceEntity udiRelevanceEntity = mainIdRelIdMap.get(thrCode);
if (IntUtil.value(udiRelevanceEntity.getHcType()) != 1) {
thrInvOrderDetails.add(thrInvOrderDetail);
}
} else {
thrInvOrderDetails.add(thrInvOrderDetail);
}
}
});
if (exmsg.length() > 0) {
exmsg.deleteCharAt(exmsg.length() - 1);
exmsg.insert(0, "以下第三方耗材字典未匹配成功:");
thrInvOrder.setExMsg(String.valueOf(exmsg));
}
if (IntUtil.value(flag) > 0){
thrInvOrder.setExMsg(null);
}
} else {//走项目组套

Loading…
Cancel
Save