|
|
|
@ -63,6 +63,9 @@ import java.util.stream.Collectors; |
|
|
|
@Service |
|
|
|
public class InspectionRequestServiceImpl extends ServiceImpl<InspectionRequestHeaderMapper, InspectionRequestHeader> implements InspectionRequestService { |
|
|
|
|
|
|
|
/** “其他验货”客户:该 customer 的新增验货申请默认数量为1且保存后免审直接已下达 - rqrq */ |
|
|
|
private static final String OTHER_INSPECT_CUSTOMER = "其他验货"; |
|
|
|
|
|
|
|
@Autowired |
|
|
|
private InspectionRequestDetailMapper poDetailMapper; |
|
|
|
|
|
|
|
@ -273,9 +276,29 @@ public class InspectionRequestServiceImpl extends ServiceImpl<InspectionRequestH |
|
|
|
header.setInspectPhone(vo.getInspectPhone()); |
|
|
|
header.setRemark(vo.getRemark()); |
|
|
|
|
|
|
|
// 默认状态:草稿 |
|
|
|
header.setStatus("草稿"); |
|
|
|
header.setStatusDb("Draft"); |
|
|
|
// 判定“其他验货”客户:命中则免审,保存直接落已下达(等价系统自动执行提交+审核);否则草稿 - rqrq |
|
|
|
String firstOrderNo = (vo.getItems() != null && !vo.getItems().isEmpty()) |
|
|
|
? vo.getItems().get(0).getOrderNo() : null; |
|
|
|
boolean skipAudit = false; |
|
|
|
if (StringUtils.hasText(firstOrderNo)) { |
|
|
|
POHeader customerHeader = poheaderMapper.selectOne( |
|
|
|
new LambdaQueryWrapper<POHeader>() |
|
|
|
.select(POHeader::getCustomer) |
|
|
|
.eq(POHeader::getSite, site) |
|
|
|
.eq(POHeader::getOrderNo, firstOrderNo) |
|
|
|
); |
|
|
|
skipAudit = customerHeader != null |
|
|
|
&& OTHER_INSPECT_CUSTOMER.equals(customerHeader.getCustomer()); |
|
|
|
} |
|
|
|
|
|
|
|
if (skipAudit) { |
|
|
|
header.setStatus("已下达"); |
|
|
|
header.setStatusDb("Audited"); |
|
|
|
} else { |
|
|
|
// 默认状态:草稿 |
|
|
|
header.setStatus("草稿"); |
|
|
|
header.setStatusDb("Draft"); |
|
|
|
} |
|
|
|
|
|
|
|
header.setCreateBy(user.getUsername()); |
|
|
|
header.setCreateDate(new Date()); |
|
|
|
@ -399,9 +422,15 @@ public class InspectionRequestServiceImpl extends ServiceImpl<InspectionRequestH |
|
|
|
|
|
|
|
|
|
|
|
detail.setQty(totalQty); |
|
|
|
// 默认状态:草稿 |
|
|
|
detail.setStatus("草稿"); |
|
|
|
detail.setStatusDb("Draft"); |
|
|
|
// 与头表保持一致:其他验货免审直接已下达,否则草稿 - rqrq |
|
|
|
if (skipAudit) { |
|
|
|
detail.setStatus("已下达"); |
|
|
|
detail.setStatusDb("Audited"); |
|
|
|
} else { |
|
|
|
// 默认状态:草稿 |
|
|
|
detail.setStatus("草稿"); |
|
|
|
detail.setStatusDb("Draft"); |
|
|
|
} |
|
|
|
|
|
|
|
inspectionRequestDetailMapper.insert(detail); |
|
|
|
requestItemNo++; |
|
|
|
|