Merge remote-tracking branch 'origin/master'

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/arreceivebill/ARReceivebill.java

@@ -49,7 +49,7 @@ public class ARReceivebill {
      */
     @JsonProperty("FREMARK")
     @NotBlank(message = "FREMARK不能为空")
-    private String FREMARK;
+    public String FREMARK;
     @JsonProperty("FRECEIVEBILLENTRY")
     public List<FRECEIVEBILLENTRY> FRECEIVEBILLENTRY=new ArrayList<>();
     @Data

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

@@ -79,6 +79,8 @@ import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -103,7 +105,7 @@ import java.util.stream.Collectors;
  */
 @Service
 public class FinCollectionConfirmationService extends MybatisBaseService<FinCollectionConfirmationMapper, FinCollectionConfirmation> {
-
+    public static final Logger log = LoggerFactory.getLogger(FinCollectionConfirmationService.class);
     @Autowired
     private FinSelectedReceivablesDetailedService finSelectedReceivablesDetailedService;
     @Autowired
@@ -909,6 +911,9 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         BigDecimal subscriptionMoneyAll = finSelectedReceivablesDetailedDtos.stream().map(AppFinSelectedReceivablesDetailedDto::getConfirmMoney).reduce(BigDecimal.ZERO, BigDecimal::add);
         //判断收款金额与所选的总认款金额是否相等
         if (finCollectionConfirmation.getFirst() == 0) {
+            if(subscriptionMoneyAll.compareTo(finCollectionConfirmation.getCollectionMoney())>0){
+                return rb.setMsg("认款金额不允许超过收款金额");
+            }
             if (subscriptionMoneyAll.compareTo(finCollectionConfirmation.getCollectionMoney()) != 0) {
                 return rb.setMsg("认款不完全，不允许提交");
             }
@@ -1305,9 +1310,14 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                 freceivebillentry.setFPURPOSEIDType("cw_skyt");
                 fEntityList.add(freceivebillentry);
                 //项目类别key、value
-                arReceivebill.setF_PAEZ_AssistantType("payType");
+                arReceivebill.setF_PAEZ_AssistantType("cw_sklb");
                 FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(finSelectedReceivablesDetailedVos1.get(0).getReceivablesSid());
-                arReceivebill.setF_PAEZ_AssistantKey(finUncollectedReceivablesDetailed.getPayTypeKey());
+                if("1".equals(finUncollectedReceivablesDetailed.getPayTypeKey())){
+                    arReceivebill.setF_PAEZ_AssistantKey("001");
+                }else if("2".equals(finUncollectedReceivablesDetailed.getPayTypeKey())){
+                    arReceivebill.setF_PAEZ_AssistantKey("002");
+                }
+
                 arReceivebill.setFRECEIVEBILLENTRY(fEntityList);
                 ResultBean resultBean1 = arReceivebillService.draftArReceivebill(arReceivebill);
 
@@ -1353,6 +1363,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
             AppBusDepositBuscenterDetailVo busDeposit = busDepositFeign.getDepositInfoDetails(confirmation.getBusSid()).getData();
             BdCustomer bdCustomer = createBdCustomer(confirmation.getUseOrgSid(),busDeposit.getPayName(),busDeposit.getPhone());
             ResultBean resultBeanMiddle = bdCustomerService.draftBdCustomer(bdCustomer);
+            log.info("客户推送："+resultBeanMiddle.getMsg());
             //往来单位
             arReceivebill.setFCONTACTUNIT(bdCustomer.getFNumber());
             fEntityList = new ArrayList<>();
@@ -1374,7 +1385,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
             arReceivebill.setF_PAEZ_AssistantType("cw_sklb");
             arReceivebill.setF_PAEZ_AssistantKey("006");
             ResultBean resultBean2 = arReceivebillService.draftArReceivebill(arReceivebill);
-
+            log.info("收款单推送："+resultBean2.getMsg());
         }
 
         //===========================================

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml

@@ -45,6 +45,7 @@
                   , #{name}
                   , '%')
             </if>
+            and length(furd.busVinSid)>0
         </where>
     </select>
 

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml

@@ -47,7 +47,8 @@
     <select id="selectListAllVo"
             resultType="com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.DetailsOfReceivablesAndUncollectedItemsVo">
         SELECT * FROM fin_uncollected_receivables_detailed
-        <where>${ew.sqlSegment}</where>
+        <where>${ew.sqlSegment} and length(busVinSid)>0
+        </where>
     </select>
 
     <select id="getCustomerBillList"

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/ApPayBillService.java

@@ -85,6 +85,10 @@ public class ApPayBillService extends FinKingDeeService {
         smiq.setMap_item(Map_item);
         smiq.setDictKey(FPURPOSEIDKey);
         smiq.setDictTypeCode(FPURPOSEIDType);
-        return sysMappingFeign.selectMappingInfo(smiq);
+        ResultBean<SysMappingInfoVo> sysMappingInfoVoResultBean = sysMappingFeign.selectMappingInfo(smiq);
+        if(!sysMappingInfoVoResultBean.getSuccess()){
+            return sysMappingInfoVoResultBean.setMsg("Map_item"+sysMappingInfoVoResultBean.getMsg());
+        }
+        return sysMappingInfoVoResultBean;
     }
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/arreceivebill/ArReceivebillService.java

@@ -83,6 +83,10 @@ public class ArReceivebillService extends FinKingDeeService {
         smiq.setMap_item(Map_item);
         smiq.setDictKey(FPURPOSEIDKey);
         smiq.setDictTypeCode(FPURPOSEIDType);
-        return sysMappingFeign.selectMappingInfo(smiq);
+        ResultBean<SysMappingInfoVo> sysMappingInfoVoResultBean = sysMappingFeign.selectMappingInfo(smiq);
+        if(!sysMappingInfoVoResultBean.getSuccess()){
+            return sysMappingInfoVoResultBean.setMsg("Map_item"+sysMappingInfoVoResultBean.getMsg());
+        }
+        return sysMappingInfoVoResultBean;
     }
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/SalOutStockService.java

@@ -85,7 +85,7 @@ public class SalOutStockService extends FinKingDeeService {
             ResultBean<SysMappingInfoVo> sysMappingInfoVoResultBean = sysMappingFeign.selectMappingInfo(smiq);
             boolean success = sysMappingInfoVoResultBean.getSuccess();
             if(!success){
-                return rb.setMsg(sysMappingInfoVoResultBean.getMsg());
+                return rb.setMsg("项目类别"+sysMappingInfoVoResultBean.getMsg());
             }
             String F_PAEZ_Assistant=sysMappingInfoVoResultBean.getData().getMap_itemKey();//TODO 根据应付类别的code,key查询金蝶系统中的应付类别的编码  映射来源“CWXT”/“财务系统”
             map_fEntityModel_.put("F_PAEZ_Assistant",F_PAEZ_Assistant);

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/app/AppSysUserRest.java

@@ -85,6 +85,7 @@ public class AppSysUserRest implements AppSysUserFeign {
         if(userQuery.getIsTest() != null){
             isTest = userQuery.getIsTest();
         }
+        isTest = true;
         if (isTest) {//添加测试版
             //将该appId的所有账号的appId都置为空
             sysUserService.updateAppIdNull(appId);