diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java index a275ed0da..1368673df 100644 --- a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java +++ b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java @@ -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 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, "单据未全部确认!"); + } + } + + /** * 确认取药 * diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java index 32cab79ab..e36ed00ee 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java @@ -821,7 +821,28 @@ public class IoCollectOrderService extends ServiceImpl { + //插入到码表 + collectCodeService.insertCodesByBill(collectOrderRequest.getBillNo()); + //更新数据至第三方系统 + //单据更新 + ioCollectOrderBackupService.generateOrder(collectOrder.getBillNo(), authAdmin); + }); + } private void removeOrderByBillNo(IoCollectOrder collectOrder) {