diff --git a/nursing-unit-services/nu-services-api/nu-services-local-api/src/main/java/com/nu/modules/invoicing/api/IInvoicingOrdersApi.java b/nursing-unit-services/nu-services-api/nu-services-local-api/src/main/java/com/nu/modules/invoicing/api/IInvoicingOrdersApi.java index f7ae13be..4d52d723 100644 --- a/nursing-unit-services/nu-services-api/nu-services-local-api/src/main/java/com/nu/modules/invoicing/api/IInvoicingOrdersApi.java +++ b/nursing-unit-services/nu-services-api/nu-services-local-api/src/main/java/com/nu/modules/invoicing/api/IInvoicingOrdersApi.java @@ -71,4 +71,16 @@ public interface IInvoicingOrdersApi { */ Result flowDythCksh(InvoicingOrdersEntity invoicingOrdersEntity); + /** + * 单元退货流程,库管点击开始 + * @param invoicingOrdersEntity + */ + Result beginDyHtOrder(InvoicingOrdersEntity invoicingOrdersEntity); + + /** + * 单元退货流程,库管点击完成 + * @param invoicingOrdersEntity + */ + Result finishDyThOrder(InvoicingOrdersEntity invoicingOrdersEntity); + } diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/mapper/xml/InvoicingOrdersMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/mapper/xml/InvoicingOrdersMapper.xml index fc119ff7..784abed5 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/mapper/xml/InvoicingOrdersMapper.xml +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/mapper/xml/InvoicingOrdersMapper.xml @@ -187,10 +187,16 @@ ,iz_finish = #{izFinish} + + ,biz_id = #{bizId} + and id = #{id} + + and pool_id = #{poolId} + and biz_id = #{bizId} @@ -209,4 +215,5 @@ + diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/service/impl/InvoicingOrdersServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/service/impl/InvoicingOrdersServiceImpl.java index 0d870dc7..29b3ecc0 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/service/impl/InvoicingOrdersServiceImpl.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/service/impl/InvoicingOrdersServiceImpl.java @@ -286,4 +286,55 @@ public class InvoicingOrdersServiceImpl extends ServiceImpl beginDyHtOrder(InvoicingOrdersEntity invoicingOrdersEntity){ + try { + Calendar c = Calendar.getInstance(); + InvoicingOrders entity = new InvoicingOrders(); + entity.setPoolId(invoicingOrdersEntity.getPoolId()); + entity.setBeginTime(c.getTime()); + entity.setIzStart("Y"); + entity.setUpdateBy(invoicingOrdersEntity.getInitiatorId()); + entity.setUpdateTime(c.getTime()); + entity.setBizType(invoicingOrdersEntity.getFlowCode()); + baseMapper.updateOrder(entity); + }catch (Exception e){ + return Result.error("开始失败:"+e.getMessage()); + } + return Result.ok("开始成功"); + } + + /** + * 单元退货流程,库管点击完成 + * @param invoicingOrdersEntity + */ + @Override + public Result finishDyThOrder(InvoicingOrdersEntity invoicingOrdersEntity){ + try { + Calendar c = Calendar.getInstance(); + QueryWrapper ioQw = new QueryWrapper<>(); + ioQw.eq("pool_id", invoicingOrdersEntity.getPoolId()); + InvoicingOrders order = this.getOne(ioQw); + InvoicingOrders DirectivePrice = baseMapper.getDirectivePrice(order.getDirectiveId());//获取服务指令价格 + InvoicingOrders entity = new InvoicingOrders(); + entity.setPoolId(invoicingOrdersEntity.getPoolId()); + entity.setBizId(invoicingOrdersEntity.getBizId()); + entity.setFinishTime(c.getTime()); + entity.setIzFinish("Y"); + entity.setUpdateBy(invoicingOrdersEntity.getInitiatorId()); + entity.setUpdateTime(c.getTime()); + entity.setBizType(invoicingOrdersEntity.getFlowCode()); + entity.setTollPrice(DirectivePrice.getTollPrice()); + entity.setComPrice(DirectivePrice.getComPrice()); + baseMapper.updateOrder(entity); + }catch (Exception e){ + return Result.error("完成失败:"+e.getMessage()); + } + return Result.ok("完成成功"); + } + } diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/service/impl/ThOrdersServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/service/impl/ThOrdersServiceImpl.java index 899ba8ab..d40f9480 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/service/impl/ThOrdersServiceImpl.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/service/impl/ThOrdersServiceImpl.java @@ -74,7 +74,12 @@ public class ThOrdersServiceImpl extends ServiceImpl