Merge remote-tracking branch 'origin/master'

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);
 }

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>

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();