From 13e24fa8c93b1ba47f27f42303e5f2c47c8044f0 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Fri, 8 Jul 2022 17:53:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B0=83=E8=BD=A6=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E3=80=81=E4=BF=AE=E6=94=B9=E5=85=A5=E8=B4=A6=E7=94=B3?= =?UTF-8?q?=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseInternalPurchase.java | 20 ++++++++----- .../BaseInternalPurchaseDetailsVo.java | 20 ++++++++----- .../BaseInternalPurchaseDto.java | 20 ++++++++----- .../BaseInternalPurchaseVo.java | 10 ++++--- .../base/api/basevehicle/BaseVehicle.java | 10 ++++--- .../base/api/basevehicle/BaseVehicleDto.java | 6 ++++ .../BaseInternalPurchaseMapper.java | 2 ++ .../BaseInternalPurchaseMapper.xml | 7 +++++ .../BaseInternalPurchaseService.java | 5 ++++ .../BaseModelModpriceMapper.java | 2 ++ .../BaseModelModpriceMapper.xml | 7 +++++ .../BaseModelModpriceService.java | 5 ++++ .../api/scmapplyinbound/ScmApplyInbound.java | 30 +++++++++++++++++-- .../scmapplyinbound/ScmApplyInboundDto.java | 28 ++++++++++++++++- .../scmapplyinbound/ScmApplyInboundVo.java | 24 +++++++++++++++ .../ScmApplyInboundService.java | 12 ++++++++ 16 files changed, 173 insertions(+), 35 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/BaseInternalPurchase.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/BaseInternalPurchase.java index f214f26e32..ef6a014085 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/BaseInternalPurchase.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/BaseInternalPurchase.java @@ -54,14 +54,18 @@ public class BaseInternalPurchase extends BaseEntity { private String applyNo; // 申请编号 @ApiModelProperty("申请人姓名") private String applyPeoName; // 申请人姓名 - @ApiModelProperty("购方机构sid") - private String buyerOrgSid; // 购方机构sid - @ApiModelProperty("购方机构名称") - private String buyerOrgName; // 购方机构名称 - @ApiModelProperty("售方机构sid") - private String sellerOrgSid; // 售方机构sid - @ApiModelProperty("售方机构名称") - private String sellerOrgName; // 售方机构名称 + @ApiModelProperty("调入分公司sid") + private String buyerOrgSid; // 调入分公司sid + @ApiModelProperty("调入分公司名称") + private String buyerOrgName; // 调入分公司名称 + @ApiModelProperty("调出分公司sid") + private String sellerOrgSid; // 调出分公司sid + @ApiModelProperty("调出分公司名称") + private String sellerOrgName; // 调出分公司名称 + @ApiModelProperty("调车类型（0调入，1调出）") + private String shuntingType; // 调车类型（0调入，1调出） + @ApiModelProperty("车辆数量") + private String num; // 车辆数量 @ApiModelProperty("使用组织sid") private String useOrgSid; // 使用组织sid @ApiModelProperty("创建组织sid") diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/BaseInternalPurchaseDetailsVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/BaseInternalPurchaseDetailsVo.java index 8a8daf3f3f..09c1b4a6ed 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/BaseInternalPurchaseDetailsVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/BaseInternalPurchaseDetailsVo.java @@ -66,14 +66,18 @@ public class BaseInternalPurchaseDetailsVo implements Vo { private String createBySid; // 创建人sid @ApiModelProperty("申请人姓名") private String applyPeoName; // 申请人姓名 - @ApiModelProperty("购方机构sid") - private String buyerOrgSid; // 购方机构sid - @ApiModelProperty("购方机构名称") - private String buyerOrgName; // 购方机构名称 - @ApiModelProperty("售方机构sid") - private String sellerOrgSid; // 售方机构sid - @ApiModelProperty("售方机构名称") - private String sellerOrgName; // 售方机构名称 + @ApiModelProperty("调入分公司sid") + private String buyerOrgSid; // 调入分公司sid + @ApiModelProperty("调入分公司名称") + private String buyerOrgName; // 调入分公司名称 + @ApiModelProperty("调出分公司sid") + private String sellerOrgSid; // 调出分公司sid + @ApiModelProperty("调出分公司名称") + private String sellerOrgName; // 调出分公司名称 + @ApiModelProperty("调车类型（0调入，1调出）") + private String shuntingType; // 调车类型（0调入，1调出） + @ApiModelProperty("车辆数量") + private String num; // 车辆数量 @ApiModelProperty("使用组织sid") private String useOrgSid; // 使用组织sid @ApiModelProperty("创建组织sid") diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/BaseInternalPurchaseDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/BaseInternalPurchaseDto.java index 911d6e697b..d92fc32306 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/BaseInternalPurchaseDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/BaseInternalPurchaseDto.java @@ -60,14 +60,18 @@ public class BaseInternalPurchaseDto implements Dto { private String applyNo; // 申请编号 @ApiModelProperty("申请人姓名") private String applyPeoName; // 申请人姓名 - @ApiModelProperty("购方机构sid") - private String buyerOrgSid; // 购方机构sid - @ApiModelProperty("购方机构名称") - private String buyerOrgName; // 购方机构名称 - @ApiModelProperty("售方机构sid") - private String sellerOrgSid; // 售方机构sid - @ApiModelProperty("售方机构名称") - private String sellerOrgName; // 售方机构名称 + @ApiModelProperty("调入分公司sid") + private String buyerOrgSid; // 调入分公司sid + @ApiModelProperty("调入分公司名称") + private String buyerOrgName; // 调入分公司名称 + @ApiModelProperty("调出分公司sid") + private String sellerOrgSid; // 调出分公司sid + @ApiModelProperty("调出分公司名称") + private String sellerOrgName; // 调出分公司名称 + @ApiModelProperty("调车类型（0调入，1调出）") + private String shuntingType; // 调车类型（0调入，1调出） + @ApiModelProperty("车辆数量") + private String num; // 车辆数量 @ApiModelProperty("使用组织sid") private String useOrgSid; // 使用组织sid @ApiModelProperty("创建组织sid") diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/BaseInternalPurchaseVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/BaseInternalPurchaseVo.java index d37c79f108..517cf89406 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/BaseInternalPurchaseVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/BaseInternalPurchaseVo.java @@ -65,8 +65,10 @@ public class BaseInternalPurchaseVo implements Vo { private Date createTime; // 申请日期 @ApiModelProperty("台数") private String num; // 台数 - @ApiModelProperty("购方机构名称") - private String buyerOrgName; // 购方机构名称 - @ApiModelProperty("售方机构名称") - private String sellerOrgName; // 售方机构名称 + @ApiModelProperty("调入分公司名称") + private String buyerOrgName; // 调入分公司名称 + @ApiModelProperty("调出分公司名称") + private String sellerOrgName; // 调出分公司名称 + @ApiModelProperty("调车类型（0调入，1调出）") + private String shuntingType; // 调车类型（0调入，1调出） } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicle.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicle.java index f21042e782..0766f87b83 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicle.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicle.java @@ -63,18 +63,18 @@ public class BaseVehicle extends BaseEntity { private String orderingNo; @ApiModelProperty(value = "入库价") - private float costPriced; + private Integer costPriced; @ApiModelProperty(value = "运费") - private float freight; + private Integer freight; @ApiModelProperty(value = "厂家合同价") - private float contractPrice; + private Integer contractPrice; @ApiModelProperty(value = "厂家入库日期") private Date priceDate; @ApiModelProperty(value = "实销日期") private Date solidDate; @ApiModelProperty(value = "指导价") - private float salePrice; + private Integer salePrice; @ApiModelProperty("创建组织(陕汽必须的字段)") private String createOrgSid; @@ -131,4 +131,6 @@ public class BaseVehicle extends BaseEntity { private String manPurOrderTypeValue; @ApiModelProperty("特殊或差异说明") private String specialInstructions; + @ApiModelProperty("内部编码") + private String insideCode; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleDto.java index 51343bc219..4c2e271a86 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleDto.java @@ -81,6 +81,8 @@ public class BaseVehicleDto implements Dto { private String locationName; @ApiModelProperty(value = "厂家入库价") private Integer costPriced; + @ApiModelProperty(value = "厂家合同价") + private Integer contractPrice; @ApiModelProperty(value = "成交价") private Integer salePrice; @ApiModelProperty("保修卡号") @@ -97,4 +99,8 @@ public class BaseVehicleDto implements Dto { private String useOrgSid; @ApiModelProperty("使用组织名称") private String useOrgName; + @ApiModelProperty("内部编码") + private String insideCode; + @ApiModelProperty(value = "运费") + private Integer freight; } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseMapper.java index dfa26b682f..7e4b9f4957 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseMapper.java @@ -67,4 +67,6 @@ public interface BaseInternalPurchaseMapper extends BaseMapper beanToMap); int selectNum(String bill); + + int selectBySid(String join); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseMapper.xml index 1cae8f5424..74ec65715b 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseMapper.xml @@ -47,4 +47,11 @@ from base_internal_purchase where applyNo LIKE concat(#{bill}, '%') + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java index f2bf345e06..11a13f27f8 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java @@ -203,6 +203,11 @@ public class BaseInternalPurchaseService extends MybatisBaseService 0) { + return rb.setMsg("删除的数据中包含已经提交审批的数据，删除失败"); + } delBySids(sids); for (String sid : sids) { baseInternalPurchaseVehicleService.delByMainSid(sid); diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceMapper.java index ecc21f9d57..d3383932fc 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceMapper.java @@ -65,4 +65,6 @@ public interface BaseModelModpriceMapper extends BaseMapper { List selectListVo(); int updateFlowFiled(Map beanToMap); + + int selectBySid(String join); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceMapper.xml index 8515073d7a..0f33e4440b 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceMapper.xml @@ -33,4 +33,11 @@ WHERE sid=#{sid} + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceService.java index 8503c1d9c4..2182178cb9 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceService.java @@ -158,6 +158,11 @@ public class BaseModelModpriceService extends MybatisBaseService 0) { + return rb.setMsg("删除的数据中包含已经提交审批的数据，删除失败"); + } delBySids(sids); for (String sid : sids) { baseModelModpriceModelService.delByMainSid(sid); diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInbound.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInbound.java index a2e70f187c..3facf4da4c 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInbound.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInbound.java @@ -6,6 +6,8 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.math.BigDecimal; + /** * Project: anrui-scm(进销存)
* File: ScmApplyInbound.java
@@ -54,9 +56,33 @@ public class ScmApplyInbound extends BaseEntity { @ApiModelProperty("常用配置Sid") private String configSid; - - @ApiModelProperty("厂家发车日期") + @ApiModelProperty("厂家合同价") + private BigDecimal contractPrice; + @ApiModelProperty("其中上装价格") + private BigDecimal amongSzPrice; + @ApiModelProperty("上装价格计算依据") + private String szPriceCalBasis; + @ApiModelProperty("一次运费") + private BigDecimal onceFreight; + @ApiModelProperty("二次运费") + private BigDecimal secondaryFreight; + @ApiModelProperty("下浮比例") + private String lowerProportion; + @ApiModelProperty("下浮金额") + private BigDecimal lowerMoney; + @ApiModelProperty("下浮合计") + private BigDecimal lowerTotal; + @ApiModelProperty("下浮备注") + private String lowerRemarks; + @ApiModelProperty("厂家结算价") + private BigDecimal costPrice; + @ApiModelProperty("内部编码") + private String insideCode; + + @ApiModelProperty("厂家发车日期") private String departureDate; + @ApiModelProperty("厂家入库日期") + private String priceDate; @ApiModelProperty("'流程定义的id'") private String procDefId; diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundDto.java index f0f8bcae4c..88d55dcb54 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundDto.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundDto.java @@ -11,6 +11,7 @@ import lombok.Data; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import javax.validation.constraints.Pattern; +import java.math.BigDecimal; import java.util.List; /** @@ -73,7 +74,32 @@ public class ScmApplyInboundDto implements Dto { private String configName; @ApiModelProperty("常用配置Sid") private String configSid; - + + @ApiModelProperty("厂家合同价") + private BigDecimal contractPrice; + @ApiModelProperty("其中上装价格") + private BigDecimal amongSzPrice; + @ApiModelProperty("上装价格计算依据") + private String szPriceCalBasis; + @ApiModelProperty("一次运费") + private BigDecimal onceFreight; + @ApiModelProperty("二次运费") + private BigDecimal secondaryFreight; + @ApiModelProperty("下浮比例") + private String lowerProportion; + @ApiModelProperty("下浮金额") + private BigDecimal lowerMoney; + @ApiModelProperty("下浮合计") + private BigDecimal lowerTotal; + @ApiModelProperty("下浮备注") + private String lowerRemarks; + @ApiModelProperty("厂家结算价") + private BigDecimal costPrice; + @ApiModelProperty("内部编码") + private String insideCode; + + @ApiModelProperty("厂家入库日期") + private String priceDate; @ApiModelProperty("厂家发车日期") private String departureDate; diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundVo.java index 4fb3c9ff2c..cd68e1ea62 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundVo.java @@ -8,6 +8,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.math.BigDecimal; import java.util.List; /** @@ -56,6 +57,29 @@ public class ScmApplyInboundVo implements Vo { @ApiModelProperty("常用配置 ") private String configName; + + @ApiModelProperty("厂家合同价") + private BigDecimal contractPrice; + @ApiModelProperty("其中上装价格") + private BigDecimal amongSzPrice; + @ApiModelProperty("上装价格计算依据") + private String szPriceCalBasis; + @ApiModelProperty("一次运费") + private BigDecimal onceFreight; + @ApiModelProperty("二次运费") + private BigDecimal secondaryFreight; + @ApiModelProperty("下浮比例") + private String lowerProportion; + @ApiModelProperty("下浮金额") + private BigDecimal lowerMoney; + @ApiModelProperty("下浮合计") + private BigDecimal lowerTotal; + @ApiModelProperty("下浮备注") + private String lowerRemarks; + @ApiModelProperty("厂家结算价") + private BigDecimal costPrice; + @ApiModelProperty("内部编码") + private String insideCode; @ApiModelProperty("厂家发车日期") private String departureDate; 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 91bff957e4..03d981b575 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 @@ -388,6 +388,18 @@ public class ScmApplyInboundService extends MybatisBaseService