diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateExcelVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateExcelVo.java index 7c9543e065..a025c670e6 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateExcelVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateExcelVo.java @@ -28,6 +28,8 @@ package com.yxt.anrui.scm.api.scmspecialrebate; import com.yxt.common.core.utils.ExportEntityMap; import lombok.Data; +import java.math.BigDecimal; + @Data public class ScmSpecialRebateExcelVo { @@ -49,8 +51,12 @@ public class ScmSpecialRebateExcelVo { private String rebateName; @ExportEntityMap(CnName = "预计返利", EnName = "estimateRebate") private String estimateRebate; - @ExportEntityMap(CnName = "其中预计费用", EnName = "expectCost") - private String expectCost; + @ExportEntityMap(CnName = "其中支出费用", EnName = "expectItureCost") + private String expectItureCost; + @ExportEntityMap(CnName = "其中待支付费用", EnName = "expectTreatCost") + private String expectTreatCost; + @ExportEntityMap(CnName = "其中抵顶费用", EnName = "expectSuppCost") + private String expectSuppCost; @ExportEntityMap(CnName = "所属年月", EnName = "palceGenDate") private String palceGenDate; @ExportEntityMap(CnName = "预提日期", EnName = "withholdingDate") @@ -65,8 +71,18 @@ public class ScmSpecialRebateExcelVo { private String secondaryUploadMoney; @ExportEntityMap(CnName = "其中待确定金额", EnName = "stayDetermineMoney") private String stayDetermineMoney; - @ExportEntityMap(CnName = "其中费用", EnName = "money") - private String money; + @ExportEntityMap(CnName = "一次支出费用", EnName = "onceItureCost") + private BigDecimal onceItureCost; + @ExportEntityMap(CnName = "一次待支付费用", EnName = "onceTreatCost") + private BigDecimal onceTreatCost; + @ExportEntityMap(CnName = "一次抵顶费用", EnName = "onceSuppCost") + private BigDecimal onceSuppCost; + @ExportEntityMap(CnName = "二次支出费用", EnName = "secondItureCost") + private BigDecimal secondItureCost; + @ExportEntityMap(CnName = "二次待支付费用", EnName = "secondTreatCost") + private BigDecimal secondTreatCost; + @ExportEntityMap(CnName = "二次抵顶费用", EnName = "secondSuppCost") + private BigDecimal secondSuppCost; @ExportEntityMap(CnName = "差异金额", EnName = "diffAmount") private String diffAmount; @ExportEntityMap(CnName = "是否调整", EnName = "isAdjustment") diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateExcelVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateExcelVo.java index d2e1fa58a3..6dd03cab06 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateExcelVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateExcelVo.java @@ -26,8 +26,11 @@ package com.yxt.anrui.scm.api.scmvehrebate; import com.yxt.common.core.utils.ExportEntityMap; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.math.BigDecimal; + @Data public class ScmVehRebateExcelVo { @@ -83,8 +86,14 @@ public class ScmVehRebateExcelVo { private String secondaryUploadMoney; @ExportEntityMap(CnName = "待确定金额", EnName = "stayDetermineMoney") private String stayDetermineMoney; - @ExportEntityMap(CnName = "费用", EnName = "money") - private String money; + @ExportEntityMap(CnName = "一次待支付费用", EnName = "onceTreatCost") + private BigDecimal onceTreatCost; + @ExportEntityMap(CnName = "一次抵顶费用", EnName = "onceSuppCost") + private BigDecimal onceSuppCost; + @ExportEntityMap(CnName = "二次待支付费用", EnName = "secondTreatCost") + private BigDecimal secondTreatCost; + @ExportEntityMap(CnName = "二次抵顶费用", EnName = "secondSuppCost") + private BigDecimal secondSuppCost; @ExportEntityMap(CnName = "是否调整", EnName = "isAdjustment") private String isAdjustment; @ExportEntityMap(CnName = "差异金额", EnName = "diffAmount") diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateMapper.xml index 7270ff6d3b..7f5d87416f 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateMapper.xml @@ -142,9 +142,6 @@ SELECT *, @row_number := @row_number + 1 AS rankNo, - expectItureCost + expectTreatCost + expectSuppCost AS expectCost, - expectItureCost + expectTreatCost + expectSuppCost AS withholdCost, - onceItureCost + onceTreatCost + onceSuppCost + secondItureCost + secondTreatCost + secondSuppCost AS money FROM scm_special_rebate,( SELECT @row_number := 0 diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.xml index f8794b59ed..684e4514ad 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.xml @@ -110,7 +110,6 @@ *, @row_number := @row_number + 1 AS rankNo, sid AS vehRebateSid, - onceTreatCost + onceSuppCost + secondTreatCost + secondSuppCost AS money FROM scm_veh_rebate,( SELECT diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/specialrebatewithapply/AppSpecialRebateWithApplyFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/specialrebatewithapply/AppSpecialRebateWithApplyFeign.java index 2a325c3f0e..fe33f98c1e 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/specialrebatewithapply/AppSpecialRebateWithApplyFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/specialrebatewithapply/AppSpecialRebateWithApplyFeign.java @@ -19,7 +19,6 @@ import java.util.List; * @Date * @Description */ -@Api(tags = "售后盘盈入库") @FeignClient( contextId = "terminal-AppSpecialRebateWithApply", name = "anrui-terminal", diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/collectionrebatecheckapply/AppCollectionrebateCheckapplyFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/collectionrebatecheckapply/AppCollectionrebateCheckapplyFeign.java index 7117a78ad9..fc99d6edf6 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/collectionrebatecheckapply/AppCollectionrebateCheckapplyFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/collectionrebatecheckapply/AppCollectionrebateCheckapplyFeign.java @@ -20,7 +20,6 @@ import java.util.List; * @Date * @Description */ -@Api(tags = "售后盘盈入库") @FeignClient( contextId = "terminal-AppCollectionrebateCheckapply", name = "anrui-terminal", diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/specialrebatedistribute/AppSpecialrebatedistributeFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/specialrebatedistribute/AppSpecialrebatedistributeFeign.java index b7a43fa5e4..ebdec67066 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/specialrebatedistribute/AppSpecialrebatedistributeFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/specialrebatedistribute/AppSpecialrebatedistributeFeign.java @@ -21,7 +21,6 @@ import java.util.List; * @Date * @Description */ -@Api(tags = "售后盘盈入库") @FeignClient( contextId = "terminal-AppSpecialrebatedistribute", name = "anrui-terminal", diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehrebatecheckapply/AppVehrebateCheckapplyFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehrebatecheckapply/AppVehrebateCheckapplyFeign.java index 2b0a1666cd..e94e5379e6 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehrebatecheckapply/AppVehrebateCheckapplyFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehrebatecheckapply/AppVehrebateCheckapplyFeign.java @@ -19,7 +19,6 @@ import java.util.List; * @Date * @Description */ -@Api(tags = "售后盘盈入库") @FeignClient( contextId = "terminal-AppVehrebateCheckapply", name = "anrui-terminal", diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehrebatewithapply/AppVehRebateWithApplyFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehrebatewithapply/AppVehRebateWithApplyFeign.java index a67315f312..d505aa4da0 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehrebatewithapply/AppVehRebateWithApplyFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehrebatewithapply/AppVehRebateWithApplyFeign.java @@ -21,7 +21,6 @@ import java.util.List; * @Date * @Description */ -@Api(tags = "售后盘盈入库") @FeignClient( contextId = "terminal-AppVehRebateWithApply", name = "anrui-terminal", diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/otheroutapply/AppOtherOutApplyFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/otheroutapply/AppOtherOutApplyFeign.java index 3e086970ff..8c6cf5aa92 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/otheroutapply/AppOtherOutApplyFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/otheroutapply/AppOtherOutApplyFeign.java @@ -17,7 +17,6 @@ import org.springframework.web.bind.annotation.*; * @Date * @Description */ -@Api(tags = "售后盘盈入库") @FeignClient( contextId = "terminal-AppOtherOutApply", name = "anrui-terminal", diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/wms/inventoryprofitin/WmsInventoryProfitinRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/wms/inventoryprofitin/WmsInventoryProfitinRest.java index b78461fa74..370157a101 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/wms/inventoryprofitin/WmsInventoryProfitinRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/wms/inventoryprofitin/WmsInventoryProfitinRest.java @@ -25,23 +25,18 @@ *********************************************************/ package com.yxt.anrui.terminal.biz.wms.inventoryprofitin; -import com.yxt.anrui.terminal.api.wms.inventorycheckbill.*; import com.yxt.anrui.terminal.api.wms.inventoryprofitin.AppInventoryProfitinDetailsVo; import com.yxt.anrui.terminal.api.wms.inventoryprofitin.AppInventoryProfitinFeign; import com.yxt.anrui.terminal.api.wms.inventoryprofitin.flowable.AppDelegateQuery; import com.yxt.anrui.terminal.api.wms.inventoryprofitin.flowable.InventInDto; import com.yxt.anrui.terminal.api.wms.inventoryprofitin.flowable.InventInQuery; import com.yxt.anrui.terminal.api.wms.inventoryprofitin.flowable.InventInTaskQuery; -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 org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import java.util.List; - @Api(tags = "售后盘盈入库") @RestController @RequestMapping("v1/inventorysurplus")