|
|
|
@ -583,18 +583,18 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
|
|
|
|
|
|
|
|
|
|
if (!collectOrder.getTagStatus().equals(4) && (IntUtil.value(collectSet.getAutoDealOrder()) || IntUtil.value(collectOrderRequest.getForceAllot()))) {//没出现耗材不匹配 且 开启了自动转成待处理单据
|
|
|
|
|
collectOrder.setTagStatus(1);
|
|
|
|
|
allotCollects.add(collectOrder);
|
|
|
|
|
allotCollectBizs.addAll(bizList);
|
|
|
|
|
boolean isExit = collectOrderMapper.exists(new LambdaQueryWrapper<IoCollectOrder>().eq(IoCollectOrder::getBillNo, collectOrder.getBillNo()).eq(IoCollectOrder::getBusType, collectOrder.getBusType()));
|
|
|
|
|
if (!isExit) {
|
|
|
|
|
collectOrderMapper.insert(collectOrder);
|
|
|
|
|
collectOrderBizService.saveBatch(bizList);
|
|
|
|
|
}
|
|
|
|
|
// saveBatch(allotCollects);
|
|
|
|
|
// allotCollects.add(collectOrder);
|
|
|
|
|
// allotCollectBizs.addAll(bizList);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (CollUtil.isNotEmpty(allotCollects)) {
|
|
|
|
|
|
|
|
|
|
saveBatch(allotCollects);
|
|
|
|
|
collectOrderBizService.saveBatch(allotCollectBizs);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|