Merge remote-tracking branch 'origin/master'

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

@@ -61,4 +61,6 @@ public class InvoicingQldGwcEntity {
      */
     private MaterialInfoEntity materialInfo;
 
+    private String qldNo;
+
 }

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

@@ -245,6 +245,39 @@ public class QingLingServiceImpl implements IQinglingApi {
     @Transactional(rollbackFor = Exception.class)
     public Map<String, Object> submitQld(InvoicingQldGwcEntity dto) {
         Map<String, Object> result = Maps.newHashMap();
+        if (StringUtils.isNotBlank(dto.getQldNo())) {
+            //回退单-提交
+            QueryWrapper<NuInvoicingQldMain> qw = new QueryWrapper<>();
+            qw.eq("qld_no", dto.getQldNo());
+            NuInvoicingQldMain one = invoicingQldMainService.getOne(qw);
+            dto.setNuId(one.getNuId());
+            dto.setElderId(one.getElderId());
+            String status = "1";
+            LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+
+            //日志表插记录
+            NuInvoicingQldLog logData = new NuInvoicingQldLog();
+            logData.setQldNo(dto.getQldNo());//请领单号
+            logData.setStatus(status);//单子操作状态
+            logData.setJdMc(status);//节点mc（字典qld_status)
+            logData.setOpeBy(sysUser.getId());//操作人
+            logData.setOpeTime(new Date());//操作时间
+            logData.setNuId(dto.getNuId());//护理单元id
+            logData.setElderId(dto.getElderId());//长者id
+            invoicingQldLogMapper.insert(logData);
+
+            //更新单子为待收货
+            one.setStatus(status);
+            one.setIzYgRead("N");//员工改为未读
+            one.setIzKgRead("N");//库管改为未读
+            one.setTjBy(sysUser.getId());//作废人
+            one.setTjTime(new Date());//作废时间
+            invoicingQldMainService.updateById(one);
+
+            result.put("status", "success");
+            return null;
+        } else {
+            //购物车-提交
             //当前购物车信息
             QueryWrapper<NuInvoicingQldGwc> gwcQW = new QueryWrapper<>();
             gwcQW.eq("nu_id", dto.getNuId());
@@ -359,6 +392,7 @@ public class QingLingServiceImpl implements IQinglingApi {
 
             result.put("status", "success");
             return result;
+        }
 
     }