pad流程-请领单-回退、回退单提交、出库、请领单作废、回退单作废增加服务流程处理

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

@@ -89,6 +89,7 @@ public class InvoicingQldMainEntity implements Serializable {
      * 长者id  nu_biz_elder_info.id
      */
     private String elderId;
+    private String elderName;
     /**
      * 作废原因
      */
@@ -127,4 +128,6 @@ public class InvoicingQldMainEntity implements Serializable {
     private String statusText;
     @TableField(exist = false)
     private List<InvoicingQldLogEntity> logList;
+    @TableField(exist = false)
+    private String nowStatus;
 }

nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/service/impl/QingLingServiceImpl.java

@@ -278,9 +278,9 @@ public class QingLingServiceImpl implements IQinglingApi {
 
             //检测是否有物料
             QueryWrapper<NuInvoicingQldInfo> infoQW = new QueryWrapper<>();
-            infoQW.eq("qld_no",dto.getQldNo());
+            infoQW.eq("qld_no", dto.getQldNo());
             List<NuInvoicingQldInfo> infoList = invoicingQldInfoMapper.selectList(infoQW);
-            if(CollectionUtils.isEmpty(infoList)){
+            if (CollectionUtils.isEmpty(infoList)) {
                 result.put("status", "faild");
                 result.put("message", "不存在物料，无法提交");
                 return result;
@@ -316,7 +316,19 @@ public class QingLingServiceImpl implements IQinglingApi {
             result.put("status", "success");
             result.put("message", "提交成功");
             result.put("result", ownService.queryQldByQldNo(dto.getQldNo()));
-            //todo 提交（被回退后再次提交）  护理员操作的  通知给库管
+
+            //被回退请领单 重新提交指令
+            InvoicingOrdersEntity orderEntity = new InvoicingOrdersEntity();
+            orderEntity.setFlowCode("ql_sqr");//指令流程flow_code 看接口有标明
+            orderEntity.setBizId(dto.getQldNo());//请领单号
+            orderEntity.setNuId(dto.getNuId());
+            orderEntity.setNuName(dto.getNuName());
+            orderEntity.setCustomerId(dto.getElderId());//长者id
+            orderEntity.setCustomerName(dto.getElderName());//长者姓名
+            orderEntity.setInitiatorId(sysUser.getEmployessId());//员工id
+            orderEntity.setInitiatorName(sysUser.getRealname());//员工姓名
+            invoicingOrdersApi.flowQlsqR(orderEntity);
+
             return result;
         } else {
             //购物车-提交
@@ -573,6 +585,7 @@ public class QingLingServiceImpl implements IQinglingApi {
         dto.setElderId(one.getElderId());
         String status = "2";
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        String nowStatus = one.getStatus();
 
         //日志表插记录
         NuInvoicingQldLog logData = new NuInvoicingQldLog();
@@ -589,7 +602,27 @@ public class QingLingServiceImpl implements IQinglingApi {
         one.setIzKgRead("N");//库管改为未读
         one.setZfBy(sysUser.getId());//作废人
         one.setZfTime(new Date());//作废时间
-        //todo 作废 护理员点击作废 通知给库管
+
+        //服务指令流程-作废
+        InvoicingOrdersEntity orderEntity = new InvoicingOrdersEntity();
+        orderEntity.setBizId(dto.getQldNo());//请领单号
+        orderEntity.setNuId(dto.getNuId());
+        orderEntity.setNuName(dto.getNuName());
+        orderEntity.setCustomerId(dto.getElderId());//长者id
+        orderEntity.setCustomerName(dto.getElderName());//长者姓名
+        orderEntity.setInitiatorId(sysUser.getEmployessId());//员工id
+        orderEntity.setInitiatorName(sysUser.getRealname());//员工姓名
+        if ("1".equals(nowStatus)) {
+            //已提交直接作废
+            orderEntity.setFlowCode("ql_zf");//指令流程flow_code 看接口有标明
+            invoicingOrdersApi.flowQlzf(orderEntity);
+        }
+        if ("3".equals(nowStatus)) {
+            //回退单作废
+            orderEntity.setFlowCode("ql_htzf");//指令流程flow_code 看接口有标明
+            invoicingOrdersApi.flowQlhtzf(orderEntity);
+        }
+
         return invoicingQldMainService.updateById(one);
     }
 
@@ -820,7 +853,19 @@ public class QingLingServiceImpl implements IQinglingApi {
         one.setHtBy(sysUser.getId());//回退人
         one.setHtTime(new Date());//回退时间
         boolean r_ = invoicingQldMainService.updateById(one);
-        //todo 回退 库管点击回退  通知给护理员
+
+        //服务指令流程-回退
+        InvoicingOrdersEntity orderEntity = new InvoicingOrdersEntity();
+        orderEntity.setFlowCode("ql_ht");//指令流程flow_code 看接口有标明
+        orderEntity.setBizId(dto.getQldNo());//请领单号
+        orderEntity.setNuId(dto.getNuId());
+        orderEntity.setNuName(dto.getNuName());
+        orderEntity.setCustomerId(dto.getElderId());//长者id
+        orderEntity.setCustomerName(dto.getElderName());//长者姓名
+        orderEntity.setInitiatorId(sysUser.getEmployessId());//员工id
+        orderEntity.setInitiatorName(sysUser.getRealname());//员工姓名
+        invoicingOrdersApi.flowQlht(orderEntity);
+
         return r_;
     }
 
@@ -908,7 +953,21 @@ public class QingLingServiceImpl implements IQinglingApi {
         qldData.setCkTime(new Date());//出库时间
         invoicingQldMainService.update(qldData, qw);
         map.put("status", "success");
-        //todo 出库（可以对多个请购单同时出库 qldNoArr就是请领单号） 库管点击出库  通知给护理员
+
+        //出库-服务指令流程
+        for (int i = 0; i < length; i++) {
+            InvoicingOrdersEntity orderEntity = new InvoicingOrdersEntity();
+            orderEntity.setFlowCode("ql_ck");//指令流程flow_code 看接口有标明
+            orderEntity.setBizId(qldNoArr[i]);//请领单号
+            orderEntity.setNuId(dto.getNuId());
+            orderEntity.setNuName(dto.getNuName());
+            orderEntity.setCustomerId(dto.getElderId());//长者id
+            orderEntity.setCustomerName(dto.getElderName());//长者姓名
+            orderEntity.setInitiatorId(sysUser.getEmployessId());//员工id
+            orderEntity.setInitiatorName(sysUser.getRealname());//员工姓名
+            invoicingOrdersApi.flowQlck(orderEntity);
+        }
+
         return map;
     }