Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageMapper.xml

@@ -82,6 +82,6 @@
     </select>
 
     <select id="selectDiscountpackage" resultType="com.yxt.anrui.base.api.basediscountpackage.app.AppDiscountpackagesVo">
-        select * from base_discountpackage where sid = #{sid}
+        select *,case isEmploy when 1 then '是' when 0 then '否' end as isEmployValue from base_discountpackage where sid = #{sid}
     </select>
 </mapper>

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

@@ -474,7 +474,7 @@ public class BaseVehicleRest implements BaseVehicleFeign {
         scmApplyInboundQueryDto.setMakeListName(scmApplyInboundVo.getApplicationName());
         scmApplyInboundQueryDto.setMakeListDate(DateUtil.formatDate(new Date()));
         String name = baseVehicleDto.getName();
-        String[] names = name.split("-");
+        String[] names = name.split(",");
         scmApplyInboundQueryDto.setConfirmSid(names[0]);
         scmApplyInboundQueryDto.setConfirmName(names[1]);
         scmApplyInboundQueryDto.setConfirmDate(names[2]);

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualdetails/BaseVehicleActualDetailsMapper.xml

@@ -55,7 +55,7 @@
                bd.dayNum,
                bd.actualMoney
         from base_vehicle_actual_details bd
-                 left join base_vehicle bv on bv.vinNo = bd.vinNo
+                 left join base_vehicle bv on trim(bv.vinNo) = trim(bd.vinNo)
         where bd.vehicleActualSid = #{sid}
           and bv.createOrgSid = #{orgSid}
     </select>

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationPageVo.java

@@ -1,6 +1,5 @@
 package com.yxt.anrui.fin.api.fincollectionconfirmation;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -55,5 +54,8 @@ public class AppFinCollectionConfirmationPageVo implements Vo {
 
     private String billNo;
 
+    @ApiModelProperty("采购系统名称")
+    private String purchaseSystemName;
+
 
 }

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

@@ -64,7 +64,8 @@
                payAccount,
                payBank,
                createByName,
-               billNo
+               billNo,
+               purchaseSystemName
         FROM fin_collection_confirmation
         <where>
             ${ew.sqlSegment}

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java

@@ -546,7 +546,7 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
                         confirmDate = DateUtil.formatDate(flowTask.getFinishTime());
                     }
                 }
-                name = confirmSid + "-" + confirmName + "-" + confirmDate;
+                name = confirmSid + "," + confirmName + "," + confirmDate;
                 newBaseVehicleDto(booad, scmApplyInboundVehicleDtos, name);
                 //入账审批通关修改采购订单状态 state = 1
                 if (booad.getManPurOrderTypeKey().equals(ManPurOrderType.ManOrderType.PC_ORDER.getCode())) {

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationPageVo.java

@@ -54,4 +54,7 @@ public class ConfirmationPageVo implements Vo {
     @JsonProperty("collectionBillId")
     private String billNo;
 
+    @ApiModelProperty("采购系统名称")
+    private String purchaseSystemName;
+
 }