From 288814add87e100de42ea59e67c077cf14819db1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Mon, 15 Dec 2025 14:58:09 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=8D=95=E5=85=83=E9=80=80?=
 =?UTF-8?q?=E8=B4=A7=E4=BB=93=E5=BA=93=E6=94=B6=E8=B4=A7=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=EF=BC=8C=E6=96=B0=E5=A2=9E=E5=8D=95=E5=85=83=E9=80=80=E8=B4=A7?=
 =?UTF-8?q?=E4=BB=93=E5=BA=93=E6=94=B6=E8=B4=A7=E5=BC=80=E5=A7=8B=E5=92=8C?=
 =?UTF-8?q?=E7=BB=93=E6=9D=9F=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../invoicing/api/IInvoicingOrdersApi.java    | 12 +++++
 .../mapper/xml/InvoicingOrdersMapper.xml      |  7 +++
 .../impl/InvoicingOrdersServiceImpl.java      | 51 +++++++++++++++++++
 .../service/impl/ThOrdersServiceImpl.java     |  7 ++-
 4 files changed, 76 insertions(+), 1 deletion(-)

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<String> flowDythCksh(InvoicingOrdersEntity invoicingOrdersEntity);
 
+    /**
+     * 单元退货流程，库管点击开始
+     * @param invoicingOrdersEntity
+     */
+    Result<String> beginDyHtOrder(InvoicingOrdersEntity invoicingOrdersEntity);
+
+    /**
+     * 单元退货流程，库管点击完成
+     * @param invoicingOrdersEntity
+     */
+    Result<String> 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 @@
         <if test="izFinish != null and izFinish != ''">
             ,iz_finish = #{izFinish}
         </if>
+        <if test="bizId != null and bizId != ''">
+            ,biz_id = #{bizId}
+        </if>
         <where>
             <if test="id != null and id != ''">
                 and id = #{id}
             </if>
+            <if test="poolId != null and poolId != ''">
+                and pool_id = #{poolId}
+            </if>
             <if test="bizId != null and bizId != ''">
                 and biz_id = #{bizId}
             </if>
@@ -209,4 +215,5 @@
         </where>
     </update>
 
+
 </mapper>
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<InvoicingOrdersMappe
         return Result.ok();
     }
 
+    /**
+     * 单元退货流程，库管点击开始
+     * @param invoicingOrdersEntity
+     */
+    @Override
+    public Result<String> 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<String> finishDyThOrder(InvoicingOrdersEntity invoicingOrdersEntity){
+        try {
+            Calendar c = Calendar.getInstance();
+            QueryWrapper<InvoicingOrders> 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<InvoicingOrdersMapper, Invo
         Calendar c = Calendar.getInstance();
         getNetImages(flowSub);
         InvoicingOrders nextEntity = new InvoicingOrders();
-        nextEntity.setBizId(invoicingOrdersEntity.getBizId());
+//        if(invoicingOrdersEntity.getPoolId()!=null&&!invoicingOrdersEntity.getPoolId().equals("")){
+            nextEntity.setPoolId(invoicingOrdersEntity.getPoolId());
+//        }
+//        if(invoicingOrdersEntity.getBizId()!=null&&!invoicingOrdersEntity.getBizId().equals("")){
+//            nextEntity.setBizId(invoicingOrdersEntity.getBizId());
+//        }
         nextEntity.setBizType(bizType);
         nextEntity.setNuId(invoicingOrdersEntity.getNuId());
         nextEntity.setNuName(invoicingOrdersEntity.getNuName());