md

emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillAjustApplyServiceImpl.java

@@ -133,7 +133,11 @@ public class EmisWaybillAjustApplyServiceImpl extends EmisBaseService implements
         checkFirstSigningDay(emisWaybillOld, getEmisWaybillNewFromJson(emisWaybillAjustApply));
 
         // 检查月结/现金客户额度
-//        checkUseQuotaCredit(emisWaybillOld, getEmisWaybillNewFromJson(emisWaybillAjustApply));
+        // bug:1657 调整后逻辑：单证部同事 员工表标识“单证专属”岗位登记的网点费用申请，不用判断 现金额度和月结客户额度
+        boolean isDZZS=checkIsDZZS(emisWaybillAjustApply.getApplyManCode());
+        if(!isDZZS) {
+            checkUseQuotaCredit(emisWaybillOld, getEmisWaybillNewFromJson(emisWaybillAjustApply));
+        }
 
         // 插入数据
         emisWaybillAjustApplyMapper.insertEmisWaybillAjustApply(emisWaybillAjustApply);
@@ -237,6 +241,30 @@ public class EmisWaybillAjustApplyServiceImpl extends EmisBaseService implements
     }
 
 
+    /**
+     * 判断是否单证专属
+     * @param empCode
+     * @return
+     */
+    private boolean checkIsDZZS(String empCode){
+        boolean isDZZS=false;
+        SysUser opUser = getEmisStaffByCode(empCode);
+        if (opUser != null) {
+            // 判断申请人是否是单证专属
+            List<Long> postIds = postMapper.selectPostListByUserId(opUser.getUserId());
+            if (!CollectionUtils.isEmpty(postIds)) {
+                for (Long poId : postIds) {
+                    if (poId == 18) {
+                        isDZZS = true;
+                        break;
+                    }
+                }
+            }
+        }
+
+        return isDZZS;
+    }
+
     @Transactional
     @Override
     public int auditCenterPass(EmisWaybillAjustApply emisWaybillAjustApply) throws EmisBizError {
@@ -255,19 +283,7 @@ public class EmisWaybillAjustApplyServiceImpl extends EmisBaseService implements
 
         // 判断申请人是否是[单证专属]岗位
         if("9".equals(emisWaybillAjustApply.getApplyType())) {
-            SysUser opUser = getEmisStaffByCode(emisWaybillAjustApply.getApplyManCode());
+            isDZZS=checkIsDZZS(emisWaybillAjustApply.getApplyManCode());
-            if (opUser != null) {
-                // 判断申请人是否是单证专属
-                List<Long> postIds = postMapper.selectPostListByUserId(opUser.getUserId());
-                if (!CollectionUtils.isEmpty(postIds)) {
-                    for (Long poId : postIds) {
-                        if (poId == 18) {
-                            isDZZS = true;
-                            break;
-                        }
-                    }
-                }
-            }
         }
 
         // 非单证专属则判断