1、调整pad接口-退货单查询：增加对应工单信息

2、调整护理类服务指令工单目录结构，创建服务指令工单目录，将现有类移至此目录下，并在此目录中创建仓库类服务指令工单api

nursing-unit-api/src/main/java/com/nu/modules/pad/directiveorder/api/CareApi.java

@@ -1,4 +1,4 @@
-package com.nu.modules.pad.care.api;
+package com.nu.modules.pad.directiveorder.api;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.nu.entity.*;
@@ -16,7 +16,7 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * 采购单pad接口
+ * 护理类服务指令工单
  */
 @RestController
 @RequestMapping("/api/pad/care")

nursing-unit-api/src/main/java/com/nu/modules/pad/directiveorder/api/WareHouseApi.java

@@ -0,0 +1,14 @@
+package com.nu.modules.pad.directiveorder.api;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 仓库类服务指令工单
+ */
+@RestController
+@RequestMapping("/api/pad/warehouse")
+public class WareHouseApi {
+
+
+}

nursing-unit-common/src/main/java/com/nu/entity/InvoicingThdMainEntity.java

@@ -115,4 +115,8 @@ public class InvoicingThdMainEntity implements Serializable {
     @DateTimeFormat(pattern="yyyy.MM.dd HH:mm:ss")
     private Date fqEndTime;
 
+    private String orderId;//对应服务指令工单id
+    private String orderIzStart;//对应服务指令工单是否开始
+    private String orderIzFinish;//对应服务指令工单是否开始
+
 }

nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/thd/mapper/xml/NuInvoicingThdMainMapper.xml

@@ -10,7 +10,10 @@
         ksrtemp.realname AS ksrName,
         rkrtemp.realname AS rkrName,
         jsrtemp.realname AS jsrName,
-        logStatus.item_text AS statusText
+        logStatus.item_text AS statusText,
+        ido.id AS orderId,
+        ido.iz_start AS orderIzStart,
+        ido.iz_finish AS orderIzFinish
         from nu_invoicing_thd_main main
         left join nu_base_info baseInfo on main.nu_id = baseInfo.nu_id
         left join sys_user sqrtemp on sqrtemp.id = main.fq_by
@@ -19,6 +22,7 @@
         left join sys_user jsrtemp on jsrtemp.id = main.js_by
         LEFT JOIN sys_dict dict ON dict.dict_code = 'thd_status'
         LEFT JOIN sys_dict_item logStatus ON logStatus.dict_id = dict.id AND logStatus.item_value = main.status
+        left join nu_biz_nu_invoicing_directive_order ido on ido.pool_id = main.id
         <where>
             <if test="dto.searchContent != null and dto.searchContent != ''">
                 AND (

nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/service/impl/CareOrdersServiceImpl.java

@@ -104,6 +104,7 @@ public class CareOrdersServiceImpl extends ServiceImpl<CareOrdersMapper, CareOrd
         for(int i=0;i<ordersList.size();i++){
             CareOrders orders = ordersList.get(i);
             generateOrdersSub(orders);
+            //todo
         }
         return Result.OK();
     }

nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/service/impl/InvoicingOrdersServiceImpl.java

@@ -48,6 +48,8 @@ public class InvoicingOrdersServiceImpl extends ServiceImpl<InvoicingOrdersMappe
         for (int i = 0; i < ordersList.size(); i++) {
             InvoicingOrders orders = ordersList.get(i);
             generateOrders(orders);
+            //todo ws推送
+
         }
         return Result.OK();
     }

nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/service/impl/QlOrdersServiceImpl.java

@@ -259,7 +259,7 @@ public class QlOrdersServiceImpl extends ServiceImpl<InvoicingOrdersMapper, Invo
      * 请领申请
      * 护理员点击提交按钮，修改请领指令工单bizId
      * 获取下一节点，派单规则获取库管，生成一条未开始出库指令工单
-     * ws推送通知库管
+     *
      * @param invoicingOrdersEntity
      */
     @Override
@@ -304,7 +304,7 @@ public class QlOrdersServiceImpl extends ServiceImpl<InvoicingOrdersMapper, Invo
      * 请领出库
      * 库管点击出库按钮，获取下一节点
      * 派单申请人是否在线，在线获取此护理员，不在线则派单规则获取护理员，生成一条未开始收货指令工单
-     * ws推送通知护理员
+     *
      * @param invoicingOrdersEntity
      */
     @Override
@@ -350,7 +350,7 @@ public class QlOrdersServiceImpl extends ServiceImpl<InvoicingOrdersMapper, Invo
      * 请领回退
      * 库管点击回退按钮，获取未完成未作废的（发给库管）的出库指令工单，获取申请人，并将此工单标记成回退
      * 获取下一节点，生成一条未开始（发给护理员请领申请）的工单
-     * ws推送通知护理员
+     *
      * @param invoicingOrdersEntity
      */
     @Override
@@ -416,9 +416,9 @@ public class QlOrdersServiceImpl extends ServiceImpl<InvoicingOrdersMapper, Invo
         baseMapper.cancelOrder(entity);
 
         if(invoicingOrdersEntity.getFlowCode().equals("ql_zf")){
-            //ws推送库管通知
+            //todo ws推送库管通知
         }
-        //ws推送护理员
+        //todo ws推送护理员
     }
 
     /**
@@ -471,7 +471,7 @@ public class QlOrdersServiceImpl extends ServiceImpl<InvoicingOrdersMapper, Invo
         getOrderNo(nextEntity);
         baseMapper.insert(nextEntity);
 
-        //ws推送 employeeId
+        //todo ws推送 employeeId
     }
 
     /**