确认取药全部完成确认

dev_unify
yewj 8 months ago
parent 25470950c7
commit a74fe8a6c3

@ -427,6 +427,29 @@ public class IoCollectOrderController extends BaseController {
}
/**
*
*
* @return
*/
@PostMapping("/udiwms/basic/collect/order/confirmFinish")
@Transactional(rollbackFor = Exception.class)
public BaseResponse confirmFinish(@RequestBody CollectOrderRequest collectOrderRequest) {
if (StrUtil.isEmpty(collectOrderRequest.getBillNo())) {
return ResultVOUtils.error(500, "单据号不能为空!");
}
List<IoCollectOrderBiz> collectOrderBizs = collectOrderBizService.listByBillNo(collectOrderRequest.getBillNo());
boolean allConfirmed = CollUtil.isNotEmpty(collectOrderBizs) &&
collectOrderBizs.stream().allMatch(biz -> IntUtil.value(biz.getGetConfirm()));
if (allConfirmed) {
collectOrderService.confirmFinishOrder(collectOrderRequest, getUser());
return ResultVOUtils.success("单据完成!");
} else {
return ResultVOUtils.error(500, "单据未全部确认!");
}
}
/**
*
*

@ -821,7 +821,28 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
});
}
public void confirmFinishOrder(CollectOrderRequest collectOrderRequest, AuthAdmin authAdmin) {
IoCollectOrder collectOrder = new IoCollectOrder();
BeanUtils.copyProperties(collectOrderRequest, collectOrder);
collectOrder.setTagStatus(3);
collectOrder.setUpdateTime(new Date());
//插入备用表
IoCollectOrderBackup ioCollectOrderBackup = new IoCollectOrderBackup();
BeanUtils.copyProperties(collectOrder, ioCollectOrderBackup);
ioCollectOrderBackupService.save(ioCollectOrderBackup);
//删除原来单据
removeOrderByBillNo(collectOrder);
ThreadUtil.execAsync(() -> {
//插入到码表
collectCodeService.insertCodesByBill(collectOrderRequest.getBillNo());
//更新数据至第三方系统
//单据更新
ioCollectOrderBackupService.generateOrder(collectOrder.getBillNo(), authAdmin);
});
}
private void removeOrderByBillNo(IoCollectOrder collectOrder) {

Loading…
Cancel
Save