移动端销售订单修改以及pc端厂家采购问题修改

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleReturnQuery.java

@@ -49,6 +49,8 @@ public class BaseVehicleReturnQuery implements Query {
     private String userSid;
     @ApiModelProperty(value = "orgSid")
     private String orgSid;
+    @ApiModelProperty("厂家采购订单编号")
+    private String orderingNo;
 
 
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java

@@ -1420,6 +1420,9 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
             qw.ne("bv.manPurOrderTypeKey", ManPurOrderType.ManOrderType.NG_ORDER.getCode());
             //非删除
             qw.eq("bv.isDelete", 0);
+            if(StringUtils.isNotBlank(params.getOrderingNo())){
+                qw.like("bv.orderingNo",params.getOrderingNo());
+            }
 
         }
         return qw;

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java

@@ -148,9 +148,9 @@ public interface BusSalesOrderFeign {
     public ResultBean deleteSaleOrder(@PathVariable("saleOrderSid") String saleOrderSid, @PathVariable("userSid") String userSid);
 
     @ApiOperation("初始化销售订单单据信息")
-    @GetMapping("/init/billInfo/{saleOrderSid}")
+    @GetMapping("/init/billInfo")
     @ResponseBody
-    public ResultBean<AppBusSalesOrderBillInfoVo> getBillInfo(@PathVariable("saleOrderSid") String saleOrderSid);
+    public ResultBean<AppBusSalesOrderBillInfoVo> getBillInfo(@SpringQueryMap AppOrderInitQuery appOrderInitQuery);
 
     /**
      * 新增保存销售订单信息

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java

@@ -131,7 +131,7 @@ public class BusSalesOrderFeignFallback implements BusSalesOrderFeign {
     }
 
     @Override
-    public ResultBean<AppBusSalesOrderBillInfoVo> getBillInfo(String saleOrderSid) {
+    public ResultBean<AppBusSalesOrderBillInfoVo> getBillInfo(AppOrderInitQuery appOrderInitQuery) {
         return null;
     }
 

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderInitQuery.java

@@ -0,0 +1,20 @@
+package com.yxt.anrui.buscenter.api.bussalesorder.app.order;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/9/2 14:11
+ * @Description
+ */
+@Data
+public class AppOrderInitQuery implements Query {
+    private static final long serialVersionUID = 7113663851206157068L;
+
+    @ApiModelProperty("销售订单sid")
+    private String saleOrderSid;
+    @ApiModelProperty("意向车型sid")
+    private String intentionSid;
+}

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java

@@ -191,9 +191,9 @@ public class BusSalesOrderRest implements BusSalesOrderFeign {
 
     @Override
     @ApiOperation("App初始化销售订单单据信息")
-    public ResultBean<AppBusSalesOrderBillInfoVo> getBillInfo(String saleOrderSid) {
+    public ResultBean<AppBusSalesOrderBillInfoVo> getBillInfo(AppOrderInitQuery appOrderInitQuery) {
         ResultBean<AppBusSalesOrderBillInfoVo> rb = ResultBean.fireFail();
-        AppBusSalesOrderBillInfoVo vo = busSalesOrderService.getBillInfo(saleOrderSid);
+        AppBusSalesOrderBillInfoVo vo = busSalesOrderService.getBillInfo(appOrderInitQuery);
         return rb.success().setData(vo);
     }
 

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@@ -88,6 +88,7 @@ import com.yxt.anrui.buscenter.biz.bussalesordervehicle.BusSalesOrderVehicleServ
 import com.yxt.anrui.buscenter.biz.bussalesvehicleorder.BusSalesVehicleOrderService;
 import com.yxt.anrui.crm.api.crmcustomertemp.AppCrmCustomerTempInfoVo;
 import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign;
+import com.yxt.anrui.crm.api.crmvehicledemand.CrmOrderVo;
 import com.yxt.anrui.crm.api.crmvehicledemand.CrmVehicleDemandOrderVo;
 import com.yxt.anrui.crm.api.crmvehicledemand.CrmVehicledemandFeign;
 import com.yxt.anrui.flowable.api.flow.FlowableFeign;
@@ -1263,23 +1264,35 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
      * @param saleOrderSid 销售订单sid
      * @return
      */
-    public AppBusSalesOrderBillInfoVo getBillInfo(String saleOrderSid) {
+    public AppBusSalesOrderBillInfoVo getBillInfo(AppOrderInitQuery appOrderInitQuery) {
-        AppBusSalesOrderBillInfoVo vo = baseMapper.getBillInfo(saleOrderSid);
+        String saleOrderSid = appOrderInitQuery.getSaleOrderSid();
-        if(vo != null){
+        String intentionSid = appOrderInitQuery.getIntentionSid();
-            String affiliatedOrgSid = vo.getAffiliatedOrgSid();
+        AppBusSalesOrderBillInfoVo vo = new AppBusSalesOrderBillInfoVo();
-            if (StringUtils.isNotBlank(affiliatedOrgSid)) {
+        if(StringUtils.isNotBlank(saleOrderSid)){
-                vo.setAffiliatedType("1");
+            vo = baseMapper.getBillInfo(saleOrderSid);
-                vo.setAffiliatedOrgNameChoose(vo.getAffiliatedCompany());
+            if(vo != null){
-            } else {
+                String affiliatedOrgSid = vo.getAffiliatedOrgSid();
-                vo.setAffiliatedType("0");
+                if (StringUtils.isNotBlank(affiliatedOrgSid)) {
-                vo.setAffiliatedOrgNameWrite(vo.getAffiliatedCompany());
+                    vo.setAffiliatedType("1");
+                    vo.setAffiliatedOrgNameChoose(vo.getAffiliatedCompany());
+                } else {
+                    vo.setAffiliatedType("0");
+                    vo.setAffiliatedOrgNameWrite(vo.getAffiliatedCompany());
+                }
+                vo.setSaleOrderSid(saleOrderSid);
             }
-            vo.setSaleOrderSid(saleOrderSid);
+
         }else{
-            vo = new AppBusSalesOrderBillInfoVo();
+            if(StringUtils.isNotBlank(intentionSid)){
-            //根据意向车型查询信息
+                //根据意向车型查询信息
-            vo.setIntentionSid(saleOrderSid);
+                ResultBean<CrmOrderVo> resultBean = crmVehicledemandFeign.selectCrmDemand(intentionSid);
-            vo.setAffiliatedType("1");
+                CrmOrderVo crmOrderVo = resultBean.getData();
+                BeanUtil.copyProperties(crmOrderVo,vo);
+                vo.setIntentionSid(intentionSid);
+                vo.setAffiliatedType("1");
+
+            }
+
         }
 
         return vo;

anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmOrderVo.java

@@ -0,0 +1,42 @@
+package com.yxt.anrui.crm.api.crmvehicledemand;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/8/31 16:39
+ * @Description
+ */
+@Data
+public class CrmOrderVo implements Vo {
+    private static final long serialVersionUID = 441436313342084907L;
+
+    @ApiModelProperty("客户名称")
+    private String customerName;
+
+    @ApiModelProperty("客户手机号")
+    private String customerMobile;
+
+    @ApiModelProperty("付款类型")
+    private String payType;
+
+    @ApiModelProperty("付款类型")
+    private String payValue;
+
+
+    @ApiModelProperty(value = "金融方案")
+    private String financePlan;
+
+    @ApiModelProperty(value = "金融方案value")
+    private String financePlanValue;
+
+    @ApiModelProperty("客户sid")
+    private String customerSid;
+
+
+
+
+
+}

anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmVehicledemandFeign.java

@@ -154,5 +154,9 @@ public interface CrmVehicledemandFeign {
     @GetMapping("/getInfo/{intentionSid}")
     ResultBean<CrmVehicleDemandOrderVo> getInfo(@PathVariable("intentionSid") String intentionSid);
 
+    @ApiOperation("根据意向车型sid查询客户的车辆需求")
+    @GetMapping("/selectCrmDemand/{intentionSid}")
+    ResultBean<CrmOrderVo> selectCrmDemand(@PathVariable("intentionSid") String intentionSid);
+
 
 }

anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmVehicledemandFeignFallback.java

@@ -99,6 +99,11 @@ public class CrmVehicledemandFeignFallback implements CrmVehicledemandFeign {
         return null;
     }
 
+    @Override
+    public ResultBean<CrmOrderVo> selectCrmDemand(String intentionSid) {
+        return null;
+    }
+
 
     //app
 

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandMapper.java

@@ -112,4 +112,6 @@ public interface CrmVehicledemandMapper extends BaseMapper<CrmVehicledemand> {
     CrmVehicledemand selectOneBySid(String vehicSid);
 
     CrmVehicleDemandOrderVo getInfo(String intentionSid);
+
+    CrmOrderVo selectCrmDemand(String intentionSid);
 }

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandMapper.xml

@@ -183,4 +183,11 @@
         from crm_vehicledemand
         where sid = #{intentionSid}
     </select>
+
+    <select id="selectCrmDemand" resultType="com.yxt.anrui.crm.api.crmvehicledemand.CrmOrderVo">
+        select crd.customerSid,crd.financePlan,crd.financePlanValue,crd.purchaseMethod payType,crd.purchaseMethodValue payValue,
+        crt.name customerName,crt.mobile customerMobile
+        from crm_vehicledemand crd left join crm_customer_temp crt on crd.customerSid = crt.sid
+        where crd.sid = #{intentionSid}
+    </select>
 </mapper>

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandRest.java

@@ -197,4 +197,9 @@ public class CrmVehicledemandRest implements CrmVehicledemandFeign {
     public ResultBean<CrmVehicleDemandOrderVo> getInfo(String intentionSid) {
         return crmVehicledemandService.getInfo(intentionSid);
     }
+
+    @Override
+    public ResultBean<CrmOrderVo> selectCrmDemand(String intentionSid) {
+        return crmVehicledemandService.selectCrmDemand(intentionSid);
+    }
 }

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandService.java

@@ -487,4 +487,10 @@ public class CrmVehicledemandService extends MybatisBaseService<CrmVehicledemand
         }
         return rb.success().setData(crmVehicleDemandOrderVo);
     }
+
+    public ResultBean<CrmOrderVo> selectCrmDemand(String intentionSid) {
+        ResultBean<CrmOrderVo> rb = ResultBean.fireFail();
+        CrmOrderVo crmOrderVo = baseMapper.selectCrmDemand(intentionSid);
+        return rb.success().setData(crmOrderVo);
+    }
 }

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

@@ -26,13 +26,18 @@
 package com.yxt.anrui.fin.biz.finpaymentrecord;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.basemanufactorsubscription.BaseManufUpdateDto;
 import com.yxt.anrui.base.api.basemanufactorsubscription.BaseManufactorSubscriptionFeign;
+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.sysstafforg.SysStaffOrgFeign;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
@@ -69,6 +74,10 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
     private SysStaffOrgFeign sysStaffOrgFeign;
     @Autowired
     private BaseManufactorSubscriptionFeign baseManufactorSubscriptionFeign;
+    @Autowired
+    private FinKingDeeService finKingDeeService;
+    @Autowired
+    private ApPayBillService apPayBillService;
 
     public PagerVo<FinPaymentrecordVo> listPageVo(PagerQuery<FinPaymentrecordQuery> pq) {
         FinPaymentrecordQuery query = pq.getParams();
@@ -145,7 +154,80 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
                 ResultBean resultBean = baseManufactorSubscriptionFeign.updatePaymentState(baseManufUpdateDto);
             }
 
+            //推送金蝶付款单
+            try{
+                ApPayBill apb=createApPayBill(finPaymentrecord);
+                ResultBean resultBean1 = apPayBillService.draftApPayBill(apb);
+            }catch (Exception e){
+                log.error(e.getMessage());
+            }
+
+
+
         }
         return rb.success();
     }
+
+    private ApPayBill createApPayBill(FinPaymentrecord finPaymentrecord) {
+        ApPayBill apPayBill = new ApPayBill();
+        //登账日期
+        apPayBill.setFPOSTDATE(DateUtil.formatDate(finPaymentrecord.getPayDate()));
+        //业务日期
+        apPayBill.setFDATE(DateUtil.formatDate(finPaymentrecord.getPayDate()));
+        //往来单位
+        apPayBill.setFCONTACTUNIT("010001");
+        //收款单位
+        apPayBill.setFRECTUNIT("010001");
+        //结算组织
+        apPayBill.setFSETTLEORGID("101");
+        //采购组织
+        apPayBill.setFPURCHASEORGID("101");
+        //采购部门
+        apPayBill.setFPURCHASEDEPTID("05.04");
+        //付款组织
+        apPayBill.setFPAYORGID("101");
+        List<ApPayBill.FPAYBILLENTRY> FPAYBILLENTRYs = new ArrayList<>();
+        if (finPaymentrecord.getCost() != null
+                && finPaymentrecord.getCost() > 0) {
+            ApPayBill.FPAYBILLENTRY fpaybillentry = new ApPayBill.FPAYBILLENTRY();
+            //应付金额
+            fpaybillentry.setFPAYTOTALAMOUNTFOR(Double.valueOf(finPaymentrecord.getCost()));
+            //付款金额
+            fpaybillentry.setFPAYAMOUNTFOR_E(Double.valueOf(finPaymentrecord.getCost()));
+            //折后金额
+            fpaybillentry.setFSETTLEPAYAMOUNTFOR(Double.valueOf(finPaymentrecord.getCost()));
+            //实付金额
+            fpaybillentry.setFREALPAYAMOUNTFOR_D(Double.valueOf(finPaymentrecord.getCost()));
+            //付款金额本位币
+            fpaybillentry.setFPAYAMOUNT_E(Double.valueOf(finPaymentrecord.getCost()));
+            //登账日期
+            fpaybillentry.setFPOSTDATE(DateUtil.formatDate(finPaymentrecord.getPayDate()));
+            //入账类型
+            fpaybillentry.setFRuZhangType("1");
+            //我方银行账号
+            fpaybillentry.setFACCOUNTID(finPaymentrecord.getReceiveBankAccount());
+            //支付类型
+            fpaybillentry.setFPayType("A");
+            //付款用途
+            if(ManPurOrderType.CostTitle.DJ_COSTTITLE.getRemarks().equals(finPaymentrecord.getCostTitleValue())){
+                //订金
+                fpaybillentry.setFPURPOSEID("SFKYT09_SYS");
+            }else{
+                //车款
+                fpaybillentry.setFPURPOSEID("SFKYT08_SYS");
+            }
+            //结算方式
+            if("承兑".equals(finPaymentrecord.getPayWayValue())){
+                fpaybillentry.setFSETTLETYPEID("09");
+            }
+            FPAYBILLENTRYs.add(fpaybillentry);
+        }
+        if (FPAYBILLENTRYs.size() > 0) {
+            apPayBill.setFPAYBILLENTRY(FPAYBILLENTRYs);
+            return apPayBill;
+        } else {
+            return null;
+        }
+
+    }
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeign.java

@@ -97,9 +97,9 @@ public interface AppBusSalesOrderFeign {
     public ResultBean deleteSaleOrder(@PathVariable("saleOrderSid") String saleOrderSid, @PathVariable("userSid") String userSid);
 
     @ApiOperation("初始化销售订单单据信息")
-    @GetMapping("/init/billInfo/{saleOrderSid}")
+    @GetMapping("/init/billInfo")
     @ResponseBody
-    public ResultBean<BusSalesOrderBillInfoVo> getBillInfo(@PathVariable("saleOrderSid") String saleOrderSid);
+    public ResultBean<BusSalesOrderBillInfoVo> getBillInfo(@SpringQueryMap OrderInitQuery orderInitQuery);
 
     @ApiOperation("新增/修改销售订单单据")
     @PostMapping("/save/billInfo")

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeignFallback.java

@@ -84,7 +84,7 @@ public class AppBusSalesOrderFeignFallback implements AppBusSalesOrderFeign {
     }
 
     @Override
-    public ResultBean<BusSalesOrderBillInfoVo> getBillInfo(String saleOrderSid) {
+    public ResultBean<BusSalesOrderBillInfoVo> getBillInfo(OrderInitQuery orderInitQuery) {
         return null;
     }
 

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderInitQuery.java

@@ -0,0 +1,20 @@
+package com.yxt.anrui.terminal.api.autoservice.saleOrders.order;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/9/2 14:02
+ * @Description
+ */
+@Data
+public class OrderInitQuery implements Query {
+    private static final long serialVersionUID = -6375976467529224306L;
+
+    @ApiModelProperty("销售订单sid")
+    private String saleOrderSid;
+    @ApiModelProperty("意向车型sid")
+    private String intentionSid;
+}

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderRest.java

@@ -101,8 +101,8 @@ public class AppBusSalesOrderRest implements AppBusSalesOrderFeign {
 
     @Override
     @ApiOperation("初始化销售订单单据信息")
-    public ResultBean<BusSalesOrderBillInfoVo> getBillInfo(String saleOrderSid) {
+    public ResultBean<BusSalesOrderBillInfoVo> getBillInfo(OrderInitQuery orderInitQuery) {
-        return appBusSalesOrderService.getBillInfo(saleOrderSid);
+        return appBusSalesOrderService.getBillInfo(orderInitQuery);
     }
 
     @Override

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java

@@ -187,10 +187,12 @@ public class AppBusSalesOrderService {
      * @param userSid
      * @return
      */
-    public ResultBean<BusSalesOrderBillInfoVo> getBillInfo(String saleOrderSid) {
+    public ResultBean<BusSalesOrderBillInfoVo> getBillInfo(OrderInitQuery orderInitQuery) {
         ResultBean<BusSalesOrderBillInfoVo> rb = ResultBean.fireFail();
         BusSalesOrderBillInfoVo vo = new BusSalesOrderBillInfoVo();
-        ResultBean<AppBusSalesOrderBillInfoVo> resultBean = busSalesOrderFeign.getBillInfo(saleOrderSid);
+        AppOrderInitQuery appOrderInitQuery = new AppOrderInitQuery();
+        BeanUtil.copyProperties(orderInitQuery,appOrderInitQuery);
+        ResultBean<AppBusSalesOrderBillInfoVo> resultBean = busSalesOrderFeign.getBillInfo(appOrderInitQuery);
         AppBusSalesOrderBillInfoVo appBusSalesOrderBillInfoVo = resultBean.getData();
         BeanUtil.copyProperties(appBusSalesOrderBillInfoVo, vo);
         return rb.success().setData(vo);