更改

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerFeign.java

@@ -145,5 +145,5 @@ public interface BaseTrailerFeign {
 
     @ApiOperation("付款申请选择挂车")
     @PostMapping("/payApply")
-    public ResultBean<List<PayApplyTrailerVo>> payApply(@RequestParam("useOrgSid") String useOrgSid);
+    public ResultBean<List<PayApplyTrailerVo>> payApply(@RequestBody PayApplyTrailerQuery query);
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/PayApplyTrailerQuery.java

@@ -0,0 +1,45 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basetrailer;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class PayApplyTrailerQuery implements Query {
+
+	@ApiModelProperty("挂车名称")
+	private String trailerTypeValue;
+	@ApiModelProperty("车架号")
+	private String vinNo;
+	@ApiModelProperty("主车车架号")
+	private String zcVinNo;
+	@ApiModelProperty("客户名称")
+	private String customerName;
+
+	private String useOrgSid;
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstall/BaseVehinstallFeign.java

@@ -25,6 +25,8 @@
  *********************************************************/
 package com.yxt.anrui.base.api.basevehinstall;
 
+import com.yxt.anrui.base.api.basetrailer.PayApplyTrailerQuery;
+import com.yxt.anrui.base.api.basetrailer.PayApplyTrailerVo;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -33,6 +35,8 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  * Project: anrui-base(上装配置管理) <br/>
  * File: BaseVehinstallFeign.java <br/>
@@ -82,7 +86,7 @@ public interface BaseVehinstallFeign {
     @ApiOperation("获取车辆的上装信息")
     @GetMapping("/selectOne")
     @ResponseBody
-    ResultBean<BaseVehinstall> selectOne(@RequestParam("vinNo")String vinNo,@RequestParam("useOrgSid")String useOrgSid);
+    ResultBean<BaseVehinstall> selectOne(@RequestParam("vinNo") String vinNo, @RequestParam("useOrgSid") String useOrgSid);
 
     @ApiOperation("上装出库")
     @PostMapping("/vehinstallOut/{sid}")
@@ -91,4 +95,8 @@ public interface BaseVehinstallFeign {
     @ApiOperation("上装单独出库(新)")
     @PostMapping("/vehinstallOutNew/{sid}")
     ResultBean vehinstallOutNew(@PathVariable("sid") String sid);
+
+    @ApiOperation("付款申请选择上装")
+    @PostMapping("/payApply")
+    public ResultBean<List<PayApplyTopVo>> payApply(@RequestBody PayApplyTopQuery query);
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstall/PayApplyTopQuery.java

@@ -0,0 +1,43 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basevehinstall;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class PayApplyTopQuery implements Query {
+
+	@ApiModelProperty("上装名称")
+	private String installNameValue;
+	@ApiModelProperty("车架号")
+	private String vinNo;
+	@ApiModelProperty("客户名称")
+	private String customerName;
+
+	private String useOrgSid;
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstall/PayApplyTopVo.java

@@ -0,0 +1,63 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basevehinstall;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class PayApplyTopVo implements Vo {
+
+	@ApiModelProperty("付款申请sid")
+	private String applySid;
+	@ApiModelProperty("上装名称")
+	private String installNameValue;
+	@ApiModelProperty("货箱内部尺寸")
+	private String size;
+	@ApiModelProperty("车架号")
+	private String vinNo;
+	@ApiModelProperty("上装sid")
+	private String topSid;
+	@ApiModelProperty("箱体颜色")
+	private String color;
+	@ApiModelProperty("厂家结算价")
+	private BigDecimal costPrice;
+	@ApiModelProperty("品牌名称")
+	private String brandName;
+	@ApiModelProperty("车型别名")
+	private String vehModel;
+	@ApiModelProperty("合同编号")
+	private String contractNo;
+	@ApiModelProperty("销售订单号")
+	private String saleOrderNo;
+	@ApiModelProperty("客户名称")
+	private String customerName;
+	@ApiModelProperty("销售类型")
+	private String payType;
+}

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerMapper.java

@@ -110,5 +110,5 @@ public interface BaseTrailerMapper extends BaseMapper<BaseTrailer> {
 
     List<BaseTrailerModelDetailsVo> fetchTypeAndMan(String materialSid);
 
-    List<PayApplyTrailerVo> payApply(String useOrgSid);
+    List<PayApplyTrailerVo> payApply(@Param(Constants.WRAPPER) Wrapper<BaseTrailer> qw);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerMapper.xml

@@ -134,7 +134,9 @@
             ON bt.vehSid = bsov.linkSid
             LEFT JOIN anrui_buscenter.bus_sales_order bso
             ON bsov.salesOrderSid = bso.sid
-        WHERE bt.useOrgSid = #{useOrgSid}
+        <where>
+            ${ew.sqlSegment}
+        </where>
           AND bt.sid NOT IN (
             SELECT ft.trailerSid
             FROM anrui_fin.fin_paymentapply_trailer ft

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerRest.java

@@ -138,7 +138,7 @@ public class BaseTrailerRest implements BaseTrailerFeign {
     }
 
     @Override
-    public ResultBean<List<PayApplyTrailerVo>> payApply(String useOrgSid) {
+    public ResultBean<List<PayApplyTrailerVo>> payApply(PayApplyTrailerQuery query) {
-        return baseTrailerService.payApply(useOrgSid);
+        return baseTrailerService.payApply(query);
     }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java

@@ -984,9 +984,23 @@ public class BaseTrailerService extends MybatisBaseService<BaseTrailerMapper, Ba
         return baseMapper.fetchTypeAndMan(vehSid);
     }
 
-    public ResultBean<List<PayApplyTrailerVo>> payApply(String useOrgSid) {
+    public ResultBean<List<PayApplyTrailerVo>> payApply(PayApplyTrailerQuery query) {
         ResultBean rb = ResultBean.fireFail();
-        List<PayApplyTrailerVo> payApplyTrailerVoList = baseMapper.payApply(useOrgSid);
+        QueryWrapper qw = new QueryWrapper<>();
+        qw.eq("bt.useOrgSid", query.getUseOrgSid());
+        if (StringUtils.isNotBlank(query.getVinNo())) {
+            qw.like("bt.vinNo", query.getVinNo());
+        }
+        if (StringUtils.isNotBlank(query.getZcVinNo())) {
+            qw.eq("bt.zcvinNo", query.getZcVinNo());
+        }
+        if (StringUtils.isNotBlank(query.getCustomerName())) {
+            qw.eq("bso.customerName", query.getCustomerName());
+        }
+        if (StringUtils.isNotBlank(query.getTrailerTypeValue())) {
+            qw.like("btm.trailerTypeValue", query.getTrailerTypeValue());
+        }
+        List<PayApplyTrailerVo> payApplyTrailerVoList = baseMapper.payApply(qw);
         return rb.success().setData(payApplyTrailerVoList);
     }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallMapper.java

@@ -26,10 +26,12 @@
 package com.yxt.anrui.base.biz.basevehinstall;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.base.api.basevehinstall.BaseVehinstallDetailsVo;
+import com.yxt.anrui.base.api.basevehinstall.PayApplyTopVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -74,4 +76,6 @@ public interface BaseVehinstallMapper extends BaseMapper<BaseVehinstall> {
     int selectNumGCRK(String bill);
 
     String selectNum(String billNo);
+
+    List<PayApplyTopVo> payApply(@Param(Constants.WRAPPER) QueryWrapper qw);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallMapper.xml

@@ -65,4 +65,38 @@
         order by billNo desc
                 limit 1
     </select>
+
+    <select id="payApply" resultType="com.yxt.anrui.base.api.basevehinstall.PayApplyTopVo">
+        SELECT bvm.installNameValue,
+        CONCAT(
+        bvm.wk_long,
+        bvm.wk_wide,
+        bvm.wk_high
+        ) AS size,
+        bv.vinNo,
+        bv.sid AS topSid,
+        bvm.colorValue AS color,
+        bv.costPrice,
+        bv.brandName,
+        bv.vehModel,
+        bso.contractNo,
+        bso.billNo AS saleOrderNo,
+        bso.customerName,
+        bso.payType
+        FROM
+        base_vehinstall bv
+        LEFT JOIN base_vehinstallmodel bvm
+        ON bv.mainSid = bvm.sid
+        LEFT JOIN anrui_buscenter.bus_sales_order_vehicle bsov
+        ON RIGHT(bv.vinNo,8) = RIGHT(bsov.linkNo,8)
+        LEFT JOIN anrui_buscenter.bus_sales_order bso
+        ON bsov.salesOrderSid = bso.sid
+        <where>
+            ${ew.sqlSegment}
+        </where>
+        AND bv.sid NOT IN (
+        SELECT ft.topSid
+        FROM anrui_fin.fin_paymentapply_top ft
+        )
+    </select>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallRest.java

@@ -79,7 +79,7 @@ import java.util.List;
  * @since 1.0
  */
 @Api(tags = "上装表")
-@RestController("com.yxt.anrui.base.biz.basevehinstall.BaseVehinstallRest")
+@RestController
 @RequestMapping("v1/basevehinstall")
 public class BaseVehinstallRest implements BaseVehinstallFeign {
 
@@ -297,4 +297,9 @@ public class BaseVehinstallRest implements BaseVehinstallFeign {
     public ResultBean vehinstallOutNew(String sid) {
         return baseVehinstallService.vehinstallOutNew(sid);
     }
+
+    @Override
+    public ResultBean<List<PayApplyTopVo>> payApply(PayApplyTopQuery query) {
+        return baseVehinstallService.payApply(query);
+    }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallService.java

@@ -31,11 +31,13 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo;
 import com.yxt.anrui.base.api.basetrailer.BaseTrailer;
+import com.yxt.anrui.base.api.basetrailer.PayApplyTrailerVo;
 import com.yxt.anrui.base.api.basetrailermodel.BaseTrailerModel;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
 import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOut;
 import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutDetailsVo;
 import com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApply;
+import com.yxt.anrui.base.api.basevehinstall.*;
 import com.yxt.anrui.base.api.basevehinstallmodel.BaseVehinstallmodel;
 import com.yxt.anrui.base.api.basevehinstallmodel.BaseVehinstallmodelDetailsVo;
 import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelVo;
@@ -57,12 +59,6 @@ import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
-import com.yxt.anrui.base.api.basevehinstall.BaseVehinstall;
-import com.yxt.anrui.base.api.basevehinstall.BaseVehinstallQuery;
-import com.yxt.anrui.base.api.basevehinstall.BaseVehinstallVo;
-import com.yxt.anrui.base.api.basevehinstall.BaseVehinstallDetailsVo;
-import com.yxt.anrui.base.api.basevehinstall.BaseVehinstallDto;
-import com.yxt.anrui.base.api.basevehinstall.BaseVehinstallFeign;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -524,4 +520,21 @@ public class BaseVehinstallService extends MybatisBaseService<BaseVehinstallMapp
         }
         return rb.success();
     }
+
+    public ResultBean<List<PayApplyTopVo>> payApply(PayApplyTopQuery query) {
+        ResultBean rb = ResultBean.fireFail();
+        QueryWrapper qw = new QueryWrapper<>();
+        qw.eq("bv.useOrgSid", query.getUseOrgSid());
+        if (StringUtils.isNotBlank(query.getVinNo())) {
+            qw.like("bv.vinNo", query.getVinNo());
+        }
+        if (StringUtils.isNotBlank(query.getCustomerName())) {
+            qw.eq("bso.customerName", query.getCustomerName());
+        }
+        if (StringUtils.isNotBlank(query.getInstallNameValue())) {
+            qw.like("bvm.installNameValue", query.getInstallNameValue());
+        }
+        List<PayApplyTopVo> payApplyTopVoList = baseMapper.payApply(qw);
+        return rb.success().setData(payApplyTopVoList);
+    }
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplytop/FinPaymentapplyTopDto.java

@@ -53,31 +53,31 @@ public class FinPaymentapplyTopDto implements Dto {
 
     private String sid; // sid
 
-	@ApiModelProperty("付款申请sid")
+    @ApiModelProperty("付款申请sid")
     private String applySid; // 付款申请sid
-	@ApiModelProperty("上装名称")
+    @ApiModelProperty("上装名称")
     private String installNameValue; // 上装名称
-	@ApiModelProperty("货箱内部尺寸")
+    @ApiModelProperty("货箱内部尺寸")
     private String size; // 货箱内部尺寸
-	@ApiModelProperty("车架号")
+    @ApiModelProperty("车架号")
     private String vinNo; // 车架号
-	@ApiModelProperty("上装sid")
+    @ApiModelProperty("上装sid")
     private String topSid; // 上装sid
-	@ApiModelProperty("箱体颜色")
+    @ApiModelProperty("箱体颜色")
     private String color; // 箱体颜色
-	@ApiModelProperty("厂家结算价")
+    @ApiModelProperty("厂家结算价")
     private BigDecimal costPrice; // 厂家结算价
-	@ApiModelProperty("品牌名称")
+    @ApiModelProperty("品牌名称")
     private String brandName; // 品牌名称
-	@ApiModelProperty("车型别名")
+    @ApiModelProperty("车型别名")
     private String vehModel; // 车型别名
-	@ApiModelProperty("合同编号")
+    @ApiModelProperty("合同编号")
     private String contractNo; // 合同编号
-	@ApiModelProperty("销售订单号")
+    @ApiModelProperty("销售订单号")
     private String saleOrderNo; // 销售订单号
-	@ApiModelProperty("客户名称")
+    @ApiModelProperty("客户名称")
     private String customerName; // 客户名称
-	@ApiModelProperty("销售类型")
+    @ApiModelProperty("销售类型")
     private String payType; // 销售类型
 
 }