问题修改

3 years ago · 191c9aa7ce
10 changed files with 70 additions and 74 deletions
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetailFeign.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetailFeign.java
@ -53,6 +53,10 @@ public interface BusVehicleApplyDetailFeign {
    @GetMapping("/fetchSid/{sid}")
    public ResultBean<BusVehicleApplyDetailVo> fetchSid(@PathVariable("sid") String sid);

+    @ApiOperation("根据厂家采购sid、车型sid、配置sid查询车辆型号")
+    @GetMapping("/fetchVehNoByMMCSid/{mainSid}/{modelSid}/{configSid}")
+    public ResultBean<String> fetchVehNoByMMCSid(@PathVariable("mainSid") String mainSid,@PathVariable("modelSid") String modelSid,@PathVariable("configSid") String configSid);
+
    @ApiOperation("查询车型sid")
    @GetMapping("/selModel/{sid}")
    public ResultBean<BusVehicleApplyDetailVo> selModel(@PathVariable("sid") String sid);
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java
@ -704,12 +704,12 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
            finPaymentrecordDto.setReceiveBankAccount(booad.getBankAccount());
            finPaymentrecordDto.setReceiveBank(booad.getDepositBankName());
            finPaymentrecordDto.setReceiveCompany(booad.getPurchasingUnitName());
-            finPaymentrecordDto.setRemarks("外采车款");
+            finPaymentrecordDto.setRemarks(ManPurOrderType.ManOrderType.WC_ORDER.getRemarks() + costTitleValue);
        } else if (costTitleKey.equals(ManPurOrderType.CostTitle.DJ_COSTTITLE.getCode())) {
            finPaymentrecordDto.setReceiveBankAccount(booad.getModelBankAccount());
            finPaymentrecordDto.setReceiveBank(booad.getModelBankName());
            finPaymentrecordDto.setReceiveCompany(booad.getModelAccountName());
-            finPaymentrecordDto.setRemarks("外采订金");
+            finPaymentrecordDto.setRemarks(ManPurOrderType.ManOrderType.WC_ORDER.getRemarks() + costTitleValue);
        }
        //金额
        if (costTitleKey.equals(ManPurOrderType.CostTitle.CK_COSTTITLE.getCode())) {
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
@ -2677,6 +2677,9 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
        if (StringUtils.isNotBlank(dto.getSupplierName())) {
            baseVehicle.setSupplierName(dto.getSupplierName());
        }
+        if (StringUtils.isNotBlank(dto.getVehMark())) {
+            baseVehicle.setVehMark(dto.getVehMark());
+        }
    }

    public void copyBeanToBean(BaseVehicle dto, BaseVehicle baseVehicle) {
@ -2842,6 +2845,9 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
        if (StringUtils.isNotBlank(dto.getSupplierName())) {
            baseVehicle.setSupplierName(dto.getSupplierName());
        }
+        if (StringUtils.isNotBlank(dto.getVehMark())) {
+            baseVehicle.setVehMark(dto.getVehMark());
+        }
    }

    /**
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplydetail/BusVehicleApplyDetailMapper.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplydetail/BusVehicleApplyDetailMapper.java
@ -86,4 +86,6 @@ public interface BusVehicleApplyDetailMapper extends BaseMapper<BusVehicleApplyD
     * @return
     */
    List<AppVehicleApplyListVo> getVehicleApply(String sid);
+
+    List<String> fetchVehNoByMMCSid(@Param("mainSid") String mainSid,@Param("modelSid") String modelSid,@Param("configSid") String configSid);
 }
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplydetail/BusVehicleApplyDetailMapper.xml
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplydetail/BusVehicleApplyDetailMapper.xml
@ -5,16 +5,16 @@
    <!--    ${ew.customSqlSegment} -->
    <select id="selectPageVo" resultType="com.yxt.anrui.base.api.busvehicleapplydetail.BusVehicleApplyDetailVo">
        SELECT bvad.applySid,
-               bvad.vehicleSid,
-               bvad.vehicleName,
-               bvad.configSid,
-               bvad.actualQuantity
-                ,
-               bvad.state,
-               bvad.saleGuPrice,
-               bva.brand
+        bvad.vehicleSid,
+        bvad.vehicleName,
+        bvad.configSid,
+        bvad.actualQuantity
+        ,
+        bvad.state,
+        bvad.saleGuPrice,
+        bva.brand
        FROM bus_vehicle_apply_detail bvad
-                 left join bus_vehicle_apply bva on bvad.applySid = bva.sid
+        left join bus_vehicle_apply bva on bvad.applySid = bva.sid
        <where>
            ${ew.sqlSegment}
        </where>
@ -36,27 +36,29 @@
    <select id="applyPage" resultType="com.yxt.anrui.base.api.busvehicleapplydetail.BusVehicleApplyListVo">
        select bo.sid linkSid, bo.orderNo linkNo, bo.orderDate linkText, bo.platformNo, bo.lockingNum
        from bus_vehicle_apply_detail bd
-                 left join bus_vehicle_apply bv on bd.applySid = bv.sid
-                 left join bus_vehicle_order bo on bo.purchaseApplyMediumModelSid = bd.sid
-            ${ew.customSqlSegment}
+                     left join bus_vehicle_apply bv on bd.applySid = bv.sid
+                     left join bus_vehicle_order bo on bo.purchaseApplyMediumModelSid = bd.sid
+                ${ew.customSqlSegment}
    </select>

    <select id="selectOrderCount" resultType="com.yxt.anrui.base.api.busvehicleorder.OrderListVo">
        select bo.platformNo, bo.lockingNum
        from bus_vehicle_apply_detail bd
-                 left join bus_vehicle_apply bv on bd.applySid = bv.sid
-                 left join bus_vehicle_order bo on bo.purchaseApplyMediumModelSid = bd.sid
-            ${ew.customSqlSegment}
+                     left join bus_vehicle_apply bv on bd.applySid = bv.sid
+                     left join bus_vehicle_order bo on bo.purchaseApplyMediumModelSid = bd.sid
+                ${ew.customSqlSegment}
    </select>

    <select id="getAppApplyList" resultType="com.yxt.anrui.base.api.busvehicleapplydetail.AppBusVehicleApplyListVo">
        select bo.sid, bo.orderNo orderId, bo.orderDate date, bo.platformNo as totalNum, bo.lockingNum
        from bus_vehicle_apply_detail bd
-                 left join bus_vehicle_apply bv on bd.applySid = bv.sid
-                 left join bus_vehicle_order bo on bo.purchaseApplyMediumModelSid = bd.sid
+                left join bus_vehicle_apply bv
+        on bd.applySid = bv.sid
+                left join bus_vehicle_order bo on bo.purchaseApplyMediumModelSid = bd.sid
        where bd.vehicleSid = #{modelSid}
          and bd.configSid = #{configSid}
-          and length(bo.platformNo) > 0
+          and length (bo.platformNo)
+            > 0
    </select>

    <select id="getVehicleApply" resultType="com.yxt.anrui.base.api.busvehicleapply.app.AppVehicleApplyListVo">
@ -72,7 +74,15 @@
               bsz.sid topSid,
               bd.actualPay
        from bus_vehicle_apply_detail bd
-                 left join bus_vehicle_apply_sz bsz on bsz.detailsSid = bd.sid
+                     left join bus_vehicle_apply_sz bsz on bsz.detailsSid = bd.sid
        where bd.applySid = #{sid}
    </select>
+
+    <select id="fetchVehNoByMMCSid" resultType="java.lang.String">
+        SELECT vehicleNo
+        FROM bus_vehicle_apply_detail
+        WHERE applySid = #{mainSid}
+          AND vehicleSid = #{modelSid}
+          AND configSid = #{configSid}
+    </select>
 </mapper>
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplydetail/BusVehicleApplyDetailRest.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplydetail/BusVehicleApplyDetailRest.java
@ -76,6 +76,11 @@ public class BusVehicleApplyDetailRest implements BusVehicleApplyDetailFeign {
        return rb.success().setData(vo);
    }

+    @Override
+    public ResultBean<String> fetchVehNoByMMCSid(String mainSid, String modelSid, String configSid) {
+        return busVehicleApplyDetailService.fetchVehNoByMMCSid(mainSid,modelSid,configSid);
+    }
+
    @Override
    public ResultBean<BusVehicleApplyDetailVo> selModel(String sid) {
        BusVehicleApplyDetailVo vo = busVehicleApplyDetailService.selModel(sid);
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplydetail/BusVehicleApplyDetailService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplydetail/BusVehicleApplyDetailService.java
@ -274,4 +274,11 @@ public class BusVehicleApplyDetailService extends MybatisBaseService<BusVehicleA
    public List<AppVehicleApplyListVo> getVehicleApply(String sid) {
        return baseMapper.getVehicleApply(sid);
    }
+
+    public ResultBean<String> fetchVehNoByMMCSid(String mainSid, String modelSid, String configSid) {
+        ResultBean rb = ResultBean.fireFail();
+        List<String> stringList = baseMapper.fetchVehNoByMMCSid(mainSid, modelSid, configSid);
+        String vehicleNo = stringList.get(0);
+        return rb.success().setData(vehicleNo);
+    }
 }
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java
@ -434,9 +434,9 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
        dataMap.put("cost", finPaymentrecord.getCost() + " " + "(" + s + ")");
        dataMap.put("payRemark", finPaymentrecord.getPayRemark());
        //获取图片路径
-        String photoPath = "D:/anrui/upload/20211227/kbjl_20211227143750186948.jpg";
+        /*String photoPath = "D:/anrui/upload/20211227/kbjl_20211227143750186948.jpg";
        String photoPath64 = image2Base64(photoPath);
-        dataMap.put("photoPath64", photoPath64);
+        dataMap.put("photoPath64", photoPath64);*/
        //获取模板
        // 模板路径
        String sourcePath = "D:\\anrui\\upload\\template\\";
@ -506,52 +506,6 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
        String base64Str = encoder.encode(data);
        return base64Str;
    }
-    /*public static String image2Base64(String imgUrl) {
-        URL url = null;
-        InputStream is = null;
-        ByteArrayOutputStream outStream = null;
-        HttpURLConnection httpUrl = null;
-        try {
-            url = new URL(null, imgUrl, new sun.net.www.protocol.https.Handler());
-            httpUrl = (HttpURLConnection) url.openConnection();
-            httpUrl.connect();
-            httpUrl.getInputStream();
-            is = httpUrl.getInputStream();
-            outStream = new ByteArrayOutputStream();
-            //创建一个Buffer字符串
-            byte[] buffer = new byte[1024];
-            //每次读取的字符串长度，如果为-1，代表全部读取完毕
-            int len = 0;
-            //使用一个输入流从buffer里把数据读取出来
-            while ((len = is.read(buffer)) != -1) {
-                //用输出流往buffer里写入数据，中间参数代表从哪个位置开始读，len代表读取的长度
-                outStream.write(buffer, 0, len);
-            }
-            // 对字节数组Base64编码
-            return Base64.encode(outStream.toByteArray());
-        } catch (Exception e) {
-            e.printStackTrace();
-        } finally {
-            if (is != null) {
-                try {
-                    is.close();
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
-            if (outStream != null) {
-                try {
-                    outStream.close();
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
-            if (httpUrl != null) {
-                httpUrl.disconnect();
-            }
-        }
-        return imgUrl;
-    }*/

    public static String upperCase2(double money) {
        String[] upNum = {"零", "壹", "贰", "叁", "肆", "伍", "陆", "柒", "捌", "玖"};
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java
@ -18,6 +18,10 @@ import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrand;
 import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrandFeign;
 import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel;
 import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelFeign;
+import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApplyDetailsVo;
+import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApplyFeign;
+import com.yxt.anrui.base.api.busvehicleapplydetail.BusVehicleApplyDetail;
+import com.yxt.anrui.base.api.busvehicleapplydetail.BusVehicleApplyDetailFeign;
 import com.yxt.anrui.base.api.busvehicleorder.ActualAndOrgDeptVo;
 import com.yxt.anrui.base.api.busvehicleorder.BusVehicleOrderFeign;
 import com.yxt.anrui.base.api.commonappendix.CommonAttachTypeEnum;
@ -41,7 +45,6 @@ import com.yxt.anrui.scm.api.scmapplyinbound.*;
 import com.yxt.anrui.scm.api.scmapplyinbound.flow.GetNodeQuery;
 import com.yxt.anrui.scm.api.scmapplyinboundvehicle.ScmApplyInboundVehicle;
 import com.yxt.anrui.scm.api.scmapplyinboundvehicle.ScmApplyInboundVehicleDto;
-import com.yxt.anrui.scm.api.scmapplyinboundvehicle.ScmApplyInboundVehicleQuery;
 import com.yxt.anrui.scm.api.scmapplyinboundvehicle.ScmApplyInboundVehicleVo;
 import com.yxt.anrui.scm.api.scmfile.ScmFileDto;
 import com.yxt.anrui.scm.api.scmfile.ScmFileVo;
@ -121,6 +124,8 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
    private SysOrganizationFeign sysOrganizationFeign;
    @Autowired
    private BaseManufacturerBankFeign baseManufacturerBankFeign;
+    @Autowired
+    private BusVehicleApplyDetailFeign busVehicleApplyDetailFeign;

    public PagerVo<ScmApplyInbound> listPage(PagerQuery<ScmApplyInboundQuery> pq) {
        ScmApplyInboundQuery query = pq.getParams();
@ -528,13 +533,14 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
        if (!actualAndOrgDept.getSuccess() || aaodd == null) {
            return;
        }
-
-
+        String vehicleOrderSid = booad.getVehicleOrderSid();
+        String vehicleNo = busVehicleApplyDetailFeign.fetchVehNoByMMCSid(vehicleOrderSid, booad.getModelSid(), booad.getConfigSid()).getData();
        for (ScmApplyInboundVehicleDto s : scmApplyInboundVehicleDtos) {
            //车辆台账推送数据
            BaseVehicleDto baseVehicleDto = new BaseVehicleDto();
-
-            // //采购系统（部门）sid
+            //车辆型号
+            baseVehicleDto.setVehMark(vehicleNo);
+            //采购系统（部门）sid
            baseVehicleDto.setPurchaseSystemSid(aaodd.getOrgDeptSid());
            //采购系统（部门）
            baseVehicleDto.setPurchaseSystemName(aaodd.getOrgDeptName());
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java
@ -418,6 +418,8 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService<ScmVehicle
                        if (StringUtils.isNotBlank(applicationDetailsVo.getPurchasePrice())) {
                            baseVehicleDto.setCostPrice(Integer.valueOf(applicationDetailsVo.getPurchasePrice()));// 厂家结算价
                        }
+                        //车辆类型
+                        baseVehicleDto.setVehMark(applicationDetailsVo.getVehMark());
                        baseVehicleDto.setOrderingNo(applicationDetailsVo.getApplicationCode()); // 采购编号 厂家订单编号
                        baseVehicleDto.setInsideCode(applicationDetailsVo.getInsideCode());
                        //添加品牌sid、品牌名称、厂商sid、供应商sid、采购系统及sid、回款通路及sid