From 5caa9a776bff8c06cbfb16d60b36daab491c5b33 Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Thu, 17 Apr 2025 15:40:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=AC=A0=E6=AC=BE=E5=87=BA=E5=8E=82=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E4=BF=9D=E5=AD=98=E6=B7=BB=E5=8A=A0=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AsArrearsoutApplyMapper.java               |  2 ++
 .../AsArrearsoutApplyMapper.xml                |  4 ++++
 .../AsArrearsoutApplyService.java              | 18 ++++++++++++++----
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asarrearsoutapply/AsArrearsoutApplyMapper.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asarrearsoutapply/AsArrearsoutApplyMapper.java
index 0da9b79f82..f76b77e05d 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asarrearsoutapply/AsArrearsoutApplyMapper.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asarrearsoutapply/AsArrearsoutApplyMapper.java
@@ -72,4 +72,6 @@ public interface AsArrearsoutApplyMapper extends BaseMapper<AsArrearsoutApply> {
 
     @Select("select nodeState from as_arrearsout_apply where pairBillSid = #{pairBillSid}")
     String selByPairBillSid(String pairBillSid);
+
+    AsArrearsoutApply selectBill(String pairBillNo);
 }
\ No newline at end of file
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asarrearsoutapply/AsArrearsoutApplyMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asarrearsoutapply/AsArrearsoutApplyMapper.xml
index 089c1b77c0..f607aab0a6 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asarrearsoutapply/AsArrearsoutApplyMapper.xml
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asarrearsoutapply/AsArrearsoutApplyMapper.xml
@@ -43,4 +43,8 @@
 		WHERE nodeState != '待提交'
 		  and find_in_set(sid, #{list})
     </select>
+
+	<select id="selectBill" resultType="com.yxt.anrui.as.api.asarrearsoutapply.AsArrearsoutApply">
+		select * from as_arrearsout_apply where pairBillNo = #{pairBillNo} and nodeState != '终止'
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asarrearsoutapply/AsArrearsoutApplyService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asarrearsoutapply/AsArrearsoutApplyService.java
index 9e1b6f09e4..1c204c731a 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asarrearsoutapply/AsArrearsoutApplyService.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asarrearsoutapply/AsArrearsoutApplyService.java
@@ -155,7 +155,8 @@ public class AsArrearsoutApplyService extends MybatisBaseService<AsArrearsoutApp
         return p;
     }
 
-    public String saveOrUpdateDto(AsArrearsoutApplyDto dto) {
+    public ResultBean<String> saveOrUpdateDto(AsArrearsoutApplyDto dto) {
+        ResultBean<String> rb = ResultBean.fireFail();
         String dtoSid = dto.getSid();
         String deptSid = dto.getDeptSid();
         SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(deptSid).getData();
@@ -164,6 +165,11 @@ public class AsArrearsoutApplyService extends MybatisBaseService<AsArrearsoutApp
         dto.setUseOrgSid(useOrgSid);
         dto.setUseOrgName(organizationVo.getName());
         if (StringUtils.isBlank(dtoSid)) {
+            //根据维修单查询
+            AsArrearsoutApply asArrearsoutApply = baseMapper.selectBill(dto.getPairBillNo());
+            if(asArrearsoutApply != null){
+                return rb.setMsg("已存在维修单编码为"+dto.getPairBillNo()+"的欠款出厂申请,不允许重复创建");
+            }
             //生成单据编号
             String billNo = "";
             String date = DateUtil.format(DateUtil.date(), "yyyyMM");
@@ -176,10 +182,10 @@ public class AsArrearsoutApplyService extends MybatisBaseService<AsArrearsoutApp
             }
             dto.setBillNo(billNo);
             String sid = this.insertByDto(dto);
-            return sid;
+            return rb.success().setData(sid);
         }
         this.updateByDto(dto);
-        return dtoSid;
+        return rb.success().setData(dtoSid);
     }
 
     public String insertByDto(AsArrearsoutApplyDto dto) {
@@ -265,7 +271,11 @@ public class AsArrearsoutApplyService extends MybatisBaseService<AsArrearsoutApp
             return rb.setMsg("操作失败!提交的数据不一致");
         }
         //新增修改保存
-        String businessSid = saveOrUpdateDto(dto);
+        ResultBean<String> resultBean = saveOrUpdateDto(dto);
+        if(!resultBean.getSuccess()){
+            return rb.setMsg(resultBean.getMsg());
+        }
+        String businessSid = resultBean.getData();
         asArrearsoutApply = fetchBySid(businessSid);
         //创建BusinessVariables实体对象
         BusinessVariables bv = new BusinessVariables();