Browse Source

问题修改

zhanglei
God 3 years ago
parent
commit
b59e7481fd
  1. 4
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerbank/BaseManufacturerBankFeign.java
  2. 5
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerbank/BaseManufacturerBankFeignFallback.java
  3. 4
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java
  4. 5
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java
  5. 6
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/VehicleModelPriceVo.java
  6. 4
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java
  7. 2
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.java
  8. 29
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.xml
  9. 5
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankRest.java
  10. 7
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankService.java
  11. 2
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerretware/BaseManufacturerRetwareService.java
  12. 20
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java
  13. 2
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java
  14. 6
      anrui-fin/anrui-fin-biz/pom.xml
  15. 4
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/AnruiFinApplication.java
  16. 50
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java
  17. 2
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/push/PushService.java
  18. 2
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stkInstockNumber/FinStkInstockNumberService.java
  19. 2
      anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flowtask/FlowTask.java
  20. 2
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateDetailsVo.java
  21. 12
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateFeign.java
  22. 10
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateFeignFallback.java
  23. 4
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateQuery.java
  24. 5
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateVo.java
  25. 15
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/StayCheckUpAgre.java
  26. 2
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyDetailsVo.java
  27. 6
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyVo.java
  28. 20
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailDetailsVo.java
  29. 3
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistribution/ScmCollectionRebateDistribution.java
  30. 10
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistribution/ScmCollectionRebateDistributionDetailsVo.java
  31. 8
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistribution/ScmCollectionRebateDistributionDto.java
  32. 2
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistribution/ScmCollectionRebateDistributionVo.java
  33. 70
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVeh.java
  34. 71
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehDetailsVo.java
  35. 71
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehDto.java
  36. 78
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehFeign.java
  37. 72
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehFeignFallback.java
  38. 69
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehQuery.java
  39. 71
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehVo.java
  40. 15
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebateveh/ScmCollectionRebateVeh.java
  41. 24
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebateveh/ScmCollectionRebateVehDetailsVo.java
  42. 24
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebateveh/ScmCollectionRebateVehDto.java
  43. 24
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebateveh/ScmCollectionRebateVehVo.java
  44. 2
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java
  45. 10
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateRest.java
  46. 437
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateService.java
  47. 20
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyRest.java
  48. 55
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyService.java
  49. 5
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailMapper.java
  50. 33
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailMapper.xml
  51. 8
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailService.java
  52. 4
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatedistribution/ScmCollectionRebateDistributionMapper.java
  53. 39
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatedistribution/ScmCollectionRebateDistributionService.java
  54. 73
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehMapper.java
  55. 13
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehMapper.xml
  56. 100
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehRest.java
  57. 118
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehService.java
  58. 1
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebateveh/ScmCollectionRebateVehMapper.java
  59. 2
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebateveh/ScmCollectionRebateVehService.java
  60. 7
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewith/ScmCollectionRebateWithService.java
  61. 1
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyService.java
  62. 2
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java
  63. 1
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java

4
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerbank/BaseManufacturerBankFeign.java

@ -59,4 +59,8 @@ public interface BaseManufacturerBankFeign {
@ApiOperation("根据厂商开户行sid查询开户行信息")
@GetMapping("/details/{sid}")
public ResultBean<BaseManufacturerBankVo> details(@PathVariable("sid") String sid);
@ApiOperation("根据品牌sid和厂家回款通路名称查询银行账号")
@GetMapping("/selectBankAccount/{brandSid}/{manufaSaleChannelValue}")
ResultBean<String> selectBankAccount(@PathVariable("brandSid") String brandSid,@PathVariable("manufaSaleChannelValue") String manufaSaleChannelValue);
}

5
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerbank/BaseManufacturerBankFeignFallback.java

@ -45,4 +45,9 @@ public class BaseManufacturerBankFeignFallback implements BaseManufacturerBankFe
public ResultBean<BaseManufacturerBankVo> details(String sid) {
return null;
}
@Override
public ResultBean<String> selectBankAccount(String brandSid, String manufaSaleChannelValue) {
return null;
}
}

4
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java

@ -386,6 +386,10 @@ public interface BaseVehicleFeign {
@PostMapping("/getModelList")
public ResultBean<PagerVo<VehicleModelPriceVo>> getModelList(@RequestBody PagerQuery<VehicleModelPriceQuery> pagerQuery);
@ApiOperation("移动端库存列表")
@PostMapping("/getStockModelList")
public ResultBean<PagerVo<VehicleModelPriceVo>> getStockModelList(@RequestBody PagerQuery<VehicleModelPriceQuery> pagerQuery);
@ApiOperation("手机端业务-现车列表(新)虚拟订单选择车辆")
@PostMapping("/getNowModelList")
public ResultBean<PagerVo<AppBaseVehicleNowModelVo>> getNowModelList(@RequestBody PagerQuery<AppBaseVehicleNowModelQuery> pagerQuery);

5
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java

@ -281,6 +281,11 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign {
return ResultBean.fireFail().setMsg("接口anrui-base/basevehicle/getModelList无法访问");
}
@Override
public ResultBean<PagerVo<VehicleModelPriceVo>> getStockModelList(PagerQuery<VehicleModelPriceQuery> pagerQuery) {
return null;
}
@Override
public ResultBean<PagerVo<AppBaseVehicleNowModelVo>> getNowModelList(PagerQuery<AppBaseVehicleNowModelQuery> pagerQuery) {
return null;

6
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/VehicleModelPriceVo.java

@ -56,4 +56,10 @@ public class VehicleModelPriceVo implements Vo {
@ApiModelProperty(value = "更多配置")
private List<MoreConfigVo> moreList;
@ApiModelProperty(value = "车型标签")
private List<String> mains;
@ApiModelProperty(value = "销售政策标签")
private String label;
}

4
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java

@ -530,7 +530,7 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
/**
* // 物料编码:FMaterialId (必填项)
*/
sf.setFMaterialId(baseInternalPurchaseVehicle.getVinNo());
sf.setFMaterialId(baseInternalPurchaseVehicle.getVinNo().substring(baseInternalPurchaseVehicle.getVinNo().length() - 8));
/**
* // 仓库:FStockId
*/
@ -671,7 +671,7 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
/**
* 物料编码:FMaterialID
*/
fe.setFMaterialID(baseVehicle.getVinNo());
fe.setFMaterialID(baseVehicle.getVinNo().substring(baseVehicle.getVinNo().length() - 8));
/**
* 库存单位:FUnitID (必填项)
*/

2
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.java

@ -71,4 +71,6 @@ public interface BaseManufacturerBankMapper extends BaseMapper<BaseManufacturerB
String fetchByMainSidAndManufSaleAccessName(@Param("manufacturerSid") String manufacturerSid,@Param("manufSaleAccessName") String manufSaleAccessName);
BaseManufacturerBankVo details(String sid);
String selectBankAccount(@Param("brandSid") String brandSid,@Param("manufaSaleChannelValue") String manufaSaleChannelValue);
}

29
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.xml

@ -53,22 +53,22 @@
<!--银行代码-->
bmb.swiftCode,
bmb.remarks,
/*厂家销售通路*/
/*厂家销售通路*/
bmb.actualPay,
bmb.actualPayKey,
bmb.paymentAccessNoKey,
bmb.paymentAccessNoValue
FROM base_manufacturer_bank bmb
WHERE bmb.manufacturerSid = #{sid}
AND bmb.isDelete = 0
AND bmb.isDelete = 0
</select>
<select id="selectByApplySid" resultType="com.yxt.anrui.base.api.busvehicleapply.BusApplyVo">
select bmb.bankAccount num, bmb.accountName name, bmb.depositBank bankName
from base_manufacturer_bank bmb
left join base_manufacturer bm on bm.sid = bmb.manufacturerSid
left join base_vehicle_brand bvb on bvb.manufacturerSid = bm.sid
left join base_vehicle_model bvm on bvm.carBrand = bvb.sid
left join base_manufacturer bm on bm.sid = bmb.manufacturerSid
left join base_vehicle_brand bvb on bvb.manufacturerSid = bm.sid
left join base_vehicle_model bvm on bvm.carBrand = bvb.sid
where bvm.sid = #{modelSid}
and bmb.dueBankValue = '订金账户'
and bmb.isDelete = 0
@ -81,7 +81,7 @@
bmb.bankAccount,
bmb.sid actualPaySid
from base_manufacturer_bank bmb
left join base_manufacturer bm on bmb.manufacturerSid = bm.sid
left join base_manufacturer bm on bmb.manufacturerSid = bm.sid
where bmb.isDelete = 0
and bm.isDelete = 0
AND bm.supplierTypeValue = #{supplierTypeValue}
@ -91,7 +91,7 @@
<select id="selectBankByApplySid" resultType="com.yxt.anrui.base.api.busvehicleapply.BusApplyVo">
select bm.manufacturerCode code, bmb.bankAccount num, bmb.accountName name
from base_manufacturer bm
left join base_manufacturer_bank bmb on bm.manBankSid = bmb.sid
left join base_manufacturer_bank bmb on bm.manBankSid = bmb.sid
where bm.createOrg = #{createOrgSid}
and dueBankValue = '订金账户'
and bmb.isDelete = 0
@ -103,7 +103,7 @@
bmb.depositBank,
bmb.bankAccount
from base_manufacturer_bank bmb
left join base_manufacturer bm on bmb.manufacturerSid = bm.sid
left join base_manufacturer bm on bmb.manufacturerSid = bm.sid
where bmb.isDelete = 0
and bm.isDelete = 0
AND bm.supplierTypeValue = #{supplierTypeValue}
@ -147,6 +147,19 @@
bmb.paymentAccessNoValue
FROM base_manufacturer_bank bmb
WHERE bmb.sid = #{sid}
AND bmb.isDelete = 0
</select>
<select id="selectBankAccount" resultType="java.lang.String">
SELECT bmb.bankAccount
FROM base_manufacturer_bank bmb
LEFT JOIN base_manufacturer bm ON bm.sid = bmb.manufacturerSid
LEFT JOIN base_vehicle_brand bvb ON bvb.manufacturerSid = bm.sid
WHERE bvb.sid = #{brandSid}
AND bmb.actualPay = #{manufaSaleChannelValue}
AND bmb.dueBankValue = '回款账户'
AND bmb.isDelete = 0
AND bm.isDelete = 0
AND bmb.actualPay != ""
</select>
</mapper>

5
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankRest.java

@ -99,5 +99,10 @@ public class BaseManufacturerBankRest implements BaseManufacturerBankFeign {
return rb.success().setData(baseManufacturerBankVo);
}
@Override
public ResultBean<String> selectBankAccount(String brandSid, String manufaSaleChannelValue) {
return baseManufacturerBankService.selectBankAccount(brandSid,manufaSaleChannelValue);
}
}

7
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankService.java

@ -6,6 +6,7 @@ import com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBank;
import com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBankVo;
import com.yxt.anrui.base.api.busvehicleapply.BusApplyVo;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.core.result.ResultBean;
import org.springframework.stereotype.Service;
import java.util.List;
@ -90,4 +91,10 @@ public class BaseManufacturerBankService extends MybatisBaseService<BaseManufact
public BaseManufacturerBankVo details(String sid) {
return baseMapper.details(sid);
}
public ResultBean<String> selectBankAccount(String brandSid, String manufaSaleChannelValue) {
ResultBean rb = ResultBean.fireFail();
String bankAccount = baseMapper.selectBankAccount(brandSid, manufaSaleChannelValue);
return rb.success().setData(bankAccount);
}
}

2
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerretware/BaseManufacturerRetwareService.java

@ -281,7 +281,7 @@ public class BaseManufacturerRetwareService extends MybatisBaseService<BaseManuf
private STKInStockPushPurmrb createPush(BaseVehicle baseVehicle) {
STKInStockPushPurmrb push=new STKInStockPushPurmrb();
push.setFMaterialId(baseVehicle.getVinNo());
push.setFMaterialId(baseVehicle.getVinNo().substring(baseVehicle.getVinNo().length() - 8));
push.setUseOrdSid(baseVehicle.getUseOrgSid());
return push;
}

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

@ -276,6 +276,7 @@ public class BaseVehicleRest implements BaseVehicleFeign {
//生成合格证信息
if (StringUtils.isNotBlank(dto.getVinNo())) {
BaseVehicleCertificate baseVehicleCertificate = new BaseVehicleCertificate();
baseVehicleCertificate.setCarModel(baseVehicle.getVehMark());
baseVehicleCertificate.setVinNo(dto.getVinNo());
baseVehicleCertificate.setCertificateState(CertificState.CertificateState.CERSTATE_XN.getCode());
baseVehicleCertificate.setCertificateStateValue(CertificState.CertificateState.CERSTATE_XN.getRemarks());
@ -466,7 +467,7 @@ public class BaseVehicleRest implements BaseVehicleFeign {
/**
* // 物料编码:FMaterialId (必填项)
*/
sf.setFMaterialId(baseVehicleDto.getVinNo());
sf.setFMaterialId(baseVehicleDto.getVinNo().substring(baseVehicleDto.getVinNo().length() - 8));
/**
* // 仓库:FStockId-目前只分在途和正式两个仓库。
*/
@ -1064,6 +1065,23 @@ public class BaseVehicleRest implements BaseVehicleFeign {
return rb.success().setData(pagerVo);
}
@Override
public ResultBean<PagerVo<VehicleModelPriceVo>> getStockModelList(PagerQuery<VehicleModelPriceQuery> pagerQuery) {
ResultBean<PagerVo<VehicleModelPriceVo>> rb = ResultBean.fireFail();
VehicleModelPriceQuery params = pagerQuery.getParams();
if (params == null) {
return rb.setMsg("必传数据不能为空");
}
String userSid = pagerQuery.getParams().getUserSid();
if (StringUtils.isBlank(userSid)) {
return rb.setMsg("用户sid不能为空");
}
PagerVo<VehicleModelPriceVo> page = new PagerVo<>();
IPage<VehicleModelPriceVo> iPage = baseVehicleService.getModelList(pagerQuery);
PagerVo<VehicleModelPriceVo> pagerVo = PagerUtil.pageToVo(iPage, page);
return rb.success().setData(pagerVo);
}
@Override
public ResultBean<PagerVo<AppBaseVehicleNowModelVo>> getNowModelList(PagerQuery<AppBaseVehicleNowModelQuery> pagerQuery) {
ResultBean<PagerVo<AppBaseVehicleNowModelVo>> rb = ResultBean.fireFail();

2
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java

@ -350,7 +350,7 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
//单价
fEntity.setFPrice(dto.getPrice());
//物料编码
fEntity.setFMaterialID(dto.getVinNo());
fEntity.setFMaterialID(dto.getVinNo().substring(dto.getVinNo().length() - 8));
//仓库id
fEntity.setFStockID(baseVehicle.getLocationCode());
/*ResultBean<ScmWarehouseVo> voResultBean = scmWarehouseFeign.fetchBySid(baseVehicle.getLocation());

6
anrui-fin/anrui-fin-biz/pom.xml

@ -101,7 +101,6 @@
<version>0.0.1-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.yxt.messagecenter</groupId>
<artifactId>message-center-api</artifactId>
@ -113,6 +112,11 @@
<version>0.0.1-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<artifactId>anrui-scm-api</artifactId>
<groupId>com.yxt.anrui.scm</groupId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
</dependencies>
<build>

4
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/AnruiFinApplication.java

@ -51,9 +51,9 @@ import org.springframework.scheduling.annotation.EnableScheduling;
"com.yxt.common.base.config",
"com.yxt.anrui.fin"
})
@EnableFeignClients(basePackages = {"com.yxt.anrui.crm","com.yxt.anrui.fin",
@EnableFeignClients(basePackages = {"com.yxt.anrui.crm", "com.yxt.anrui.fin",
"com.yxt.anrui.portal", "com.yxt.anrui.buscenter",
"com.yxt.anrui.base", "com.yxt.anrui.flowable","com.yxt.messagecenter"})
"com.yxt.anrui.base", "com.yxt.anrui.flowable", "com.yxt.messagecenter", "com.yxt.anrui.scm"})
public class AnruiFinApplication {
public static void main(String[] args) {

50
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java

@ -26,9 +26,12 @@
package com.yxt.anrui.fin.biz.finpaymentapply;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
import com.yxt.anrui.base.api.basevehicle.BaseVehicleSelectVo;
import com.yxt.anrui.base.common.enums.BillTypeEnum;
import com.yxt.anrui.base.common.utils.Rule;
import com.yxt.anrui.base.common.utils.domain.BillNo;
@ -62,7 +65,12 @@ import com.yxt.anrui.portal.api.sysstaffpost.SysStaffPostFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserVo;
import com.yxt.anrui.portal.api.sysuser.UserQuery;
import com.yxt.anrui.scm.api.scmcollectionrebate.ScmCollectionRebate;
import com.yxt.anrui.scm.api.scmcollectionrebate.ScmCollectionRebateDto;
import com.yxt.anrui.scm.api.scmcollectionrebate.ScmCollectionRebateFeign;
import com.yxt.anrui.scm.api.scmcollectionrebateveh.ScmCollectionRebateVehDto;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.DateUtils;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
@ -75,6 +83,8 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.text.Format;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
@ -115,6 +125,10 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
private FinPaymentapplyVehicleService finPaymentapplyVehicleService;
@Autowired
private MessageFeign messageFeign;
@Autowired
private ScmCollectionRebateFeign scmCollectionRebateFeign;
@Autowired
private BaseVehicleFeign baseVehicleFeign;
public PagerVo<FinPaymentapplyVo> listPageVo(PagerQuery<FinPaymentapplyQuery> pq) {
FinPaymentapplyQuery query = pq.getParams();
@ -449,6 +463,42 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
}
}
finPaymentrecordDto.setReceiveBankAccount(finPaymentapply.getReceiveBankAccount());
finPaymentrecordService.saveDto(finPaymentrecordDto);
//到回款返利申请
if (finPaymentapply.getCostTitleValue().equals("车款")){
ScmCollectionRebateDto scmCollectionRebateDto = new ScmCollectionRebateDto();
List<ScmCollectionRebateVehDto> scmCollectionRebateVehDtos = new ArrayList<>();
List<FinPaymentapplyDetailVo> details = finPaymentapplyDetailsService.getDetails(finPaymentapply.getSid());
List<FinPaymentapplyVehicleVo> vehicleList = finPaymentapplyVehicleService.getVehicleList(finPaymentapply.getSid());
scmCollectionRebateDto.setBrandSid(finPaymentapply.getCarBrandSid());
scmCollectionRebateDto.setBrandName(finPaymentapply.getCarBrandName());
scmCollectionRebateDto.setCollectionTypeKey(details.get(0).getPaymentTypeKey());
scmCollectionRebateDto.setCollectionTypeValue(details.get(0).getPaymentType());
scmCollectionRebateDto.setManufaSaleChannelValue(details.get(0).getActualPay());
scmCollectionRebateDto.setCollectionMoney(details.get(0).getPayAccount());
scmCollectionRebateDto.setCollectionDate(DateUtil.format(new Date(),"yyyy-MM-dd"));
scmCollectionRebateDto.setCreateOrgSid(finPaymentapply.getCreateOrgSid());
scmCollectionRebateDto.setUseOrgSid(finPaymentapply.getUseOrgSid());
if (!vehicleList.isEmpty()){
for (FinPaymentapplyVehicleVo finPaymentapplyVehicleVo : vehicleList) {
ScmCollectionRebateVehDto scmCollectionRebateVehDto = new ScmCollectionRebateVehDto();
BaseVehicleSelectVo baseVehicleSelectVo = baseVehicleFeign.details(finPaymentapplyVehicleVo.getVehiSid()).getData();
scmCollectionRebateVehDto.setCarModelSid(finPaymentapplyVehicleVo.getModelSid());
scmCollectionRebateVehDto.setCarModelName(finPaymentapplyVehicleVo.getModelName());
scmCollectionRebateVehDto.setPriceDate(DateUtil.format(baseVehicleSelectVo.getPriceDate(),"yyyy-MM-dd"));
if (baseVehicleSelectVo.getSalesDate() != null){
scmCollectionRebateVehDto.setSalesDate(DateUtil.format(baseVehicleSelectVo.getSalesDate(),"yyyy-MM-dd"));
}
scmCollectionRebateVehDto.setVehSid(finPaymentapplyVehicleVo.getVehiSid());
scmCollectionRebateVehDto.setVinNo(finPaymentapplyVehicleVo.getVinNo());
scmCollectionRebateVehDto.setCostPrice(finPaymentapplyVehicleVo.getMoney());
scmCollectionRebateVehDtos.add(scmCollectionRebateVehDto);
}
}
scmCollectionRebateDto.setScmCollectionRebateVehs(scmCollectionRebateVehDtos);
scmCollectionRebateFeign.save(scmCollectionRebateDto);
}
} else {
//极光推送
UpdateFlowFieldVo ufVo = resultBean.getData();

2
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/push/PushService.java

@ -85,7 +85,7 @@ public class PushService extends FinKingDeeService {
*/
private List<FinStkInstockNumber> getFinStkInstockNumbers(STKInStockPushPurmrb sTKInStockPushPurmrb) {
FinStkInstockNumber finStkInstockNumber=new FinStkInstockNumber();
finStkInstockNumber.setFMaterialId(sTKInStockPushPurmrb.getFMaterialId());
finStkInstockNumber.setFMaterialId(sTKInStockPushPurmrb.getFMaterialId().substring(sTKInStockPushPurmrb.getFMaterialId().length() - 8));
finStkInstockNumber.setUseOrgSid(sTKInStockPushPurmrb.getUseOrdSid());
List<FinStkInstockNumber> lists=finStkInstockNumberService.getDatasByFMaterialId(finStkInstockNumber);
return lists;

2
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stkInstockNumber/FinStkInstockNumberService.java

@ -69,7 +69,7 @@ public class FinStkInstockNumberService extends MybatisBaseService<FinStkInstock
public ResultBean<String> getStinstockByFMaterialId(String fMaterialId) {
ResultBean<String> rb=ResultBean.fireFail();
FinStkInstockNumber finStkInstockNumber=new FinStkInstockNumber();
finStkInstockNumber.setFMaterialId(fMaterialId);
finStkInstockNumber.setFMaterialId(fMaterialId.substring(fMaterialId.length() - 8));
List<FinStkInstockNumber> datasByFMaterialId = getDatasByFMaterialId(finStkInstockNumber);
if(datasByFMaterialId==null||datasByFMaterialId.size()==0){
return rb.setMsg("没有对应的入库单!");

2
anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flowtask/FlowTask.java

@ -95,7 +95,7 @@ public class FlowTask extends BaseEntity implements Serializable {
private Date createTime;
@ApiModelProperty("任务完成时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss.SSS",timezone="GMT+8")
private Date finishTime;
@ApiModelProperty("环节的办理人信息")

2
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateDetailsVo.java

@ -76,6 +76,8 @@ public class ScmCollectionRebateDetailsVo implements Vo {
private String manufaSaleChannel; // 厂家销售通路key
@ApiModelProperty("厂家销售通路value")
private String manufaSaleChannelValue; // 厂家销售通路value
@ApiModelProperty("厂家收款账号")
private String manufaBankAccount; // 厂家收款账号
@ApiModelProperty("回款金额")
private String collectionMoney; // 回款金额
@ApiModelProperty("运费")

12
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateFeign.java

@ -91,4 +91,16 @@ public interface ScmCollectionRebateFeign {
@PostMapping("/checkApplyGetAlreadyUploadCollectionRebate")
@ResponseBody
public ResultBean<PagerVo<ScmCollectionRebateVo>> checkApplyGetAlreadyUploadCollectionRebate(@RequestBody PagerQuery<ScmCollectionRebateQuery> pq);
@ApiOperation("待核对上传一致")
@PostMapping("/stayCheckUpAgre")
@ResponseBody
public ResultBean stayCheckUpAgre(@RequestBody StayCheckUpAgre stayCheckUpAgre);
@ApiOperation("待核对编辑回显")
@GetMapping("/stayCheckBySid/{sid}")
@ResponseBody
public ResultBean<ScmCollectionRebateDetailsVo> stayCheckBySid(@PathVariable("sid") String sid);
}

10
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateFeignFallback.java

@ -84,4 +84,14 @@ public class ScmCollectionRebateFeignFallback implements ScmCollectionRebateFeig
public ResultBean<PagerVo<ScmCollectionRebateVo>> checkApplyGetAlreadyUploadCollectionRebate(PagerQuery<ScmCollectionRebateQuery> pq) {
return null;
}
@Override
public ResultBean stayCheckUpAgre(StayCheckUpAgre stayCheckUpAgre) {
return null;
}
@Override
public ResultBean<ScmCollectionRebateDetailsVo> stayCheckBySid(String sid) {
return null;
}
}

4
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateQuery.java

@ -65,6 +65,10 @@ public class ScmCollectionRebateQuery implements Query {
private String createStartTime; // 创建开始日期
@ApiModelProperty("创建结束日期")
private String createEndTime; // 创建结束日期
@ApiModelProperty("预提开始日期")
private String withholdingStartDate; // 预提开始日期
@ApiModelProperty("预提结束日期")
private String withholdingEndDate; // 预提结束日期
@ApiModelProperty("状态")
private String state; // 状态
@ApiModelProperty("回款返利sid")

5
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateVo.java

@ -66,6 +66,8 @@ public class ScmCollectionRebateVo implements Vo {
private String collectionTypeValue; // 回款方式value
@ApiModelProperty("厂家销售通路key")
private String manufaSaleChannel; // 厂家销售通路key
@ApiModelProperty("厂家收款账号")
private String manufaBankAccount; // 厂家收款账号
@ApiModelProperty("厂家销售通路value")
private String manufaSaleChannelValue; // 厂家销售通路value
@ApiModelProperty("回款金额")
@ -80,8 +82,7 @@ public class ScmCollectionRebateVo implements Vo {
@ApiModelProperty("预计返利")
private String estimateRebate; // 预计返利
@ApiModelProperty("预提日期")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date withholdingDate; // 预提日期
private String withholdingDate; // 预提日期
@ApiModelProperty("预提日期(页面展示)")
private String withholdingDateCopy; // 预提日期(页面展示)
@ApiModelProperty("上传日期")

15
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/StayCheckUpAgre.java

@ -0,0 +1,15 @@
package com.yxt.anrui.scm.api.scmcollectionrebate;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
@Data
public class StayCheckUpAgre {
@ApiModelProperty("上传日期")
private String upDate; // 上传日期
@ApiModelProperty("回款返利sids")
private List<String> sids; // 回款返利sids
}

2
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyDetailsVo.java

@ -62,6 +62,8 @@ public class ScmCollectionrebateCheckapplyDetailsVo implements Vo {
private String brandName; // 品牌名称
@ApiModelProperty("核对申请标题")
private String checkApply; // 核对申请标题
@ApiModelProperty("创建人sid")
private String createBySid; // 创建人sid
@ApiModelProperty("创建人姓名")
private String createByName; // 创建人姓名
@ApiModelProperty("使用组织sid")

6
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyVo.java

@ -26,12 +26,15 @@
package com.yxt.anrui.scm.api.scmcollectionrebatecheckapply;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
* Project: anrui-scm(回款返利) <br/>
* File: ScmCollectionrebateCheckapplyVo.java <br/>
@ -51,6 +54,9 @@ public class ScmCollectionrebateCheckapplyVo implements Vo {
private String sid; // sid
@ApiModelProperty(value = "创建日期")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date createTime;
@ApiModelProperty("品牌sid")
private String brandSid; // 品牌sid
@ApiModelProperty("品牌名称")

20
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailDetailsVo.java

@ -32,6 +32,8 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* Project: anrui-scm(回款返利) <br/>
* File: ScmCollectionrebateCheckapplydetailVo.java <br/>
@ -51,8 +53,26 @@ public class ScmCollectionrebateCheckapplydetailDetailsVo implements Vo {
private String sid; // sid
@ApiModelProperty("预提日期")
private String withholdingDate; // 预提日期
@ApiModelProperty("预提日期(页面展示)")
private String withholdingDateCopy; // 预提日期(页面展示)
@ApiModelProperty("回款方式key")
private String collectionTypeKey; // 回款方式key
@ApiModelProperty("回款方式value")
private String collectionTypeValue; // 回款方式value
@ApiModelProperty("回款金额")
private String collectionMoney; // 回款金额
@ApiModelProperty("预提金额")
private String estimateRebate; // 预提金额
@ApiModelProperty("上传金额")
private String uploadMoney; // 上传金额
@ApiModelProperty("调整金额")
private String adjustmentMoney; // 调整金额
@ApiModelProperty("回款返利sid")
private String collectionRebateSid; // 回款返利sid
@ApiModelProperty("回款返利sids")
private List<String> collectionRebateSids; // 回款返利sids
@ApiModelProperty("核对申请sid")
private String mainSid; // 核对申请sid

3
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistribution/ScmCollectionRebateDistribution.java

@ -78,5 +78,6 @@ public class ScmCollectionRebateDistribution extends BaseEntity {
private String createOrgName; // 创建组织名称
@ApiModelProperty("分配状态")
private String distributionState; // 分配状态
@ApiModelProperty("回款返利sid")
private String collRebateSid; // 回款返利sid
}

10
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistribution/ScmCollectionRebateDistributionDetailsVo.java

@ -26,8 +26,8 @@
package com.yxt.anrui.scm.api.scmcollectionrebatedistribution;
import com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh.ScmCollectionRebateDistributionVehDetailsVo;
import com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh.ScmCollectionRebateDistributionVehDto;
import com.yxt.anrui.scm.api.scmcollectionrebateveh.ScmCollectionRebateVehDetailsVo;
import com.yxt.anrui.scm.api.scmcollectionrebateveh.ScmCollectionRebateVehDto;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
@ -83,6 +83,8 @@ public class ScmCollectionRebateDistributionDetailsVo implements Vo {
private String createOrgName; // 创建组织名称
@ApiModelProperty("分配状态")
private String distributionState; // 分配状态
@ApiModelProperty("回款返利分配车辆列表")
private List<ScmCollectionRebateDistributionVehDetailsVo> scmCollectionRebateDistributionVehs; // 回款返利分配车辆列表
@ApiModelProperty("回款返利sid")
private String collRebateSid; // 回款返利sid
@ApiModelProperty("回款返利车辆列表")
private List<ScmCollectionRebateVehDetailsVo> scmCollectionRebateVehs; // 回款返利车辆列表
}

8
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistribution/ScmCollectionRebateDistributionDto.java

@ -26,7 +26,7 @@
package com.yxt.anrui.scm.api.scmcollectionrebatedistribution;
import com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh.ScmCollectionRebateDistributionVehDto;
import com.yxt.anrui.scm.api.scmcollectionrebateveh.ScmCollectionRebateVehDto;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModel;
@ -82,6 +82,8 @@ public class ScmCollectionRebateDistributionDto implements Dto {
private String createOrgName; // 创建组织名称
@ApiModelProperty("分配状态")
private String distributionState; // 分配状态
@ApiModelProperty("回款返利分配车辆列表")
private List<ScmCollectionRebateDistributionVehDto> scmCollectionRebateDistributionVehs; // 回款返利分配车辆列表
@ApiModelProperty("回款返利sid")
private String collRebateSid; // 回款返利sid
@ApiModelProperty("回款返利车辆列表")
private List<ScmCollectionRebateVehDto> scmCollectionRebateVehs; // 回款返利车辆列表
}

2
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistribution/ScmCollectionRebateDistributionVo.java

@ -79,5 +79,7 @@ public class ScmCollectionRebateDistributionVo implements Vo {
private String createOrgName; // 创建组织名称
@ApiModelProperty("分配状态")
private String distributionState; // 分配状态
@ApiModelProperty("回款返利sid")
private String collRebateSid; // 回款返利sid
}

70
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVeh.java

@ -1,70 +0,0 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh;
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(回款返利分配) <br/>
* File: ScmCollectionRebateDistributionVeh.java <br/>
* Class: com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh.ScmCollectionRebateDistributionVeh <br/>
* Description: 回款返利分配车辆表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-11-21 15:14:34 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "回款返利分配车辆表", description = "回款返利分配车辆表")
@TableName("scm_collection_rebate_distribution_veh")
public class ScmCollectionRebateDistributionVeh extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty("车型sid")
private String carModelSid; // 车型sid
@ApiModelProperty("车型名称")
private String carModelName; // 车型名称
@ApiModelProperty("车架号")
private String vinNo; // 车架号
@ApiModelProperty("厂家结算价")
private String costPrice; // 厂家结算价
@ApiModelProperty("入库日期")
private String priceDate; // 入库日期
@ApiModelProperty("销售日期")
private String salesDate; // 销售日期
@ApiModelProperty("回款返利分配sid")
private String mainSid; // 回款返利分配sid
@ApiModelProperty("分配的回款返利")
private String distributionCollectionRebate; // 分配的回款返利
}

71
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehDetailsVo.java

@ -1,71 +0,0 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: anrui-scm(回款返利分配) <br/>
* File: ScmCollectionRebateDistributionVehVo.java <br/>
* Class: com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh.ScmCollectionRebateDistributionVehVo <br/>
* Description: 回款返利分配车辆表 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-11-21 15:14:34 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "回款返利分配车辆表 视图数据详情", description = "回款返利分配车辆表 视图数据详情")
public class ScmCollectionRebateDistributionVehDetailsVo implements Vo {
private String sid; // sid
@ApiModelProperty("车型sid")
private String carModelSid; // 车型sid
@ApiModelProperty("车型名称")
private String carModelName; // 车型名称
@ApiModelProperty("车架号")
private String vinNo; // 车架号
@ApiModelProperty("厂家结算价")
private String costPrice; // 厂家结算价
@ApiModelProperty("入库日期")
private String priceDate; // 入库日期
@ApiModelProperty("销售日期")
private String salesDate; // 销售日期
@ApiModelProperty("回款返利分配sid")
private String mainSid; // 回款返利分配sid
@ApiModelProperty("分配的回款返利")
private String distributionCollectionRebate; // 分配的回款返利
}

71
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehDto.java

@ -1,71 +0,0 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: anrui-scm(回款返利分配) <br/>
* File: ScmCollectionRebateDistributionVehDto.java <br/>
* Class: com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh.ScmCollectionRebateDistributionVehDto <br/>
* Description: 回款返利分配车辆表 数据传输对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-11-21 15:14:34 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "回款返利分配车辆表 数据传输对象", description = "回款返利分配车辆表 数据传输对象")
public class ScmCollectionRebateDistributionVehDto implements Dto {
private String sid; // sid
@ApiModelProperty("车型sid")
private String carModelSid; // 车型sid
@ApiModelProperty("车型名称")
private String carModelName; // 车型名称
@ApiModelProperty("车架号")
private String vinNo; // 车架号
@ApiModelProperty("厂家结算价")
private String costPrice; // 厂家结算价
@ApiModelProperty("入库日期")
private String priceDate; // 入库日期
@ApiModelProperty("销售日期")
private String salesDate; // 销售日期
@ApiModelProperty("回款返利分配sid")
private String mainSid; // 回款返利分配sid
@ApiModelProperty("分配的回款返利")
private String distributionCollectionRebate; // 分配的回款返利
}

78
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehFeign.java

@ -1,78 +0,0 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh;
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(回款返利分配) <br/>
* File: ScmCollectionRebateDistributionVehFeign.java <br/>
* Class: com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh.ScmCollectionRebateDistributionVehFeign <br/>
* Description: 回款返利分配车辆表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-11-21 15:14:34 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Api(tags = "回款返利分配车辆表")
@FeignClient(
contextId = "anrui-scm-ScmCollectionRebateDistributionVeh",
name = "anrui-scm",
path = "v1/scmcollectionrebatedistributionveh",
fallback = ScmCollectionRebateDistributionVehFeignFallback.class)
public interface ScmCollectionRebateDistributionVehFeign {
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
@ResponseBody
public ResultBean<PagerVo<ScmCollectionRebateDistributionVehVo>> listPage(@RequestBody PagerQuery<ScmCollectionRebateDistributionVehQuery> pq);
@ApiOperation("新增或修改")
@PostMapping("/save")
@ResponseBody
public ResultBean save(@RequestBody ScmCollectionRebateDistributionVehDto dto);
@ApiOperation("根据sid删除记录")
@DeleteMapping("/delBySids")
@ResponseBody
public ResultBean delBySids(@RequestBody String[] sids);
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
@ResponseBody
public ResultBean<ScmCollectionRebateDistributionVehDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
}

72
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehFeignFallback.java

@ -1,72 +0,0 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh;
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(回款返利分配) <br/>
* File: ScmCollectionRebateDistributionVehFeignFallback.java <br/>
* Class: com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh.ScmCollectionRebateDistributionVehFeignFallback <br/>
* Description: 回款返利分配车辆表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-11-21 15:14:34 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Component
public class ScmCollectionRebateDistributionVehFeignFallback implements ScmCollectionRebateDistributionVehFeign {
@Override
public ResultBean<PagerVo<ScmCollectionRebateDistributionVehVo>> listPage(PagerQuery<ScmCollectionRebateDistributionVehQuery> pq){
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui-scm/scmcollectionrebatedistributionveh/listPage无法访问");
}
@Override
public ResultBean save(ScmCollectionRebateDistributionVehDto dto){
return ResultBean.fireFail().setMsg("接口anrui-scm/scmcollectionrebatedistributionveh/save无法访问");
}
@Override
public ResultBean delBySids( String[] sids){
return ResultBean.fireFail().setMsg("接口anrui-scm/scmcollectionrebatedistributionveh/delBySids无法访问");
}
@Override
public ResultBean<ScmCollectionRebateDistributionVehDetailsVo> fetchDetailsBySid(String sid){
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui-scm/scmcollectionrebatedistributionveh/fetchDetailsBySid无法访问");
}
}

69
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehQuery.java

@ -1,69 +0,0 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: anrui-scm(回款返利分配) <br/>
* File: ScmCollectionRebateDistributionVehQuery.java <br/>
* Class: com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh.ScmCollectionRebateDistributionVehQuery <br/>
* Description: 回款返利分配车辆表 查询条件. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-11-21 15:14:34 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "回款返利分配车辆表 查询条件", description = "回款返利分配车辆表 查询条件")
public class ScmCollectionRebateDistributionVehQuery implements Query {
@ApiModelProperty("车型sid")
private String carModelSid; // 车型sid
@ApiModelProperty("车型名称")
private String carModelName; // 车型名称
@ApiModelProperty("车架号")
private String vinNo; // 车架号
@ApiModelProperty("厂家结算价")
private String costPrice; // 厂家结算价
@ApiModelProperty("入库日期")
private String priceDate; // 入库日期
@ApiModelProperty("销售日期")
private String salesDate; // 销售日期
@ApiModelProperty("回款返利分配sid")
private String mainSid; // 回款返利分配sid
@ApiModelProperty("分配的回款返利")
private String distributionCollectionRebate; // 分配的回款返利
}

71
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehVo.java

@ -1,71 +0,0 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: anrui-scm(回款返利分配) <br/>
* File: ScmCollectionRebateDistributionVehVo.java <br/>
* Class: com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh.ScmCollectionRebateDistributionVehVo <br/>
* Description: 回款返利分配车辆表 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-11-21 15:14:34 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "回款返利分配车辆表 视图数据对象", description = "回款返利分配车辆表 视图数据对象")
public class ScmCollectionRebateDistributionVehVo implements Vo {
private String sid; // sid
@ApiModelProperty("车型sid")
private String carModelSid; // 车型sid
@ApiModelProperty("车型名称")
private String carModelName; // 车型名称
@ApiModelProperty("车架号")
private String vinNo; // 车架号
@ApiModelProperty("厂家结算价")
private String costPrice; // 厂家结算价
@ApiModelProperty("入库日期")
private String priceDate; // 入库日期
@ApiModelProperty("销售日期")
private String salesDate; // 销售日期
@ApiModelProperty("回款返利分配sid")
private String mainSid; // 回款返利分配sid
@ApiModelProperty("分配的回款返利")
private String distributionCollectionRebate; // 分配的回款返利
}

15
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebateveh/ScmCollectionRebateVeh.java

@ -56,9 +56,22 @@ public class ScmCollectionRebateVeh extends BaseEntity {
private String vehSid; // 车辆sid
@ApiModelProperty("车架号")
private String vinNo; // 车架号
@ApiModelProperty("车型sid")
private String carModelSid; // 车型sid
@ApiModelProperty("车型名称")
private String carModelName; // 车型名称
@ApiModelProperty("入库日期")
private String priceDate; // 入库日期
@ApiModelProperty("销售日期")
private String salesDate; // 销售日期
@ApiModelProperty("厂家结算价")
private String costPrice; // 厂家结算价
@ApiModelProperty("预计返利")
private String estimateRebate; // 预计返利
@ApiModelProperty("分配返利金额")
private String distributionCollectionRebate; // 分配返利金额
@ApiModelProperty("上传金额")
private String uploadMoney; // 上传金额
@ApiModelProperty("调整金额")
private String adjustmentMoney; // 调整金额
}

24
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebateveh/ScmCollectionRebateVehDetailsVo.java

@ -51,15 +51,29 @@ public class ScmCollectionRebateVehDetailsVo implements Vo {
private String sid; // sid
@ApiModelProperty("回款返利sid")
@ApiModelProperty("回款返利sid")
private String mainSid; // 回款返利sid
@ApiModelProperty("车辆sid")
@ApiModelProperty("车辆sid")
private String vehSid; // 车辆sid
@ApiModelProperty("车架号")
@ApiModelProperty("车架号")
private String vinNo; // 车架号
@ApiModelProperty("厂家结算价")
@ApiModelProperty("车型sid")
private String carModelSid; // 车型sid
@ApiModelProperty("车型名称")
private String carModelName; // 车型名称
@ApiModelProperty("入库日期")
private String priceDate; // 入库日期
@ApiModelProperty("销售日期")
private String salesDate; // 销售日期
@ApiModelProperty("厂家结算价")
private String costPrice; // 厂家结算价
@ApiModelProperty("预计返利")
@ApiModelProperty("预计返利")
private String estimateRebate; // 预计返利
@ApiModelProperty("分配返利金额")
private String distributionCollectionRebate; // 分配返利金额
@ApiModelProperty("上传金额")
private String uploadMoney; // 上传金额
@ApiModelProperty("调整金额")
private String adjustmentMoney; // 调整金额
}

24
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebateveh/ScmCollectionRebateVehDto.java

@ -51,15 +51,29 @@ public class ScmCollectionRebateVehDto implements Dto {
private String sid; // sid
@ApiModelProperty("回款返利sid")
@ApiModelProperty("回款返利sid")
private String mainSid; // 回款返利sid
@ApiModelProperty("车辆sid")
@ApiModelProperty("车辆sid")
private String vehSid; // 车辆sid
@ApiModelProperty("车架号")
@ApiModelProperty("车架号")
private String vinNo; // 车架号
@ApiModelProperty("厂家结算价")
@ApiModelProperty("车型sid")
private String carModelSid; // 车型sid
@ApiModelProperty("车型名称")
private String carModelName; // 车型名称
@ApiModelProperty("入库日期")
private String priceDate; // 入库日期
@ApiModelProperty("销售日期")
private String salesDate; // 销售日期
@ApiModelProperty("厂家结算价")
private String costPrice; // 厂家结算价
@ApiModelProperty("预计返利")
@ApiModelProperty("预计返利")
private String estimateRebate; // 预计返利
@ApiModelProperty("分配返利金额")
private String distributionCollectionRebate; // 分配返利金额
@ApiModelProperty("上传金额")
private String uploadMoney; // 上传金额
@ApiModelProperty("调整金额")
private String adjustmentMoney; // 调整金额
}

24
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebateveh/ScmCollectionRebateVehVo.java

@ -51,15 +51,29 @@ public class ScmCollectionRebateVehVo implements Vo {
private String sid; // sid
@ApiModelProperty("回款返利sid")
@ApiModelProperty("回款返利sid")
private String mainSid; // 回款返利sid
@ApiModelProperty("车辆sid")
@ApiModelProperty("车辆sid")
private String vehSid; // 车辆sid
@ApiModelProperty("车架号")
@ApiModelProperty("车架号")
private String vinNo; // 车架号
@ApiModelProperty("厂家结算价")
@ApiModelProperty("车型sid")
private String carModelSid; // 车型sid
@ApiModelProperty("车型名称")
private String carModelName; // 车型名称
@ApiModelProperty("入库日期")
private String priceDate; // 入库日期
@ApiModelProperty("销售日期")
private String salesDate; // 销售日期
@ApiModelProperty("厂家结算价")
private String costPrice; // 厂家结算价
@ApiModelProperty("预计返利")
@ApiModelProperty("预计返利")
private String estimateRebate; // 预计返利
@ApiModelProperty("分配返利金额")
private String distributionCollectionRebate; // 分配返利金额
@ApiModelProperty("上传金额")
private String uploadMoney; // 上传金额
@ApiModelProperty("调整金额")
private String adjustmentMoney; // 调整金额
}

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

@ -666,7 +666,7 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
List<StkInStock.FInStockEntry> FInStockEntry = new ArrayList<>();
for (ScmApplyInboundVehicleDto s : scmApplyInboundVehicleDtos) {
StkInStock.FInStockEntry fise = new StkInStock.FInStockEntry();
fise.setFMaterialId(s.getVinNo());// 物料编码
fise.setFMaterialId(s.getVinNo().substring(s.getVinNo().length() - 8));// 物料编码
//fise.setFRealQty(1.0);// 实收数量
//fise.setFPriceUnitQty("1");// 计价数量
//fise.setFRemainInStockQty(1.0);// 采购数量

10
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateRest.java

@ -130,4 +130,14 @@ public class ScmCollectionRebateRest implements ScmCollectionRebateFeign {
PagerVo<ScmCollectionRebateVo> pv = scmCollectionRebateService.checkApplyGetAlreadyUploadCollectionRebate(pq);
return rb.success().setData(pv);
}
@Override
public ResultBean stayCheckUpAgre(StayCheckUpAgre stayCheckUpAgre) {
return scmCollectionRebateService.stayCheckUpAgre(stayCheckUpAgre);
}
@Override
public ResultBean<ScmCollectionRebateDetailsVo> stayCheckBySid(String sid) {
return scmCollectionRebateService.stayCheckBySid(sid);
}
}

437
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateService.java

@ -26,13 +26,16 @@
package com.yxt.anrui.scm.biz.scmcollectionrebate;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBankFeign;
import com.yxt.anrui.scm.api.scmcollectionrebate.*;
import com.yxt.anrui.scm.api.scmcollectionrebatedistribution.ScmCollectionRebateDistributionDetailsVo;
import com.yxt.anrui.scm.api.scmcollectionrebateveh.ScmCollectionRebateVehDetailsVo;
import com.yxt.anrui.scm.api.scmcollectionrebateveh.ScmCollectionRebateVehDto;
import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebate;
import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateDetailsVo;
import com.yxt.anrui.scm.biz.scmcollectionrebatedistribution.ScmCollectionRebateDistributionService;
import com.yxt.anrui.scm.biz.scmcollectionrebateveh.ScmCollectionRebateVehService;
import org.apache.commons.lang3.StringUtils;
import com.yxt.common.base.service.MybatisBaseService;
@ -40,12 +43,6 @@ import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.anrui.scm.api.scmcollectionrebate.ScmCollectionRebate;
import com.yxt.anrui.scm.api.scmcollectionrebate.ScmCollectionRebateQuery;
import com.yxt.anrui.scm.api.scmcollectionrebate.ScmCollectionRebateVo;
import com.yxt.anrui.scm.api.scmcollectionrebate.ScmCollectionRebateDetailsVo;
import com.yxt.anrui.scm.api.scmcollectionrebate.ScmCollectionRebateDto;
import com.yxt.anrui.scm.api.scmcollectionrebate.ScmCollectionRebateFeign;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -69,203 +66,249 @@ import java.util.List;
*/
@Service
public class ScmCollectionRebateService extends MybatisBaseService<ScmCollectionRebateMapper, ScmCollectionRebate> {
@Autowired
private ScmCollectionRebateVehService scmCollectionRebateVehService;
private QueryWrapper<ScmCollectionRebate> createQueryWrapper(ScmCollectionRebateQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
QueryWrapper<ScmCollectionRebate> qw = new QueryWrapper<>();
return qw;
}
public PagerVo<ScmCollectionRebateVo> listPageVo(PagerQuery<ScmCollectionRebateQuery> pq) {
ScmCollectionRebateQuery query = pq.getParams();
QueryWrapper<ScmCollectionRebate> qw = new QueryWrapper<>();
qw.eq("createOrgSid",query.getCreateOrgSid());
if (StringUtils.isNotBlank(query.getCollectionTypeKey())){
qw.eq("collectionTypeKey",query.getCollectionTypeKey());
}
String collectionStartDate = query.getCollectionStartDate();
String collectionEndDate = query.getCollectionEndDate();
qw.apply(StringUtils.isNotBlank(collectionStartDate), "date_format (collectionDate,'%Y-%m-%d') >= date_format('" + collectionStartDate + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(collectionEndDate), "date_format (collectionDate,'%Y-%m-%d') <= date_format('" + collectionEndDate + "','%Y-%m-%d')"
);
String createStartTime = query.getCreateStartTime();
String createEndTime = query.getCreateEndTime();
qw.apply(StringUtils.isNotEmpty(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
apply(StringUtils.isNotEmpty(createEndTime), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
);
IPage<ScmCollectionRebate> page = PagerUtil.queryToPage(pq);
IPage<ScmCollectionRebateVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<ScmCollectionRebateVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public ResultBean saveOrUpdateDto(ScmCollectionRebateDto dto){
ResultBean rb = ResultBean.fireFail();
@Autowired
private ScmCollectionRebateVehService scmCollectionRebateVehService;
@Autowired
private BaseManufacturerBankFeign baseManufacturerBankFeign;
private QueryWrapper<ScmCollectionRebate> createQueryWrapper(ScmCollectionRebateQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
QueryWrapper<ScmCollectionRebate> qw = new QueryWrapper<>();
return qw;
}
public PagerVo<ScmCollectionRebateVo> listPageVo(PagerQuery<ScmCollectionRebateQuery> pq) {
ScmCollectionRebateQuery query = pq.getParams();
QueryWrapper<ScmCollectionRebate> qw = new QueryWrapper<>();
qw.eq("createOrgSid", query.getCreateOrgSid());
if (StringUtils.isNotBlank(query.getCollectionTypeKey())) {
qw.eq("collectionTypeKey", query.getCollectionTypeKey());
}
String collectionStartDate = query.getCollectionStartDate();
String collectionEndDate = query.getCollectionEndDate();
qw.apply(StringUtils.isNotBlank(collectionStartDate), "date_format (collectionDate,'%Y-%m-%d') >= date_format('" + collectionStartDate + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(collectionEndDate), "date_format (collectionDate,'%Y-%m-%d') <= date_format('" + collectionEndDate + "','%Y-%m-%d')"
);
String createStartTime = query.getCreateStartTime();
String createEndTime = query.getCreateEndTime();
qw.apply(StringUtils.isNotEmpty(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
apply(StringUtils.isNotEmpty(createEndTime), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
);
IPage<ScmCollectionRebate> page = PagerUtil.queryToPage(pq);
IPage<ScmCollectionRebateVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<ScmCollectionRebateVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public ResultBean saveOrUpdateDto(ScmCollectionRebateDto dto) {
ResultBean rb = ResultBean.fireFail();
String dtoSid = dto.getSid();
List<ScmCollectionRebateVehDto> scmCollectionRebateVehs = dto.getScmCollectionRebateVehs();
if (StringUtils.isBlank(dtoSid)) {
String s = this.insertByDto(dto);
if (!scmCollectionRebateVehs.isEmpty()){
for (ScmCollectionRebateVehDto scmCollectionRebateVeh : scmCollectionRebateVehs) {
scmCollectionRebateVeh.setMainSid(s);
scmCollectionRebateVehService.insertByDto(scmCollectionRebateVeh);
}
}
return rb.success().setMsg("添加成功");
List<ScmCollectionRebateVehDto> scmCollectionRebateVehs = dto.getScmCollectionRebateVehs();
if (StringUtils.isBlank(dtoSid)) {
String s = this.insertByDto(dto);
if (!scmCollectionRebateVehs.isEmpty()) {
for (ScmCollectionRebateVehDto scmCollectionRebateVeh : scmCollectionRebateVehs) {
scmCollectionRebateVeh.setMainSid(s);
scmCollectionRebateVehService.insertByDto(scmCollectionRebateVeh);
}
}
return rb.success().setMsg("添加成功");
}
ScmCollectionRebate scmCollectionRebate = fetchBySid(dtoSid);
if (scmCollectionRebate == null) {
return rb.setMsg("该回款返利不存在");
}
ScmCollectionRebate scmCollectionRebate = fetchBySid(dtoSid);
if (scmCollectionRebate == null){
return rb.setMsg("该回款返利不存在");
}
this.updateByDto(dto);
scmCollectionRebateVehService.delByMainSid(dtoSid);
if (!scmCollectionRebateVehs.isEmpty()){
for (ScmCollectionRebateVehDto scmCollectionRebateVeh : scmCollectionRebateVehs) {
scmCollectionRebateVeh.setMainSid(dtoSid);
scmCollectionRebateVehService.updateByDto(scmCollectionRebateVeh);
}
}
return rb.success().setMsg("修改成功");
}
public String insertByDto(ScmCollectionRebateDto dto){
ScmCollectionRebate entity = new ScmCollectionRebate();
BeanUtil.copyProperties(dto, entity, "id", "sid");
entity.setState(0);
baseMapper.insert(entity);
return entity.getSid();
}
public void updateByDto(ScmCollectionRebateDto dto){
String dtoSid = dto.getSid();
if (StringUtils.isNotBlank(dto.getUploadMoney())) {
dto.setState("3");
}
this.updateByDto(dto);
scmCollectionRebateVehService.delByMainSid(dtoSid);
if (!scmCollectionRebateVehs.isEmpty()) {
for (ScmCollectionRebateVehDto scmCollectionRebateVeh : scmCollectionRebateVehs) {
scmCollectionRebateVeh.setMainSid(dtoSid);
scmCollectionRebateVehService.insertByDto(scmCollectionRebateVeh);
}
}
return rb.success().setMsg("修改成功");
}
public String insertByDto(ScmCollectionRebateDto dto) {
ScmCollectionRebate entity = new ScmCollectionRebate();
BeanUtil.copyProperties(dto, entity, "id", "sid");
entity.setState(0);
baseMapper.insert(entity);
return entity.getSid();
}
public void updateByDto(ScmCollectionRebateDto dto) {
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
return;
}
ScmCollectionRebate entity = fetchBySid(dtoSid);
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.updateById(entity);
}
public ScmCollectionRebateDetailsVo fetchDetailsVoBySid(String sid){
ScmCollectionRebate entity = fetchBySid(sid);
ScmCollectionRebateDetailsVo vo = new ScmCollectionRebateDetailsVo();
BeanUtil.copyProperties(entity, vo);
return vo;
}
}
ScmCollectionRebate entity = fetchBySid(dtoSid);
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.updateById(entity);
}
public void updateWithholdingDateBySid(String collectionRebateSid) {
baseMapper.updateWithholdingDateBySid(collectionRebateSid);
}
public ScmCollectionRebateDetailsVo fetchDetailsVoBySid(String sid) {
ScmCollectionRebate entity = fetchBySid(sid);
ScmCollectionRebateDetailsVo vo = new ScmCollectionRebateDetailsVo();
BeanUtil.copyProperties(entity, vo);
return vo;
}
public void updateState(String collectionRebateSid) {
baseMapper.updateState(collectionRebateSid);
}
public void updateWithholdingDateBySid(String collectionRebateSid) {
baseMapper.updateWithholdingDateBySid(collectionRebateSid);
}
public PagerVo<ScmCollectionRebateVo> withApplyGetCollectionRebate(PagerQuery<ScmCollectionRebateQuery> pq) {
ScmCollectionRebateQuery query = pq.getParams();
QueryWrapper<ScmCollectionRebate> qw = new QueryWrapper<>();
qw.eq("brandSid",query.getBrandSid());
if (StringUtils.isNotBlank(query.getCollectionTypeKey())) {
qw.eq("collectionTypeKey", query.getCollectionTypeKey());
}
String collectionStartDate = query.getCollectionStartDate();
String collectionEndDate = query.getCollectionEndDate();
qw.apply(StringUtils.isNotBlank(collectionStartDate), "date_format (collectionDate,'%Y-%m-%d') >= date_format('" + collectionStartDate + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(collectionEndDate), "date_format (collectionDate,'%Y-%m-%d') <= date_format('" + collectionEndDate + "','%Y-%m-%d')"
);
String createStartTime = query.getCreateStartTime();
String createEndTime = query.getCreateEndTime();
qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(createEndTime), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
);
qw.eq("createOrgSid", query.getCreateOrgSid());
qw.eq("state", 0);
if (query.getSidList().size() > 0) {
qw.notIn("sid", query.getSidList());
}
IPage<ScmCollectionRebate> page = PagerUtil.queryToPage(pq);
IPage<ScmCollectionRebateVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<ScmCollectionRebateVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public void updateState(String collectionRebateSid) {
baseMapper.updateState(collectionRebateSid);
}
public PagerVo<ScmCollectionRebateVo> checkApplyGetCollectionRebate(PagerQuery<ScmCollectionRebateQuery> pq) {
ScmCollectionRebateQuery query = pq.getParams();
QueryWrapper<ScmCollectionRebate> qw = new QueryWrapper<>();
if (StringUtils.isNotBlank(query.getCollectionTypeKey())) {
qw.eq("collectionTypeKey", query.getCollectionTypeKey());
}
String collectionStartDate = query.getCollectionStartDate();
String collectionEndDate = query.getCollectionEndDate();
qw.apply(StringUtils.isNotBlank(collectionStartDate), "date_format (collectionDate,'%Y-%m-%d') >= date_format('" + collectionStartDate + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(collectionEndDate), "date_format (collectionDate,'%Y-%m-%d') <= date_format('" + collectionEndDate + "','%Y-%m-%d')"
);
String createStartTime = query.getCreateStartTime();
String createEndTime = query.getCreateEndTime();
qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(createEndTime), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
);
qw.eq("createOrgSid", query.getCreateOrgSid());
qw.ne("state", 0);
IPage<ScmCollectionRebate> page = PagerUtil.queryToPage(pq);
IPage<ScmCollectionRebateVo> pagging = baseMapper.selectPageVo(page, qw);
for (ScmCollectionRebateVo record : pagging.getRecords()) {
//上传状态:未上传
if (StringUtils.isBlank(record.getUploadDate()) && StringUtils.isBlank(record.getUploadMoney())) {
record.setUploadState("2");
}
//上传状态:已上传
if (StringUtils.isNotBlank(record.getUploadDate()) && StringUtils.isNotBlank(record.getUploadMoney())) {
record.setUploadState("3");
}
}
PagerVo<ScmCollectionRebateVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public PagerVo<ScmCollectionRebateVo> withApplyGetCollectionRebate(PagerQuery<ScmCollectionRebateQuery> pq) {
ScmCollectionRebateQuery query = pq.getParams();
QueryWrapper<ScmCollectionRebate> qw = new QueryWrapper<>();
qw.eq("brandSid", query.getBrandSid());
if (StringUtils.isNotBlank(query.getCollectionTypeKey())) {
qw.eq("collectionTypeKey", query.getCollectionTypeKey());
}
String collectionStartDate = query.getCollectionStartDate();
String collectionEndDate = query.getCollectionEndDate();
qw.apply(StringUtils.isNotBlank(collectionStartDate), "date_format (collectionDate,'%Y-%m-%d') >= date_format('" + collectionStartDate + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(collectionEndDate), "date_format (collectionDate,'%Y-%m-%d') <= date_format('" + collectionEndDate + "','%Y-%m-%d')"
);
String createStartTime = query.getCreateStartTime();
String createEndTime = query.getCreateEndTime();
qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(createEndTime), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
);
qw.eq("createOrgSid", query.getCreateOrgSid());
qw.eq("state", 0);
if (query.getSidList().size() > 0) {
qw.notIn("sid", query.getSidList());
}
IPage<ScmCollectionRebate> page = PagerUtil.queryToPage(pq);
IPage<ScmCollectionRebateVo> pagging = baseMapper.selectPageVo(page, qw);
for (ScmCollectionRebateVo record : pagging.getRecords()) {
String brandSid = record.getBrandSid();
String manufaSaleChannelValue = record.getManufaSaleChannelValue();
String bankAccount = baseManufacturerBankFeign.selectBankAccount(brandSid, manufaSaleChannelValue).getData();
record.setManufaBankAccount(bankAccount);
}
PagerVo<ScmCollectionRebateVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public PagerVo<ScmCollectionRebateVo> checkApplyGetCollectionRebate(PagerQuery<ScmCollectionRebateQuery> pq) {
ScmCollectionRebateQuery query = pq.getParams();
QueryWrapper<ScmCollectionRebate> qw = new QueryWrapper<>();
if (StringUtils.isNotBlank(query.getCollectionTypeKey())) {
qw.eq("collectionTypeKey", query.getCollectionTypeKey());
}
String collectionStartDate = query.getCollectionStartDate();
String collectionEndDate = query.getCollectionEndDate();
qw.apply(StringUtils.isNotBlank(collectionStartDate), "date_format (collectionDate,'%Y-%m-%d') >= date_format('" + collectionStartDate + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(collectionEndDate), "date_format (collectionDate,'%Y-%m-%d') <= date_format('" + collectionEndDate + "','%Y-%m-%d')"
);
String createStartTime = query.getCreateStartTime();
String createEndTime = query.getCreateEndTime();
qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(createEndTime), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
);
qw.eq("createOrgSid", query.getCreateOrgSid());
qw.ne("state", 0);
IPage<ScmCollectionRebate> page = PagerUtil.queryToPage(pq);
IPage<ScmCollectionRebateVo> pagging = baseMapper.selectPageVo(page, qw);
List<ScmCollectionRebateVo> records = pagging.getRecords();
for (ScmCollectionRebateVo record : records) {
//上传状态:未上传
if (StringUtils.isBlank(record.getUploadDate()) && StringUtils.isBlank(record.getUploadMoney())) {
record.setUploadState("2");
}
//上传状态:已上传
if (StringUtils.isNotBlank(record.getUploadDate()) && StringUtils.isNotBlank(record.getUploadMoney())) {
record.setUploadState("3");
}
String withholdingDate = record.getWithholdingDate();
DateTime parse = DateUtil.parse(withholdingDate, "yyyy-MM-dd");
record.setWithholdingDate(parse.toString());
String brandSid = record.getBrandSid();
String manufaSaleChannelValue = record.getManufaSaleChannelValue();
String bankAccount = baseManufacturerBankFeign.selectBankAccount(brandSid, manufaSaleChannelValue).getData();
record.setManufaBankAccount(bankAccount);
}
PagerVo<ScmCollectionRebateVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public PagerVo<ScmCollectionRebateVo> checkApplyGetAlreadyUploadCollectionRebate(PagerQuery<ScmCollectionRebateQuery> pq) {
ScmCollectionRebateQuery query = pq.getParams();
QueryWrapper<ScmCollectionRebate> qw = new QueryWrapper<>();
if (StringUtils.isNotBlank(query.getCollectionTypeKey())) {
qw.eq("collectionTypeKey", query.getCollectionTypeKey());
}
String collectionStartDate = query.getCollectionStartDate();
String collectionEndDate = query.getCollectionEndDate();
qw.apply(StringUtils.isNotBlank(collectionStartDate), "date_format (collectionDate,'%Y-%m-%d') >= date_format('" + collectionStartDate + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(collectionEndDate), "date_format (collectionDate,'%Y-%m-%d') <= date_format('" + collectionEndDate + "','%Y-%m-%d')"
);
String createStartTime = query.getCreateStartTime();
String createEndTime = query.getCreateEndTime();
qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(createEndTime), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
);
qw.eq("createOrgSid", query.getCreateOrgSid());
qw.eq("state", 3);
if (query.getSidList().size() > 0) {
qw.notIn("sid", query.getSidList());
}
IPage<ScmCollectionRebate> page = PagerUtil.queryToPage(pq);
IPage<ScmCollectionRebateVo> pagging = baseMapper.selectPageVo(page, qw);
for (ScmCollectionRebateVo record : pagging.getRecords()) {
Date withholdingDate = record.getWithholdingDate();
int year = DateUtil.year(withholdingDate);
int month = DateUtil.month(withholdingDate) + 1;
String withholdingDateCopy = year + "年" + month + "月";
record.setWithholdingDateCopy(withholdingDateCopy);
}
PagerVo<ScmCollectionRebateVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public PagerVo<ScmCollectionRebateVo> checkApplyGetAlreadyUploadCollectionRebate(PagerQuery<ScmCollectionRebateQuery> pq) {
ScmCollectionRebateQuery query = pq.getParams();
QueryWrapper<ScmCollectionRebate> qw = new QueryWrapper<>();
if (StringUtils.isNotBlank(query.getCollectionTypeKey())) {
qw.eq("collectionTypeKey", query.getCollectionTypeKey());
}
String collectionStartDate = query.getCollectionStartDate();
String collectionEndDate = query.getCollectionEndDate();
qw.apply(StringUtils.isNotBlank(collectionStartDate), "date_format (collectionDate,'%Y-%m-%d') >= date_format('" + collectionStartDate + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(collectionEndDate), "date_format (collectionDate,'%Y-%m-%d') <= date_format('" + collectionEndDate + "','%Y-%m-%d')"
);
String withholdingStartDate = query.getWithholdingStartDate();
String withholdingEndDate = query.getWithholdingEndDate();
qw.apply(StringUtils.isNotBlank(withholdingStartDate), "date_format (withholdingDate,'%Y-%m-%d') >= date_format('" + withholdingStartDate + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(withholdingEndDate), "date_format (withholdingDate,'%Y-%m-%d') <= date_format('" + withholdingEndDate + "','%Y-%m-%d')"
);
qw.eq("createOrgSid", query.getCreateOrgSid());
qw.eq("state", 3);
if (query.getSidList().size() > 0) {
qw.notIn("sid", query.getSidList());
}
IPage<ScmCollectionRebate> page = PagerUtil.queryToPage(pq);
IPage<ScmCollectionRebateVo> pagging = baseMapper.selectPageVo(page, qw);
for (ScmCollectionRebateVo record : pagging.getRecords()) {
String withholdingDate = record.getWithholdingDate();
DateTime parse = DateUtil.parse(withholdingDate, "yyyy-MM-dd");
int year = DateUtil.year(parse);
int month = DateUtil.month(parse) + 1;
String withholdingDateCopy = year + "年" + month + "月";
record.setWithholdingDate(parse.toString());
record.setWithholdingDateCopy(withholdingDateCopy);
String brandSid = record.getBrandSid();
String manufaSaleChannelValue = record.getManufaSaleChannelValue();
String bankAccount = baseManufacturerBankFeign.selectBankAccount(brandSid, manufaSaleChannelValue).getData();
record.setManufaBankAccount(bankAccount);
}
PagerVo<ScmCollectionRebateVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public ResultBean<ScmCollectionRebateDetailsVo> fetchAllDetailsVoBySid(String sid) {
ResultBean rb = ResultBean.fireFail();
ScmCollectionRebateDetailsVo scmCollectionRebateDetailsVo = fetchDetailsVoBySid(sid);
List<ScmCollectionRebateVehDetailsVo> scmCollectionRebateVehDetailsVos = scmCollectionRebateVehService.fetchByMainSid(sid);
scmCollectionRebateDetailsVo.setScmCollectionRebateVehs(scmCollectionRebateVehDetailsVos);
return rb.success().setData(scmCollectionRebateDetailsVo);
}
public ResultBean stayCheckUpAgre(StayCheckUpAgre stayCheckUpAgre) {
ResultBean rb = ResultBean.fireFail();
List<String> sids = stayCheckUpAgre.getSids();
for (String sid : sids) {
ScmCollectionRebate scmCollectionRebate = fetchBySid(sid);
scmCollectionRebate.setUploadMoney(scmCollectionRebate.getEstimateRebate());
scmCollectionRebate.setUploadDate(stayCheckUpAgre.getUpDate());
scmCollectionRebate.setAdjustmentMoney("0");
saveOrUpdate(scmCollectionRebate);
}
return rb.success().setMsg("上传成功");
}
public ResultBean<ScmCollectionRebateDetailsVo> fetchAllDetailsVoBySid(String sid) {
ResultBean rb = ResultBean.fireFail();
ScmCollectionRebateDetailsVo scmCollectionRebateDetailsVo = fetchDetailsVoBySid(sid);
List<ScmCollectionRebateVehDetailsVo> scmCollectionRebateVehDetailsVos = scmCollectionRebateVehService.fetchByMainSid(sid);
scmCollectionRebateDetailsVo.setScmCollectionRebateVehs(scmCollectionRebateVehDetailsVos);
return rb.success().setData(scmCollectionRebateDetailsVo);
}
public ResultBean<ScmCollectionRebateDetailsVo> stayCheckBySid(String sid) {
ResultBean rb = ResultBean.fireFail();
ScmCollectionRebateDetailsVo scmCollectionRebateDetailsVo = fetchDetailsVoBySid(sid);
List<ScmCollectionRebateVehDetailsVo> scmCollectionRebateVehDetailsVos = scmCollectionRebateVehService.fetchByMainSid(sid);
scmCollectionRebateDetailsVo.setScmCollectionRebateVehs(scmCollectionRebateVehDetailsVos);
return rb.success().setData(scmCollectionRebateDetailsVo);
}
}

20
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyRest.java

@ -29,10 +29,12 @@ import cn.hutool.core.bean.BeanUtil;
import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
import com.yxt.anrui.scm.api.flow.FlowTaskVo;
import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.*;
import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.flow.ScmCollectionRebateCheckApplyCompleteDto;
import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.flow.SubmitScmCollectionRebateCheckApplyDto;
import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.GetNodeQuery;
import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.GetNodeVo;
import com.yxt.anrui.scm.api.scmspecialrebatewithapply.ScmSpecialRebateWithApply;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
@ -43,12 +45,6 @@ import org.springframework.web.bind.annotation.*;
import java.util.List;
import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.ScmCollectionrebateCheckapplyQuery;
import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.ScmCollectionrebateCheckapplyVo;
import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.ScmCollectionrebateCheckapplyDetailsVo;
import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.ScmCollectionrebateCheckapplyDto;
import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.ScmCollectionrebateCheckapplyFeign;
/**
* Project: anrui-scm(回款返利) <br/>
* File: ScmCollectionrebateCheckapplyFeignFallback.java <br/>
@ -88,9 +84,15 @@ public class ScmCollectionrebateCheckapplyRest implements ScmCollectionrebateChe
@Override
@ApiOperation("根据sid批量删除")
@PostMapping("/delBySids")
@DeleteMapping("/delBySids")
public ResultBean delBySids(@RequestBody String[] sids) {
ResultBean rb = ResultBean.fireFail();
for (String sid : sids) {
ScmCollectionrebateCheckapply scmCollectionrebateCheckapply = scmCollectionrebateCheckapplyService.fetchBySid(sid);
if (!scmCollectionrebateCheckapply.getNodeState().equals("待提交")){
return rb.setMsg("所选数据中包含已提交专项返利信息,无法删除");
}
}
scmCollectionrebateCheckapplyService.delBySids(sids);
return rb.success();
}
@ -99,9 +101,7 @@ public class ScmCollectionrebateCheckapplyRest implements ScmCollectionrebateChe
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
public ResultBean<ScmCollectionrebateCheckapplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid) {
ResultBean rb = ResultBean.fireFail();
ScmCollectionrebateCheckapplyDetailsVo vo = scmCollectionrebateCheckapplyService.fetchDetailsVoBySid(sid);
return rb.success().setData(vo);
return scmCollectionrebateCheckapplyService.fetchDetailsVoBySid(sid);
}
@Override

55
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyService.java

@ -26,6 +26,7 @@
package com.yxt.anrui.scm.biz.scmcollectionrebatecheckapply;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@ -41,6 +42,7 @@ import com.yxt.anrui.portal.api.sysuser.SysUserVo;
import com.yxt.anrui.scm.api.flow.FlowTaskVo;
import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.flow.SubmitScmCollectionRebateCheckApplyDto;
import com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetail;
import com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailDetailsVo;
import com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailDto;
import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.GetNodeQuery;
import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.GetNodeVo;
@ -101,17 +103,17 @@ public class ScmCollectionrebateCheckapplyService extends MybatisBaseService<Scm
ScmCollectionrebateCheckapplyQuery query = pq.getParams();
QueryWrapper<ScmCollectionrebateCheckapply> qw = new QueryWrapper<>();
if (StringUtils.isNotBlank(query.getBrandSid())) {
qw.eq("ssc.brandSid", query.getBrandSid());
qw.eq("scc.brandSid", query.getBrandSid());
}
if (StringUtils.isNotBlank(query.getCheckApply())) {
qw.like("ssc.checkApply", query.getCheckApply());
qw.like("scc.collectionApply", query.getCheckApply());
}
String createStartTime = query.getCreateStartTime();
String createEndTime = query.getCreateEndTime();
qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (ssc.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(createEndTime), "date_format (ssc.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (scc.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(createEndTime), "date_format (scc.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
);
qw.eq("ssc.createOrgSid", query.getCreateOrgSid());
qw.eq("scc.createOrgSid", query.getCreateOrgSid());
IPage<ScmCollectionrebateCheckapply> page = PagerUtil.queryToPage(pq);
IPage<ScmCollectionrebateCheckapplyVo> pagging = baseMapper.selectPageVo(page, qw);
List<ScmCollectionrebateCheckapplyVo> records = pagging.getRecords();
@ -205,11 +207,44 @@ public class ScmCollectionrebateCheckapplyService extends MybatisBaseService<Scm
baseMapper.updateById(entity);
}
public ScmCollectionrebateCheckapplyDetailsVo fetchDetailsVoBySid(String sid) {
ScmCollectionrebateCheckapply entity = fetchBySid(sid);
ScmCollectionrebateCheckapplyDetailsVo vo = new ScmCollectionrebateCheckapplyDetailsVo();
BeanUtil.copyProperties(entity, vo);
return vo;
public ResultBean<ScmCollectionrebateCheckapplyDetailsVo> fetchDetailsVoBySid(String sid) {
ResultBean rb = ResultBean.fireFail();
ScmCollectionrebateCheckapplyDetailsVo scmCollectionrebateCheckapplyDetailsVo = new ScmCollectionrebateCheckapplyDetailsVo();
ScmCollectionrebateCheckapply scmCollectionrebateCheckapply = fetchBySid(sid);
BeanUtil.copyProperties(scmCollectionrebateCheckapply,scmCollectionrebateCheckapplyDetailsVo);
List<ScmCollectionrebateCheckapplydetailDetailsVo> scmWhenCollectionrebateCheckapplydetailDetailsVos = scmCollectionrebateCheckapplydetailService.fetchWhenDetailsVoBySid(sid);
if (scmWhenCollectionrebateCheckapplydetailDetailsVos.size() > 0){
for (ScmCollectionrebateCheckapplydetailDetailsVo scmWhenCollectionrebateCheckapplydetailDetailsVo : scmWhenCollectionrebateCheckapplydetailDetailsVos) {
String CollectionRebateSid = scmWhenCollectionrebateCheckapplydetailDetailsVo.getCollectionRebateSid();
String[] CollectionRebateSids = CollectionRebateSid.split(",");
scmWhenCollectionrebateCheckapplydetailDetailsVo.setCollectionRebateSids(Arrays.asList(CollectionRebateSids));
scmWhenCollectionrebateCheckapplydetailDetailsVo.setEstimateRebate(scmWhenCollectionrebateCheckapplydetailDetailsVo.getEstimateRebate().substring(0,scmWhenCollectionrebateCheckapplydetailDetailsVo.getEstimateRebate().lastIndexOf(".")));
scmWhenCollectionrebateCheckapplydetailDetailsVo.setUploadMoney(scmWhenCollectionrebateCheckapplydetailDetailsVo.getUploadMoney().substring(0,scmWhenCollectionrebateCheckapplydetailDetailsVo.getUploadMoney().lastIndexOf(".")));
scmWhenCollectionrebateCheckapplydetailDetailsVo.setCollectionMoney(scmWhenCollectionrebateCheckapplydetailDetailsVo.getCollectionMoney().substring(0,scmWhenCollectionrebateCheckapplydetailDetailsVo.getCollectionMoney().lastIndexOf(".")));
scmWhenCollectionrebateCheckapplydetailDetailsVo.setAdjustmentMoney(scmWhenCollectionrebateCheckapplydetailDetailsVo.getAdjustmentMoney().substring(0,scmWhenCollectionrebateCheckapplydetailDetailsVo.getAdjustmentMoney().lastIndexOf(".")));
}
}
scmCollectionrebateCheckapplyDetailsVo.setScmWhenCollectionrebateCheckapplydetailDetails(scmWhenCollectionrebateCheckapplydetailDetailsVos);
List<ScmCollectionrebateCheckapplydetailDetailsVo> scmLastCollectionrebateCheckapplydetailDetailsVos = scmCollectionrebateCheckapplydetailService.fetchLastDetailsVoBySid(sid);
if (scmLastCollectionrebateCheckapplydetailDetailsVos.size() > 0){
for (ScmCollectionrebateCheckapplydetailDetailsVo scmLastCollectionrebateCheckapplydetailDetailsVo : scmLastCollectionrebateCheckapplydetailDetailsVos) {
String CollectionRebateSid = scmLastCollectionrebateCheckapplydetailDetailsVo.getCollectionRebateSid();
String[] CollectionRebateSids = CollectionRebateSid.split(",");
scmLastCollectionrebateCheckapplydetailDetailsVo.setCollectionRebateSids(Arrays.asList(CollectionRebateSids));
scmLastCollectionrebateCheckapplydetailDetailsVo.setEstimateRebate(scmLastCollectionrebateCheckapplydetailDetailsVo.getEstimateRebate().substring(0,scmLastCollectionrebateCheckapplydetailDetailsVo.getEstimateRebate().lastIndexOf(".")));
scmLastCollectionrebateCheckapplydetailDetailsVo.setUploadMoney(scmLastCollectionrebateCheckapplydetailDetailsVo.getUploadMoney().substring(0,scmLastCollectionrebateCheckapplydetailDetailsVo.getUploadMoney().lastIndexOf(".")));
scmLastCollectionrebateCheckapplydetailDetailsVo.setCollectionMoney(scmLastCollectionrebateCheckapplydetailDetailsVo.getCollectionMoney().substring(0,scmLastCollectionrebateCheckapplydetailDetailsVo.getCollectionMoney().lastIndexOf(".")));
scmLastCollectionrebateCheckapplydetailDetailsVo.setAdjustmentMoney(scmLastCollectionrebateCheckapplydetailDetailsVo.getAdjustmentMoney().substring(0,scmLastCollectionrebateCheckapplydetailDetailsVo.getAdjustmentMoney().lastIndexOf(".")));
String withholdingDate = scmLastCollectionrebateCheckapplydetailDetailsVo.getWithholdingDate();
Date parse = DateUtil.parse(withholdingDate);
int year = DateUtil.year(parse);
int month = DateUtil.month(parse) + 1;
String withholdingDateCopy = year + "年" + month + "月";
scmLastCollectionrebateCheckapplydetailDetailsVo.setWithholdingDateCopy(withholdingDateCopy);
}
}
scmCollectionrebateCheckapplyDetailsVo.setScmLastCollectionrebateCheckapplydetailDetails(scmLastCollectionrebateCheckapplydetailDetailsVos);
return rb.success().setData(scmCollectionrebateCheckapplyDetailsVo);
}
public ResultBean submitCollectionRebateCheckApply(SubmitScmCollectionRebateCheckApplyDto dto) {

5
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailMapper.java

@ -29,6 +29,7 @@ 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 com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailDetailsVo;
import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@ -61,4 +62,8 @@ public interface ScmCollectionrebateCheckapplydetailMapper extends BaseMapper<Sc
List<ScmCollectionrebateCheckapplydetailVo> selectListVo();
void delByMainSid(String dtoSid);
List<ScmCollectionrebateCheckapplydetailDetailsVo> fetchWhenDetailsVoBySid(String sid);
List<ScmCollectionrebateCheckapplydetailDetailsVo> fetchLastDetailsVoBySid(String sid);
}

33
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailMapper.xml

@ -30,4 +30,37 @@
FROM scm_collectionrebate_checkapplydetail
WHERE mainSid = #{dtoSid}
</delete>
<select id="fetchWhenDetailsVoBySid"
resultType="com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailDetailsVo">
SELECT scr.collectionTypeKey,
scr.`collectionTypeValue`,
SUM(scr.`estimateRebate`) estimateRebate,
GROUP_CONCAT(scc.`collectionRebateSid`) collectionRebateSid,
SUM(scr.`uploadMoney`) uploadMoney,
SUM(scr.`collectionMoney`) collectionMoney,
SUM(scr.`adjustmentMoney`) adjustmentMoney
FROM scm_collectionrebate_checkapplydetail scc
LEFT JOIN scm_collection_rebate scr
ON scr.`sid` = scc.`collectionRebateSid`
WHERE scc.`mainSid` = #{sid}
AND DATE_FORMAT(scr.withholdingDate, '%Y%m') = DATE_FORMAT(CURDATE(), '%Y%m')
GROUP BY scr.`collectionTypeKey`
</select>
<select id="fetchLastDetailsVoBySid"
resultType="com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailDetailsVo">
SELECT scr.withholdingDate,
SUM(scr.`estimateRebate`) estimateRebate,
GROUP_CONCAT(scc.`collectionRebateSid`) collectionRebateSid,
SUM(scr.`uploadMoney`) uploadMoney,
SUM(scr.`collectionMoney`) collectionMoney,
SUM(scr.`adjustmentMoney`) adjustmentMoney
FROM scm_collectionrebate_checkapplydetail scc
LEFT JOIN scm_collection_rebate scr
ON scr.`sid` = scc.`collectionRebateSid`
WHERE scc.`mainSid` = #{sid}
AND DATE_FORMAT(scr.withholdingDate, '%Y%m') != DATE_FORMAT(CURDATE(), '%Y%m')
GROUP BY scr.withholdingDate
</select>
</mapper>

8
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailService.java

@ -109,4 +109,12 @@ public class ScmCollectionrebateCheckapplydetailService extends MybatisBaseServi
public void delByMainSid(String dtoSid) {
baseMapper.delByMainSid(dtoSid);
}
public List<ScmCollectionrebateCheckapplydetailDetailsVo> fetchWhenDetailsVoBySid(String sid) {
return baseMapper.fetchWhenDetailsVoBySid(sid);
}
public List<ScmCollectionrebateCheckapplydetailDetailsVo> fetchLastDetailsVoBySid(String sid) {
return baseMapper.fetchLastDetailsVoBySid(sid);
}
}

4
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatedistribution/ScmCollectionRebateDistributionMapper.java

@ -29,6 +29,7 @@ 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 com.yxt.anrui.scm.api.scmcollectionrebatedistribution.ScmCollectionRebateDistributionDetailsVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
@ -62,4 +63,7 @@ public interface ScmCollectionRebateDistributionMapper extends BaseMapper<ScmCol
@Select("select * from scm_collection_rebate_distribution")
List<ScmCollectionRebateDistributionVo> selectListVo();
@Select("select * from scm_collection_rebate_distribution where collRebateSid = #{sid}")
ScmCollectionRebateDistributionDetailsVo fetchByCollRebate(String sid);
}

39
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatedistribution/ScmCollectionRebateDistributionService.java

@ -28,9 +28,9 @@ package com.yxt.anrui.scm.biz.scmcollectionrebatedistribution;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh.ScmCollectionRebateDistributionVehDetailsVo;
import com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh.ScmCollectionRebateDistributionVehDto;
import com.yxt.anrui.scm.biz.scmcollectionrebatedistributionveh.ScmCollectionRebateDistributionVehService;
import com.yxt.anrui.scm.api.scmcollectionrebateveh.ScmCollectionRebateVehDetailsVo;
import com.yxt.anrui.scm.api.scmcollectionrebateveh.ScmCollectionRebateVehDto;
import com.yxt.anrui.scm.biz.scmcollectionrebateveh.ScmCollectionRebateVehService;
import org.apache.commons.lang3.StringUtils;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
@ -42,7 +42,6 @@ import com.yxt.anrui.scm.api.scmcollectionrebatedistribution.ScmCollectionRebate
import com.yxt.anrui.scm.api.scmcollectionrebatedistribution.ScmCollectionRebateDistributionVo;
import com.yxt.anrui.scm.api.scmcollectionrebatedistribution.ScmCollectionRebateDistributionDetailsVo;
import com.yxt.anrui.scm.api.scmcollectionrebatedistribution.ScmCollectionRebateDistributionDto;
import com.yxt.anrui.scm.api.scmcollectionrebatedistribution.ScmCollectionRebateDistributionFeign;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -66,7 +65,7 @@ import java.util.List;
public class ScmCollectionRebateDistributionService extends MybatisBaseService<ScmCollectionRebateDistributionMapper, ScmCollectionRebateDistribution> {
@Autowired
private ScmCollectionRebateDistributionVehService scmCollectionRebateDistributionVehService;
private ScmCollectionRebateVehService scmCollectionRebateVehService;
private QueryWrapper<ScmCollectionRebateDistribution> createQueryWrapper(ScmCollectionRebateDistributionQuery query) {
// todo: 这里根据具体业务调整查询条件
@ -99,13 +98,13 @@ public class ScmCollectionRebateDistributionService extends MybatisBaseService<S
public ResultBean saveOrUpdateDto(ScmCollectionRebateDistributionDto dto){
ResultBean rb = ResultBean.fireFail();
String dtoSid = dto.getSid();
List<ScmCollectionRebateDistributionVehDto> scmCollectionRebateDistributionVehs = dto.getScmCollectionRebateDistributionVehs();
List<ScmCollectionRebateVehDto> scmCollectionRebateVehs = dto.getScmCollectionRebateVehs();
if (StringUtils.isBlank(dtoSid)) {
String s = this.insertByDto(dto);
if (!scmCollectionRebateDistributionVehs.isEmpty()){
for (ScmCollectionRebateDistributionVehDto scmCollectionRebateDistributionVeh : scmCollectionRebateDistributionVehs) {
scmCollectionRebateDistributionVeh.setMainSid(s);
scmCollectionRebateDistributionVehService.insertByDto(scmCollectionRebateDistributionVeh);
this.insertByDto(dto);
if (!scmCollectionRebateVehs.isEmpty()){
for (ScmCollectionRebateVehDto scmCollectionRebateVehDto : scmCollectionRebateVehs) {
scmCollectionRebateVehDto.setMainSid(dto.getCollRebateSid());
scmCollectionRebateVehService.insertByDto(scmCollectionRebateVehDto);
}
}
return rb.success().setMsg("添加成功");
@ -115,11 +114,11 @@ public class ScmCollectionRebateDistributionService extends MybatisBaseService<S
return rb.setMsg("该分配信息不存在");
}
this.updateByDto(dto);
scmCollectionRebateDistributionVehService.delByMainSid(dtoSid);
if (!scmCollectionRebateDistributionVehs.isEmpty()){
for (ScmCollectionRebateDistributionVehDto scmCollectionRebateDistributionVeh : scmCollectionRebateDistributionVehs) {
scmCollectionRebateDistributionVeh.setMainSid(dtoSid);
scmCollectionRebateDistributionVehService.updateByDto(scmCollectionRebateDistributionVeh);
scmCollectionRebateVehService.delByMainSid(scmCollectionRebateDistribution.getCollRebateSid());
if (!scmCollectionRebateVehs.isEmpty()){
for (ScmCollectionRebateVehDto scmCollectionRebateVehDto : scmCollectionRebateVehs) {
scmCollectionRebateVehDto.setMainSid(scmCollectionRebateDistribution.getCollRebateSid());
scmCollectionRebateVehService.insertByDto(scmCollectionRebateVehDto);
}
}
return rb.success().setMsg("修改成功");
@ -152,8 +151,12 @@ public class ScmCollectionRebateDistributionService extends MybatisBaseService<S
public ResultBean<ScmCollectionRebateDistributionDetailsVo> fetchAllDetailsVoBySid(String sid) {
ResultBean rb = ResultBean.fireFail();
ScmCollectionRebateDistributionDetailsVo scmCollectionRebateDistributionDetailsVo = fetchDetailsVoBySid(sid);
List<ScmCollectionRebateDistributionVehDetailsVo> scmCollectionRebateDistributionVehDetailsVos = scmCollectionRebateDistributionVehService.fetchByMainSid(sid);
scmCollectionRebateDistributionDetailsVo.setScmCollectionRebateDistributionVehs(scmCollectionRebateDistributionVehDetailsVos);
List<ScmCollectionRebateVehDetailsVo> scmCollectionRebateVehDetailsVos = scmCollectionRebateVehService.fetchByMainSid(sid);
scmCollectionRebateDistributionDetailsVo.setScmCollectionRebateVehs(scmCollectionRebateVehDetailsVos);
return rb.success().setData(scmCollectionRebateDistributionDetailsVo);
}
public ScmCollectionRebateDistributionDetailsVo fetchByCollRebate(String sid) {
return baseMapper.fetchByCollRebate(sid);
}
}

73
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehMapper.java

@ -1,73 +0,0 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.scm.biz.scmcollectionrebatedistributionveh;
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 com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh.ScmCollectionRebateDistributionVehDetailsVo;
import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh.ScmCollectionRebateDistributionVeh;
import com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh.ScmCollectionRebateDistributionVehVo;
import java.util.List;
/**
* Project: anrui-scm(回款返利分配) <br/>
* File: ScmCollectionRebateDistributionVehMapper.java <br/>
* Class: com.yxt.anrui.scm.biz.scmcollectionrebatedistributionveh.ScmCollectionRebateDistributionVehMapper <br/>
* Description: 回款返利分配车辆表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-11-21 15:14:34 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Mapper
public interface ScmCollectionRebateDistributionVehMapper extends BaseMapper<ScmCollectionRebateDistributionVeh> {
//@Update("update scm_collection_rebate_distribution_veh set name=#{msg} where id=#{id}")
//IPage<ScmCollectionRebateDistributionVehVo> voPage(IPage<ScmCollectionRebateDistributionVeh> page, @Param(Constants.WRAPPER) QueryWrapper<ScmCollectionRebateDistributionVeh> qw);
IPage<ScmCollectionRebateDistributionVehVo> selectPageVo(IPage<ScmCollectionRebateDistributionVeh> page, @Param(Constants.WRAPPER) Wrapper<ScmCollectionRebateDistributionVeh> qw);
List<ScmCollectionRebateDistributionVehVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<ScmCollectionRebateDistributionVeh> qw);
@Select("select * from scm_collection_rebate_distribution_veh")
List<ScmCollectionRebateDistributionVehVo> selectListVo();
@Delete("delete from scm_collection_rebate_distribution_veh where mainSid = #{dtoSid}")
void delByMainSid(String dtoSid);
@Select("select * from scm_collection_rebate_distribution_veh where mainSid = #{sid}")
List<ScmCollectionRebateDistributionVehDetailsVo> fetchByMainSid(String sid);
}

13
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehMapper.xml

@ -1,13 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yxt.anrui.scm.biz.scmcollectionrebatedistributionveh.ScmCollectionRebateDistributionVehMapper">
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh.ScmCollectionRebateDistributionVehVo">
SELECT * FROM scm_collection_rebate_distribution_veh <where> ${ew.sqlSegment} </where>
</select>
<select id="selectListAllVo" resultType="com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh.ScmCollectionRebateDistributionVehVo">
SELECT * FROM scm_collection_rebate_distribution_veh <where> ${ew.sqlSegment} </where>
</select>
</mapper>

100
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehRest.java

@ -1,100 +0,0 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.scm.biz.scmcollectionrebatedistributionveh;
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.scmcollectionrebatedistributionveh.ScmCollectionRebateDistributionVeh;
import com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh.ScmCollectionRebateDistributionVehQuery;
import com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh.ScmCollectionRebateDistributionVehVo;
import com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh.ScmCollectionRebateDistributionVehDetailsVo;
import com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh.ScmCollectionRebateDistributionVehDto;
import com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh.ScmCollectionRebateDistributionVehFeign;
/**
* Project: anrui-scm(回款返利分配) <br/>
* File: ScmCollectionRebateDistributionVehFeignFallback.java <br/>
* Class: com.yxt.anrui.scm.biz.scmcollectionrebatedistributionveh.ScmCollectionRebateDistributionVehRest <br/>
* Description: 回款返利分配车辆表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-11-21 15:14:34 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Api(tags = "回款返利分配车辆表")
@RestController("com.yxt.anrui.scm.biz.scmcollectionrebatedistributionveh.ScmCollectionRebateDistributionVehRest")
@RequestMapping("v1/scmcollectionrebatedistributionveh")
public class ScmCollectionRebateDistributionVehRest implements ScmCollectionRebateDistributionVehFeign {
@Autowired
private ScmCollectionRebateDistributionVehService scmCollectionRebateDistributionVehService;
@Override
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
public ResultBean<PagerVo<ScmCollectionRebateDistributionVehVo>> listPage(@RequestBody PagerQuery<ScmCollectionRebateDistributionVehQuery> pq){
ResultBean rb = ResultBean.fireFail();
PagerVo<ScmCollectionRebateDistributionVehVo> pv = scmCollectionRebateDistributionVehService.listPageVo(pq);
return rb.success().setData(pv);
}
@Override
@ApiOperation("新增或修改")
@PostMapping("/save")
public ResultBean save(@RequestBody ScmCollectionRebateDistributionVehDto dto){
ResultBean rb = ResultBean.fireFail();
scmCollectionRebateDistributionVehService.saveOrUpdateDto(dto);
return rb.success();
}
@Override
@ApiOperation("根据sid批量删除")
@PostMapping("/delBySids")
public ResultBean delBySids(@RequestBody String[] sids){
ResultBean rb = ResultBean.fireFail();
scmCollectionRebateDistributionVehService.delBySids(sids);
return rb.success();
}
@Override
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
public ResultBean<ScmCollectionRebateDistributionVehDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
ResultBean rb = ResultBean.fireFail();
ScmCollectionRebateDistributionVehDetailsVo vo = scmCollectionRebateDistributionVehService.fetchDetailsVoBySid(sid);
return rb.success().setData(vo);
}
}

118
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehService.java

@ -1,118 +0,0 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.scm.biz.scmcollectionrebatedistributionveh;
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.scmcollectionrebatedistributionveh.ScmCollectionRebateDistributionVeh;
import com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh.ScmCollectionRebateDistributionVehQuery;
import com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh.ScmCollectionRebateDistributionVehVo;
import com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh.ScmCollectionRebateDistributionVehDetailsVo;
import com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh.ScmCollectionRebateDistributionVehDto;
import com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh.ScmCollectionRebateDistributionVehFeign;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* Project: anrui-scm(回款返利分配) <br/>
* File: ScmCollectionRebateDistributionVehService.java <br/>
* Class: com.yxt.anrui.scm.biz.scmcollectionrebatedistributionveh.ScmCollectionRebateDistributionVehService <br/>
* Description: 回款返利分配车辆表 业务逻辑. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-11-21 15:14:34 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Service
public class ScmCollectionRebateDistributionVehService extends MybatisBaseService<ScmCollectionRebateDistributionVehMapper, ScmCollectionRebateDistributionVeh> {
private QueryWrapper<ScmCollectionRebateDistributionVeh> createQueryWrapper(ScmCollectionRebateDistributionVehQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
QueryWrapper<ScmCollectionRebateDistributionVeh> qw = new QueryWrapper<>();
return qw;
}
public PagerVo<ScmCollectionRebateDistributionVehVo> listPageVo(PagerQuery<ScmCollectionRebateDistributionVehQuery> pq) {
ScmCollectionRebateDistributionVehQuery query = pq.getParams();
QueryWrapper<ScmCollectionRebateDistributionVeh> qw = createQueryWrapper(query);
IPage<ScmCollectionRebateDistributionVeh> page = PagerUtil.queryToPage(pq);
IPage<ScmCollectionRebateDistributionVehVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<ScmCollectionRebateDistributionVehVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public void saveOrUpdateDto(ScmCollectionRebateDistributionVehDto dto){
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
this.insertByDto(dto);
return;
}
this.updateByDto(dto);
}
public void insertByDto(ScmCollectionRebateDistributionVehDto dto){
ScmCollectionRebateDistributionVeh entity = new ScmCollectionRebateDistributionVeh();
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.insert(entity);
}
public void updateByDto(ScmCollectionRebateDistributionVehDto dto){
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
return;
}
ScmCollectionRebateDistributionVeh entity = fetchBySid(dtoSid);
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.updateById(entity);
}
public ScmCollectionRebateDistributionVehDetailsVo fetchDetailsVoBySid(String sid){
ScmCollectionRebateDistributionVeh entity = fetchBySid(sid);
ScmCollectionRebateDistributionVehDetailsVo vo = new ScmCollectionRebateDistributionVehDetailsVo();
BeanUtil.copyProperties(entity, vo);
return vo;
}
public void delByMainSid(String dtoSid) {
baseMapper.delByMainSid(dtoSid);
}
public List<ScmCollectionRebateDistributionVehDetailsVo> fetchByMainSid(String sid) {
return baseMapper.fetchByMainSid(sid);
}
}

1
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebateveh/ScmCollectionRebateVehMapper.java

@ -29,6 +29,7 @@ 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 com.yxt.anrui.scm.api.scmcollectionrebatedistribution.ScmCollectionRebateDistributionDetailsVo;
import com.yxt.anrui.scm.api.scmcollectionrebateveh.ScmCollectionRebateVehDetailsVo;
import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Mapper;

2
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebateveh/ScmCollectionRebateVehService.java

@ -28,6 +28,7 @@ package com.yxt.anrui.scm.biz.scmcollectionrebateveh;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.scm.api.scmcollectionrebatedistribution.ScmCollectionRebateDistributionDetailsVo;
import org.apache.commons.lang3.StringUtils;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
@ -41,6 +42,7 @@ import com.yxt.anrui.scm.api.scmcollectionrebateveh.ScmCollectionRebateVehDetail
import com.yxt.anrui.scm.api.scmcollectionrebateveh.ScmCollectionRebateVehDto;
import com.yxt.anrui.scm.api.scmcollectionrebateveh.ScmCollectionRebateVehFeign;
import org.apache.ibatis.annotations.Select;
import org.springframework.stereotype.Service;
import java.util.List;

7
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewith/ScmCollectionRebateWithService.java

@ -28,6 +28,7 @@ package com.yxt.anrui.scm.biz.scmcollectionrebatewith;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBankFeign;
import com.yxt.anrui.scm.api.scmcollectionrebate.ScmCollectionRebate;
import com.yxt.anrui.scm.api.scmcollectionrebate.ScmCollectionRebateDetailsVo;
import com.yxt.anrui.scm.biz.scmcollectionrebate.ScmCollectionRebateService;
@ -68,6 +69,8 @@ public class ScmCollectionRebateWithService extends MybatisBaseService<ScmCollec
@Autowired
private ScmCollectionRebateService scmCollectionRebateService;
@Autowired
private BaseManufacturerBankFeign baseManufacturerBankFeign;
private QueryWrapper<ScmCollectionRebateWith> createQueryWrapper(ScmCollectionRebateWithQuery query) {
// todo: 这里根据具体业务调整查询条件
@ -141,6 +144,10 @@ public class ScmCollectionRebateWithService extends MybatisBaseService<ScmCollec
ScmCollectionRebate scmCollectionRebate = scmCollectionRebateService.fetchBySid(s);
ScmCollectionRebateDetailsVo scmCollectionRebateDetailsVo = new ScmCollectionRebateDetailsVo();
BeanUtil.copyProperties(scmCollectionRebate,scmCollectionRebateDetailsVo);
String brandSid = scmCollectionRebateDetailsVo.getBrandSid();
String manufaSaleChannelValue = scmCollectionRebateDetailsVo.getManufaSaleChannelValue();
String bankAccount = baseManufacturerBankFeign.selectBankAccount(brandSid, manufaSaleChannelValue).getData();
scmCollectionRebateDetailsVo.setManufaBankAccount(bankAccount);
scmCollectionRebateDetailsVos.add(scmCollectionRebateDetailsVo);
}
return rb.success().setData(scmCollectionRebateDetailsVos);

1
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyService.java

@ -354,6 +354,7 @@ public class ScmCollectionRebateWithApplyService extends MybatisBaseService<ScmC
BeanUtil.copyProperties(scmCollectionRebate,scmCollectionRebateDistribution);
scmCollectionRebateDistribution.setSid(sid);
scmCollectionRebateDistribution.setDistributionState("未分配");
scmCollectionRebateDistribution.setCollRebateSid(scmCollectionRebate.getSid());
scmCollectionRebateDistribution.setWithholdingApply(scmCollectionRebateDistribution.getWithholdingApply());
scmCollectionRebateDistributionService.save(scmCollectionRebateDistribution);
}

2
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java

@ -393,7 +393,7 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService<ScmVehicle
ScmWarehouse scmWarehouse = scmWarehouseService.fetchBySid(scmVehicleEnterlibrary.getLocationSid());
// fBillEntry.setFDestStockId("CK003");//调入仓库
fBillEntry.setFDestStockId(scmWarehouse.getGressionCode());//调入仓库
fBillEntry.setFMaterialId(scmVehicleEnterlibrary.getVinNo());//物料编码
fBillEntry.setFMaterialId(scmVehicleEnterlibrary.getVinNo().substring(scmVehicleEnterlibrary.getVinNo().length() - 8));//物料编码
// fBillEntry.setFSrcStockId("CK001");//调出仓库
fBillEntry.setFSrcStockId("ARZTCK");//调出仓库 在途
FPAYBILLENTRYs.add(fBillEntry);

1
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java

@ -213,6 +213,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
int year = DateUtil.year(parse);
int month = DateUtil.month(parse) + 1;
String withholdingDateCopy = year + "年" + month + "月";
record.setWithholdingDate(parse.toString());
record.setWithholdingDateCopy(withholdingDateCopy);
}
PagerVo<ScmVehRebateVo> p = PagerUtil.pageToVo(pagging, null);

Loading…
Cancel
Save