|
|
|
@ -539,7 +539,7 @@ public class IoCheckInoutService {
|
|
|
|
|
* @param orderEntity
|
|
|
|
|
*/
|
|
|
|
|
public void unCheckFirstFinish(IoOrderEntity orderEntity) {
|
|
|
|
|
|
|
|
|
|
log.error("进入了 一次校验(无需校验)完成");
|
|
|
|
|
List<IoOrderDetailCodeEntity> orderDetailCodeEntities = orderDetailCodeService.findByOrderId(orderEntity.getBillNo());
|
|
|
|
|
|
|
|
|
|
if (CollUtil.isEmpty(orderDetailCodeEntities)) {
|
|
|
|
@ -553,8 +553,10 @@ public class IoCheckInoutService {
|
|
|
|
|
if (orderEntity.getFromType() != ConstantStatus.FROM_UDISP) {
|
|
|
|
|
if (orderEntity.getFromType() != ConstantStatus.FROM_COPY
|
|
|
|
|
&& orderEntity.getFromType() != ConstantStatus.FROM_CHANGE) {
|
|
|
|
|
log.error("进入了 一次校验(无需校验)完成 2");
|
|
|
|
|
orderDetailBizService.deleteByOrderId(orderEntity.getBillNo());
|
|
|
|
|
}
|
|
|
|
|
log.error("进入了 一次校验(无需校验)完成 3");
|
|
|
|
|
orderDetailResultService.deleteByOrderId(orderEntity.getBillNo());
|
|
|
|
|
if (!orderDetailBizService.isExit(orderEntity.getBillNo())) {
|
|
|
|
|
orderDetailCodeEntities.forEach(orderDetailCodeEntity ->
|
|
|
|
@ -567,6 +569,7 @@ public class IoCheckInoutService {
|
|
|
|
|
orderDetailBizService.insert(orderDetailBizEntity);
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
log.error("进入了 一次校验(无需校验)完成 4");
|
|
|
|
|
}
|
|
|
|
|
orderDetailCodeEntities.forEach(orderDetailCodeEntity ->
|
|
|
|
|
{
|
|
|
|
@ -584,10 +587,12 @@ public class IoCheckInoutService {
|
|
|
|
|
orderDetailResultService.insert(orderDetailResultEntity);
|
|
|
|
|
|
|
|
|
|
});
|
|
|
|
|
log.error("进入了 一次校验(无需校验)完成 5");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//临时表转正式表
|
|
|
|
|
List<IoCodeTempEntity> codeTempEntities = codeTempService.findByOrderId(orderEntity.getBillNo());
|
|
|
|
|
log.error("进入了 一次校验(无需校验)完成 6");
|
|
|
|
|
for (IoCodeTempEntity codeTempEntity : codeTempEntities) {
|
|
|
|
|
IoCodeEntity codeEnttity = new IoCodeEntity();
|
|
|
|
|
BeanUtils.copyProperties(codeTempEntity, codeEnttity);
|
|
|
|
@ -603,6 +608,7 @@ public class IoCheckInoutService {
|
|
|
|
|
codeEnttity.setId(null);
|
|
|
|
|
codeService.insert(codeEnttity);
|
|
|
|
|
}
|
|
|
|
|
log.error("进入了 一次校验(无需校验)完成 7");
|
|
|
|
|
codeTempService.deleteByBillNo(orderEntity.getBillNo());
|
|
|
|
|
orderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK_SUCCESS);
|
|
|
|
|
orderEntity.setDealStatus(ConstantStatus.ORDER_DEAL_POST);
|
|
|
|
|