From c24c0749bfba90b4114806d2168793a1b0d3d59a Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Sun, 29 Jan 2023 14:30:09 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusVehicleApplyDetailsVo.java | 3 + .../anrui/flowable/api/utils/ProcDefEnum.java | 68 +++++------ .../ScmApplyInboundQuery.java | 100 ++++++++++++++++ .../ScmApplyInboundQueryDetailsVo.java | 101 ++++++++++++++++ .../ScmApplyInboundQueryDto.java | 105 +++++++++++++++++ .../ScmApplyInboundQueryFeign.java | 78 +++++++++++++ .../ScmApplyInboundQueryFeignFallback.java | 72 ++++++++++++ .../ScmApplyInboundQueryQuery.java | 99 ++++++++++++++++ .../ScmApplyInboundQueryVo.java | 101 ++++++++++++++++ .../ScmApplyInboundVehQuery.java | 78 +++++++++++++ .../ScmApplyInboundVehQueryDetailsVo.java | 79 +++++++++++++ .../ScmApplyInboundVehQueryDto.java | 82 +++++++++++++ .../ScmApplyInboundVehQueryFeign.java | 78 +++++++++++++ .../ScmApplyInboundVehQueryFeignFallback.java | 72 ++++++++++++ .../ScmApplyInboundVehQueryQuery.java | 77 ++++++++++++ .../ScmApplyInboundVehQueryVo.java | 79 +++++++++++++ .../ScmApplyInboundService.java | 60 +++++++++- .../ScmApplyInboundQueryMapper.java | 65 +++++++++++ .../ScmApplyInboundQueryMapper.xml | 13 +++ .../ScmApplyInboundQueryRest.java | 100 ++++++++++++++++ .../ScmApplyInboundQueryService.java | 110 ++++++++++++++++++ .../ScmApplyInboundVehQueryMapper.java | 65 +++++++++++ .../ScmApplyInboundVehQueryMapper.xml | 13 +++ .../ScmApplyInboundVehQueryRest.java | 100 ++++++++++++++++ .../ScmApplyInboundVehQueryService.java | 110 ++++++++++++++++++ 25 files changed, 1869 insertions(+), 39 deletions(-) create mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundquery/ScmApplyInboundQuery.java create mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundquery/ScmApplyInboundQueryDetailsVo.java create mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundquery/ScmApplyInboundQueryDto.java create mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundquery/ScmApplyInboundQueryFeign.java create mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundquery/ScmApplyInboundQueryFeignFallback.java create mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundquery/ScmApplyInboundQueryQuery.java create mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundquery/ScmApplyInboundQueryVo.java create mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehquery/ScmApplyInboundVehQuery.java create mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehquery/ScmApplyInboundVehQueryDetailsVo.java create mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehquery/ScmApplyInboundVehQueryDto.java create mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehquery/ScmApplyInboundVehQueryFeign.java create mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehquery/ScmApplyInboundVehQueryFeignFallback.java create mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehquery/ScmApplyInboundVehQueryQuery.java create mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehquery/ScmApplyInboundVehQueryVo.java create mode 100644 anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundquery/ScmApplyInboundQueryMapper.java create mode 100644 anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundquery/ScmApplyInboundQueryMapper.xml create mode 100644 anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundquery/ScmApplyInboundQueryRest.java create mode 100644 anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundquery/ScmApplyInboundQueryService.java create mode 100644 anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundvehquery/ScmApplyInboundVehQueryMapper.java create mode 100644 anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundvehquery/ScmApplyInboundVehQueryMapper.xml create mode 100644 anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundvehquery/ScmApplyInboundVehQueryRest.java create mode 100644 anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundvehquery/ScmApplyInboundVehQueryService.java diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDetailsVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDetailsVo.java index c8f6877221..ec0bb06357 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDetailsVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDetailsVo.java @@ -70,4 +70,7 @@ public class BusVehicleApplyDetailsVo implements Vo { @ApiModelProperty("申请人orgPath") private String orgPath; + + @ApiModelProperty(value = "供应商sid") + private String supplierSid; } diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java index e6c5d457b9..5fdfe50204 100644 --- a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java +++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java @@ -7,7 +7,7 @@ public enum ProcDefEnum { /***************************正式流程id***********************************/ - /*ORDERDEPOSITAPPROVE("简易订单-订金收取", "process_pkyns85b:4:575004"), + ORDERDEPOSITAPPROVE("简易订单-订金收取", "process_pkyns85b:4:575004"), ORDERDEPOSITVEHICLEAPPROVE("简易订单-车辆预定", "process_pkyns85b:5:575008"), ORDERAPPROVE("订单审批", "order_approve_96asleqi:1:227504"), SALESPOLICY("销售政策审批流程", "process_biw9gfh7:2:727504"),//TODO:正式新2022-11-25 @@ -38,43 +38,43 @@ public enum ProcDefEnum { SCMCOLLECTIONREBATEWITHAPPLY("回款返利预提申请", "process_k4lodiyg:1:630004"), SCMCOLLECTIONREBATECHECKAPPLY("回款返利核对申请", "process_fgrv1mbv:1:630008"), CONTRACTAPPLY("合同审核", "process_gd8c9xd5:1:545008"), - BASEDISPACKAGEAPPLY("优惠包申请流程", "process_l8i6tqho:1:967504"),*/ + BASEDISPACKAGEAPPLY("优惠包申请流程", "process_l8i6tqho:1:967504"), /******************************测试流程id*********************************************/ - ORDERDEPOSITAPPROVE("简易订单-订金收取", "process_pkyns85b:4:575004"), - ORDERDEPOSITVEHICLEAPPROVE("简易订单-车辆预定", "process_pkyns85b:5:575008"), - ORDERAPPROVE("订单审批", "order_approve_96asleqi:1:227504"), - RECORDAPPLICATION("入库申请", "process_xbwq2c7p:3:675024"), - SEALAPPLY("盖章申请", "process_7h0z66tp:1:240064"), - SALESORDER("销售订单审批流程", "process_p5ils2rn:5:557508"), - BUSDELIVEREDAPPLY("出库申请", "process_wgt1n66l:2:357504"), - BASESHUNINVOICAPPLY("调车开票申请", "process_u4xrvaso:1:400008"), - BASEVEHINSTALLMODPRICE("上装调价申请", "process_s0a0svth:1:492508"), - SCMVEHREBATEWITHAPPLY("单车返利预提申请", "process_qegarc7r:1:535004"), - SCMVEHREBATECHECKAPPLY("单车返利核对申请", "process_3xtbbru8:1:560004"), - SCMSPECIALREBATEWITHAPPLY("专项返利预提申请", "process_l0yxpgs2:1:590004"), - SCMSPECIALREBATECHECKAPPLY("专项返利核对申请", "process_qw22vupn:1:590008"), - SCMSPECIALREBATECHEDISTRIBUTE("专项返利分配申请", "process_h3w1aval:1:615004"), - SCMCOLLECTIONREBATEWITHAPPLY("回款返利预提申请", "process_k4lodiyg:1:630004"), - SCMCOLLECTIONREBATECHECKAPPLY("回款返利核对申请", "process_fgrv1mbv:1:630008"), - CONTRACTAPPLY("合同审核", "process_gd8c9xd5:1:545008"), - SCMCARTRANSFER("库存地点变更申请", "process_3bc4p2em:8:860004"), //TODO:测试 - BASEVEHICLEACTUALSALES("未售买断", "process_6qx07b75:9:852504"),//ToDo:测试 - VEHICLEAPPLY("排产申请流程", "process_9egcg169:12:910004"),//TODO:测试 - FINCOSTAPPLY("费用申请","process_u0pahv0s:6:902504"),//ToDo:测试 - FINPAYAPPLY("付款申请","process_gin2tntb:4:902508"),//ToDo:测试 - ARREARSCARRYVEHICLE("欠款提车审批流程", "process_8ax1xxn3:2:862512"),//测试(新)2022、11、22 - BUSCENTERADVANCEGINVOICEAPPLY("提前开票申请流程", "process_zt1gov6e:4:862504"), //测试 - FINBILLAPPLICATION("开票申请流程", "process_sndce6s9:2:937504"),//测试(新)2022、11、22 - BASEOUTSOURCINGAPPLICATION("外采申请", "process_5tqysnjc:5:867504"),//测试外采流程定义id - BASEMODELMODPRICE("车型调价申请", "process_kydcif7k:7:867520"),//测试车型调价流程定义id - BASEINTERNALPURCHASE("调车申请", "process_i6luw5xq:4:892504"),//测试调车流程定义id - BASEACCADJAPPLY("调账申请", "process_r6pyzqoz:2:867516"), //测试调账流程定义id - SCMVEHICLERETURN("采购退库", "process_md8aeoap:2:867508"),//测试采购退库流程定义id - SALESPOLICY("销售政策审批流程", "process_biw9gfh7:2:867524"),//测试销售政策流程定义id*/ - BASEDISPACKAGEAPPLY("优惠包申请流程", "process_l8i6tqho:1:967504"),//测试优惠包申请流程定义id +// ORDERDEPOSITAPPROVE("简易订单-订金收取", "process_pkyns85b:4:575004"), +// ORDERDEPOSITVEHICLEAPPROVE("简易订单-车辆预定", "process_pkyns85b:5:575008"), +// ORDERAPPROVE("订单审批", "order_approve_96asleqi:1:227504"), +// RECORDAPPLICATION("入库申请", "process_xbwq2c7p:3:675024"), +// SEALAPPLY("盖章申请", "process_7h0z66tp:1:240064"), +// SALESORDER("销售订单审批流程", "process_p5ils2rn:5:557508"), +// BUSDELIVEREDAPPLY("出库申请", "process_wgt1n66l:2:357504"), +// BASESHUNINVOICAPPLY("调车开票申请", "process_u4xrvaso:1:400008"), +// BASEVEHINSTALLMODPRICE("上装调价申请", "process_s0a0svth:1:492508"), +// SCMVEHREBATEWITHAPPLY("单车返利预提申请", "process_qegarc7r:1:535004"), +// SCMVEHREBATECHECKAPPLY("单车返利核对申请", "process_3xtbbru8:1:560004"), +// SCMSPECIALREBATEWITHAPPLY("专项返利预提申请", "process_l0yxpgs2:1:590004"), +// SCMSPECIALREBATECHECKAPPLY("专项返利核对申请", "process_qw22vupn:1:590008"), +// SCMSPECIALREBATECHEDISTRIBUTE("专项返利分配申请", "process_h3w1aval:1:615004"), +// SCMCOLLECTIONREBATEWITHAPPLY("回款返利预提申请", "process_k4lodiyg:1:630004"), +// SCMCOLLECTIONREBATECHECKAPPLY("回款返利核对申请", "process_fgrv1mbv:1:630008"), +// CONTRACTAPPLY("合同审核", "process_gd8c9xd5:1:545008"), +// SCMCARTRANSFER("库存地点变更申请", "process_3bc4p2em:8:860004"), //TODO:测试 +// BASEVEHICLEACTUALSALES("未售买断", "process_6qx07b75:9:852504"),//ToDo:测试 +// VEHICLEAPPLY("排产申请流程", "process_9egcg169:12:910004"),//TODO:测试 +// FINCOSTAPPLY("费用申请","process_u0pahv0s:6:902504"),//ToDo:测试 +// FINPAYAPPLY("付款申请","process_gin2tntb:4:902508"),//ToDo:测试 +// ARREARSCARRYVEHICLE("欠款提车审批流程", "process_8ax1xxn3:2:862512"),//测试(新)2022、11、22 +// BUSCENTERADVANCEGINVOICEAPPLY("提前开票申请流程", "process_zt1gov6e:4:862504"), //测试 +// FINBILLAPPLICATION("开票申请流程", "process_sndce6s9:2:937504"),//测试(新)2022、11、22 +// BASEOUTSOURCINGAPPLICATION("外采申请", "process_5tqysnjc:5:867504"),//测试外采流程定义id +// BASEMODELMODPRICE("车型调价申请", "process_kydcif7k:7:867520"),//测试车型调价流程定义id +// BASEINTERNALPURCHASE("调车申请", "process_i6luw5xq:4:892504"),//测试调车流程定义id +// BASEACCADJAPPLY("调账申请", "process_r6pyzqoz:2:867516"), //测试调账流程定义id +// SCMVEHICLERETURN("采购退库", "process_md8aeoap:2:867508"),//测试采购退库流程定义id +// SALESPOLICY("销售政策审批流程", "process_biw9gfh7:2:867524"),//测试销售政策流程定义id*/ +// BASEDISPACKAGEAPPLY("优惠包申请流程", "process_l8i6tqho:1:967504"),//测试优惠包申请流程定义id ; ProcDefEnum(String proDefName, String proDefId) { diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundquery/ScmApplyInboundQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundquery/ScmApplyInboundQuery.java new file mode 100644 index 0000000000..200449d7c7 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundquery/ScmApplyInboundQuery.java @@ -0,0 +1,100 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmapplyinboundquery; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui-scm(车辆入库单查询)
+ * File: ScmApplyInboundQuery.java
+ * Class: com.yxt.anrui.scm.api.scmapplyinboundquery.ScmApplyInboundQuery
+ * Description: 车辆入库单查询.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-01-28 15:55:31
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "车辆入库单查询", description = "车辆入库单查询") +@TableName("scm_apply_inbound_query") +public class ScmApplyInboundQuery extends BaseEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty("公司入库日期") + private String orgPriceDate; // 公司入库日期 + @ApiModelProperty("采购类型key") + private String manPurOrderTypeKey; // 采购类型key + @ApiModelProperty("采购类型value") + private String manPurOrderTypeValue; // 采购类型value + @ApiModelProperty("业务单据编号") + private String applicationCode; // 业务单据编号 + @ApiModelProperty("部门sid") + private String orgDeptSid; // 部门sid + @ApiModelProperty("部门名称") + private String orgDeptName; // 部门名称 + @ApiModelProperty("采购系统名称") + private String purchaseSystemName; // 采购系统名称 + @ApiModelProperty("财务中分公司编码") + private String orgCode; // 财务中分公司编码 + @ApiModelProperty("供应商sid") + private String manSid; // 供应商sid + @ApiModelProperty("供应商编码") + private String manCode; // 供应商编码 + @ApiModelProperty("供应商名称") + private String manName; // 供应商名称 + @ApiModelProperty("金额合计") + private String totalMoney; // 金额合计 + @ApiModelProperty("制单人sid") + private String makeListSid; // 制单人sid + @ApiModelProperty("制单人姓名") + private String makeListName; // 制单人姓名 + @ApiModelProperty("制单日期") + private String makeListDate; // 制单日期 + @ApiModelProperty("审核人sid") + private String confirmSid; // 审核人sid + @ApiModelProperty("审核人姓名") + private String confirmName; // 审核人姓名 + @ApiModelProperty("审核日期") + private String confirmDate; // 审核日期 + @ApiModelProperty("创建组织sid") + private String createOrgSid; // 创建组织sid + @ApiModelProperty("创建组织名称") + private String createOrgName; // 创建组织名称 + @ApiModelProperty("业务sid") + private String busSid; // 业务sid + @ApiModelProperty("下载次数") + private String downNum; // 下载次数 + @ApiModelProperty("最新下载时间") + private String newDownDate; // 最新下载时间 + +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundquery/ScmApplyInboundQueryDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundquery/ScmApplyInboundQueryDetailsVo.java new file mode 100644 index 0000000000..95b5d38b00 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundquery/ScmApplyInboundQueryDetailsVo.java @@ -0,0 +1,101 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmapplyinboundquery; + + +import com.yxt.common.core.vo.Vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui-scm(车辆入库单查询)
+ * File: ScmApplyInboundQueryVo.java
+ * Class: com.yxt.anrui.scm.api.scmapplyinboundquery.ScmApplyInboundQueryVo
+ * Description: 车辆入库单查询 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-01-28 15:55:31
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "车辆入库单查询 视图数据详情", description = "车辆入库单查询 视图数据详情") +public class ScmApplyInboundQueryDetailsVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("公司入库日期") + private String orgPriceDate; // 公司入库日期 + @ApiModelProperty("采购类型key") + private String manPurOrderTypeKey; // 采购类型key + @ApiModelProperty("采购类型value") + private String manPurOrderTypeValue; // 采购类型value + @ApiModelProperty("业务单据编号") + private String applicationCode; // 业务单据编号 + @ApiModelProperty("部门sid") + private String orgDeptSid; // 部门sid + @ApiModelProperty("部门名称") + private String orgDeptName; // 部门名称 + @ApiModelProperty("采购系统名称") + private String purchaseSystemName; // 采购系统名称 + @ApiModelProperty("财务中分公司编码") + private String orgCode; // 财务中分公司编码 + @ApiModelProperty("供应商sid") + private String manSid; // 供应商sid + @ApiModelProperty("供应商编码") + private String manCode; // 供应商编码 + @ApiModelProperty("供应商名称") + private String manName; // 供应商名称 + @ApiModelProperty("金额合计") + private String totalMoney; // 金额合计 + @ApiModelProperty("制单人sid") + private String makeListSid; // 制单人sid + @ApiModelProperty("制单人姓名") + private String makeListName; // 制单人姓名 + @ApiModelProperty("制单日期") + private String makeListDate; // 制单日期 + @ApiModelProperty("审核人sid") + private String confirmSid; // 审核人sid + @ApiModelProperty("审核人姓名") + private String confirmName; // 审核人姓名 + @ApiModelProperty("审核日期") + private String confirmDate; // 审核日期 + @ApiModelProperty("创建组织sid") + private String createOrgSid; // 创建组织sid + @ApiModelProperty("创建组织名称") + private String createOrgName; // 创建组织名称 + @ApiModelProperty("业务sid") + private String busSid; // 业务sid + @ApiModelProperty("下载次数") + private String downNum; // 下载次数 + @ApiModelProperty("最新下载时间") + private String newDownDate; // 最新下载时间 + +} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundquery/ScmApplyInboundQueryDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundquery/ScmApplyInboundQueryDto.java new file mode 100644 index 0000000000..a31da74d45 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundquery/ScmApplyInboundQueryDto.java @@ -0,0 +1,105 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmapplyinboundquery; + + +import com.yxt.anrui.scm.api.scmapplyinboundvehquery.ScmApplyInboundVehQueryDto; +import com.yxt.common.core.dto.Dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * Project: anrui-scm(车辆入库单查询)
+ * File: ScmApplyInboundQueryDto.java
+ * Class: com.yxt.anrui.scm.api.scmapplyinboundquery.ScmApplyInboundQueryDto
+ * Description: 车辆入库单查询 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-01-28 15:55:31
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "车辆入库单查询 数据传输对象", description = "车辆入库单查询 数据传输对象") +public class ScmApplyInboundQueryDto implements Dto { + + private String sid; // sid + + @ApiModelProperty("公司入库日期") + private String orgPriceDate; // 公司入库日期 + @ApiModelProperty("采购类型key") + private String manPurOrderTypeKey; // 采购类型key + @ApiModelProperty("采购类型value") + private String manPurOrderTypeValue; // 采购类型value + @ApiModelProperty("业务单据编号") + private String applicationCode; // 业务单据编号 + @ApiModelProperty("部门sid") + private String orgDeptSid; // 部门sid + @ApiModelProperty("部门名称") + private String orgDeptName; // 部门名称 + @ApiModelProperty("采购系统名称") + private String purchaseSystemName; // 采购系统名称 + @ApiModelProperty("财务中分公司编码") + private String orgCode; // 财务中分公司编码 + @ApiModelProperty("供应商sid") + private String manSid; // 供应商sid + @ApiModelProperty("供应商编码") + private String manCode; // 供应商编码 + @ApiModelProperty("供应商名称") + private String manName; // 供应商名称 + @ApiModelProperty("金额合计") + private String totalMoney; // 金额合计 + @ApiModelProperty("制单人sid") + private String makeListSid; // 制单人sid + @ApiModelProperty("制单人姓名") + private String makeListName; // 制单人姓名 + @ApiModelProperty("制单日期") + private String makeListDate; // 制单日期 + @ApiModelProperty("审核人sid") + private String confirmSid; // 审核人sid + @ApiModelProperty("审核人姓名") + private String confirmName; // 审核人姓名 + @ApiModelProperty("审核日期") + private String confirmDate; // 审核日期 + @ApiModelProperty("创建组织sid") + private String createOrgSid; // 创建组织sid + @ApiModelProperty("创建组织名称") + private String createOrgName; // 创建组织名称 + @ApiModelProperty("业务sid") + private String busSid; // 业务sid + @ApiModelProperty("下载次数") + private String downNum; // 下载次数 + @ApiModelProperty("最新下载时间") + private String newDownDate; // 最新下载时间 + @ApiModelProperty("入库查询车辆列表") + private List scmApplyInboundVehQueryList; // 入库查询车辆列表 +} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundquery/ScmApplyInboundQueryFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundquery/ScmApplyInboundQueryFeign.java new file mode 100644 index 0000000000..6fe7165b16 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundquery/ScmApplyInboundQueryFeign.java @@ -0,0 +1,78 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmapplyinboundquery; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * Project: anrui-scm(车辆入库单查询)
+ * File: ScmApplyInboundQueryFeign.java
+ * Class: com.yxt.anrui.scm.api.scmapplyinboundquery.ScmApplyInboundQueryFeign
+ * Description: 车辆入库单查询.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-01-28 15:55:31
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "车辆入库单查询") +@FeignClient( + contextId = "anrui-scm-ScmApplyInboundQuery", + name = "anrui-scm", + path = "v1/scmapplyinboundquery", + fallback = ScmApplyInboundQueryFeignFallback.class) +public interface ScmApplyInboundQueryFeign { + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + @ResponseBody + public ResultBean> listPage(@RequestBody PagerQuery pq); + + @ApiOperation("新增或修改") + @PostMapping("/save") + @ResponseBody + public ResultBean save(@RequestBody ScmApplyInboundQueryDto dto); + + @ApiOperation("根据sid删除记录") + @DeleteMapping("/delBySids") + @ResponseBody + public ResultBean delBySids(@RequestBody String[] sids); + + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + @ResponseBody + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); +} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundquery/ScmApplyInboundQueryFeignFallback.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundquery/ScmApplyInboundQueryFeignFallback.java new file mode 100644 index 0000000000..5d1325f507 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundquery/ScmApplyInboundQueryFeignFallback.java @@ -0,0 +1,72 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmapplyinboundquery; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import org.springframework.stereotype.Component; + +import java.util.List; + +/** + * Project: anrui-scm(车辆入库单查询)
+ * File: ScmApplyInboundQueryFeignFallback.java
+ * Class: com.yxt.anrui.scm.api.scmapplyinboundquery.ScmApplyInboundQueryFeignFallback
+ * Description: 车辆入库单查询.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-01-28 15:55:31
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Component +public class ScmApplyInboundQueryFeignFallback implements ScmApplyInboundQueryFeign { + + @Override + public ResultBean> listPage(PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui-scm/scmapplyinboundquery/listPage无法访问"); + } + + @Override + public ResultBean save(ScmApplyInboundQueryDto dto){ + return ResultBean.fireFail().setMsg("接口anrui-scm/scmapplyinboundquery/save无法访问"); + } + + @Override + public ResultBean delBySids( String[] sids){ + return ResultBean.fireFail().setMsg("接口anrui-scm/scmapplyinboundquery/delBySids无法访问"); + } + + @Override + public ResultBean fetchDetailsBySid(String sid){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui-scm/scmapplyinboundquery/fetchDetailsBySid无法访问"); + } +} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundquery/ScmApplyInboundQueryQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundquery/ScmApplyInboundQueryQuery.java new file mode 100644 index 0000000000..9e124eea12 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundquery/ScmApplyInboundQueryQuery.java @@ -0,0 +1,99 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmapplyinboundquery; + + +import com.yxt.common.core.query.Query; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui-scm(车辆入库单查询)
+ * File: ScmApplyInboundQueryQuery.java
+ * Class: com.yxt.anrui.scm.api.scmapplyinboundquery.ScmApplyInboundQueryQuery
+ * Description: 车辆入库单查询 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-01-28 15:55:31
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "车辆入库单查询 查询条件", description = "车辆入库单查询 查询条件") +public class ScmApplyInboundQueryQuery implements Query { + + @ApiModelProperty("公司入库日期") + private String orgPriceDate; // 公司入库日期 + @ApiModelProperty("采购类型key") + private String manPurOrderTypeKey; // 采购类型key + @ApiModelProperty("采购类型value") + private String manPurOrderTypeValue; // 采购类型value + @ApiModelProperty("业务单据编号") + private String applicationCode; // 业务单据编号 + @ApiModelProperty("部门sid") + private String orgDeptSid; // 部门sid + @ApiModelProperty("部门名称") + private String orgDeptName; // 部门名称 + @ApiModelProperty("采购系统名称") + private String purchaseSystemName; // 采购系统名称 + @ApiModelProperty("财务中分公司编码") + private String orgCode; // 财务中分公司编码 + @ApiModelProperty("供应商sid") + private String manSid; // 供应商sid + @ApiModelProperty("供应商编码") + private String manCode; // 供应商编码 + @ApiModelProperty("供应商名称") + private String manName; // 供应商名称 + @ApiModelProperty("金额合计") + private String totalMoney; // 金额合计 + @ApiModelProperty("制单人sid") + private String makeListSid; // 制单人sid + @ApiModelProperty("制单人姓名") + private String makeListName; // 制单人姓名 + @ApiModelProperty("制单日期") + private String makeListDate; // 制单日期 + @ApiModelProperty("审核人sid") + private String confirmSid; // 审核人sid + @ApiModelProperty("审核人姓名") + private String confirmName; // 审核人姓名 + @ApiModelProperty("审核日期") + private String confirmDate; // 审核日期 + @ApiModelProperty("创建组织sid") + private String createOrgSid; // 创建组织sid + @ApiModelProperty("创建组织名称") + private String createOrgName; // 创建组织名称 + @ApiModelProperty("业务sid") + private String busSid; // 业务sid + @ApiModelProperty("下载次数") + private String downNum; // 下载次数 + @ApiModelProperty("最新下载时间") + private String newDownDate; // 最新下载时间 + +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundquery/ScmApplyInboundQueryVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundquery/ScmApplyInboundQueryVo.java new file mode 100644 index 0000000000..ca5eb6eb5e --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundquery/ScmApplyInboundQueryVo.java @@ -0,0 +1,101 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmapplyinboundquery; + + +import com.yxt.common.core.vo.Vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui-scm(车辆入库单查询)
+ * File: ScmApplyInboundQueryVo.java
+ * Class: com.yxt.anrui.scm.api.scmapplyinboundquery.ScmApplyInboundQueryVo
+ * Description: 车辆入库单查询 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-01-28 15:55:31
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "车辆入库单查询 视图数据对象", description = "车辆入库单查询 视图数据对象") +public class ScmApplyInboundQueryVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("公司入库日期") + private String orgPriceDate; // 公司入库日期 + @ApiModelProperty("采购类型key") + private String manPurOrderTypeKey; // 采购类型key + @ApiModelProperty("采购类型value") + private String manPurOrderTypeValue; // 采购类型value + @ApiModelProperty("业务单据编号") + private String applicationCode; // 业务单据编号 + @ApiModelProperty("部门sid") + private String orgDeptSid; // 部门sid + @ApiModelProperty("部门名称") + private String orgDeptName; // 部门名称 + @ApiModelProperty("采购系统名称") + private String purchaseSystemName; // 采购系统名称 + @ApiModelProperty("财务中分公司编码") + private String orgCode; // 财务中分公司编码 + @ApiModelProperty("供应商sid") + private String manSid; // 供应商sid + @ApiModelProperty("供应商编码") + private String manCode; // 供应商编码 + @ApiModelProperty("供应商名称") + private String manName; // 供应商名称 + @ApiModelProperty("金额合计") + private String totalMoney; // 金额合计 + @ApiModelProperty("制单人sid") + private String makeListSid; // 制单人sid + @ApiModelProperty("制单人姓名") + private String makeListName; // 制单人姓名 + @ApiModelProperty("制单日期") + private String makeListDate; // 制单日期 + @ApiModelProperty("审核人sid") + private String confirmSid; // 审核人sid + @ApiModelProperty("审核人姓名") + private String confirmName; // 审核人姓名 + @ApiModelProperty("审核日期") + private String confirmDate; // 审核日期 + @ApiModelProperty("创建组织sid") + private String createOrgSid; // 创建组织sid + @ApiModelProperty("创建组织名称") + private String createOrgName; // 创建组织名称 + @ApiModelProperty("业务sid") + private String busSid; // 业务sid + @ApiModelProperty("下载次数") + private String downNum; // 下载次数 + @ApiModelProperty("最新下载时间") + private String newDownDate; // 最新下载时间 + +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehquery/ScmApplyInboundVehQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehquery/ScmApplyInboundVehQuery.java new file mode 100644 index 0000000000..a4b25dc8a7 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehquery/ScmApplyInboundVehQuery.java @@ -0,0 +1,78 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmapplyinboundvehquery; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui-scm(车辆入库单查询)
+ * File: ScmApplyInboundVehQuery.java
+ * Class: com.yxt.anrui.scm.api.scmapplyinboundvehquery.ScmApplyInboundVehQuery
+ * Description: 车辆入库单车辆查询.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-01-28 15:55:31
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "车辆入库单车辆查询", description = "车辆入库单车辆查询") +@TableName("scm_apply_inbound_veh_query") +public class ScmApplyInboundVehQuery extends BaseEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty("主表sid") + private String mainSid; // 主表sid + @ApiModelProperty("物料编号") + private String vinNo; // 物料编号 + @ApiModelProperty("物料分组code") + private String mGroupCode; // 物料分组code + @ApiModelProperty("物料分组名称") + private String mGroupName; // 物料分组名称 + @ApiModelProperty("车辆类型key") + private String vehicleTypeKey; // 车辆类型key + @ApiModelProperty("车辆类型value") + private String vehicleTypeValue; // 车辆类型value + @ApiModelProperty("计量单位") + private String iunit; // 计量单位 + @ApiModelProperty("数量") + private String num; // 数量 + @ApiModelProperty("结算金额") + private String settleMoney; // 结算金额 + @ApiModelProperty("仓库sid") + private String localSid; // 仓库sid + @ApiModelProperty("仓库名称") + private String localName; // 仓库名称 + @ApiModelProperty("仓库编码") + private String localCode; // 仓库编码 + +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehquery/ScmApplyInboundVehQueryDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehquery/ScmApplyInboundVehQueryDetailsVo.java new file mode 100644 index 0000000000..fb9f8e3c63 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehquery/ScmApplyInboundVehQueryDetailsVo.java @@ -0,0 +1,79 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmapplyinboundvehquery; + + +import com.yxt.common.core.vo.Vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui-scm(车辆入库单查询)
+ * File: ScmApplyInboundVehQueryVo.java
+ * Class: com.yxt.anrui.scm.api.scmapplyinboundvehquery.ScmApplyInboundVehQueryVo
+ * Description: 车辆入库单车辆查询 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-01-28 15:55:31
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "车辆入库单车辆查询 视图数据详情", description = "车辆入库单车辆查询 视图数据详情") +public class ScmApplyInboundVehQueryDetailsVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("主表sid") + private String mainSid; // 主表sid + @ApiModelProperty("物料编号") + private String vinNo; // 物料编号 + @ApiModelProperty("物料分组code") + private String mGroupCode; // 物料分组code + @ApiModelProperty("物料分组名称") + private String mGroupName; // 物料分组名称 + @ApiModelProperty("车辆类型key") + private String vehicleTypeKey; // 车辆类型key + @ApiModelProperty("车辆类型value") + private String vehicleTypeValue; // 车辆类型value + @ApiModelProperty("计量单位") + private String iunit; // 计量单位 + @ApiModelProperty("数量") + private String num; // 数量 + @ApiModelProperty("结算金额") + private String settleMoney; // 结算金额 + @ApiModelProperty("仓库sid") + private String localSid; // 仓库sid + @ApiModelProperty("仓库名称") + private String localName; // 仓库名称 + @ApiModelProperty("仓库编码") + private String localCode; // 仓库编码 + +} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehquery/ScmApplyInboundVehQueryDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehquery/ScmApplyInboundVehQueryDto.java new file mode 100644 index 0000000000..429cc95590 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehquery/ScmApplyInboundVehQueryDto.java @@ -0,0 +1,82 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmapplyinboundvehquery; + + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.yxt.common.core.dto.Dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui-scm(车辆入库单查询)
+ * File: ScmApplyInboundVehQueryDto.java
+ * Class: com.yxt.anrui.scm.api.scmapplyinboundvehquery.ScmApplyInboundVehQueryDto
+ * Description: 车辆入库单车辆查询 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-01-28 15:55:31
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "车辆入库单车辆查询 数据传输对象", description = "车辆入库单车辆查询 数据传输对象") +public class ScmApplyInboundVehQueryDto implements Dto { + + private String sid; // sid + + @ApiModelProperty("主表sid") + private String mainSid; // 主表sid + @ApiModelProperty("物料编号") + private String vinNo; // 物料编号 + @ApiModelProperty("物料分组code") + @JsonProperty("mGroupCode") + private String mGroupCode; // 物料分组code + @ApiModelProperty("物料分组名称") + @JsonProperty("mGroupName") + private String mGroupName; // 物料分组名称 + @ApiModelProperty("车辆类型key") + private String vehicleTypeKey; // 车辆类型key + @ApiModelProperty("车辆类型value") + private String vehicleTypeValue; // 车辆类型value + @ApiModelProperty("计量单位") + private String iunit; // 计量单位 + @ApiModelProperty("数量") + private String num; // 数量 + @ApiModelProperty("结算金额") + private String settleMoney; // 结算金额 + @ApiModelProperty("仓库sid") + private String localSid; // 仓库sid + @ApiModelProperty("仓库名称") + private String localName; // 仓库名称 + @ApiModelProperty("仓库编码") + private String localCode; // 仓库编码 + +} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehquery/ScmApplyInboundVehQueryFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehquery/ScmApplyInboundVehQueryFeign.java new file mode 100644 index 0000000000..3f42f7dc2b --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehquery/ScmApplyInboundVehQueryFeign.java @@ -0,0 +1,78 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmapplyinboundvehquery; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * Project: anrui-scm(车辆入库单查询)
+ * File: ScmApplyInboundVehQueryFeign.java
+ * Class: com.yxt.anrui.scm.api.scmapplyinboundvehquery.ScmApplyInboundVehQueryFeign
+ * Description: 车辆入库单车辆查询.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-01-28 15:55:31
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "车辆入库单车辆查询") +@FeignClient( + contextId = "anrui-scm-ScmApplyInboundVehQuery", + name = "anrui-scm", + path = "v1/scmapplyinboundvehquery", + fallback = ScmApplyInboundVehQueryFeignFallback.class) +public interface ScmApplyInboundVehQueryFeign { + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + @ResponseBody + public ResultBean> listPage(@RequestBody PagerQuery pq); + + @ApiOperation("新增或修改") + @PostMapping("/save") + @ResponseBody + public ResultBean save(@RequestBody ScmApplyInboundVehQueryDto dto); + + @ApiOperation("根据sid删除记录") + @DeleteMapping("/delBySids") + @ResponseBody + public ResultBean delBySids(@RequestBody String[] sids); + + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + @ResponseBody + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); +} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehquery/ScmApplyInboundVehQueryFeignFallback.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehquery/ScmApplyInboundVehQueryFeignFallback.java new file mode 100644 index 0000000000..32c413c309 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehquery/ScmApplyInboundVehQueryFeignFallback.java @@ -0,0 +1,72 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmapplyinboundvehquery; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import org.springframework.stereotype.Component; + +import java.util.List; + +/** + * Project: anrui-scm(车辆入库单查询)
+ * File: ScmApplyInboundVehQueryFeignFallback.java
+ * Class: com.yxt.anrui.scm.api.scmapplyinboundvehquery.ScmApplyInboundVehQueryFeignFallback
+ * Description: 车辆入库单车辆查询.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-01-28 15:55:31
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Component +public class ScmApplyInboundVehQueryFeignFallback implements ScmApplyInboundVehQueryFeign { + + @Override + public ResultBean> listPage(PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui-scm/scmapplyinboundvehquery/listPage无法访问"); + } + + @Override + public ResultBean save(ScmApplyInboundVehQueryDto dto){ + return ResultBean.fireFail().setMsg("接口anrui-scm/scmapplyinboundvehquery/save无法访问"); + } + + @Override + public ResultBean delBySids( String[] sids){ + return ResultBean.fireFail().setMsg("接口anrui-scm/scmapplyinboundvehquery/delBySids无法访问"); + } + + @Override + public ResultBean fetchDetailsBySid(String sid){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui-scm/scmapplyinboundvehquery/fetchDetailsBySid无法访问"); + } +} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehquery/ScmApplyInboundVehQueryQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehquery/ScmApplyInboundVehQueryQuery.java new file mode 100644 index 0000000000..7097f2b4de --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehquery/ScmApplyInboundVehQueryQuery.java @@ -0,0 +1,77 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmapplyinboundvehquery; + + +import com.yxt.common.core.query.Query; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui-scm(车辆入库单查询)
+ * File: ScmApplyInboundVehQueryQuery.java
+ * Class: com.yxt.anrui.scm.api.scmapplyinboundvehquery.ScmApplyInboundVehQueryQuery
+ * Description: 车辆入库单车辆查询 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-01-28 15:55:31
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "车辆入库单车辆查询 查询条件", description = "车辆入库单车辆查询 查询条件") +public class ScmApplyInboundVehQueryQuery implements Query { + + @ApiModelProperty("主表sid") + private String mainSid; // 主表sid + @ApiModelProperty("物料编号") + private String vinNo; // 物料编号 + @ApiModelProperty("物料分组code") + private String mGroupCode; // 物料分组code + @ApiModelProperty("物料分组名称") + private String mGroupName; // 物料分组名称 + @ApiModelProperty("车辆类型key") + private String vehicleTypeKey; // 车辆类型key + @ApiModelProperty("车辆类型value") + private String vehicleTypeValue; // 车辆类型value + @ApiModelProperty("计量单位") + private String iunit; // 计量单位 + @ApiModelProperty("数量") + private String num; // 数量 + @ApiModelProperty("结算金额") + private String settleMoney; // 结算金额 + @ApiModelProperty("仓库sid") + private String localSid; // 仓库sid + @ApiModelProperty("仓库名称") + private String localName; // 仓库名称 + @ApiModelProperty("仓库编码") + private String localCode; // 仓库编码 + +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehquery/ScmApplyInboundVehQueryVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehquery/ScmApplyInboundVehQueryVo.java new file mode 100644 index 0000000000..9a1df0a353 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehquery/ScmApplyInboundVehQueryVo.java @@ -0,0 +1,79 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmapplyinboundvehquery; + + +import com.yxt.common.core.vo.Vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui-scm(车辆入库单查询)
+ * File: ScmApplyInboundVehQueryVo.java
+ * Class: com.yxt.anrui.scm.api.scmapplyinboundvehquery.ScmApplyInboundVehQueryVo
+ * Description: 车辆入库单车辆查询 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-01-28 15:55:31
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "车辆入库单车辆查询 视图数据对象", description = "车辆入库单车辆查询 视图数据对象") +public class ScmApplyInboundVehQueryVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("主表sid") + private String mainSid; // 主表sid + @ApiModelProperty("物料编号") + private String vinNo; // 物料编号 + @ApiModelProperty("物料分组code") + private String mGroupCode; // 物料分组code + @ApiModelProperty("物料分组名称") + private String mGroupName; // 物料分组名称 + @ApiModelProperty("车辆类型key") + private String vehicleTypeKey; // 车辆类型key + @ApiModelProperty("车辆类型value") + private String vehicleTypeValue; // 车辆类型value + @ApiModelProperty("计量单位") + private String iunit; // 计量单位 + @ApiModelProperty("数量") + private String num; // 数量 + @ApiModelProperty("结算金额") + private String settleMoney; // 结算金额 + @ApiModelProperty("仓库sid") + private String localSid; // 仓库sid + @ApiModelProperty("仓库名称") + private String localName; // 仓库名称 + @ApiModelProperty("仓库编码") + private String localCode; // 仓库编码 + +} diff --git 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 index 3173b94946..64959c72f2 100644 --- 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 @@ -7,9 +7,12 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerAllVo; +import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerDetailsVo; import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerFeign; import com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBankFeign; import com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBankVo; +import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo; +import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeign; import com.yxt.anrui.base.api.basevehicle.BaseVehicle; import com.yxt.anrui.base.api.basevehicle.BaseVehicleDto; import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign; @@ -22,6 +25,7 @@ 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.busvehicleapplydetail.BusVehicleApplyDetailVo; import com.yxt.anrui.base.api.busvehicleorder.ActualAndOrgDeptVo; import com.yxt.anrui.base.api.busvehicleorder.BusVehicleOrderFeign; import com.yxt.anrui.base.api.commonappendix.CommonAttachTypeEnum; @@ -43,13 +47,16 @@ import com.yxt.anrui.portal.api.sysuser.SysUserVo; import com.yxt.anrui.scm.api.flow.FlowTaskVo; import com.yxt.anrui.scm.api.scmapplyinbound.*; import com.yxt.anrui.scm.api.scmapplyinbound.flow.GetNodeQuery; +import com.yxt.anrui.scm.api.scmapplyinboundquery.ScmApplyInboundQueryDto; import com.yxt.anrui.scm.api.scmapplyinboundvehicle.ScmApplyInboundVehicle; import com.yxt.anrui.scm.api.scmapplyinboundvehicle.ScmApplyInboundVehicleDto; import com.yxt.anrui.scm.api.scmapplyinboundvehicle.ScmApplyInboundVehicleVo; +import com.yxt.anrui.scm.api.scmapplyinboundvehquery.ScmApplyInboundVehQueryDto; import com.yxt.anrui.scm.api.scmfile.ScmFileDto; import com.yxt.anrui.scm.api.scmfile.ScmFileVo; import com.yxt.anrui.scm.api.scmvehinspectitem.ScmVehinspectItemDto; import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseVo; +import com.yxt.anrui.scm.biz.scmapplyinboundquery.ScmApplyInboundQueryService; import com.yxt.anrui.scm.biz.scmapplyinboundvehicle.ScmApplyInboundVehicleService; import com.yxt.anrui.scm.biz.scmfile.ScmFileService; import com.yxt.anrui.scm.biz.scmvehicleexamine.ScmVehicleExamineService; @@ -66,10 +73,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.UUID; +import java.util.*; import java.util.stream.Collectors; /** @@ -126,6 +130,12 @@ public class ScmApplyInboundService extends MybatisBaseService listPage(PagerQuery pq) { ScmApplyInboundQuery query = pq.getParams(); @@ -498,7 +508,47 @@ public class ScmApplyInboundService extends MybatisBaseService scmApplyInboundVehQuerys = new ArrayList<>(); + /*for (ScmApplyInboundVehicleDto scmApplyInboundVehicleDto : scmApplyInboundVehicleDtos) { + ScmApplyInboundVehQueryDto scmApplyInboundVehQueryDto = new ScmApplyInboundVehQueryDto(); + scmApplyInboundVehQueryDto.setVinNo(scmApplyInboundVehicleDto.getVinNo()); + scmApplyInboundVehQueryDto.setMGroupCode(scmApplyInboundVehicleDto.get); + scmApplyInboundVehQueryDto.setMGroupName(); + scmApplyInboundVehQueryDto.setVehicleTypeKey(); + scmApplyInboundVehQueryDto.setVehicleTypeValue(); + scmApplyInboundVehQueryDto.setIunit("辆"); + scmApplyInboundVehQueryDto.setNum("1"); + scmApplyInboundVehQueryDto.setSettleMoney(); + scmApplyInboundVehQueryDto.setLocalSid(); + scmApplyInboundVehQueryDto.setLocalName(); + scmApplyInboundVehQueryDto.setLocalCode(); + }*/ + scmApplyInboundQueryService.saveOrUpdateDto(scmApplyInboundQueryDto); + //入账审批通关修改采购订单状态 state = 1 if (booad.getManPurOrderTypeKey().equals(ManPurOrderType.ManOrderType.PC_ORDER.getCode())) { busVehicleOrderFeign.updateState(scmApplyInbound.getVehicleOrderSid()); } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundquery/ScmApplyInboundQueryMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundquery/ScmApplyInboundQueryMapper.java new file mode 100644 index 0000000000..cfaa616390 --- /dev/null +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundquery/ScmApplyInboundQueryMapper.java @@ -0,0 +1,65 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.biz.scmapplyinboundquery; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; +import com.yxt.anrui.scm.api.scmapplyinboundquery.ScmApplyInboundQuery; +import com.yxt.anrui.scm.api.scmapplyinboundquery.ScmApplyInboundQueryVo; + +import java.util.List; + +/** + * Project: anrui-scm(车辆入库单查询)
+ * File: ScmApplyInboundQueryMapper.java
+ * Class: com.yxt.anrui.scm.biz.scmapplyinboundquery.ScmApplyInboundQueryMapper
+ * Description: 车辆入库单查询.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-01-28 15:55:31
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Mapper +public interface ScmApplyInboundQueryMapper extends BaseMapper { + + //@Update("update scm_apply_inbound_query set name=#{msg} where id=#{id}") + //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + + List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); + + @Select("select * from scm_apply_inbound_query") + List selectListVo(); +} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundquery/ScmApplyInboundQueryMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundquery/ScmApplyInboundQueryMapper.xml new file mode 100644 index 0000000000..8f1a4f50c1 --- /dev/null +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundquery/ScmApplyInboundQueryMapper.xml @@ -0,0 +1,13 @@ + + + + + + + + + \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundquery/ScmApplyInboundQueryRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundquery/ScmApplyInboundQueryRest.java new file mode 100644 index 0000000000..0fd742fe6d --- /dev/null +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundquery/ScmApplyInboundQueryRest.java @@ -0,0 +1,100 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.biz.scmapplyinboundquery; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import com.yxt.anrui.scm.api.scmapplyinboundquery.ScmApplyInboundQuery; +import com.yxt.anrui.scm.api.scmapplyinboundquery.ScmApplyInboundQueryQuery; +import com.yxt.anrui.scm.api.scmapplyinboundquery.ScmApplyInboundQueryVo; +import com.yxt.anrui.scm.api.scmapplyinboundquery.ScmApplyInboundQueryDetailsVo; +import com.yxt.anrui.scm.api.scmapplyinboundquery.ScmApplyInboundQueryDto; +import com.yxt.anrui.scm.api.scmapplyinboundquery.ScmApplyInboundQueryFeign; + +/** + * Project: anrui-scm(车辆入库单查询)
+ * File: ScmApplyInboundQueryFeignFallback.java
+ * Class: com.yxt.anrui.scm.biz.scmapplyinboundquery.ScmApplyInboundQueryRest
+ * Description: 车辆入库单查询.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-01-28 15:55:31
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "车辆入库单查询") +@RestController("com.yxt.anrui.scm.biz.scmapplyinboundquery.ScmApplyInboundQueryRest") +@RequestMapping("v1/scmapplyinboundquery") +public class ScmApplyInboundQueryRest implements ScmApplyInboundQueryFeign { + + @Autowired + private ScmApplyInboundQueryService scmApplyInboundQueryService; + + @Override + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = scmApplyInboundQueryService.listPageVo(pq); + return rb.success().setData(pv); + } + + @Override + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody ScmApplyInboundQueryDto dto){ + ResultBean rb = ResultBean.fireFail(); + scmApplyInboundQueryService.saveOrUpdateDto(dto); + return rb.success(); + } + + @Override + @ApiOperation("根据sid批量删除") + @PostMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids){ + ResultBean rb = ResultBean.fireFail(); + scmApplyInboundQueryService.delBySids(sids); + return rb.success(); + } + + @Override + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ + ResultBean rb = ResultBean.fireFail(); + ScmApplyInboundQueryDetailsVo vo = scmApplyInboundQueryService.fetchDetailsVoBySid(sid); + return rb.success().setData(vo); + } +} diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundquery/ScmApplyInboundQueryService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundquery/ScmApplyInboundQueryService.java new file mode 100644 index 0000000000..8cf7801b7f --- /dev/null +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundquery/ScmApplyInboundQueryService.java @@ -0,0 +1,110 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.biz.scmapplyinboundquery; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.commons.lang3.StringUtils; +import com.yxt.common.base.service.MybatisBaseService; +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.scm.api.scmapplyinboundquery.ScmApplyInboundQuery; +import com.yxt.anrui.scm.api.scmapplyinboundquery.ScmApplyInboundQueryQuery; +import com.yxt.anrui.scm.api.scmapplyinboundquery.ScmApplyInboundQueryVo; +import com.yxt.anrui.scm.api.scmapplyinboundquery.ScmApplyInboundQueryDetailsVo; +import com.yxt.anrui.scm.api.scmapplyinboundquery.ScmApplyInboundQueryDto; +import com.yxt.anrui.scm.api.scmapplyinboundquery.ScmApplyInboundQueryFeign; + +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * Project: anrui-scm(车辆入库单查询)
+ * File: ScmApplyInboundQueryService.java
+ * Class: com.yxt.anrui.scm.biz.scmapplyinboundquery.ScmApplyInboundQueryService
+ * Description: 车辆入库单查询 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-01-28 15:55:31
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Service +public class ScmApplyInboundQueryService extends MybatisBaseService { + private QueryWrapper createQueryWrapper(ScmApplyInboundQueryQuery query) { + // todo: 这里根据具体业务调整查询条件 + // 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); + QueryWrapper qw = new QueryWrapper<>(); + return qw; + } + + public PagerVo listPageVo(PagerQuery pq) { + ScmApplyInboundQueryQuery query = pq.getParams(); + QueryWrapper qw = createQueryWrapper(query); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public void saveOrUpdateDto(ScmApplyInboundQueryDto dto){ + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) {//新增 + this.insertByDto(dto); + return; + } + this.updateByDto(dto); + } + + public void insertByDto(ScmApplyInboundQueryDto dto){ + ScmApplyInboundQuery entity = new ScmApplyInboundQuery(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + } + + public void updateByDto(ScmApplyInboundQueryDto dto){ + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + return; + } + ScmApplyInboundQuery entity = fetchBySid(dtoSid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + } + + public ScmApplyInboundQueryDetailsVo fetchDetailsVoBySid(String sid){ + ScmApplyInboundQuery entity = fetchBySid(sid); + ScmApplyInboundQueryDetailsVo vo = new ScmApplyInboundQueryDetailsVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } +} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundvehquery/ScmApplyInboundVehQueryMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundvehquery/ScmApplyInboundVehQueryMapper.java new file mode 100644 index 0000000000..e8fdf674a7 --- /dev/null +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundvehquery/ScmApplyInboundVehQueryMapper.java @@ -0,0 +1,65 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.biz.scmapplyinboundvehquery; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; +import com.yxt.anrui.scm.api.scmapplyinboundvehquery.ScmApplyInboundVehQuery; +import com.yxt.anrui.scm.api.scmapplyinboundvehquery.ScmApplyInboundVehQueryVo; + +import java.util.List; + +/** + * Project: anrui-scm(车辆入库单查询)
+ * File: ScmApplyInboundVehQueryMapper.java
+ * Class: com.yxt.anrui.scm.biz.scmapplyinboundvehquery.ScmApplyInboundVehQueryMapper
+ * Description: 车辆入库单车辆查询.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-01-28 15:55:31
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Mapper +public interface ScmApplyInboundVehQueryMapper extends BaseMapper { + + //@Update("update scm_apply_inbound_veh_query set name=#{msg} where id=#{id}") + //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + + List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); + + @Select("select * from scm_apply_inbound_veh_query") + List selectListVo(); +} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundvehquery/ScmApplyInboundVehQueryMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundvehquery/ScmApplyInboundVehQueryMapper.xml new file mode 100644 index 0000000000..5dc71394da --- /dev/null +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundvehquery/ScmApplyInboundVehQueryMapper.xml @@ -0,0 +1,13 @@ + + + + + + + + + \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundvehquery/ScmApplyInboundVehQueryRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundvehquery/ScmApplyInboundVehQueryRest.java new file mode 100644 index 0000000000..72700d729a --- /dev/null +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundvehquery/ScmApplyInboundVehQueryRest.java @@ -0,0 +1,100 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.biz.scmapplyinboundvehquery; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import com.yxt.anrui.scm.api.scmapplyinboundvehquery.ScmApplyInboundVehQuery; +import com.yxt.anrui.scm.api.scmapplyinboundvehquery.ScmApplyInboundVehQueryQuery; +import com.yxt.anrui.scm.api.scmapplyinboundvehquery.ScmApplyInboundVehQueryVo; +import com.yxt.anrui.scm.api.scmapplyinboundvehquery.ScmApplyInboundVehQueryDetailsVo; +import com.yxt.anrui.scm.api.scmapplyinboundvehquery.ScmApplyInboundVehQueryDto; +import com.yxt.anrui.scm.api.scmapplyinboundvehquery.ScmApplyInboundVehQueryFeign; + +/** + * Project: anrui-scm(车辆入库单查询)
+ * File: ScmApplyInboundVehQueryFeignFallback.java
+ * Class: com.yxt.anrui.scm.biz.scmapplyinboundvehquery.ScmApplyInboundVehQueryRest
+ * Description: 车辆入库单车辆查询.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-01-28 15:55:31
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "车辆入库单车辆查询") +@RestController("com.yxt.anrui.scm.biz.scmapplyinboundvehquery.ScmApplyInboundVehQueryRest") +@RequestMapping("v1/scmapplyinboundvehquery") +public class ScmApplyInboundVehQueryRest implements ScmApplyInboundVehQueryFeign { + + @Autowired + private ScmApplyInboundVehQueryService scmApplyInboundVehQueryService; + + @Override + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = scmApplyInboundVehQueryService.listPageVo(pq); + return rb.success().setData(pv); + } + + @Override + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody ScmApplyInboundVehQueryDto dto){ + ResultBean rb = ResultBean.fireFail(); + scmApplyInboundVehQueryService.saveOrUpdateDto(dto); + return rb.success(); + } + + @Override + @ApiOperation("根据sid批量删除") + @PostMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids){ + ResultBean rb = ResultBean.fireFail(); + scmApplyInboundVehQueryService.delBySids(sids); + return rb.success(); + } + + @Override + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ + ResultBean rb = ResultBean.fireFail(); + ScmApplyInboundVehQueryDetailsVo vo = scmApplyInboundVehQueryService.fetchDetailsVoBySid(sid); + return rb.success().setData(vo); + } +} diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundvehquery/ScmApplyInboundVehQueryService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundvehquery/ScmApplyInboundVehQueryService.java new file mode 100644 index 0000000000..b7521c8e27 --- /dev/null +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundvehquery/ScmApplyInboundVehQueryService.java @@ -0,0 +1,110 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.biz.scmapplyinboundvehquery; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.commons.lang3.StringUtils; +import com.yxt.common.base.service.MybatisBaseService; +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.scm.api.scmapplyinboundvehquery.ScmApplyInboundVehQuery; +import com.yxt.anrui.scm.api.scmapplyinboundvehquery.ScmApplyInboundVehQueryQuery; +import com.yxt.anrui.scm.api.scmapplyinboundvehquery.ScmApplyInboundVehQueryVo; +import com.yxt.anrui.scm.api.scmapplyinboundvehquery.ScmApplyInboundVehQueryDetailsVo; +import com.yxt.anrui.scm.api.scmapplyinboundvehquery.ScmApplyInboundVehQueryDto; +import com.yxt.anrui.scm.api.scmapplyinboundvehquery.ScmApplyInboundVehQueryFeign; + +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * Project: anrui-scm(车辆入库单查询)
+ * File: ScmApplyInboundVehQueryService.java
+ * Class: com.yxt.anrui.scm.biz.scmapplyinboundvehquery.ScmApplyInboundVehQueryService
+ * Description: 车辆入库单车辆查询 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-01-28 15:55:31
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Service +public class ScmApplyInboundVehQueryService extends MybatisBaseService { + private QueryWrapper createQueryWrapper(ScmApplyInboundVehQueryQuery query) { + // todo: 这里根据具体业务调整查询条件 + // 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); + QueryWrapper qw = new QueryWrapper<>(); + return qw; + } + + public PagerVo listPageVo(PagerQuery pq) { + ScmApplyInboundVehQueryQuery query = pq.getParams(); + QueryWrapper qw = createQueryWrapper(query); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public void saveOrUpdateDto(ScmApplyInboundVehQueryDto dto){ + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + this.insertByDto(dto); + return; + } + this.updateByDto(dto); + } + + public void insertByDto(ScmApplyInboundVehQueryDto dto){ + ScmApplyInboundVehQuery entity = new ScmApplyInboundVehQuery(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + } + + public void updateByDto(ScmApplyInboundVehQueryDto dto){ + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + return; + } + ScmApplyInboundVehQuery entity = fetchBySid(dtoSid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + } + + public ScmApplyInboundVehQueryDetailsVo fetchDetailsVoBySid(String sid){ + ScmApplyInboundVehQuery entity = fetchBySid(sid); + ScmApplyInboundVehQueryDetailsVo vo = new ScmApplyInboundVehQueryDetailsVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } +} \ No newline at end of file