财务对接付款单修改

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusApplyVo.java

@@ -13,4 +13,5 @@ public class BusApplyVo implements Vo {
     private static final long serialVersionUID = -4976630638474677681L;
     private String name;
     private String num;
+    private String code;
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.java

@@ -62,4 +62,6 @@ public interface BaseManufacturerBankMapper extends BaseMapper<BaseManufacturerB
     List<BusApplyVo> selectByApplySid(String modelSid);
 
     List<BaseManActualVo> actualList(@Param("useOrgSid") String useOrgSid, @Param("code") String code);
+
+    List<BusApplyVo> selectBankByApplySid(String createOrgSid);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.xml

@@ -79,4 +79,9 @@
           AND bm.useOrg = #{useOrgSid}
           and bmb.dueBankKey = #{code}
     </select>
+
+    <select id="selectBankByApplySid" resultType="com.yxt.anrui.base.api.busvehicleapply.BusApplyVo">
+        select bm.manufacturerCode code,bmb.bankAccount num,bmb.accountName name from base_manufacturer bm left join base_manufacturer_bank bmb on bm.manBankSid = bmb.sid
+        where bm.createOrg = #{createOrgSid} and dueBankValue = '订金账户'
+    </select>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankService.java

@@ -73,4 +73,8 @@ public class BaseManufacturerBankService extends MybatisBaseService<BaseManufact
     public List<BaseManActualVo> actualList(String useOrgSid, String code) {
         return baseMapper.actualList(useOrgSid,code);
     }
+
+    public List<BusApplyVo> selectBankByApplySid(String createOrgSid) {
+        return baseMapper.selectBankByApplySid(createOrgSid);
+    }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java

@@ -60,7 +60,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.annotation.Resource;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -518,7 +517,7 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
                     finPaymentrecordDto.setCostTypeKey(DictCommonEnum.costType.CG_TYPE.getCode());
                     finPaymentrecordDto.setCostTypeValue(DictCommonEnum.costType.CG_TYPE.getRemarks());
                     //查询收款单位和收款账号
-                    List<BusVehicleApplyDetailVo> busVehicleApplyDetailList = busVehicleApplyDetailService.fetchByApplySid(busVehicleApply.getSid());
+                   /* List<BusVehicleApplyDetailVo> busVehicleApplyDetailList = busVehicleApplyDetailService.fetchByApplySid(busVehicleApply.getSid());
                     String modelSid = busVehicleApplyDetailList.get(0).getVehicleSid();
                     //根据车型sid查询账户名称和银行账号
                     List<BusApplyVo> busApplyVo = baseManufacturerBankService.selectByApplySid(modelSid);
@@ -526,6 +525,13 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
                     if (!busApplyVo.isEmpty()) {
                         finPaymentrecordDto.setReceiveBankAccount(busApplyVo.get(0).getNum());
                         finPaymentrecordDto.setReceiveCompany(busApplyVo.get(0).getName());
+                    }*/
+                    List<BusApplyVo> busApplyVo = baseManufacturerBankService.selectBankByApplySid(busVehicleApply.getCreateOrgSid());
+                    busApplyVo.removeAll(Collections.singleton(null));
+                    if (!busApplyVo.isEmpty()) {
+                        finPaymentrecordDto.setReceiveBankAccount(busApplyVo.get(0).getNum());
+                        finPaymentrecordDto.setReceiveCompany(busApplyVo.get(0).getName());
+                        finPaymentrecordDto.setPayCode(busApplyVo.get(0).getCode());
                     }
                     finPaymentrecordDto.setBusSid(r.getData());
                     finPaymentrecordFeign.save(finPaymentrecordDto);

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecord.java

@@ -98,4 +98,7 @@ public class FinPaymentrecord extends BaseEntity {
     @ApiModelProperty(value = "业务编号")
     private String busSid;
 
+    @ApiModelProperty("供应商编码")
+    private String payCode;
+
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordDto.java

@@ -77,4 +77,7 @@ public class FinPaymentrecordDto implements Dto {
     @ApiModelProperty(value = "业务编号")
     private String busSid;
 
+    @ApiModelProperty("供应商编码")
+    private String payCode;
+
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java

@@ -34,13 +34,14 @@ import com.yxt.anrui.base.api.basemanufactorsubscription.BaseManufactorSubscript
 import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApplyDetailsVo;
 import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApplyFeign;
 import com.yxt.anrui.base.common.enums.DictCommonEnum;
-import com.yxt.anrui.base.common.enums.ManPurOrderType;
 import com.yxt.anrui.fin.api.finpaymentapply.FinPaymentapply;
 import com.yxt.anrui.fin.api.finpaymentrecord.*;
 import com.yxt.anrui.fin.api.kingdee.appaybill.ApPayBill;
 import com.yxt.anrui.fin.biz.finpaymentapply.FinPaymentapplyService;
 import com.yxt.anrui.fin.biz.kingdee.FinKingDeeService;
 import com.yxt.anrui.fin.biz.kingdee.appaybill.ApPayBillService;
+import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
+import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
@@ -84,6 +85,8 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
     private ApPayBillService apPayBillService;
     @Autowired
     private BusVehicleApplyFeign busVehicleApplyFeign;
+    @Autowired
+    private SysOrganizationFeign sysOrganizationFeign;
 
     public PagerVo<FinPaymentrecordVo> listPageVo(PagerQuery<FinPaymentrecordQuery> pq) {
         FinPaymentrecordQuery query = pq.getParams();
@@ -182,20 +185,36 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
     private ApPayBill createApPayBill(FinPaymentrecord finPaymentrecord) {
         ApPayBill apPayBill = new ApPayBill();
         //登账日期
-       // apPayBill.setFPOSTDATE(DateUtil.formatDate(finPaymentrecord.getPayDate()));
+        // apPayBill.setFPOSTDATE(DateUtil.formatDate(finPaymentrecord.getPayDate()));
         //业务日期
         apPayBill.setFDATE(DateUtil.formatDate(finPaymentrecord.getPayDate()));
         //收款单位
-        apPayBill.setFRECTUNIT("010001");
+//        apPayBill.setFRECTUNIT("010001");
+        apPayBill.setFRECTUNIT(finPaymentrecord.getPayCode());
         //采购组织
-        apPayBill.setFPURCHASEORGID("101");
+        //根据使用组织查询采购组织的编码
+        ResultBean<SysOrganizationVo> resultBean = sysOrganizationFeign.fetchBySid(finPaymentrecord.getCreateOrgSid());
+        if (!resultBean.getSuccess()) {
+            SysOrganizationVo vo = resultBean.getData();
+            if (vo != null) {
+                apPayBill.setFPURCHASEORGID(vo.getOrgCode());
+            }
+        }
+//        apPayBill.setFPURCHASEORGID("101");
         //采购部门
-        apPayBill.setFPURCHASEDEPTID("05.04");
+        ResultBean<SysOrganizationVo> resultBean1 = sysOrganizationFeign.selectByPSid(finPaymentrecord.getCreateOrgSid(), "销售支持部");
+        if (resultBean1.getSuccess()) {
+            SysOrganizationVo vo = resultBean1.getData();
+            if (vo != null) {
+                apPayBill.setFPURCHASEDEPTID(vo.getOrgCode());
+            }
+        }
+        //        apPayBill.setFPURCHASEDEPTID("05.04");
         //应付类别默认005定金
-        apPayBill.setF_PAEZ_AssistantKey("005");
-        apPayBill.setF_PAEZ_AssistantType("005");
-
-
+        if ("排产".equals(finPaymentrecord.getCostTitleValue())) {
+            apPayBill.setF_PAEZ_AssistantKey("005");
+            apPayBill.setF_PAEZ_AssistantType("定金");
+        }
         List<ApPayBill.FPAYBILLENTRY> FPAYBILLENTRYs = new ArrayList<>();
         if (finPaymentrecord.getCost() != null
                 && finPaymentrecord.getCost() > 0) {
@@ -205,9 +224,15 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
             //登账日期
             fpaybillentry.setFPOSTDATE(DateUtil.formatDate(finPaymentrecord.getPayDate()));
             //我方银行账号
-            fpaybillentry.setFACCOUNTID("100473861600010002");//finPaymentrecord.getReceiveBankAccount());
+//            fpaybillentry.setFACCOUNTID("100473861600010002");
+            fpaybillentry.setFACCOUNTID(finPaymentrecord.getPayBankAccount());
             //付款用途
-            if (ManPurOrderType.CostTitle.DJ_COSTTITLE.getRemarks().equals(finPaymentrecord.getCostTitleValue())) {
+            fpaybillentry.setFPURPOSEIDKey(finPaymentrecord.getCostTitleKey());
+            fpaybillentry.setFPURPOSEIDType(finPaymentrecord.getCostTitleValue());
+            //结算方式
+            fpaybillentry.setFSETTLETYPEIDKey(finPaymentrecord.getPayWayKey());
+            fpaybillentry.setFSETTLETYPEIDType(finPaymentrecord.getPayWayValue());
+           /* if (ManPurOrderType.CostTitle.DJ_COSTTITLE.getRemarks().equals(finPaymentrecord.getCostTitleValue())) {
                 //订金
                 fpaybillentry.setFPURPOSEIDKey("SFKYT09_SYS");
                 fpaybillentry.setFPURPOSEIDType("SFKYT09_SYS");
@@ -215,15 +240,14 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
                 //车款
                 fpaybillentry.setFPURPOSEIDKey("SFKYT08_SYS");
                 fpaybillentry.setFPURPOSEIDType("SFKYT08_SYS");
-            }
-            //结算方式
-            if ("承兑".equals(finPaymentrecord.getPayWayValue())) {
+            }*/
+           /* if ("承兑".equals(finPaymentrecord.getPayWayValue())) {
                 fpaybillentry.setFSETTLETYPEIDKey("09");
                 fpaybillentry.setFSETTLETYPEIDType("09");
             } else {
                 fpaybillentry.setFSETTLETYPEIDKey("02");
                 fpaybillentry.setFSETTLETYPEIDType("02");
-            }
+            }*/
             FPAYBILLENTRYs.add(fpaybillentry);
         }
         if (FPAYBILLENTRYs.size() > 0) {

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeign.java

@@ -144,4 +144,9 @@ public interface SysOrganizationFeign {
     @ResponseBody
     @ApiOperation("当前分公司下所有部门")
     ResultBean<List<SysOrganizationListsVo>> selectOrgLists(@SpringQueryMap SysOrganizationListQuery query);
+
+    @GetMapping("/selectByPSid")
+    @ResponseBody
+    @ApiOperation("查询分公司下的销售支持部")
+    ResultBean<SysOrganizationVo> selectByPSid(@RequestParam("sid") String sid, @RequestParam("name") String name);
 }

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java

@@ -147,4 +147,9 @@ public class SysOrganizationFeignFallback implements SysOrganizationFeign {
     public ResultBean<List<SysOrganizationListsVo>> selectOrgLists(SysOrganizationListQuery query) {
         return null;
     }
+
+    @Override
+    public ResultBean<SysOrganizationVo> selectByPSid(String sid, String name) {
+        return null;
+    }
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.java

@@ -109,4 +109,6 @@ public interface SysOrganizationMapper extends BaseMapper<SysOrganization> {
     List<SysOrganizationListsVo> selectOrgLists(String orgSid);
 
     List<SysOrgStaffVo> selectByOrgDeptSid(String orgDeptSid);
+
+    SysOrganizationVo selectByPSid(@Param("sid") String sid, @Param("name") String name);
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml

@@ -193,4 +193,8 @@
                  left join sys_staffinfo si on so.staffSid = si.sid
         where so.orgSid = #{orgDeptSid}
     </select>
+
+    <select id="selectByPSid" resultType="com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo">
+        select * from sys_organization where psid = #{sid} and name = #{name}
+    </select>
 </mapper>

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java

@@ -366,4 +366,9 @@ public class SysOrganizationRest implements SysOrganizationFeign {
     public ResultBean<List<SysOrganizationListsVo>> selectOrgLists(SysOrganizationListQuery query) {
         return sysOrganizationService.selectOrgLists(query);
     }
+
+    @Override
+    public ResultBean<SysOrganizationVo> selectByPSid(String sid, String name) {
+        return sysOrganizationService.selectByPSid(sid,name);
+    }
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java

@@ -507,4 +507,10 @@ public class SysOrganizationService extends MybatisBaseService<SysOrganizationMa
         return rb.success().setData(sysOrganizationListVos);
 
     }
+
+    public ResultBean<SysOrganizationVo> selectByPSid(String sid, String name) {
+        ResultBean<SysOrganizationVo> rb = ResultBean.fireFail();
+        SysOrganizationVo vo = baseMapper.selectByPSid(sid,name);
+        return rb.success().setData(vo);
+    }
 }