|
|
|
@ -329,7 +329,6 @@ public class IoCheckInoutService {
|
|
|
|
|
codeService.insert(codeEnttity);
|
|
|
|
|
}
|
|
|
|
|
codeTempService.deleteByBillNo(orderEntity.getBillNo());
|
|
|
|
|
|
|
|
|
|
orderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK_SUCCESS);
|
|
|
|
|
orderEntity.setDealStatus(ConstantStatus.ORDER_DEAL_POST);
|
|
|
|
|
orderEntity.setUpdateTime(new Date());
|
|
|
|
@ -748,7 +747,9 @@ public class IoCheckInoutService {
|
|
|
|
|
orderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK_REW);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (StrUtil.isEmpty(orderEntity.getCheckUser())) {
|
|
|
|
|
orderEntity.setCheckUser(orderEntity.getCreateUser());
|
|
|
|
|
}
|
|
|
|
|
if (orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_CHECK_REW) {
|
|
|
|
|
orderEntity.setDealStatus(ConstantStatus.ORDER_DEAL_REW);
|
|
|
|
|
orderEntity.setUpdateTime(new Date());
|
|
|
|
@ -810,6 +811,9 @@ public class IoCheckInoutService {
|
|
|
|
|
orderEntity.setDealStatus(ConstantStatus.ORDER_DEAL_CHECK);
|
|
|
|
|
orderEntity.setUpdateTime(new Date());
|
|
|
|
|
orderEntity.setAuditTime(new Date());
|
|
|
|
|
if (StrUtil.isEmpty(orderEntity.getReviewUser())) {
|
|
|
|
|
orderEntity.setReviewUser(orderEntity.getReviewUser());
|
|
|
|
|
}
|
|
|
|
|
orderService.update(orderEntity);
|
|
|
|
|
genInv(orderEntity, bussinessTypeEntity);
|
|
|
|
|
}
|
|
|
|
|