From cb0bcc104ce101e30700bd859c6241ceb0aa72c9 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Tue, 28 May 2024 08:37:08 +0800
Subject: [PATCH] md

---
 .../web/emis/EmisElectronicPagApplyController.java   |  3 +++
 .../service/impl/EmisElectronicPagServiceImpl.java   | 12 ++++++++++++
 2 files changed, 15 insertions(+)

diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisElectronicPagApplyController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisElectronicPagApplyController.java
index 1d599db2b..3b1279c59 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisElectronicPagApplyController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisElectronicPagApplyController.java
@@ -80,6 +80,9 @@ public class EmisElectronicPagApplyController extends BaseController
     @PostMapping("/export")
     public void export(HttpServletResponse response, EmisElectronicPagApply emisElectronicPagApply)
     {
+        if(!getLoginUser().getUser().isTopSite()) {
+            emisElectronicPagApply.setApplySiteCode(getLoginUser().getUser().getOwnerSiteCode());
+        }
         List<EmisElectronicPagApply> list = emisElectronicPagApplyService.selectEmisElectronicPagApplyList(emisElectronicPagApply);
         ExcelUtil<EmisElectronicPagApply> util = new ExcelUtil<EmisElectronicPagApply>(EmisElectronicPagApply.class);
         util.exportExcel(response, list, "网点电子面单申请数据");
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisElectronicPagServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisElectronicPagServiceImpl.java
index 954273419..e281a654f 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisElectronicPagServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisElectronicPagServiceImpl.java
@@ -86,6 +86,18 @@ public class EmisElectronicPagServiceImpl extends EmisBaseService implements IEm
             throw new EmisBizError(EmisBizErrorType.NOT_EXISTS,"流水号不存在");
         }
 
+        if("1".equals(emisElectronicPagApply.getBlSend())
+        ){
+            throw new EmisBizError(EmisBizErrorType.NOT_EXISTS,"已发放，不能重复发放");
+
+        }
+
+        if("1".equals(emisElectronicPagApply.getBlCancel())
+        ){
+            throw new EmisBizError(EmisBizErrorType.NOT_EXISTS,"已取消，不能重复发放");
+
+        }
+
         String prefix=emisElectronicPagApply.getPrefix();
         Integer applyNum=emisElectronicPagApply.getApplyCount();