调整单元退货仓库收货接口，新增单元退货仓库收货开始和结束接口

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);
+
 }

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>

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("完成成功");
+    }
+
 }

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());