From 5af357d158fdf598299f8b3d6234372250aa592d Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Tue, 13 Aug 2024 16:35:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=93=E4=B8=BA=E5=B9=B3=E6=BD=AD=E5=86=99?=
 =?UTF-8?q?=E7=9A=84=E5=88=A0=E9=99=A4=E6=89=80=E6=9C=89=E7=A7=91=E5=AE=A4?=
 =?UTF-8?q?=E5=87=BA=E5=BA=93=E5=8D=95=E6=8D=AE=E7=9A=84=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/inout/IoOrderController.java   | 41 +++++++++++++++++--
 .../api/service/inout/IoOrderService.java     |  2 +
 .../inout/impl/IoOrderServiceImpl.java        |  7 +++-
 3 files changed, 45 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java
index 64e29349e..41ca39079 100644
--- a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java
+++ b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java
@@ -42,10 +42,7 @@ import com.glxp.api.service.inv.InvPreProductDetailService;
 import com.glxp.api.service.inv.InvPreinProductDetailService;
 import com.glxp.api.service.inv.impl.InvProductDetailService;
 import com.glxp.api.service.system.SystemParamConfigService;
-import com.glxp.api.util.CustomUtil;
-import com.glxp.api.util.GennerOrderUtils;
-import com.glxp.api.util.IntUtil;
-import com.glxp.api.util.OrderNoTypeBean;
+import com.glxp.api.util.*;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.BeanUtils;
@@ -762,6 +759,42 @@ public class IoOrderController extends BaseController {
         return ResultVOUtils.success("删除成功！");
     }
 
+    @Resource
+    public RedisUtil redisUtil;
+
+    /**
+     * 为平潭写的删除科室出库的单据,验收完后需要删掉
+     *
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @PostMapping("udiwms/inout/order/finish/pt/delete")
+    @Log(title = "单据管理", businessType = BusinessType.DELETE)
+    public BaseResponse deleteAll(@RequestBody DeleteRequest deleteRequest) {
+
+        List<IoOrderEntity> orderEntities = orderService.findAllByAction("SC71021292871198");
+        Boolean b = redisUtil.getBool("deleteAllOrder");
+        if (b)
+            return ResultVOUtils.error("当前删除任务正在执行，请勿重复点击！");
+        redisUtil.set("deleteAllOrder", true);
+        orderEntities.parallelStream().forEach(item ->
+                {
+                    List<String> delBillNos = new ArrayList<>();
+                    delBillNos.add(item.getBillNo());
+                    orderService.deleteInvByBillNo(delBillNos);
+                    for (String billNo : delBillNos) {
+                        orderService.deleteByBillNo(billNo);
+                        orderDetailBizService.deleteByOrderId(billNo);
+                        orderDetailCodeService.deleteByOrderId(billNo);
+                        codeTempService.deleteByBillNo(billNo);
+                        codeService.deleteCodeByOrderId(billNo);
+                    }
+                }
+        );
+        redisUtil.set("deleteAllOrder", false);
+        return ResultVOUtils.success("删除成功！");
+    }
+
 
     //单据编辑，条码减一
     @AuthRuleAnnotation("")
diff --git a/src/main/java/com/glxp/api/service/inout/IoOrderService.java b/src/main/java/com/glxp/api/service/inout/IoOrderService.java
index 791c9a581..ef77c0207 100644
--- a/src/main/java/com/glxp/api/service/inout/IoOrderService.java
+++ b/src/main/java/com/glxp/api/service/inout/IoOrderService.java
@@ -141,6 +141,8 @@ public interface IoOrderService {
 
     boolean isExitByAction(String action);
 
+    List<IoOrderEntity> findAllByAction(String action);
+
     /**
      * 定时任务自动提交单据到第三方系统
      *
diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java
index 07c40bfaa..203286ef4 100644
--- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java
+++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java
@@ -479,7 +479,7 @@ public class IoOrderServiceImpl implements IoOrderService {
         } else {
             //更新临时表
             IoCodeTempEntity ioCodeEntity = codeTempService.selectById(codeEntity.getId());
-            if (ioCodeEntity.getCount() > 1  &&   ! deleteAll) {
+            if (ioCodeEntity.getCount() > 1 && !deleteAll) {
                 //删除一个条码
                 ioCodeEntity.setCount(ioCodeEntity.getCount() - 1);
                 int reCount = udiCalCountUtil.getActCount(ioCodeEntity.getNameCode());
@@ -966,6 +966,11 @@ public class IoOrderServiceImpl implements IoOrderService {
     }
 
 
+    @Override
+    public List<IoOrderEntity> findAllByAction(String action) {
+        return orderDao.selectList(new QueryWrapper<IoOrderEntity>().eq("action", action));
+    }
+
     @Resource
     ThrOrderUploadBustypesService thrOrderUploadBustypesService;
     @Resource