Browse Source

Merge remote-tracking branch 'origin/master'

zhanglei
yunuo970428 3 years ago
parent
commit
2db2ef9cf1
  1. 3
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApply.java
  2. 2
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDetailsVo.java
  3. 3
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDto.java
  4. 2
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/app/AppVehicleApplyVo.java
  5. 6
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/AppCommonContractQuery.java
  6. 1
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/AppCrmCustomerFileDto.java
  7. 6
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContract.java
  8. 9
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeign.java
  9. 10
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeignFallback.java
  10. 17
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/flowable/AppSubmitContractInfoDto.java
  11. 7
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java
  12. 4
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml
  13. 2
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceService.java
  14. 31
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java
  15. 11
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml
  16. 10
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java
  17. 3
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyMapper.xml
  18. 2
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java
  19. 3
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.java
  20. 10
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractRest.java
  21. 151
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java
  22. 4
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderinsurance/BusSalesOrderInsurance.java
  23. 4
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderinsurance/BusSalesOrderInsuranceDetailsVo.java
  24. 4
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderinsurance/BusSalesOrderInsuranceDto.java
  25. 2
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderinsurance/BusSalesOrderInsuranceQuery.java
  26. 3
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderinsurance/BusSalesOrderInsuranceVo.java
  27. 2
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderinsurance/app/AppBusSalesOrderInsuranceDto.java
  28. 2
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderinsurance/app/AppBusSalesOrderInsuranceVo.java
  29. 2
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
  30. 84
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java
  31. 137
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
  32. 3
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceMapper.xml
  33. 3
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceService.java
  34. 1
      anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmVehicledemandFeign.java
  35. 6
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeign.java
  36. 6
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeignFallBack.java
  37. 1
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/KingDeeBillId.java
  38. 198
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/stktransferdirect/StkTransferDirect.java
  39. 2
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/submitkd/SubmitKD.java
  40. 16
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java
  41. 66
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stktransferdirect/StkTransferDirectCastToKingDeeBillFields.java
  42. 36
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stktransferdirect/StkTransferDirectService.java
  43. 4
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stktransferdirect/data.json
  44. 58
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stktransferdirect/data_FBillEntry.json
  45. 13
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stktransferdirect/data_data.json
  46. 42
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stktransferdirect/data_model.json
  47. 175
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stktransferdirect/remarks.txt
  48. 5
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stktransferdirect/webapi测试的数据.txt
  49. BIN
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stktransferdirect/直接调拨单的参数必填备注.xlsx
  50. 2
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturn.java
  51. 14
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateFeign.java
  52. 10
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateFeignFallback.java
  53. 50
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateVehAdjDto.java
  54. 2
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateVehDto.java
  55. 7
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateVo.java
  56. 80
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/ScmVehrebateCheckapply.java
  57. 90
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/ScmVehrebateCheckapplyDetailsVo.java
  58. 89
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/ScmVehrebateCheckapplyDto.java
  59. 78
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/ScmVehrebateCheckapplyFeign.java
  60. 72
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/ScmVehrebateCheckapplyFeignFallback.java
  61. 66
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/ScmVehrebateCheckapplyQuery.java
  62. 84
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/ScmVehrebateCheckapplyVo.java
  63. 58
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetail.java
  64. 86
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailDetailsVo.java
  65. 61
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailDto.java
  66. 73
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailFeign.java
  67. 66
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailFeignFallback.java
  68. 57
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailQuery.java
  69. 59
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailVo.java
  70. 2
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/ScmVehRebateWithApplyVo.java
  71. 6
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryService.java
  72. 15
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnService.java
  73. 4
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.java
  74. 13
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateRest.java
  75. 80
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java
  76. 65
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyMapper.java
  77. 31
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyMapper.xml
  78. 99
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyRest.java
  79. 246
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyService.java
  80. 74
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailMapper.java
  81. 59
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailMapper.xml
  82. 91
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailRest.java
  83. 115
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailService.java
  84. 3
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithMapper.java
  85. 2
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithMapper.xml
  86. 4
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithService.java
  87. 58
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyMapper.xml
  88. 27
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyService.java
  89. 9
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/contract/AppCommonContractFeign.java
  90. 6
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/contract/AppCommonContractFeignFallback.java
  91. 21
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/contract/flowable/SubmitContractInfoDto.java
  92. 3
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/insurance/InsuranceInfoDto.java
  93. 2
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/insurance/InsuranceInfoVo.java
  94. 6
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/contract/AppCommonContractRest.java
  95. 19
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/contract/AppCommonContractService.java

3
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApply.java

@ -61,4 +61,7 @@ public class BusVehicleApply extends BaseEntity {
@ApiModelProperty("采购类型value")
private String applyType;
@ApiModelProperty("订金付款备注")
private String payRemarks;
}

2
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDetailsVo.java

@ -51,4 +51,6 @@ public class BusVehicleApplyDetailsVo implements Vo {
private String applyTypeKey;
private String applyType;
@ApiModelProperty("订金付款备注")
private String payRemarks;
}

3
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDto.java

@ -64,4 +64,7 @@ public class BusVehicleApplyDto implements Dto {
@ApiModelProperty("采购类型value")
private String applyType;
@ApiModelProperty("订金付款备注")
private String payRemarks;
}

2
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/app/AppVehicleApplyVo.java

@ -46,4 +46,6 @@ public class AppVehicleApplyVo implements Vo {
@ApiModelProperty(value = "采购类型")
private String applyType;
@ApiModelProperty("订金付款备注")
private String payRemarks;
}

6
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/AppCommonContractQuery.java

@ -26,13 +26,13 @@ public class AppCommonContractQuery implements Query {
@ApiModelProperty("用户sid")
private String userSid;
@ApiModelProperty("合同类型key")
@ApiModelProperty("状态")
private String type;
@ApiModelProperty("")
private String names;
@ApiModelProperty("业务员sid")
private String staffSid;
@ApiModelProperty("分公司sid")
private String useOrgSid;
}

1
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/AppCrmCustomerFileDto.java

@ -1,5 +1,6 @@
package com.yxt.anrui.base.api.commoncontract;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

6
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContract.java

@ -29,8 +29,7 @@ import java.util.Date;
public class CommonContract extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty("备注")
private String remarks;
@ApiModelProperty("合同编号(合同类型+部门编码+yyyyMMdd+001)")
private String contractNo;
@ -97,6 +96,9 @@ public class CommonContract extends BaseEntity {
@ApiModelProperty("单台订金")
private BigDecimal oneDeposit;
@ApiModelProperty("备注")
private String remarks;
@ApiModelProperty(value = "节点状态")
private String nodeState;
@ApiModelProperty(value = "节点id")

9
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeign.java

@ -1,9 +1,6 @@
package com.yxt.anrui.base.api.commoncontract;
import com.yxt.anrui.base.api.commoncontract.flowable.CommonContractCompleteDto;
import com.yxt.anrui.base.api.commoncontract.flowable.CommonContractNodeQuery;
import com.yxt.anrui.base.api.commoncontract.flowable.CommonContractNodeVo;
import com.yxt.anrui.base.api.commoncontract.flowable.CommonContractTaskQuery;
import com.yxt.anrui.base.api.commoncontract.flowable.*;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
@ -166,6 +163,10 @@ public interface CommonContractFeign {
//====================移动端合同审核流程
@ApiOperation("移动端-提交合同审核流程")
@PostMapping("/submitContractInfo")
public ResultBean submitContractInfo(@Valid @RequestBody AppSubmitContractInfoDto dto);
@ApiOperation(value = "办理(同意)")
@PostMapping("/complete")
public ResultBean complete(@Valid @RequestBody CommonContractCompleteDto query);

10
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeignFallback.java

@ -1,10 +1,7 @@
package com.yxt.anrui.base.api.commoncontract;
import com.yxt.anrui.base.api.busvehicleapply.flow.GetNodeVo;
import com.yxt.anrui.base.api.commoncontract.flowable.CommonContractCompleteDto;
import com.yxt.anrui.base.api.commoncontract.flowable.CommonContractNodeQuery;
import com.yxt.anrui.base.api.commoncontract.flowable.CommonContractNodeVo;
import com.yxt.anrui.base.api.commoncontract.flowable.CommonContractTaskQuery;
import com.yxt.anrui.base.api.commoncontract.flowable.*;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
@ -172,6 +169,11 @@ public class CommonContractFeignFallback implements CommonContractFeign {
return null;
}
@Override
public ResultBean submitContractInfo(AppSubmitContractInfoDto dto) {
return null;
}
@Override
public ResultBean complete(CommonContractCompleteDto query) {
return null;

17
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/flowable/AppSubmitContractInfoDto.java

@ -0,0 +1,17 @@
package com.yxt.anrui.base.api.commoncontract.flowable;
import com.yxt.anrui.base.api.commoncontract.AppCrmCustomerFileDto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class AppSubmitContractInfoDto extends AppCrmCustomerFileDto {
private static final long serialVersionUID = -2769162783495307511L;
@ApiModelProperty("意见")
private String comment;
@ApiModelProperty("流程实例id")
private String instanceId;
@ApiModelProperty("任务id")
private String taskId;
}

7
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java

@ -521,11 +521,14 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
String buyerOrgSid = baseInternalPurchase.getBuyerOrgSid();
BaseVehmodelVo baseVehmodelVo = baseVehmodelConfigService.selectVehPur(vehicleSid, configSid, buyerOrgSid);
if (baseVehmodelVo == null) {
BaseVehicle baseVehicle = baseVehicleService.selVehicleByVinNoAndOrgSid(booad.getVinNo(), baseInternalPurchase.getSellerOrgSid());
String insideCode = baseVehicle.getInsideCode();
BaseVehmodelConfig baseVehmodelConfig = new BaseVehmodelConfig();
baseVehmodelConfig.setModelSid(vehicleSid);
baseVehmodelConfig.setConfigurationItemsSid(configSid);
baseVehmodelConfig.setUseOrgSid(buyerOrgSid);
baseVehmodelConfig.setGuidedPrice(new BigDecimal(booad.getGuidedPrice()));
baseVehmodelConfig.setInsideCode(insideCode);
baseVehmodelConfigService.save(baseVehmodelConfig);
}
}
@ -538,6 +541,7 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo,messageFlowVo);
ufVo.setProcInsId(baseInternalPurchase.getProcInstId());
ufVo.setProcDefId(baseInternalPurchase.getProcDefId());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(bv.getBusinessSid());
@ -620,6 +624,7 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo,messageFlowVo);
ufVo.setProcInsId(baseInternalPurchase.getProcInstId());
ufVo.setProcDefId(baseInternalPurchase.getProcDefId());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(bv.getBusinessSid());
@ -673,6 +678,7 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo,messageFlowVo);
ufVo.setProcInsId(baseInternalPurchase.getProcInstId());
ufVo.setProcDefId(baseInternalPurchase.getProcDefId());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(bv.getBusinessSid());
@ -741,6 +747,7 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
BeanUtil.copyProperties(ufVo,messageFlowVo);
String procId = baseInternalPurchase.getProcInstId();
ufVo.setProcInsId(procId);
ufVo.setProcDefId(baseInternalPurchase.getProcDefId());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(businessSid);

4
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml

@ -643,9 +643,7 @@
bmc.independentSources,
bmc.fuelTank,
bmc.multimedia,
if(MIN(bvc.guidedPrice) = MAX(bvc.guidedPrice), convert(MAX(bvc.guidedPrice) / 10000, decimal (10, 2)),
CONCAT(convert(MIN(bvc.guidedPrice) / 10000, decimal (10, 2)), '-',
convert(MAX(bvc.guidedPrice) / 10000, decimal (10, 2)))) AS price,
convert(bvc.guidedPrice/10000,decimal(10,2)) AS price,
bvc.priceValidity,
bvm.sid as modelSid,
bvm.vehicleAlias as modelName,

2
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceService.java

@ -353,6 +353,7 @@ public class BaseModelModpriceService extends MybatisBaseService<BaseModelModpri
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo, messageFlowVo);
ufVo.setProcInsId(baseModelModprice.getProcInstId());
ufVo.setProcDefId(baseModelModprice.getProcDefId());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(bv.getBusinessSid());
@ -424,6 +425,7 @@ public class BaseModelModpriceService extends MybatisBaseService<BaseModelModpri
BeanUtil.copyProperties(ufVo, messageFlowVo);
String procId = baseModelModprice.getProcInstId();
ufVo.setProcInsId(procId);
ufVo.setProcDefId(baseModelModprice.getProcDefId());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(query.getBusinessSid());

31
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java

@ -26,7 +26,6 @@
package com.yxt.anrui.base.biz.baseoutsourcingapplication;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.thread.ThreadUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@ -89,7 +88,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
@ -470,6 +468,7 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(uff,messageFlowVo);
uff.setProcInsId(baseOutsourcingApplication.getProcInstSid());
uff.setProcDefId(baseOutsourcingApplication.getProcDefId());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(businessSid);
@ -598,6 +597,24 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
ResultBean<UpdateFlowFieldVo> rb = flowableFeign.handleProsess(bv);
Map<String, Object> stringObjectMap = BeanUtil.beanToMap(rb.getData());
updateFlowFiled(stringObjectMap);
//消息推送===========开始
UpdateFlowFieldVo uff = rb.getData();
if (!"Event_end".equals(uff.getTaskDefKey())) {
BaseOutsourcingApplication baseOutsourcingApplication = fetchBySid(bv.getBusinessSid());
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(uff,messageFlowVo);
uff.setProcInsId(baseOutsourcingApplication.getProcInstSid());
uff.setProcDefId(baseOutsourcingApplication.getProcDefId());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap((Map<String, Object>) bv.getFormVariables().get("app"));
messageFlowableQuery.setBusinessSid(bv.getBusinessSid());
messageFlowableQuery.setModuleName("外采申请");
messageFlowableQuery.setMsgContent(baseOutsourcingApplication.getCreateByName()+"提交的"+messageFlowableQuery.getModuleName()+",请审批");
messageFlowableQuery.setMsgTitle("供应链");
ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
}
//消息推送结束=====
return rb;
}
/**
@ -608,19 +625,19 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
StkInStock stkInStock=new StkInStock();
stkInStock.setSid(booad.getApplicationDate());
stkInStock.setFPurchaseOrgId("101");
stkInStock.setFStockOrgId("101");
// stkInStock.setFStockOrgId("101");
stkInStock.setFPurchaseDeptId("05.04");
stkInStock.setFSupplierId("010001");
stkInStock.setFDate(booad.getApplicationDate());
stkInStock.setFOwnerIdHead("101");
stkInStock.setFSettleOrgId("101");
// stkInStock.setFOwnerIdHead("101");
// stkInStock.setFSettleOrgId("101");
List<StkInStock.FInStockEntry> FInStockEntry=new ArrayList<>();
StkInStock.FInStockEntry fise=new StkInStock.FInStockEntry();
fise.setFMaterialId(" JX091054");
fise.setFRealQty(1.0);
fise.setFPriceUnitQty("0");
fise.setFRemainInStockQty(1.0);
// fise.setFPriceUnitQty("0");
// fise.setFRemainInStockQty(1.0);
fise.setFLot("1234567890");
fise.setFStockId("CK001");
fise.setFUnitID("liang");

11
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml

@ -512,6 +512,11 @@
AND bv.modelConfigSid = #{configSid}
AND bv.lockedState = #{state}
and bv.useOrgSid = #{orgSid}
AND (
bv.vehicleStateValue = '库存'
or bv.vehicleStateValue = '在途'
or bv.vehicleStateValue = '调入'
)
</select>
<select id="selExistingCarPageList"
@ -566,8 +571,7 @@
OR bv.vehicleStateValue = '在途'
or bv.vehicleStateValue = '调入')
AND lockedState = #{lockedStateKey}
AND bv.useOrgSid =
#{useOrgSid}) AS nowCarNum,
AND bv.useOrgSid = #{useOrgSid}) AS nowCarNum,
(select SUM(distinct cast((cast(bo.platformNo as signed)-IFNULL(cast(bo.lockingNum as signed),'0')) as signed))
as quantity from bus_vehicle_order bo
LEFT JOIN bus_vehicle_apply_detail bd on bo.purchaseApplyMediumModelSid = bd.sid
@ -577,6 +581,7 @@
left join base_vehicle_brand bb on bb.sid = bvm.carBrand
<where>
${ew.sqlSegment}
and length(bvc.guidedPrice)>0
</where>
ORDER BY nowCarNum DESC
</select>
@ -647,7 +652,7 @@
(SELECT count(*)
FROM base_vehmodel_config bvc2
WHERE bvc2.modelSid = bvm.sid
AND bvc2.useOrgSid = #{useOrgSid}) AS configNum,
AND bvc2.useOrgSid = #{useOrgSid} and Length(bvc2.guidedPrice)>0) AS configNum,
(SELECT count(*)
FROM base_vehicle bv
WHERE bv.modelSid = bvm.sid

10
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java

@ -403,6 +403,7 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo,messageFlowVo);
ufVo.setProcDefId(baseVehicleActualSales.getProcDefId());
ufVo.setProcInsId(baseVehicleActualSales.getProcInstId());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
@ -508,6 +509,7 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
BeanUtil.copyProperties(ufVo,messageFlowVo);
String procId = baseVehicleActualSales.getProcInstId();
ufVo.setProcInsId(procId);
ufVo.setProcDefId(baseVehicleActualSales.getProcDefId());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(query.getBusinessSid());
@ -553,6 +555,12 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
return rb.setMsg(resultBean.getMsg());
}
updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
if(query.getUserSid().equals(baseVehicleActualSales.getCreateBySid())){
//更新车辆状态为未买断
String settlementStatus = VehicleState.BuyoutEnum.UN_BUYOUT.getCode();
String settlementStatusValue = VehicleState.BuyoutEnum.UN_BUYOUT.getRemarks();
updateByVinNo(baseVehicleActualSales.getSid(), settlementStatus, settlementStatusValue);
}
return rb.success().setData(resultBean.getData());
}
}
@ -621,7 +629,7 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
map.put("modelSid", modelSid);
map.put("configSid", configSid);
map.put("selectType", 0);
appVehicleVersionVo.setJson(JSONObject.toJSONString(map));
appSubVersionVo.setJson(JSONObject.toJSONString(map));
BeanUtil.copyProperties(appSubVersionVo, appVehicleVersionVo);
vos.setCarDetailPage(appVehicleVersionVo);});}
vo.setRecords(records);

3
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyMapper.xml

@ -73,7 +73,8 @@
ba.taskId,
ba.createOrgSid as userSid,
ba.createOrgName,
ba.applyType
ba.applyType,
ba.payRemarks
from bus_vehicle_apply ba
where sid = #{sid}
</select>

2
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java

@ -535,6 +535,7 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo,messageFlowVo);
ufVo.setProcDefId(busVehicleApply.getProcDefId());
ufVo.setProcInsId(busVehicleApply.getProcInstId());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
@ -685,6 +686,7 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
BeanUtil.copyProperties(ufVo,messageFlowVo);
String procId = busVehicleApply.getProcInstId();
ufVo.setProcInsId(procId);
ufVo.setProcDefId(busVehicleApply.getProcDefId());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(businessSid);

3
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.java

@ -82,4 +82,7 @@ public interface CommonContractMapper extends BaseMapper<CommonContract> {
int selectNum(String bill);
int updateFlowFiled(Map<String, Object> map);
@Update("update common_contract set `state`=#{state} where sid=#{businessSid}")
void updateBySidAndState(@Param("businessSid") String businessSid, @Param("state") String state);
}

10
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractRest.java

@ -5,10 +5,7 @@ import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo;
import com.yxt.anrui.base.api.commonappendix.CommonAttachTypeEnum;
import com.yxt.anrui.base.api.commonappendix.PcCommonAppendixDto;
import com.yxt.anrui.base.api.commoncontract.*;
import com.yxt.anrui.base.api.commoncontract.flowable.CommonContractCompleteDto;
import com.yxt.anrui.base.api.commoncontract.flowable.CommonContractNodeQuery;
import com.yxt.anrui.base.api.commoncontract.flowable.CommonContractNodeVo;
import com.yxt.anrui.base.api.commoncontract.flowable.CommonContractTaskQuery;
import com.yxt.anrui.base.api.commoncontract.flowable.*;
import com.yxt.anrui.base.biz.commonappendix.CommonAppendixService;
import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedFeign;
import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
@ -532,6 +529,11 @@ public class CommonContractRest implements CommonContractFeign {
return rb.success();
}
@Override
public ResultBean submitContractInfo(AppSubmitContractInfoDto dto) {
return commonContractService.submitContractInfo(dto);
}
@Override
public ResultBean complete(CommonContractCompleteDto query) {
BusinessVariables bv = new BusinessVariables();

151
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java

@ -5,8 +5,11 @@ import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
import com.yxt.anrui.base.api.basemodelmodprice.BaseModelModprice;
import com.yxt.anrui.base.api.basemodelmodprice.flow.SubmitBaseModelModPriceDto;
import com.yxt.anrui.base.api.commonappendix.CommonAppendix;
import com.yxt.anrui.base.api.commoncontract.*;
import com.yxt.anrui.base.api.commoncontract.flowable.AppSubmitContractInfoDto;
import com.yxt.anrui.base.api.commoncontract.flowable.CommonContractNodeQuery;
import com.yxt.anrui.base.api.commoncontract.flowable.CommonContractNodeVo;
import com.yxt.anrui.base.api.commoncontract.flowable.CommonContractTaskQuery;
@ -42,6 +45,7 @@ import com.yxt.anrui.portal.api.dictcommon.DictCommonFeign;
import com.yxt.anrui.portal.api.dictcommon.DictCommonVo;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
@ -982,8 +986,6 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
*/
public PagerVo<AppCommonContractPageVo> getContractList(PagerQuery<AppCommonContractQuery> pagerQuery) {
AppCommonContractQuery query = pagerQuery.getParams();
String staffSid = sysUserFeign.getUserOrgInfoByUserSid(query.getUserSid()).getData().getStaffSid();
query.setStaffSid(staffSid);
QueryWrapper<CommonContract> qw = appCreateQueryWrapper(query);
IPage<CommonContract> page = PagerUtil.queryToPage(pagerQuery);
IPage<AppCommonContractPageVo> iPage = baseMapper.getContractList(page, qw);
@ -997,9 +999,9 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
QueryWrapper<CommonContract> qw = new QueryWrapper<>();
if (StringUtils.isNotBlank(query.getType())) { //合同类型
qw.eq("contractTypeKey", query.getType());
}
// if (StringUtils.isNotBlank(query.getType())) { //合同类型
// qw.eq("contractTypeKey", query.getType());
// }
if (StringUtils.isNotBlank(query.getNames())) { // 甲方名称
qw.like("partyA", query.getNames());
}
@ -1009,8 +1011,11 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
if (StringUtils.isNotBlank(query.getNames())) { // 其他方名称
qw.like("partyC", query.getNames());
}
if (StringUtils.isNotBlank(query.getStaffSid())) { // 业务员sid
qw.eq("staffSid", query.getStaffSid());
if (StringUtils.isNotBlank(query.getUserSid())) { // 业务员sid
qw.eq("staffSid", query.getUserSid());
}
if (StringUtils.isNotBlank(query.getType())) { // 业务员sid
qw.eq("state", query.getType());
}
return qw;
}
@ -1023,8 +1028,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
* @return
*/
public AppCommonContractInitVo getContractInfo(String contractSid, String userSid) {
String staffSid = sysUserFeign.getUserOrgInfoByUserSid(userSid).getData().getStaffSid();
AppCommonContractInitVo vo = baseMapper.getContractInfo(contractSid, staffSid);
AppCommonContractInitVo vo = baseMapper.getContractInfo(contractSid, userSid);
String urlPrefix = fileUploadComponent.getUrlPrefix();
vo.setUserSid(userSid);
if (StringUtils.isNotBlank(vo.getAppdixUrl())) {
@ -1089,7 +1093,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
commonContract.setPartyB(dto.getPartyB());
commonContract.setContractAmount(dto.getContractPrice());
commonContract.setCustomerSid(dto.getCustomerSid());
commonContract.setStaffSid(data.getStaffSid());
commonContract.setStaffSid(dto.getUserSid());
commonContract.setStaffName(data.getStaffName());
commonContract.setOrgSid(data.getOrgSid());
String s1 = "";
@ -1125,7 +1129,115 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
}
}
updateById(commonContract);
return rb.success();
return rb.success().setData(commonContract.getSid());
}
public ResultBean submitContractInfo(AppSubmitContractInfoDto dto) {
ResultBean rb = ResultBean.fireFail();
//根据用户sid获取staffSid
ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid());
if (!userVoResultBean.getSuccess()) {
return rb.setMsg(userVoResultBean.getMsg());
}
//根据staffSid获取用户的组织全路径
ResultBean<SysStaffOrg> orgByStaffSid = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid());
if (!orgByStaffSid.getSuccess()) {
return rb.setMsg(orgByStaffSid.getMsg());
}
//用户的组织全路径
String orgSidPath = orgByStaffSid.getData().getOrgSidPath();
CommonContract commonContract = fetchBySid(dto.getContractSid());
int r = submitBusinessData(dto, commonContract);
if (r == 3) {
return rb.setMsg("该申请不存在");
}
if (r == 0) {
return rb.setMsg("操作失败!提交的数据不一致");
}
ResultBean<String> resultBean = saveContractInfo(dto);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
String businessSid = resultBean.getData();
baseMapper.updateBySidAndState(businessSid, "2");
//创建BusinessVariables实体对象
BusinessVariables bv = new BusinessVariables();
//流程中的参数赋值
Map<String, Object> variables = BeanUtil.beanToMap(dto);
//若有网关,则赋值网关中判断的字段。
variables.put("businessSid", businessSid);
//用户的部门全路径sid
bv.setOrgSidPath(orgSidPath);
//业务sid
bv.setBusinessSid(businessSid);
//用户sid
bv.setUserSid(dto.getUserSid());
bv.setFormVariables(variables);
//若app移动端有此功能,则传递appMap参数
Map<String, Object> appMap = new HashMap<>();
//需和移动端沟通业务sid保存的属性具体值:appMap中sid不是固定的。移动端提供具体字段。
appMap.put("sid", businessSid);
variables.put("app", appMap);
//流程定义id
bv.setModelId(ProcDefEnum.CONTRACTAPPLY.getProDefId());
if (r == 1) {
ResultBean<UpdateFlowFieldVo> voResultBean = flowableFeign.startProcess(bv);
UpdateFlowFieldVo ufVo = voResultBean.getData();
updateFlowFiled(BeanUtil.beanToMap(ufVo));
//极光推送
commonContract = fetchBySid(businessSid);
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo, messageFlowVo);
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(businessSid);
messageFlowableQuery.setModuleName("合同审核申请");
messageFlowableQuery.setMsgContent(commonContract.getStaffName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
messageFlowableQuery.setMsgTitle("业务");
ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
return voResultBean;
}
if (r == 2) {
// ToDo:驳回到发起人后再次提交
if (StringUtils.isBlank(dto.getInstanceId())) {
return rb.setMsg("参数错误:instanceId");
}
bv.setTaskId(commonContract.getTaskId());
bv.setTaskDefKey(commonContract.getNodeId());
bv.setComment(StringUtils.isNotBlank(dto.getComment()) ? dto.getComment() : "重新提交");
bv.setInstanceId(dto.getInstanceId());
return complete(bv);
}
return rb;
}
/**
* 判断提交的流程是否被允许
*
* @param dto
* @return
*/
private synchronized int submitBusinessData(AppSubmitContractInfoDto dto, CommonContract commonContract) {
int r = 0;
if (StringUtils.isBlank(dto.getContractSid())) {
r = 1;
} else {
if (commonContract != null) {
String businessTaskId = commonContract.getTaskId();
if (StringUtils.isBlank(businessTaskId) && StringUtils.isBlank(dto.getTaskId())) {
//新提交
r = 1;
} else if (StringUtils.isNotBlank(businessTaskId) && businessTaskId.equals(dto.getTaskId())) {
//二次提交//只有数据一致的时候才能进行下一步
r = 2;
}
} else {
r = 3;
}
}
return r;
}
public ResultBean<List<PrintConfirmVo>> printConfirm(PrintConfirmDto dto) {
@ -1275,6 +1387,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
//签订日期、签订地点
//订金、合同金额
commonContract.setDeposit(new BigDecimal(depositTotal));
commonContract.setContractAmount(depositTotal);
//合同附件
//身份证信息附件
//车型sid
@ -1332,13 +1445,13 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
commonContract = fetchBySid(businessSid);
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo,messageFlowVo);
BeanUtil.copyProperties(ufVo, messageFlowVo);
ufVo.setProcInsId(commonContract.getProcInstId());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(businessSid);
messageFlowableQuery.setModuleName("合同审核申请");
messageFlowableQuery.setMsgContent(commonContract.getStaffName()+"提交的"+messageFlowableQuery.getModuleName()+",请审批");
messageFlowableQuery.setMsgContent(commonContract.getStaffName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
messageFlowableQuery.setMsgTitle("业务中心");
ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
}
@ -1416,20 +1529,20 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
commonContract = fetchBySid(businessSid);
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo,messageFlowVo);
BeanUtil.copyProperties(ufVo, messageFlowVo);
String procId = commonContract.getProcInstId();
ufVo.setProcInsId(procId);
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(businessSid);
messageFlowableQuery.setModuleName("合同审核申请");
ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(procId);
ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(procId);
String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_();
List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
if(receiveSidList.size() == 1 && receiveSidList.get(0).equals(commonContract.getStaffSid())){
messageFlowableQuery.setMsgContent("您提交的"+messageFlowableQuery.getModuleName()+"已被驳回,请重新提交");
}else{
messageFlowableQuery.setMsgContent(commonContract.getStaffName()+"提交的"+messageFlowableQuery.getModuleName()+",请审批");
if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(commonContract.getStaffSid())) {
messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交");
} else {
messageFlowableQuery.setMsgContent(commonContract.getStaffName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
}
messageFlowableQuery.setMsgTitle("业务中心");
ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);

4
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderinsurance/BusSalesOrderInsurance.java

@ -59,6 +59,8 @@ public class BusSalesOrderInsurance extends BaseEntity {
@ApiModelProperty("单台车保费预估金额")
private BigDecimal insuranceCarMoney;
@ApiModelProperty("公司入保期数")
private Integer insuranceNum;
private String insuranceNum;
private String insuranceNumKey;
}

4
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderinsurance/BusSalesOrderInsuranceDetailsVo.java

@ -57,9 +57,11 @@ public class BusSalesOrderInsuranceDetailsVo implements Vo {
@JsonSerialize(using = ToStringSerializer.class)
private String insuranceCarMoney;
@ApiModelProperty("公司入保期数")
private Integer insuranceNum;
private String insuranceNum;
@ApiModelProperty(value = "保险备注")
private String remarks;
private String insuranceNumKey;
}

4
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderinsurance/BusSalesOrderInsuranceDto.java

@ -54,9 +54,11 @@ public class BusSalesOrderInsuranceDto implements Dto {
@ApiModelProperty("单台车保费预估金额")
private String insuranceCarMoney;
@ApiModelProperty("公司入保期数")
private Integer insuranceNum;
private String insuranceNum;
@ApiModelProperty(value = "备注")
private String remarks;
private String insuranceNumKey;
}

2
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderinsurance/BusSalesOrderInsuranceQuery.java

@ -58,6 +58,6 @@ public class BusSalesOrderInsuranceQuery implements Query {
@ApiModelProperty("单台车保费预估金额")
private BigDecimal insuranceCarMoney;
@ApiModelProperty("公司入保期数")
private Integer insuranceNum;
private String insuranceNum;
}

3
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderinsurance/BusSalesOrderInsuranceVo.java

@ -61,6 +61,7 @@ public class BusSalesOrderInsuranceVo implements Vo {
@JsonSerialize(using = ToStringSerializer.class)
private String insuranceCarMoney;
@ApiModelProperty("公司入保期数")
private Integer insuranceNum;
private String insuranceNum;
private String insuranceNumKey;
}

2
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderinsurance/app/AppBusSalesOrderInsuranceDto.java

@ -27,4 +27,6 @@ public class AppBusSalesOrderInsuranceDto implements Dto {
@ApiModelProperty(value = "销售订单sid")
private String salesOrderSid;
private String insuranceNumKey;
}

2
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderinsurance/app/AppBusSalesOrderInsuranceVo.java

@ -27,4 +27,6 @@ public class AppBusSalesOrderInsuranceVo implements Vo {
private String number;
@ApiModelProperty(value = "备注")
private String remarks;
private String numberKey;
}

2
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java

@ -601,7 +601,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
/**
* 发货组织:FStockOrgId (必填项)
*/
salOutStock.setFStockOrgId("101");
//salOutStock.setFStockOrgId("101");
List<SalOutStock.FEntity> fEntity=new ArrayList<>();

84
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java

@ -94,9 +94,7 @@ 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.messagecenter.api.message.MessageFeign;
import com.yxt.messagecenter.api.message.MessageFlowableDto;
import com.yxt.messagecenter.api.message.MessageJsonDto;
import com.yxt.messagecenter.api.message.*;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@ -1778,7 +1776,17 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
updateFlowFiled(BeanUtil.beanToMap(ufVo));
//极光推送
busMainDeposit = fetchBySid(businessSid);
String msgSid = getMessage(ufVo, appMap, busMainDeposit);
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo,messageFlowVo);
ufVo.setProcInsId(busMainDeposit.getProcInsId());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(businessSid);
messageFlowableQuery.setModuleName("简易订单-订金申请");
messageFlowableQuery.setMsgContent(busMainDeposit.getStaffName()+"提交的"+messageFlowableQuery.getModuleName()+",请审批");
messageFlowableQuery.setMsgTitle("业务中心");
ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
return voResultBean;
}
if (r == 2) {
@ -1889,7 +1897,18 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
baseVehicleFeign.updateMainDepositByVinNo(busMainDepositUpdateQuery);
//极光推送
busMainDeposit = fetchBySid(businessSid);
String msgSid = getMessage(ufVo, appMap, busMainDeposit);
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo,messageFlowVo);
ufVo.setProcInsId(busMainDeposit.getProcInsId());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(businessSid);
messageFlowableQuery.setModuleName("简易订单-订车申请");
messageFlowableQuery.setMsgContent(busMainDeposit.getStaffName()+"提交的"+messageFlowableQuery.getModuleName()+",请审批");
messageFlowableQuery.setMsgTitle("业务中心");
ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
// String msgSid = getMessage(ufVo, appMap, busMainDeposit);
return voResultBean;
}
if (r == 2) {
@ -1934,7 +1953,23 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
baseVehicleFeign.updateMainDepositByVinNo(busMainDepositUpdateQuery);
//极光推送
busMainDeposit = fetchBySid(bv.getBusinessSid());
String msgSid = getMessage(ufVo, appMap, busMainDeposit);
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo,messageFlowVo);
ufVo.setProcInsId(busMainDeposit.getProcInsId());
ufVo.setProcDefId(busMainDeposit.getProcDefId());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(bv.getBusinessSid());
if ("01".equals(busMainDeposit.getDepositBillTypeKey())) {//订金收取
messageFlowableQuery.setModuleName("简易订单-订金申请");
}else{
messageFlowableQuery.setModuleName("简易订单-订车申请");
}
messageFlowableQuery.setMsgContent(busMainDeposit.getStaffName()+"提交的"+messageFlowableQuery.getModuleName()+",请审批");
messageFlowableQuery.setMsgTitle("业务中心");
ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
// String msgSid = getMessage(ufVo, appMap, busMainDeposit);
}
return rb.success().setData(resultBean.getData());
} else {
@ -2023,7 +2058,30 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
updateFlowFiled(map);
//极光推送
busMainDeposit = fetchBySid(query.getBusinessSid());
String msgSid = getMessage(ufVo, appMap, busMainDeposit);
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo,messageFlowVo);
String procId = busMainDeposit.getProcInsId();
ufVo.setProcInsId(busMainDeposit.getProcInsId());
ufVo.setProcDefId(busMainDeposit.getProcDefId());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(query.getBusinessSid());
if ("01".equals(busMainDeposit.getDepositBillTypeKey())) {//订金收取
messageFlowableQuery.setModuleName("简易订单-订金申请");
}else{
messageFlowableQuery.setModuleName("简易订单-订车申请");
}
ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(procId);
String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_();
List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
if(receiveSidList.size() == 1 && receiveSidList.get(0).equals(busMainDeposit.getStaffSid())){
messageFlowableQuery.setMsgContent("您提交的"+messageFlowableQuery.getModuleName()+"已被驳回,请重新提交");
}else{
messageFlowableQuery.setMsgContent(busMainDeposit.getStaffName()+"提交的"+messageFlowableQuery.getModuleName()+",请审批");
}
messageFlowableQuery.setMsgTitle("业务中心");
ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
return rb.success();
}
}
@ -2087,15 +2145,7 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
return rb.setMsg("操作失败!提交的数据不一致!");
}
/**
* 消息推送
*
* @param ufVo
* @param appMap
* @param busMainDeposit
* @return
*/
public String getMessage(UpdateFlowFieldVo ufVo, Map<String, Object> appMap, BusMainDeposit busMainDeposit) {
/* public String getMessage(UpdateFlowFieldVo ufVo, Map<String, Object> appMap, BusMainDeposit busMainDeposit) {
//=====极光推送信息========================================参数组装
String procId = busMainDeposit.getProcInsId();
ResultBean<List<LatestTaskVo>> resultBean = flowTaskFeign.getLatestTasks(procId);
@ -2149,6 +2199,6 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
String msgSid = stringResultBean.getData();
return msgSid;
}
}*/
}

137
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@ -97,7 +97,6 @@ import com.yxt.anrui.flowable.api.flowtask.FlowTaskVo;
import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo;
import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFeign;
import com.yxt.anrui.flowable.api.sysprourl.SysProUrlFeign;
import com.yxt.anrui.flowable.api.sysprourl.SysProUrlVo;
import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
import com.yxt.anrui.portal.api.dictcommon.DictCommonFeign;
@ -118,8 +117,8 @@ import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.messagecenter.api.message.MessageFeign;
import com.yxt.messagecenter.api.message.MessageFlowableDto;
import com.yxt.messagecenter.api.message.MessageJsonDto;
import com.yxt.messagecenter.api.message.MessageFlowVo;
import com.yxt.messagecenter.api.message.MessageFlowableQuery;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -913,12 +912,31 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
//更新业务中的流程相关的参数
updateFlowFiled(map);
if(!"Event_end".equals(ufVo.getTaskDefKey())){
//极光推送
busSalesOrder = fetchBySid(query.getBusinessSid());
String msgSid = getMessage(ufVo, (Map<String, Object>) variables.get("app"), busSalesOrder);
//极光推送
busSalesOrder = fetchBySid(query.getBusinessSid());
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo, messageFlowVo);
String procId = busSalesOrder.getProcInstId();
ufVo.setProcInsId(procId);
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap((Map<String, Object>) variables.get("app"));
messageFlowableQuery.setBusinessSid(query.getBusinessSid());
messageFlowableQuery.setModuleName("销售订单申请");
ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(procId);
String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_();
List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(busSalesOrder.getStaffSid())) {
messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交");
} else {
messageFlowableQuery.setMsgContent(busSalesOrder.getStaffName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
}
messageFlowableQuery.setMsgTitle("业务中心");
ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
// String msgSid = getMessage(ufVo, (Map<String, Object>) variables.get("app"), busSalesOrder);
return rb.success();
}
}
@ -1247,15 +1265,23 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
*/
public AppBusSalesOrderBillInfoVo getBillInfo(String saleOrderSid) {
AppBusSalesOrderBillInfoVo vo = baseMapper.getBillInfo(saleOrderSid);
String affiliatedOrgSid = vo.getAffiliatedOrgSid();
if (StringUtils.isNotBlank(affiliatedOrgSid)) {
if(vo != null){
String affiliatedOrgSid = vo.getAffiliatedOrgSid();
if (StringUtils.isNotBlank(affiliatedOrgSid)) {
vo.setAffiliatedType("1");
vo.setAffiliatedOrgNameChoose(vo.getAffiliatedCompany());
} else {
vo.setAffiliatedType("0");
vo.setAffiliatedOrgNameWrite(vo.getAffiliatedCompany());
}
vo.setSaleOrderSid(saleOrderSid);
}else{
vo = new AppBusSalesOrderBillInfoVo();
//根据意向车型查询信息
vo.setIntentionSid(saleOrderSid);
vo.setAffiliatedType("1");
vo.setAffiliatedOrgNameChoose(vo.getAffiliatedCompany());
} else {
vo.setAffiliatedType("0");
vo.setAffiliatedOrgNameWrite(vo.getAffiliatedCompany());
}
vo.setSaleOrderSid(saleOrderSid);
return vo;
}
@ -1503,8 +1529,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
type = "2";
//查询数量
BusSalesOrderPrice busSalesOrderPrice = busSalesOrderPriceService.selectBySalesOrderSid(saleOrderSid);
if(busSalesOrderPrice != null){
if(busSalesOrderPrice.getQuantity() != null){
if (busSalesOrderPrice != null) {
if (busSalesOrderPrice.getQuantity() != null) {
vo.setArrangeNumber(busSalesOrderPrice.getQuantity().toString());
}
}
@ -2145,6 +2171,10 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
String x2 = "入保期数";
vo.setInsuranceInfo(busSalesOrderInsurance.getInsuranceName() + x + x1 + busSalesOrderInsurance.getInsuranceCarMoney() + "元" + x + x2 + busSalesOrderInsurance.getInsuranceNum() + "期");
}
}else{
if ("0".equals(busSalesOrder.getIsInsurance())) {
vo.setInsuranceInfo("未在公司入保");
}
}
/***************************车型信息***************************************/
AppOrderModelInfoVo modelInfo = busSalesOrderModelService.selectModel(sid);
@ -2292,7 +2322,17 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
updateFlowFiled(BeanUtil.beanToMap(ufVo));
//极光推送
busSalesOrder = fetchBySid(businessSid);
String msgSid = getMessage(ufVo, (Map<String, Object>) variables.get("app"), busSalesOrder);
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo, messageFlowVo);
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap((Map<String, Object>) variables.get("app"));
messageFlowableQuery.setBusinessSid(businessSid);
messageFlowableQuery.setModuleName("销售订单申请");
messageFlowableQuery.setMsgContent(busSalesOrder.getStaffName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
messageFlowableQuery.setMsgTitle("业务中心");
ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
// String msgSid = getMessage(ufVo, (Map<String, Object>) variables.get("app"), busSalesOrder);
return voResultBean;
}
if (r == 2) {
@ -2367,8 +2407,22 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
UpdateFlowFieldVo ufVo = resultBean.getData();
updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
//极光推送
busSalesOrder = fetchBySid(bv.getBusinessSid());
String msgSid = getMessage(ufVo, (Map<String, Object>) variables.get("app"), busSalesOrder);
if (!"Event_end".equals(resultBean.getData().getTaskDefKey())) {
//极光推送
busSalesOrder = fetchBySid(bv.getBusinessSid());
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo, messageFlowVo);
ufVo.setProcInsId(busSalesOrder.getProcInstId());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap((Map<String, Object>) variables.get("app"));
messageFlowableQuery.setBusinessSid(bv.getBusinessSid());
messageFlowableQuery.setModuleName("销售订单申请");
messageFlowableQuery.setMsgContent(busSalesOrder.getStaffName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
messageFlowableQuery.setMsgTitle("业务中心");
ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
}
// String msgSid = getMessage(ufVo, (Map<String, Object>) variables.get("app"), busSalesOrder);
return rb.success().setData(resultBean.getData());
} else {
return rb.setMsg("操作失败!提交的数据不一致");
@ -2443,49 +2497,4 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
// variables.put("isLoan1", "3".equals(busSalesOrder.getType()));
return variables;
}
public String getMessage(UpdateFlowFieldVo ufVo, Map<String, Object> appMap, BusSalesOrder busSalesOrder) {
//=====极光推送信息========================================参数组装
String procId = busSalesOrder.getProcInstId();
ResultBean<List<LatestTaskVo>> resultBean = flowTaskFeign.getLatestTasks(procId);
String nextNodeUserSids = resultBean.getData().get(0).getASSIGNEE_();
List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
//根据用户的sid查询用户的id
ResultBean<String> stringList1 = sysUserFeign.selectIdBySid(receiveSidList);
List<String> reveiveIdList = Arrays.asList(stringList1.getData().split(","));
MessageFlowableDto messageFlowableDto = new MessageFlowableDto();
MessageJsonDto messageJsonDto = new MessageJsonDto();
BeanUtil.copyProperties(ufVo, messageJsonDto);
//查询流程审批的页面操作地址组装json的参数
//根据taskDef和移动端标识
ResultBean<SysProUrlVo> selectUrlByKey = sysProUrlFeign.selectUrlByKey(ProcDefEnum.SALESORDER.getProDefId(), ufVo.getTaskDefKey(), "1", "2");
SysProUrlVo sysProUrlVo = selectUrlByKey.getData();
messageFlowableDto.setBusinessSid(busSalesOrder.getSid());
messageFlowableDto.setApp_type("2");
if (sysProUrlVo.getUrl().contains("#")) {
messageFlowableDto.setModuleAction(Arrays.asList(sysProUrlVo.getUrl().split("#")).get(0));
List<Integer> codesInteger = Arrays.asList(Arrays.asList(sysProUrlVo.getUrl().split("#")).get(1).split(",")).stream().map(Integer::parseInt).collect(Collectors.toList());
int[] ints = codesInteger.stream().mapToInt(Integer::valueOf).toArray();
;
messageJsonDto.setButtons(ints);
} else {
messageFlowableDto.setModuleAction(sysProUrlVo.getUrl());
}
messageFlowableDto.setModuleSid(Arrays.asList(sysProUrlVo.getModulePluginName().split("#")).get(0));
messageJsonDto.setTaskName(ufVo.getNodeState());
messageJsonDto.setProcInsId(ufVo.getProcInsId());
messageJsonDto.setAppMap(appMap);
messageFlowableDto.setJson(messageJsonDto);
messageFlowableDto.setList(receiveSidList);
messageFlowableDto.setReceiveIdList(reveiveIdList);
messageFlowableDto.setModuleName("销售订单申请");
messageFlowableDto.setMsgContent("销售订单申请");
messageFlowableDto.setMsgTitle("销售订单申请");
messageFlowableDto.setCreateName(busSalesOrder.getStaffName());
messageFlowableDto.setTaskId(ufVo.getTaskId());
ResultBean<String> stringResultBean = messageFeign.getMessage(messageFlowableDto);
String msgSid = stringResultBean.getData();
return msgSid;
}
}

3
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceMapper.xml

@ -49,7 +49,8 @@
insuranceName as name,
insuranceCarMoney as price,
insuranceNum as number,
remarks
remarks,
insuranceNumKey as numberKey
from bus_sales_order_insurance
where salesOrderSid = #{sid}
</select>

3
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceService.java

@ -112,6 +112,9 @@ public class BusSalesOrderInsuranceService extends MybatisBaseService<BusSalesOr
}
} else if ("0".equals(dto.getIsInsureType())) {
if(StringUtils.isBlank(dto.getRemarks())){
return rb.setMsg("备注不能为空");
}
//查询保险信息是否有数据
BusSalesOrderInsurance busSalesOrderInsurance = baseMapper.selectByOrderSid(dto.getSalesOrderSid());
if (busSalesOrderInsurance != null) {

1
anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmVehicledemandFeign.java

@ -154,4 +154,5 @@ public interface CrmVehicledemandFeign {
@GetMapping("/getInfo/{intentionSid}")
ResultBean<CrmVehicleDemandOrderVo> getInfo(@PathVariable("intentionSid") String intentionSid);
}

6
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeign.java

@ -7,6 +7,7 @@ import com.yxt.anrui.fin.api.kingdee.bdmaterial.BdMaterial;
import com.yxt.anrui.fin.api.kingdee.purmrb.PurMrb;
import com.yxt.anrui.fin.api.kingdee.saloutstock.SalOutStock;
import com.yxt.anrui.fin.api.kingdee.stkinstock.StkInStock;
import com.yxt.anrui.fin.api.kingdee.stktransferdirect.StkTransferDirect;
import com.yxt.common.core.result.ResultBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@ -72,4 +73,9 @@ public interface FinKingDeeFeign {
@ResponseBody
public ResultBean<List<KingDeeResult>> draftBdMaterialList(@RequestBody List<BdMaterial> bdMaterial) ;
@ApiOperation("保存直接调拨单的接口")
@PostMapping("/draftStkTransferDirect")
@ResponseBody
public ResultBean<List<KingDeeResult>> draftStkTransferDirect(@RequestBody StkTransferDirect stkTransferDirect) ;
}

6
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeignFallBack.java

@ -7,6 +7,7 @@ import com.yxt.anrui.fin.api.kingdee.bdmaterial.BdMaterial;
import com.yxt.anrui.fin.api.kingdee.purmrb.PurMrb;
import com.yxt.anrui.fin.api.kingdee.saloutstock.SalOutStock;
import com.yxt.anrui.fin.api.kingdee.stkinstock.StkInStock;
import com.yxt.anrui.fin.api.kingdee.stktransferdirect.StkTransferDirect;
import com.yxt.common.core.result.ResultBean;
import java.util.List;
@ -53,4 +54,9 @@ implements FinKingDeeFeign{
return null;
}
@Override
public ResultBean<List<KingDeeResult>> draftStkTransferDirect(StkTransferDirect stkTransferDirect) {
return null;
}
}

1
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/KingDeeBillId.java

@ -8,6 +8,7 @@ public enum KingDeeBillId {
STK_INSTOCK("STK_InStock","采购入库单"),
PUR_MRB("PUR_MRB","采购退料单"),
SAL_OUTSTOCK("SAL_OUTSTOCK","销售出库单"),
STK_TRANSFERDIRECT("STK_TransferDirect","直接调拨单"),
BD_MATERIAL("BD_MATERIAL","物料");
private String ID;
private String NAME;

198
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/stktransferdirect/StkTransferDirect.java

@ -0,0 +1,198 @@
package com.yxt.anrui.fin.api.kingdee.stktransferdirect;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.yxt.anrui.fin.api.kingdee.stkinstock.StkInStock;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
/**
* 直接调拨单
*/
@Data
public class StkTransferDirect {
@Data
public static class FBillEntry{
/* 调入库存状态:FDestStockStatusId (必填项)*/
@JsonProperty("FDestStockStatusId")
@NotBlank
public String FDestStockStatusId;
/*调出库存状态:FSrcStockStatusId (必填项)*/
@JsonProperty("FSrcStockStatusId")
@NotBlank
public String FSrcStockStatusId;
/*基本单位:FBaseUnitId (必填项)*/
@JsonProperty("FBaseUnitId")
@NotBlank
public String FBaseUnitId;
/*调入货主类型:FOwnerTypeId (必填项)*/
@JsonProperty("FOwnerTypeId")
@NotBlank
public String FOwnerTypeId;
/* 调出保管者:FKeeperOutId (必填项)*/
@JsonProperty("FKeeperOutId")
@NotBlank
public String FKeeperOutId;
/* 调出货主:FOwnerOutId (必填项)*/
@JsonProperty("FOwnerOutId")
@NotBlank
public String FOwnerOutId;
/*调出批号:FLot*/
@JsonProperty("FLot")
@NotBlank
public String FLot;
/* 调出货主类型:FOwnerTypeOutId (必填项)*/
@JsonProperty("FOwnerTypeOutId")
@NotBlank
public String FOwnerTypeOutId;
/*调入批号:FDestLot*/
@JsonProperty("FDestLot")
@NotBlank
public String FDestLot;
/* 调入货主:FOwnerId (必填项)*/
@JsonProperty("FOwnerId")
@NotBlank
public String FOwnerId;
/* 调入货主:FOwnerIdHead (必填项)*/
@JsonProperty("FOwnerIdHead")
@NotBlank
public String FOwnerIdHead;
/* 调出保管者类型:FKeeperTypeOutId (必填项)*/
@JsonProperty("FKeeperTypeOutId")
@NotBlank
public String FKeeperTypeOutId;
/* 调入保管者:FKeeperId (必填项)*/
@JsonProperty("FKeeperId")
@NotBlank
public String FKeeperId;
/* 调入保管者类型:FKeeperTypeId (必填项)*/
@JsonProperty("FKeeperTypeId")
@NotBlank
public String FKeeperTypeId;
/* 调入仓库:FDestStockId (必填项)*/
@JsonProperty("FDestStockId")
@NotBlank
public String FDestStockId;
/* 单位:FUnitID (必填项)*/
@JsonProperty("FUnitID")
@NotBlank
public String FUnitID;
/* 物料编码:FMaterialId (必填项)*/
@JsonProperty("FMaterialId")
@NotBlank
public String FMaterialId;
/* 调出仓库:FSrcStockId (必填项)*/
@JsonProperty("FSrcStockId")
@NotBlank
public String FSrcStockId;
}
/* 调出库存组织:FStockOutOrgId (必填项)*/
@JsonProperty("FStockOutOrgId")
@NotBlank
public String FStockOutOrgId;
/* 调拨类型:FTransferBizType (必填项)*/
@JsonProperty("FTransferBizType")
@NotBlank
public String FTransferBizType;
/* 调拨方向:FTransferDirect (必填项)*/
@JsonProperty("FTransferDirect")
@NotBlank
public String FTransferDirect;
/* 调出货主类型:FOwnerTypeOutIdHead (必填项)*/
@JsonProperty("FOwnerTypeOutIdHead")
@NotBlank
public String FOwnerTypeOutIdHead;
/* 调入库存组织:FStockOrgId (必填项)*/
@JsonProperty("FStockOrgId")
@NotBlank
public String FStockOrgId;
/* 调入货主类型:FOwnerTypeIdHead (必填项)*/
@JsonProperty("FOwnerTypeIdHead")
@NotBlank
public String FOwnerTypeIdHead;
/* 单据类型:FBillTypeID (必填项)*/
@JsonProperty("FBillTypeID")
@NotBlank
public String FBillTypeID;
/* 日期:FDate (必填项)*/
@JsonProperty("FDate")
@NotBlank
public String FDate;
/**
* FBillEntry
*/
@JsonProperty("FBillEntry")
@NotBlank
public List<FBillEntry> FBillEntry=new ArrayList<>();
public final static StkTransferDirect stkTransferDirect = new StkTransferDirect();
static {
SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
Date date=new Date();
/* 单据类型:FBillTypeID (必填项)*/
stkTransferDirect.setFBillTypeID("ZJDB01_SYS");
/* 日期:FDate (必填项)*/
stkTransferDirect.setFDate(sdf.format(date));
/* 调出库存组织:FStockOutOrgId (必填项)*/
stkTransferDirect.setFStockOutOrgId("101");
/* 调出货主类型:FOwnerTypeOutIdHead (必填项)*/
stkTransferDirect.setFOwnerTypeOutIdHead("BD_OwnerOrg");
/* 调拨类型:FTransferBizType (必填项)*/
stkTransferDirect.setFTransferBizType("InnerOrgTransfer");
/* 调拨方向:FTransferDirect (必填项)*/
stkTransferDirect.setFTransferDirect("GENERAL");
/* 调入库存组织:FStockOrgId (必填项)*/
stkTransferDirect.setFStockOrgId("101");
/* 调入货主类型:FOwnerTypeIdHead (必填项)*/
stkTransferDirect.setFOwnerTypeIdHead("BD_OwnerOrg");
List<StkTransferDirect.FBillEntry> fBillEntry=new ArrayList<>();
StkTransferDirect.FBillEntry fbe=new StkTransferDirect.FBillEntry();
/*调入批号:FDestLot*/
fbe.setFDestLot("1234567890");
/*调出批号:FLot*/
fbe.setFLot("1234567890");
/*基本单位:FBaseUnitId (必填项)*/
fbe.setFBaseUnitId("liang");
/* 调入仓库:FDestStockId (必填项)*/
fbe.setFDestStockId("CK002");
/* 单位:FUnitID (必填项)*/
fbe.setFUnitID("liang");
/* 物料编码:FMaterialId (必填项)*/
fbe.setFMaterialId(" JX091054");
/* 调入库存状态:FDestStockStatusId (必填项)*/
fbe.setFDestStockStatusId("KCZT01_SYS");
/* 调入货主类型:FOwnerTypeId (必填项)*/
fbe.setFOwnerTypeId("BD_OwnerOrg");
/* 调入货主:FOwnerId (必填项)*/
fbe.setFOwnerId("101");
/* 调入货主:FOwnerId (必填项)*/
fbe.setFOwnerIdHead("101");
/* 调出保管者:FKeeperOutId (必填项)*/
fbe.setFKeeperOutId("101");
/* 调出货主:FOwnerOutId (必填项)*/
fbe.setFOwnerOutId("101");
/* 调出货主类型:FOwnerTypeOutId (必填项)*/
fbe.setFOwnerTypeOutId("BD_OwnerOrg");
/* 调出保管者类型:FKeeperTypeOutId (必填项)*/
fbe.setFKeeperTypeOutId("BD_KeeperOrg");
/* 调入保管者:FKeeperId (必填项)*/
fbe.setFKeeperId("101");
/* 调入保管者类型:FKeeperTypeId (必填项)*/
fbe.setFKeeperTypeId("BD_KeeperOrg");
/*调出库存状态:FSrcStockStatusId (必填项)*/
fbe.setFSrcStockStatusId("KCZT01_SYS");
/* 调出仓库:FSrcStockId (必填项)*/
fbe.setFSrcStockId("CK001");
fBillEntry.add(fbe);
stkTransferDirect.setFBillEntry(fBillEntry);
}
public static StkTransferDirect createStkTransferDirect() {
return stkTransferDirect;
}
}

2
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/submitkd/SubmitKD.java

@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
/**
* 提交金蝶接口的数据格式
* 提交功能 金蝶接口的数据格式
*/
@Data
public class SubmitKD {

16
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java

@ -9,6 +9,7 @@ import com.yxt.anrui.fin.api.kingdee.bdmaterial.BdMaterial;
import com.yxt.anrui.fin.api.kingdee.purmrb.PurMrb;
import com.yxt.anrui.fin.api.kingdee.saloutstock.SalOutStock;
import com.yxt.anrui.fin.api.kingdee.stkinstock.StkInStock;
import com.yxt.anrui.fin.api.kingdee.stktransferdirect.StkTransferDirect;
import com.yxt.anrui.fin.biz.kingdee.appaybill.ApPayBillService;
import com.yxt.anrui.fin.biz.kingdee.appayable.APPayableService;
import com.yxt.anrui.fin.biz.kingdee.bdmaterial.BdMaterialService;
@ -16,6 +17,7 @@ import com.yxt.anrui.fin.biz.kingdee.purmrb.PurMrbService;
import com.yxt.anrui.fin.biz.kingdee.receivablebill.ReceivableBillService;
import com.yxt.anrui.fin.biz.kingdee.saloutstock.SalOutStockService;
import com.yxt.anrui.fin.biz.kingdee.stkinstock.STKInStockService;
import com.yxt.anrui.fin.biz.kingdee.stktransferdirect.StkTransferDirectService;
import com.yxt.common.core.result.ResultBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@ -64,6 +66,11 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
*/
@Autowired
private BdMaterialService bdMaterialService;
/**
* 保存直接调拨单
*/
@Autowired
private StkTransferDirectService stkTransferDirectService;
@ApiOperation("入账保存应付单的接口")
@PostMapping("/draftEntryBill")
@ResponseBody
@ -111,7 +118,7 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
@PostMapping("/draftBdMaterial")
@ResponseBody
@Override
public ResultBean<List<KingDeeResult>> draftBdMaterial(BdMaterial bdMaterial) {
public ResultBean<List<KingDeeResult>> draftBdMaterial(@RequestBody BdMaterial bdMaterial) {
return bdMaterialService.draftBdMaterial(bdMaterial);
}
@ -122,4 +129,11 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
public ResultBean<List<KingDeeResult>> draftBdMaterialList(@RequestBody List<BdMaterial> bdMaterial) {
return bdMaterialService.draftBdMaterialList(bdMaterial);
}
@ApiOperation("保存直接调拨单的接口")
@PostMapping("/draftStkTransferDirect")
@ResponseBody
@Override
public ResultBean<List<KingDeeResult>> draftStkTransferDirect(@RequestBody StkTransferDirect stkTransferDirect) {
return stkTransferDirectService.draftStkTransferDirect(stkTransferDirect);
}
}

66
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stktransferdirect/StkTransferDirectCastToKingDeeBillFields.java

@ -0,0 +1,66 @@
package com.yxt.anrui.fin.biz.kingdee.stktransferdirect;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.parser.Feature;
import com.yxt.anrui.fin.biz.kingdee.KingDeeUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* 封装转换的类
*/
public class StkTransferDirectCastToKingDeeBillFields {
private static Logger log=LoggerFactory.getLogger(StkTransferDirectCastToKingDeeBillFields.class);
/**
* 构造金蝶需要的数据结构 并对字段赋值
*
* @param map_fEntityModel_
* @param vehicleList
* @return
*/
public static String getKingDeeData(Map<String,String> map_fEntityModel_,List<Map<String,String>> vehicleList){
/**
* 取模板
*/
String readJsonFile = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/stktransferdirect/data.json");
String fEntityData_ = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/stktransferdirect/data_data.json");
String fEntityModel_ = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/stktransferdirect/data_model.json");
String fBillEntry_ = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/stktransferdirect/data_FBillEntry.json");
log.info("readJsonFile:{}",readJsonFile);
log.info("fEntityData_:{}",fEntityData_);
log.info("fEntityModel_:{}",fEntityModel_);
log.info("FBillEntry_:{}",fBillEntry_);
//模板字符创转json
JSONObject jsonObj= JSONObject.parseObject(readJsonFile, Feature.OrderedField);
JSONObject jsonFEntityData_= JSONObject.parseObject(fEntityData_,Feature.OrderedField);
fEntityModel_ =KingDeeUtils.replaceTemplateParams(fEntityModel_, map_fEntityModel_);
JSONObject jsonFEntityModel_= JSONObject.parseObject(fEntityModel_,Feature.OrderedField);
List<JSONObject> list_fEntityDetail_=new ArrayList<>();
//对模板字段赋值 根据传递进来的map数据的集合进行赋值
for(int i=0;i<vehicleList.size();i++){
Map<String,String> params=vehicleList.get(i);
Map<String,String> map_fEntityDetail_=new HashMap<>();
for (Map.Entry<String, String> entry : params.entrySet()) {
map_fEntityDetail_.put(entry.getKey(),entry.getValue());
}
fBillEntry_ =KingDeeUtils.replaceTemplateParams(fBillEntry_, map_fEntityDetail_);
list_fEntityDetail_.add(JSONObject.parseObject(fBillEntry_,Feature.OrderedField));
}
jsonFEntityModel_.put("FBillEntry", JSONArray.parseArray(JSON.toJSONString(list_fEntityDetail_)));
jsonFEntityData_.put("Model",JSONObject.parseObject(JSON.toJSONString(jsonFEntityModel_),Feature.OrderedField));
jsonObj.put("data",jsonFEntityData_.toJSONString());
return jsonObj.toJSONString();
}
}

36
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stktransferdirect/StkTransferDirectService.java

@ -0,0 +1,36 @@
package com.yxt.anrui.fin.biz.kingdee.stktransferdirect;
import com.yxt.anrui.fin.api.kingdee.KingDeeBillId;
import com.yxt.anrui.fin.api.kingdee.stktransferdirect.StkTransferDirect;
import com.yxt.anrui.fin.biz.kingdee.FinKingDeeService;
import com.yxt.common.core.result.ResultBean;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Map;
@Service
public class StkTransferDirectService extends FinKingDeeService {
/**
* 保存采购入库单
* @param stkTransferDirect
* @return
*/
public ResultBean draftStkTransferDirect(StkTransferDirect stkTransferDirect) {
stkTransferDirect=StkTransferDirect.createStkTransferDirect();
ResultBean rb=ResultBean.fireFail();
try {
//业务表的主表数据集合
Map<String,String> map_fEntityModel_= object2Map(stkTransferDirect);
List<StkTransferDirect.FBillEntry> fBillEntry = stkTransferDirect.getFBillEntry();
//准备 物料列表的数据 ForEntryBill
List<Map<String, String>> vehicleListMap = createVehicleLists(fBillEntry);
String kingDeeData = StkTransferDirectCastToKingDeeBillFields.getKingDeeData(map_fEntityModel_,vehicleListMap);
return saveBill(KingDeeBillId.STK_TRANSFERDIRECT.getID(),kingDeeData);
} catch (Exception e) {
e.printStackTrace();
}
return rb;
}
}

4
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stktransferdirect/data.json

@ -0,0 +1,4 @@
{
"formId": "STK_TransferDirect",
"data": "@KD_data"
}

58
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stktransferdirect/data_FBillEntry.json

@ -0,0 +1,58 @@
{
"FMaterialId": {
"FNumber": "@KD_FMaterialId"
},
"FUnitID": {
"FNumber": "@KD_FUnitID"
},
"FDestLot":{
"FNumber": "@KD_FDestLot"
},
"FLot": {
"FNumber": "@KD_Flot"
},
"FQty": 1.0,
"FSrcStockId": {
"FNumber": "@KD_FSrcStockId"
},
"FDestStockId": {
"FNumber": "@KD_FDestStockId"
},
"FSrcStockStatusId": {
"FNumber": "@KD_FSrcStockStatusId"
},
"FDestStockStatusId": {
"FNumber": "@KD_FDestStockStatusId"
},
"FBusinessDate": "2022-08-31 00:00:00",
"FOwnerTypeOutId": "@KD_FOwnerTypeOutId",
"FOwnerOutId": {
"FNumber": "@KD_FOwnerOutId"
},
"FOwnerTypeId": "@KD_FOwnerTypeId",
"FOwnerId": {
"FNumber": "@KD_FOwnerId"
},
"FBaseUnitId": {
"FNumber": "@KD_FBaseUnitId"
},
"FBaseQty": 1.0,
"FISFREE": false,
"FKeeperTypeId": "@KD_FKeeperTypeId",
"FKeeperId": {
"FNumber": "@KD_FKeeperId"
},
"FKeeperTypeOutId": "@KD_FKeeperTypeOutId",
"FKeeperOutId": {
"FNumber": "@KD_FKeeperOutId"
},
"FDestMaterialId": {
"FNUMBER": " JX091054"
},
"FPriceUnitID": {
"FNumber": "liang"
},
"FPriceQty": 1.0,
"FPriceBaseQty": 1.0,
"FTransReserveLink": false
}

13
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stktransferdirect/data_data.json

@ -0,0 +1,13 @@
{
"Creator": "",
"NeedUpDateFields": [],
"NeedReturnFields": [],
"IsDeleteEntry": "True",
"SubSystemId": "",
"IsVerifyBaseDataField": "false",
"IsEntryBatchFill": "True",
"ValidateFlag": "True",
"NumberSearch": "True",
"InterationFlags": "",
"Model":{}
}

42
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stktransferdirect/data_model.json

@ -0,0 +1,42 @@
{
"FID": 0,
"FBillTypeID": {
"FNUMBER": "@KD_FBillTypeID"
},
"FBizType": "NORMAL",
"FTransferDirect": "@KD_FTransferDirect",
"FTransferBizType": "@KD_FTransferBizType",
"FSettleOrgId": {
"FNumber": "101"
},
"FSaleOrgId": {
"FNumber": "101"
},
"FStockOutOrgId": {
"FNumber": "@KD_FStockOutOrgId"
},
"FOwnerTypeOutIdHead": "@KD_FOwnerTypeOutIdHead",
"FOwnerOutIdHead": {
"FNumber": "101"
},
"FStockOrgId": {
"FNumber": "@KD_FStockOrgId"
},
"FIsIncludedTax": true,
"FIsPriceExcludeTax": true,
"FOwnerTypeIdHead": "@KD_FOwnerTypeIdHead",
"FSETTLECURRID": {
"FNUMBER": "PRE001"
},
"FOwnerIdHead": {
"FNumber": "101"
},
"FDate": "2022-08-31 00:00:00",
"FBaseCurrId": {
"FNumber": "PRE001"
},
"FCustID": {
"FNUMBER": "GYRHHR002529"
},
"FBillEntry": []
}

175
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stktransferdirect/remarks.txt

@ -0,0 +1,175 @@
一、请求参数说明:
1.formid:业务对象表单Id,字符串类型(必录)
2.data:Json格式数据(详情参考Json格式数据)(必录)
2.1.Creator:创建者内码(非必录)
2.2.NeedUpDateFields:需要更新的字段,数组类型,格式:[key1,key2,...](非必录),注(更新单据体字段得加上单据体key)
2.3.NeedReturnFields:需返回结果的字段集合,数组类型,格式:[key,entitykey.key,...](非必录),注(返回单据体字段格式:entitykey.key)
2.4.IsDeleteEntry:是否删除已存在的分录,布尔类型,默认true(非必录)
2.5.SubSystemId:表单所在的子系统内码,字符串类型(非必录)
2.6.IsVerifyBaseDataField:是否验证所有的基础资料有效性,布尔类,默认false(非必录)
2.7.IsEntryBatchFill:是否批量填充分录,默认true(非必录)
2.8.ValidateFlag:是否验证标志,布尔类型,默认true(非必录)
2.9.NumberSearch:是否用编码搜索基础资料,布尔类型,默认true(非必录)
2.10.InterationFlags:交互标志集合,字符串类型,分号分隔,格式:"flag1;flag2;..."(非必录),例如(允许负库存标识:STK_InvCheckResult)
2.11.Model:表单数据包,Json类型(必录)
五、字段说明:
序列号单位:FSNUnitID
订单类别:FORDERTYPE
关联出库数量(基本单位):FBASEOUTJOINQTY
到货确认:FArrivalStatus
入库日期:FBusinessDate
序列号单位数量:FSNQty
备注:FNoteEntry
调入库存更新标识:FStockInFlag
调出库存更新标识:FStockOutFlag
关联出库数量:FOutJoinQty
业务流程:FBFLowId
源单编号:FSrcBillNo
到货确认人:FArrivalConfirmor
金额:FConsignAmount
税率%:FTaxRate
含税单价:FTaxPrice
折扣额:FDiscount
价税合计:FAllAmount
税额:FTaxAmount
补货数量:FRepairQty
拒收数量:FRefuseQty
到货日期:FArrivalDate
单价:FConsignPrice
实收数量:FActQty
是否补货:FIsRepair
库存辅单位:FSecUnitId
调入库存状态:FDestStockStatusId (必填项)
调出库存状态:FSrcStockStatusId (必填项)
调拨数量(基本单位):FBaseQty
基本单位:FBaseUnitId (必填项)
调拨数量(库存辅单位):FSecQty
生产日期:FProduceDate
辅助属性:FAuxPropId
BOM版本:FBomId
项目编号:FProjectNo
计划跟踪号:FMtoNo
有效期至:FExpiryDate
调入货主类型:FOwnerTypeId (必填项)
源单行号:FSrcSeq
源单类型:FSrcBillTypeId
调出保管者:FKeeperOutId (必填项)
关联退回数量(基本单位):FBaseJoinQty
关联退回数量:FReceiveQty
订单编号:FOrderNo
调出货主:FOwnerOutId (必填项)
调出货主类型:FOwnerTypeOutId (必填项)
调入货主:FOwnerId (必填项)
调出保管者类型:FKeeperTypeOutId (必填项)
调入保管者:FKeeperId (必填项)
调入保管者类型:FKeeperTypeId (必填项)
净价:FTaxNetPrice
服务上下文:FServiceContext
结算关联数量(销售基本单位):FJoinSaleBaseSettQty
出库关联数量(销售基本单位):FSalBaseOutJoinQty
计价基本数量:FPriceBaseQty
计价数量:FPriceQty
计价单位:FPriceUnitID
携带源单主业务单位:FSrcBizUnitId
销售基本单位退货关联数量:FSalBaseJoinQty
普通调拨源单类型:FGenSrcBillFormId
源单辅单位基本数量:FSrcAuxBaseQty
源单主单位基本数量:FSrcBizBaseQty
携带源单辅单位:FSrcAuxUnitId
销售基本单位数量旧值:FSalBaseQtyUp
转移预留关系:FTransReserveLink
赠品:FISFREE
第三方源单分录编码:FThirdSrcEntryId
备注:FSerialNote
序列号:FSerialId
序列号:FSerialNo
质量类型:FDeliChkQualifyType
通知单编号:FNoticeNo
基本单位数量旧值:FBaseQtyUp
销售订单EntryId:FSOEntryId
库存状态转换EntryId:FConvertEntryId
库存请检单EntryId:FQmEntryId
拒收标志:FRefuseFlag
退货备注:FRETURNNOTE
折扣率%:FDiscountRate
结算关联数量(辅单位):FJOINSECSETTQTY
保质期:FExpPeriod
保质期单位:FExpUnit
结算关联数量:FJoinSettleQty
客户物料名称:FCustMatName
客户物料编码:FCustMatId
未结算关联数量(基本单位):FJoinBaseUnSettQty
未结算关联数量:FJoinUnSettleQty
结算关联数量(基本单位):FJoinBaseSettQty
出库关联数量(辅单位):FSECOUTJOINQTY
捡货结果标记:FLotPickFlag
调拨数量(辅单位):FExtAuxUnitQty
辅单位:FExtAuxUnitId
销售数量:FSaleQty
销售基本数量:FSalBaseQty
销售单位:FSaleUnitId
结算可退数量(基本单位):FBaseSettCanRetQty
调入批号:FDestLot
退货关联数量(辅单位):FSECJOINQTY
消耗汇总:FIsConsumeSum
调入BOM:FDestBomId
调入物料:FDestMaterialId
总成本:FAmount
调出库存组织:FStockOutOrgId (必填项)
调拨类型:FTransferBizType (必填项)
调入货主:FOwnerIdHead
调拨方向:FTransferDirect (必填项)
调出货主:FOwnerOutIdHead
调出货主类型:FOwnerTypeOutIdHead (必填项)
调入库存组织:FStockOrgId (必填项)
单据状态:FDocumentStatus
单据编号:FBillNo
调入货主类型:FOwnerTypeIdHead (必填项)
单据类型:FBillTypeID (必填项)
日期:FDate (必填项)
创建人:FCreatorId
仓管员:FStockerId
作废状态:FCancelStatus
作废人:FCancellerId
备注:FNote
本位币:FBaseCurrId
库存组:FStockerGroupId
最后修改日期:FModifyDate
最后修改人:FModifierId
创建日期:FCreateDate
作废日期:FCancelDate
审核日期:FApproveDate
审核人:FApproverId
业务类型:FBizType
第三方源单编码:FThirdSrcBillNo
第三方源单内码:FThirdSrcId
价外税:FIsPriceExcludeTax
序列号上传:FScanBox
对应供应商:FSUPPLIERID
对应客户:FCustID
组织间结算跨法人标识:FIsInterLegalPerson
第三方系统:FThirdSystem
调入仓位:FDestStockLocId
调入仓库:FDestStockId (必填项)
调出仓位:FSrcStockLocId
成本价:FPrice
调拨数量:FQty
单位:FUnitID (必填项)
物料名称:FMaterialName
物料编码:FMaterialId (必填项)
调出仓库:FSrcStockId (必填项)
调出批号:FLot
规格型号:FModel
结算组织:FSettleOrgId
销售组织:FSaleOrgId
结算币别:FSETTLECURRID
汇率:FExchangeRate
跨组织业务类型:FTransferBizTypeId
是否含税:FIsIncludedTax
收款条件:FRecConditionId
结算方式:FSettleModeId
汇率类型:FExchangeTypeId
销售员:FSalerId
销售组:FSaleGroupId
销售部门:FSaleDeptId

5
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stktransferdirect/webapi测试的数据.txt

@ -0,0 +1,5 @@
{\"Creator\":\"\",\"NeedUpDateFields\":[],\"NeedReturnFields\":[],\"IsDeleteEntry\":\"True\",\"SubSystemId\":\"\",\"IsVerifyBaseDataField\":\"false\",\"IsEntryBatchFill\":\"True\",\"ValidateFlag\":\"True\",\"NumberSearch\":\"True\",\"InterationFlags\":\"\",\"Model\":{\"FID\":0,\"FBillTypeID\":{\"FNUMBER\":\"ZJDB01_SYS\"},\"FBizType\":\"NORMAL\",\"FTransferDirect\":\"GENERAL\",\"FTransferBizType\":\"InnerOrgTransfer\",\"FSettleOrgId\":{\"FNumber\":\"101\"},\"FSaleOrgId\":{\"FNumber\":\"101\"},\"FStockOutOrgId\":{\"FNumber\":\"101\"},\"FOwnerTypeOutIdHead\":\"BD_OwnerOrg\",\"FOwnerOutIdHead\":{\"FNumber\":\"101\"},\"FStockOrgId\":{\"FNumber\":\"101\"},\"FIsIncludedTax\":true,\"FIsPriceExcludeTax\":true,\"FOwnerTypeIdHead\":\"BD_OwnerOrg\",\"FSETTLECURRID\":{\"FNUMBER\":\"PRE001\"},\"FOwnerIdHead\":{\"FNumber\":\"101\"},\"FDate\":\"2022-08-31 00:00:00\",\"FBaseCurrId\":{\"FNumber\":\"PRE001\"},\"FCustID\":{\"FNUMBER\":\"GYRHHR002529\"},\"FBillEntry\":[{\"FMaterialId\":{\"FNumber\":\" JX091054\"},\"FUnitID\":{\"FNumber\":\"liang\"},\"FQty\":1.0,\"FSrcStockId\":{\"FNumber\":\"CK001\"},\"FDestStockId\":{\"FNumber\":\"CK002\"},\"FSrcStockStatusId\":{\"FNumber\":\"KCZT01_SYS\"},\"FDestStockStatusId\":{\"FNumber\":\"KCZT01_SYS\"},\"FBusinessDate\":\"2022-08-31 00:00:00\",\"FOwnerTypeOutId\":\"BD_OwnerOrg\",\"FOwnerOutId\":{\"FNumber\":\"101\"},\"FOwnerTypeId\":\"BD_OwnerOrg\",\"FOwnerId\":{\"FNumber\":\"101\"},\"FBaseUnitId\":{\"FNumber\":\"liang\"},\"FBaseQty\":1.0,\"FISFREE\":false,\"FKeeperTypeId\":\"BD_KeeperOrg\",\"FKeeperId\":{\"FNumber\":\"101\"},\"FKeeperTypeOutId\":\"BD_KeeperOrg\",\"FKeeperOutId\":{\"FNumber\":\"101\"},\"FDestMaterialId\":{\"FNUMBER\":\" JX091054\"},\"FPriceUnitID\":{\"FNumber\":\"liang\"},\"FPriceQty\":1.0,\"FPriceBaseQty\":1.0,\"FTransReserveLink\":false}]}}
{"formId":"STK_TransferDirect","data":"{\"Creator\":\"\",\"NeedUpDateFields\":[],\"NeedReturnFields\":[],\"IsDeleteEntry\":\"True\",\"SubSystemId\":\"\",\"IsVerifyBaseDataField\":\"false\",\"IsEntryBatchFill\":\"True\",\"ValidateFlag\":\"True\",\"NumberSearch\":\"True\",\"InterationFlags\":\"\",\"Model\":{\"FID\":0,\"FBillTypeID\":{\"FNUMBER\":\"ZJDB01_SYS\"},\"FBizType\":\"NORMAL\",\"FTransferDirect\":\"GENERAL\",\"FTransferBizType\":\"InnerOrgTransfer\",\"FSettleOrgId\":{\"FNumber\":\"101\"},\"FSaleOrgId\":{\"FNumber\":\"101\"},\"FStockOutOrgId\":{\"FNumber\":\"101\"},\"FOwnerTypeOutIdHead\":\"BD_OwnerOrg\",\"FOwnerOutIdHead\":{\"FNumber\":\"101\"},\"FStockOrgId\":{\"FNumber\":\"101\"},\"FIsIncludedTax\":true,\"FIsPriceExcludeTax\":true,\"FOwnerTypeIdHead\":\"BD_OwnerOrg\",\"FSETTLECURRID\":{\"FNUMBER\":\"PRE001\"},\"FOwnerIdHead\":{\"FNumber\":\"101\"},\"FDate\":\"2022-08-31 00:00:00\",\"FBaseCurrId\":{\"FNumber\":\"PRE001\"},\"FCustID\":{\"FNUMBER\":\"GYRHHR002529\"},\"FBillEntry\":[{\"FOwnerTypeOutId\":\"BD_OwnerOrg\",\"FDestStockStatusId\":{\"FNumber\":\"KCZT01_SYS\"},\"FPriceBaseQty\":1.0,\"FBaseQty\":1.0,\"FBusinessDate\":\"2022-08-31 00:00:00\",\"FLot\":{\"FNumber\":\"@KD_Flot\"},\"FOwnerOutId\":{\"FNumber\":\"101\"},\"FSrcStockStatusId\":{\"FNumber\":\"KCZT01_SYS\"},\"FDestStockId\":{\"FNumber\":\"CK002\"},\"FMaterialId\":{\"FNumber\":\" JX091054\"},\"FOwnerTypeId\":\"BD_OwnerOrg\",\"FDestMaterialId\":{\"FNUMBER\":\" JX091054\"},\"FOwnerId\":{\"FNumber\":\"101\"},\"FISFREE\":false,\"FKeeperId\":{\"FNumber\":\"101\"},\"FPriceUnitID\":{\"FNumber\":\"liang\"},\"FKeeperOutId\":{\"FNumber\":\"101\"},\"FQty\":1.0,\"FDestLot\":{\"FNumber\":\"1234567890\"},\"FBaseUnitId\":{\"FNumber\":\"liang\"},\"FKeeperTypeId\":\"BD_KeeperOrg\",\"FTransReserveLink\":false,\"FUnitID\":{\"FNumber\":\"liang\"},\"FPriceQty\":1.0,\"FSrcStockId\":{\"FNumber\":\"CK001\"},\"FKeeperTypeOutId\":\"BD_KeeperOrg\"}]}}"}

BIN
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stktransferdirect/直接调拨单的参数必填备注.xlsx

Binary file not shown.

2
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturn.java

@ -35,4 +35,6 @@ public class ScmVehicleReturn extends BaseEntity {
@ApiModelProperty("流程实例id")
private String instanceId;
private String procDefId;
}

14
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateFeign.java

@ -63,16 +63,21 @@ public interface ScmVehRebateFeign {
@ResponseBody
public ResultBean<PagerVo<ScmVehRebateVo>> listPage(@RequestBody PagerQuery<ScmVehRebateQuery> pq);
@ApiOperation("单车返利预提申请选择单车返利信息")
@ApiOperation("单车返利预提申请选择单车返利信息")
@PostMapping("/withApplyGetVehRebate")
@ResponseBody
public ResultBean<PagerVo<ScmVehRebateVo>> withApplyGetVehRebate(@RequestBody PagerQuery<ScmVehRebateQuery> pq);
@ApiOperation("单车返利核对申请选择单车返利信息")
@ApiOperation("单车返利核对申请选择待核对单车返利信息")
@PostMapping("/checkApplyGetVehRebate")
@ResponseBody
public ResultBean<PagerVo<ScmVehRebateVo>> checkApplyGetVehRebate(@RequestBody PagerQuery<ScmVehRebateQuery> pq);
@ApiOperation("单车返利核对申请选择已上传单车返利信息")
@PostMapping("/checkApplyGetAlreadyUploadVehRebate")
@ResponseBody
public ResultBean<PagerVo<ScmVehRebateVo>> checkApplyGetAlreadyUploadVehRebate(@RequestBody PagerQuery<ScmVehRebateQuery> pq);
@ApiOperation("新增")
@PostMapping("/save")
@ResponseBody
@ -82,6 +87,11 @@ public interface ScmVehRebateFeign {
@PostMapping("/update")
@ResponseBody
public ResultBean update(@RequestBody ScmVehRebateVehDto dto);
@ApiOperation("调整")
@PostMapping("/adjustment")
@ResponseBody
public ResultBean adjustment(@RequestBody ScmVehRebateVehAdjDto dto);
@ApiOperation("根据sid删除记录")
@DeleteMapping("/delBySids")

10
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateFeignFallback.java

@ -64,6 +64,11 @@ public class ScmVehRebateFeignFallback implements ScmVehRebateFeign {
return null;
}
@Override
public ResultBean<PagerVo<ScmVehRebateVo>> checkApplyGetAlreadyUploadVehRebate(PagerQuery<ScmVehRebateQuery> pq) {
return null;
}
@Override
public ResultBean save(ScmVehRebateDto dto){
return ResultBean.fireFail().setMsg("接口anrui-scm/scmvehrebate/save无法访问");
@ -74,6 +79,11 @@ public class ScmVehRebateFeignFallback implements ScmVehRebateFeign {
return null;
}
@Override
public ResultBean adjustment(ScmVehRebateVehAdjDto dto) {
return null;
}
@Override
public ResultBean delBySids( String[] sids){
return ResultBean.fireFail().setMsg("接口anrui-scm/scmvehrebate/delBySids无法访问");

50
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateVehAdjDto.java

@ -0,0 +1,50 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.scm.api.scmvehrebate;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
@ApiModel(value = "单车返利表 数据传输对象", description = "单车返利表 数据传输对象")
public class ScmVehRebateVehAdjDto implements Dto {
private String sid; // sid
@ApiModelProperty("二次上传日期")
private String secondaryUploadDate; // 二次上传日期
@ApiModelProperty("二次上传金额")
private String secondaryUploadMoney; // 二次上传金额
@ApiModelProperty("待确定金额")
private String stayDetermineMoney; // 待确定金额
@ApiModelProperty("费用")
private String cost; // 费用
@ApiModelProperty("调整金额")
private String adjustmentMoney; // 调整金额
}

2
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateVehDto.java

@ -52,6 +52,8 @@ public class ScmVehRebateVehDto implements Dto {
private String sid; // sid
@ApiModelProperty("状态")
private String state; // 状态
@ApiModelProperty("备注")
private String remarks; // 备注
@ApiModelProperty("品牌sid")

7
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateVo.java

@ -57,7 +57,7 @@ public class ScmVehRebateVo implements Vo {
@ApiModelProperty("创建日期")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date createTime; // 创建日期
@ApiModelProperty("状态(0未提计,1已提计,2待核对,3已核对)")
@ApiModelProperty("状态(0未预提、1已预提、2未上传、3已上传、4已核对)")
private String state; // 状态
@ApiModelProperty("品牌sid")
private String brandSid; // 品牌sid
@ -87,6 +87,8 @@ public class ScmVehRebateVo implements Vo {
private String estimateRebate; // 预计返利
@ApiModelProperty("所属年月")
private String palceGenDate; // 所属年月
@ApiModelProperty("所属年月(页面展示)")
private String palceGenDateCopy; // 所属年月(页面展示)
@ApiModelProperty("预提日期")
private String withholdingDate; // 预提日期
@ApiModelProperty("上传日期")
@ -119,5 +121,6 @@ public class ScmVehRebateVo implements Vo {
private String createOrgSid; // 创建组织sid
@ApiModelProperty("创建组织名称")
private String createOrgName; // 创建组织名称
@ApiModelProperty("上传状态(0未调整、1已调整、2未上传、3已上传)")
private String uploadState; // 上传状态
}

80
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/ScmVehrebateCheckapply.java

@ -0,0 +1,80 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.scm.api.scmvehrebatecheckapply;
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: ScmVehrebateCheckapply.java <br/>
* Class: com.yxt.anrui.scm.api.scmvehrebatecheckapply.ScmVehrebateCheckapply <br/>
* Description: 单车返利核对申请表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-08-29 16:01:00 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "单车返利核对申请表", description = "单车返利核对申请表")
@TableName("scm_vehrebate_checkapply")
public class ScmVehrebateCheckapply extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty("品牌sid")
private String brandSid; // 品牌sid
@ApiModelProperty("品牌名称")
private String brandName; // 品牌名称
@ApiModelProperty("核对申请标题")
private String checkApply; // 核对申请标题
@ApiModelProperty("创建人姓名")
private String createByName; // 创建人姓名
@ApiModelProperty("使用组织sid")
private String useOrgSid; // 使用组织sid
@ApiModelProperty("使用组织名称")
private String useOrgName; // 使用组织名称
@ApiModelProperty("创建组织sid")
private String createOrgSid; // 创建组织sid
@ApiModelProperty("创建组织名称")
private String createOrgName; // 创建组织名称
@ApiModelProperty("流程状态")
private String nodeState; // 流程状态
@ApiModelProperty("流程定义的id")
private String procDefId; // 流程定义的id
@ApiModelProperty("环节定义的sid")
private String nodeSid; // 环节定义的sid
@ApiModelProperty("流程实例的sid")
private String procInstId; // 流程实例的sid
@ApiModelProperty("taskId")
private String taskId; // taskId
}

90
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/ScmVehrebateCheckapplyDetailsVo.java

@ -0,0 +1,90 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.scm.api.scmvehrebatecheckapply;
import com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailDetailsVo;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* Project: anrui-scm(单车返利核对) <br/>
* File: ScmVehrebateCheckapplyVo.java <br/>
* Class: com.yxt.anrui.scm.api.scmvehrebatecheckapply.ScmVehrebateCheckapplyVo <br/>
* Description: 单车返利核对申请表 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-08-29 16:01:01 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "单车返利核对申请表 视图数据详情", description = "单车返利核对申请表 视图数据详情")
public class ScmVehrebateCheckapplyDetailsVo implements Vo {
private String sid; // sid
@ApiModelProperty("备注")
private String remarks; // 备注
@ApiModelProperty("品牌sid")
private String brandSid; // 品牌sid
@ApiModelProperty("品牌名称")
private String brandName; // 品牌名称
@ApiModelProperty("核对申请标题")
private String checkApply; // 核对申请标题
@ApiModelProperty("创建人姓名")
private String createByName; // 创建人姓名
@ApiModelProperty("使用组织sid")
private String useOrgSid; // 使用组织sid
@ApiModelProperty("使用组织名称")
private String useOrgName; // 使用组织名称
@ApiModelProperty("创建组织sid")
private String createOrgSid; // 创建组织sid
@ApiModelProperty("创建组织名称")
private String createOrgName; // 创建组织名称
@ApiModelProperty("流程状态")
private String nodeState; // 流程状态
@ApiModelProperty("流程定义的id")
private String procDefId; // 流程定义的id
@ApiModelProperty("环节定义的sid")
private String nodeSid; // 环节定义的sid
@ApiModelProperty("流程实例的sid")
private String procInstId; // 流程实例的sid
@ApiModelProperty("taskId")
private String taskId; // taskId
@ApiModelProperty("本月核对本月已上传单车返利信息")
private List<ScmVehrebateCheckapplydetailDetailsVo> scmWhenVehrebateCheckapplydetailDetails; // 本月核对本月已上传单车返利信息
@ApiModelProperty("本月核对往月已上传单车返利信息")
private List<ScmVehrebateCheckapplydetailDetailsVo> scmLastVehrebateCheckapplydetailDetails; // 本月核对往月已上传单车返利信息
}

89
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/ScmVehrebateCheckapplyDto.java

@ -0,0 +1,89 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.scm.api.scmvehrebatecheckapply;
import com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailDto;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* Project: anrui-scm(单车返利核对) <br/>
* File: ScmVehrebateCheckapplyDto.java <br/>
* Class: com.yxt.anrui.scm.api.scmvehrebatecheckapply.ScmVehrebateCheckapplyDto <br/>
* Description: 单车返利核对申请表 数据传输对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-08-29 16:01:00 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "单车返利核对申请表 数据传输对象", description = "单车返利核对申请表 数据传输对象")
public class ScmVehrebateCheckapplyDto implements Dto {
private String sid; // sid
@ApiModelProperty("备注")
private String remarks; // 备注
@ApiModelProperty("品牌sid")
private String brandSid; // 品牌sid
@ApiModelProperty("品牌名称")
private String brandName; // 品牌名称
@ApiModelProperty("核对申请标题")
private String checkApply; // 核对申请标题
@ApiModelProperty("创建人姓名")
private String createByName; // 创建人姓名
@ApiModelProperty("使用组织sid")
private String useOrgSid; // 使用组织sid
@ApiModelProperty("使用组织名称")
private String useOrgName; // 使用组织名称
@ApiModelProperty("创建组织sid")
private String createOrgSid; // 创建组织sid
@ApiModelProperty("创建组织名称")
private String createOrgName; // 创建组织名称
@ApiModelProperty("流程状态")
private String nodeState; // 流程状态
@ApiModelProperty("流程定义的id")
private String procDefId; // 流程定义的id
@ApiModelProperty("环节定义的sid")
private String nodeSid; // 环节定义的sid
@ApiModelProperty("流程实例的sid")
private String procInstId; // 流程实例的sid
@ApiModelProperty("taskId")
private String taskId; // taskId
@ApiModelProperty("本月核对本月已上传单车返利信息")
private List<ScmVehrebateCheckapplydetailDto> scmWhenVehrebateCheckapplydetailDetails; // 本月核对本月已上传单车返利信息
@ApiModelProperty("本月核对往月已上传单车返利信息")
private List<ScmVehrebateCheckapplydetailDto> scmLastVehrebateCheckapplydetailDetails; // 本月核对往月已上传单车返利信息
}

78
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/ScmVehrebateCheckapplyFeign.java

@ -0,0 +1,78 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.scm.api.scmvehrebatecheckapply;
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: ScmVehrebateCheckapplyFeign.java <br/>
* Class: com.yxt.anrui.scm.api.scmvehrebatecheckapply.ScmVehrebateCheckapplyFeign <br/>
* Description: 单车返利核对申请表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-08-29 16:01:00 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Api(tags = "单车返利核对申请表")
@FeignClient(
contextId = "anrui-scm-ScmVehrebateCheckapply",
name = "anrui-scm",
path = "v1/scmvehrebatecheckapply",
fallback = ScmVehrebateCheckapplyFeignFallback.class)
public interface ScmVehrebateCheckapplyFeign {
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
@ResponseBody
public ResultBean<PagerVo<ScmVehrebateCheckapplyVo>> listPage(@RequestBody PagerQuery<ScmVehrebateCheckapplyQuery> pq);
@ApiOperation("新增或修改")
@PostMapping("/save")
@ResponseBody
public ResultBean save(@RequestBody ScmVehrebateCheckapplyDto dto);
@ApiOperation("根据sid删除记录")
@DeleteMapping("/delBySids")
@ResponseBody
public ResultBean delBySids(@RequestBody String[] sids);
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
@ResponseBody
public ResultBean<ScmVehrebateCheckapplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
}

72
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/ScmVehrebateCheckapplyFeignFallback.java

@ -0,0 +1,72 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.scm.api.scmvehrebatecheckapply;
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: ScmVehrebateCheckapplyFeignFallback.java <br/>
* Class: com.yxt.anrui.scm.api.scmvehrebatecheckapply.ScmVehrebateCheckapplyFeignFallback <br/>
* Description: 单车返利核对申请表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-08-29 16:01:00 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Component
public class ScmVehrebateCheckapplyFeignFallback implements ScmVehrebateCheckapplyFeign {
@Override
public ResultBean<PagerVo<ScmVehrebateCheckapplyVo>> listPage(PagerQuery<ScmVehrebateCheckapplyQuery> pq){
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui-scm/scmvehrebatecheckapply/listPage无法访问");
}
@Override
public ResultBean save(ScmVehrebateCheckapplyDto dto){
return ResultBean.fireFail().setMsg("接口anrui-scm/scmvehrebatecheckapply/save无法访问");
}
@Override
public ResultBean delBySids( String[] sids){
return ResultBean.fireFail().setMsg("接口anrui-scm/scmvehrebatecheckapply/delBySids无法访问");
}
@Override
public ResultBean<ScmVehrebateCheckapplyDetailsVo> fetchDetailsBySid(String sid){
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui-scm/scmvehrebatecheckapply/fetchDetailsBySid无法访问");
}
}

66
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/ScmVehrebateCheckapplyQuery.java

@ -0,0 +1,66 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.scm.api.scmvehrebatecheckapply;
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: ScmVehrebateCheckapplyQuery.java <br/>
* Class: com.yxt.anrui.scm.api.scmvehrebatecheckapply.ScmVehrebateCheckapplyQuery <br/>
* Description: 单车返利核对申请表 查询条件. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-08-29 16:01:00 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "单车返利核对申请表 查询条件", description = "单车返利核对申请表 查询条件")
public class ScmVehrebateCheckapplyQuery implements Query {
@ApiModelProperty("品牌sid")
private String brandSid; // 品牌sid
@ApiModelProperty("核对申请标题")
private String checkApply; // 核对申请标题
@ApiModelProperty("创建开始日期")
private String createStartTime; // 创建开始日期
@ApiModelProperty("创建结束日期")
private String createEndTime; // 创建结束日期
@ApiModelProperty("创建组织sid")
private String createOrgSid; // 创建组织sid
@ApiModelProperty("流程定义的id")
private String procDefId; // 流程定义的id
@ApiModelProperty("流程实例的sid")
private String procInstId; // 流程实例的sid
}

84
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/ScmVehrebateCheckapplyVo.java

@ -0,0 +1,84 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.scm.api.scmvehrebatecheckapply;
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: ScmVehrebateCheckapplyVo.java <br/>
* Class: com.yxt.anrui.scm.api.scmvehrebatecheckapply.ScmVehrebateCheckapplyVo <br/>
* Description: 单车返利核对申请表 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-08-29 16:01:00 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "单车返利核对申请表 视图数据对象", description = "单车返利核对申请表 视图数据对象")
public class ScmVehrebateCheckapplyVo implements Vo {
private String sid; // sid
@ApiModelProperty("品牌名称")
private String brandName; // 品牌名称
@ApiModelProperty("核对申请标题")
private String checkApply; // 核对申请标题
@ApiModelProperty("创建人姓名")
private String createByName; // 创建人姓名
@ApiModelProperty("创建日期")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date createTime; // 创建日期
@ApiModelProperty("创建组织名称")
private String createOrgName; // 创建组织名称
@ApiModelProperty("预计返利")
private String estimateRebate; // 预计返利
@ApiModelProperty("上传金额")
private String uploadMoney; // 上传金额
@ApiModelProperty("待确定金额")
private String stayDetermineMoney; // 待确定金额
@ApiModelProperty("费用")
private String money; // 费用
@ApiModelProperty("调整金额")
private String adjustmentMoney; // 调整金额
@ApiModelProperty("流程状态")
private String nodeState; // 流程状态
@ApiModelProperty("流程定义的id")
private String procDefId; // 流程定义的id
@ApiModelProperty("流程实例的sid")
private String procInstId; // 流程实例的sid
}

58
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetail.java

@ -0,0 +1,58 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail;
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: ScmVehrebateCheckapplydetail.java <br/>
* Class: com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetail <br/>
* Description: 单车返利核对申请表_返利列表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-08-29 16:01:01 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "单车返利核对申请表_返利列表", description = "单车返利核对申请表_返利列表")
@TableName("scm_vehrebate_checkapplydetail")
public class ScmVehrebateCheckapplydetail extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty("单车返利sid")
private String vehRebateSid; // 单车返利sid
@ApiModelProperty("核对申请sid")
private String mainSid; // 核对申请sid
}

86
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailDetailsVo.java

@ -0,0 +1,86 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* Project: anrui-scm(单车返利核对) <br/>
* File: ScmVehrebateCheckapplydetailVo.java <br/>
* Class: com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailVo <br/>
* Description: 单车返利核对申请表_返利列表 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-08-29 16:01:01 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "单车返利核对申请表_返利列表 视图数据详情", description = "单车返利核对申请表_返利列表 视图数据详情")
public class ScmVehrebateCheckapplydetailDetailsVo implements Vo {
private String sid; // sid
@ApiModelProperty("所属年月")
private String palceGenDate; // 所属年月
@ApiModelProperty("所属年月(页面展示)")
private String palceGenDateCopy; // 所属年月(页面展示)
@ApiModelProperty("返利类型key")
private String rebateTypeKey; // 返利类型key
@ApiModelProperty("返利类型value")
private String rebateTypeValue; // 返利类型value
@ApiModelProperty("台数")
private String num; // 台数
@ApiModelProperty("预提数量")
private String withholdingAmount; // 预提数量
@ApiModelProperty("上传数量")
private String uploadAmount; // 上传数量
@ApiModelProperty("预提金额")
private String withRebate; // 预提金额
@ApiModelProperty("上传金额")
private String uploadMoney; // 上传金额
@ApiModelProperty("待确定金额")
private String stayDetermineMoney; // 待确定金额
@ApiModelProperty("调整金额")
private String adjustmentMoney; // 调整金额
@ApiModelProperty("费用")
private String money; // 费用
@ApiModelProperty("单车返利sid")
private String vehRebateSid; // 单车返利sid
@ApiModelProperty("核对申请sid")
private String mainSid; // 核对申请sid
@ApiModelProperty("单车返利sid")
private List<String> vehRebateSids; // 单车返利sid
}

61
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailDto.java

@ -0,0 +1,61 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* Project: anrui-scm(单车返利核对) <br/>
* File: ScmVehrebateCheckapplydetailDto.java <br/>
* Class: com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailDto <br/>
* Description: 单车返利核对申请表_返利列表 数据传输对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-08-29 16:01:01 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "单车返利核对申请表_返利列表 数据传输对象", description = "单车返利核对申请表_返利列表 数据传输对象")
public class ScmVehrebateCheckapplydetailDto implements Dto {
private String sid; // sid
@ApiModelProperty("单车返利sid")
private List<String> vehRebateSids; // 单车返利sid
@ApiModelProperty("核对申请sid")
private String mainSid; // 核对申请sid
}

73
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailFeign.java

@ -0,0 +1,73 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail;
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: ScmVehrebateCheckapplydetailFeign.java <br/>
* Class: com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailFeign <br/>
* Description: 单车返利核对申请表_返利列表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-08-29 16:01:01 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Api(tags = "单车返利核对申请表_返利列表")
@FeignClient(
contextId = "anrui-scm-ScmVehrebateCheckapplydetail",
name = "anrui-scm",
path = "v1/scmvehrebatecheckapplydetail",
fallback = ScmVehrebateCheckapplydetailFeignFallback.class)
public interface ScmVehrebateCheckapplydetailFeign {
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
@ResponseBody
public ResultBean<PagerVo<ScmVehrebateCheckapplydetailVo>> listPage(@RequestBody PagerQuery<ScmVehrebateCheckapplydetailQuery> pq);
@ApiOperation("新增或修改")
@PostMapping("/save")
@ResponseBody
public ResultBean save(@RequestBody ScmVehrebateCheckapplydetailDto dto);
@ApiOperation("根据sid删除记录")
@DeleteMapping("/delBySids")
@ResponseBody
public ResultBean delBySids(@RequestBody String[] sids);
}

66
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailFeignFallback.java

@ -0,0 +1,66 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail;
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: ScmVehrebateCheckapplydetailFeignFallback.java <br/>
* Class: com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailFeignFallback <br/>
* Description: 单车返利核对申请表_返利列表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-08-29 16:01:01 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Component
public class ScmVehrebateCheckapplydetailFeignFallback implements ScmVehrebateCheckapplydetailFeign {
@Override
public ResultBean<PagerVo<ScmVehrebateCheckapplydetailVo>> listPage(PagerQuery<ScmVehrebateCheckapplydetailQuery> pq){
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui-scm/scmvehrebatecheckapplydetail/listPage无法访问");
}
@Override
public ResultBean save(ScmVehrebateCheckapplydetailDto dto){
return ResultBean.fireFail().setMsg("接口anrui-scm/scmvehrebatecheckapplydetail/save无法访问");
}
@Override
public ResultBean delBySids( String[] sids){
return ResultBean.fireFail().setMsg("接口anrui-scm/scmvehrebatecheckapplydetail/delBySids无法访问");
}
}

57
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailQuery.java

@ -0,0 +1,57 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail;
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: ScmVehrebateCheckapplydetailQuery.java <br/>
* Class: com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailQuery <br/>
* Description: 单车返利核对申请表_返利列表 查询条件. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-08-29 16:01:01 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "单车返利核对申请表_返利列表 查询条件", description = "单车返利核对申请表_返利列表 查询条件")
public class ScmVehrebateCheckapplydetailQuery implements Query {
@ApiModelProperty("单车返利sid")
private String vehRebateSid; // 单车返利sid
@ApiModelProperty("核对申请sid")
private String mainSid; // 核对申请sid
}

59
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailVo.java

@ -0,0 +1,59 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail;
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: ScmVehrebateCheckapplydetailVo.java <br/>
* Class: com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailVo <br/>
* Description: 单车返利核对申请表_返利列表 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-08-29 16:01:01 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "单车返利核对申请表_返利列表 视图数据对象", description = "单车返利核对申请表_返利列表 视图数据对象")
public class ScmVehrebateCheckapplydetailVo implements Vo {
private String sid; // sid
@ApiModelProperty("单车返利sid")
private String vehRebateSid; // 单车返利sid
@ApiModelProperty("核对申请sid")
private String mainSid; // 核对申请sid
}

2
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/ScmVehRebateWithApplyVo.java

@ -63,6 +63,8 @@ public class ScmVehRebateWithApplyVo implements Vo {
private String brandName; // 品牌名称
@ApiModelProperty("预提申请")
private String withApply; // 预提申请
@ApiModelProperty("预提返利合计")
private String withRebateTotal; // 预提返利合计
@ApiModelProperty("创建人姓名")
private String createByName; // 创建人姓名
@ApiModelProperty("使用组织sid")

6
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryService.java

@ -290,7 +290,6 @@ public class ScmVehicleInventoryService extends MybatisBaseService<ScmVehicleInv
// return rb.setMsg("请选择盘库人员");
// }
String sid = dto.getSid();
scmVehicleStayInventoryService.delBySid(sid, dto.getInventoryName());
ScmVehicleInventory scmVehicleInventory = new ScmVehicleInventory();
BeanUtil.copyProperties(dto, scmVehicleInventory, "sid");
scmVehicleInventory.setInventoryDate(new SimpleDateFormat("yyyy-MM-dd").format(new Date()));
@ -330,6 +329,11 @@ public class ScmVehicleInventoryService extends MybatisBaseService<ScmVehicleInv
}
}
}
if (StringUtils.isBlank(dto.getInventoryName())) {
scmVehicleStayInventoryService.delBySid(sid, dto.getLoginName());
} else {
scmVehicleStayInventoryService.delBySid(sid, dto.getInventoryName());
}
save(scmVehicleInventory);
return rb.success().setMsg("保存成功");
}

15
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnService.java

@ -333,7 +333,18 @@ public class ScmVehicleReturnService extends MybatisBaseService<ScmVehicleReturn
//极光推送
UpdateFlowFieldVo uff = rrb.getData();
ScmVehicleReturn scmVehicleReturn = fetchBySid(businessSid);
String msgSid = getMessage(uff, appMap, scmVehicleReturn);
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(uff, messageFlowVo);
uff.setProcInsId(scmVehicleReturn.getInstanceId());
uff.setProcDefId(scmVehicleReturn.getProcDefId());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(businessSid);
messageFlowableQuery.setModuleName("采购退库申请");
messageFlowableQuery.setMsgContent(scmVehicleReturn.getApplicationName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
messageFlowableQuery.setMsgTitle("供应链");
ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
return rrb;
} else {
return ResultBean.fireFail().setMsg("操作失败,提交的数据不一致!");
@ -418,6 +429,7 @@ public class ScmVehicleReturnService extends MybatisBaseService<ScmVehicleReturn
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(uff, messageFlowVo);
uff.setProcInsId(scmVehicleReturn.getInstanceId());
uff.setProcDefId(scmVehicleReturn.getProcDefId());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(bv.getBusinessSid());
@ -732,6 +744,7 @@ public class ScmVehicleReturnService extends MybatisBaseService<ScmVehicleReturn
BeanUtil.copyProperties(uff, messageFlowVo);
String procId = scmVehicleReturn.getInstanceId();
uff.setProcInsId(procId);
uff.setProcDefId(scmVehicleReturn.getProcDefId());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(flowTaskVo.getBusinessSid());

4
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.java

@ -34,6 +34,7 @@ import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebate;
import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateVo;
import org.apache.ibatis.annotations.Update;
import java.util.List;
@ -62,4 +63,7 @@ public interface ScmVehRebateMapper extends BaseMapper<ScmVehRebate> {
@Select("select * from scm_veh_rebate")
List<ScmVehRebateVo> selectListVo();
@Update("update from scm_veh_rebate set state = 1 where sid = #{sid}")
void updateState(String sid);
}

13
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateRest.java

@ -80,6 +80,13 @@ public class ScmVehRebateRest implements ScmVehRebateFeign {
return rb.success().setData(pv);
}
@Override
public ResultBean<PagerVo<ScmVehRebateVo>> checkApplyGetAlreadyUploadVehRebate(PagerQuery<ScmVehRebateQuery> pq) {
ResultBean rb = ResultBean.fireFail();
PagerVo<ScmVehRebateVo> pv = scmVehRebateService.checkApplyGetAlreadyUploadVehRebate(pq);
return rb.success().setData(pv);
}
@Override
public ResultBean save(@RequestBody ScmVehRebateDto dto){
return scmVehRebateService.saveAll(dto);
@ -88,10 +95,16 @@ public class ScmVehRebateRest implements ScmVehRebateFeign {
@Override
public ResultBean update(ScmVehRebateVehDto dto) {
ResultBean rb = ResultBean.fireFail();
dto.setState("3");
scmVehRebateService.updateBySid(dto,dto.getSid());
return rb.success().setMsg("修改成功");
}
@Override
public ResultBean adjustment(ScmVehRebateVehAdjDto dto) {
return scmVehRebateService.adjustment(dto);
}
@Override
@ApiOperation("根据sid批量删除")
@DeleteMapping("/delBySids")

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

@ -26,6 +26,8 @@
package com.yxt.anrui.scm.biz.scmvehrebate;
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.scm.api.scmvehrebate.*;
@ -38,6 +40,7 @@ import com.yxt.common.core.vo.PagerVo;
import org.springframework.stereotype.Service;
import java.util.Date;
import java.util.List;
/**
@ -153,12 +156,65 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
apply(StringUtils.isNotBlank(createEndTime), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
);
qw.eq("createOrgSid",query.getCreateOrgSid());
qw.eq("state", 2);
qw.ne("state", 0);
IPage<ScmVehRebate> page = PagerUtil.queryToPage(pq);
IPage<ScmVehRebateVo> pagging = baseMapper.selectPageVo(page, qw);
for (ScmVehRebateVo 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.getIsAdjustment().equals("否")){
record.setUploadState("3");
}
//上传状态:未调整
if (StringUtils.isNotBlank(record.getUploadDate()) && StringUtils.isNotBlank(record.getUploadMoney()) && record.getIsAdjustment().equals("是")){
record.setUploadState("0");
}
}
PagerVo<ScmVehRebateVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public PagerVo<ScmVehRebateVo> checkApplyGetAlreadyUploadVehRebate(PagerQuery<ScmVehRebateQuery> pq) {
ScmVehRebateQuery query = pq.getParams();
QueryWrapper<ScmVehRebate> qw = new QueryWrapper<>();
if (StringUtils.isNotBlank(query.getBrandSid())) {
qw.eq("brandSid", query.getBrandSid());
}
if (StringUtils.isNotBlank(query.getVehModelName())) {
qw.like("vehModelName", query.getVehModelName());
}
if (StringUtils.isNotBlank(query.getVinNo())) {
qw.like("vinNo", query.getVinNo());
}
if (StringUtils.isNotBlank(query.getRebateTypeKey())) {
qw.eq("rebateTypeKey", query.getRebateTypeKey());
}
if (StringUtils.isNotBlank(query.getRebateName())) {
qw.like("rebateName", query.getRebateName());
}
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<ScmVehRebate> page = PagerUtil.queryToPage(pq);
IPage<ScmVehRebateVo> pagging = baseMapper.selectPageVo(page, qw);
for (ScmVehRebateVo record : pagging.getRecords()) {
String palceGenDate = record.getPalceGenDate();
Date parse = DateUtil.parse(palceGenDate);
int year = DateUtil.year(parse);
int month = DateUtil.month(parse) + 1;
String palceGenDateCopy = year + "年" + month + "月";
record.setPalceGenDateCopy(palceGenDateCopy);
}
PagerVo<ScmVehRebateVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
@ -201,4 +257,26 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
}
return rb.success().setMsg("保存成功");
}
public void updateState(String sid) {
baseMapper.updateState(sid);
}
public ResultBean adjustment(ScmVehRebateVehAdjDto dto) {
ResultBean rb = ResultBean.fireFail();
String sid = dto.getSid();
ScmVehRebate scmVehRebate = fetchBySid(sid);
ScmVehRebateVehDto scmVehRebateVehDto = new ScmVehRebateVehDto();
BeanUtil.copyProperties(scmVehRebate,scmVehRebateVehDto);
scmVehRebateVehDto.setSecondaryUploadDate(dto.getSecondaryUploadDate());
scmVehRebateVehDto.setSecondaryUploadMoney(dto.getSecondaryUploadMoney());
scmVehRebateVehDto.setStayDetermineMoney(dto.getStayDetermineMoney());
int mon = Integer.parseInt(scmVehRebateVehDto.getMoney());
int cost = Integer.parseInt(dto.getCost());
String money = String.valueOf(mon + cost);
scmVehRebateVehDto.setMoney(money);
scmVehRebateVehDto.setAdjustmentMoney(dto.getAdjustmentMoney());
updateBySid(scmVehRebateVehDto,sid);
return rb.success().setMsg("调整成功");
}
}

65
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyMapper.java

@ -0,0 +1,65 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.scm.biz.scmvehrebatecheckapply;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import com.yxt.anrui.scm.api.scmvehrebatecheckapply.ScmVehrebateCheckapply;
import com.yxt.anrui.scm.api.scmvehrebatecheckapply.ScmVehrebateCheckapplyVo;
import java.util.List;
/**
* Project: anrui-scm(单车返利核对) <br/>
* File: ScmVehrebateCheckapplyMapper.java <br/>
* Class: com.yxt.anrui.scm.biz.scmvehrebatecheckapply.ScmVehrebateCheckapplyMapper <br/>
* Description: 单车返利核对申请表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-08-29 16:01:01 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Mapper
public interface ScmVehrebateCheckapplyMapper extends BaseMapper<ScmVehrebateCheckapply> {
//@Update("update scm_vehrebate_checkapply set name=#{msg} where id=#{id}")
//IPage<ScmVehrebateCheckapplyVo> voPage(IPage<ScmVehrebateCheckapply> page, @Param(Constants.WRAPPER) QueryWrapper<ScmVehrebateCheckapply> qw);
IPage<ScmVehrebateCheckapplyVo> selectPageVo(IPage<ScmVehrebateCheckapply> page, @Param(Constants.WRAPPER) Wrapper<ScmVehrebateCheckapply> qw);
List<ScmVehrebateCheckapplyVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<ScmVehrebateCheckapply> qw);
@Select("select * from scm_vehrebate_checkapply")
List<ScmVehrebateCheckapplyVo> selectListVo();
}

31
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyMapper.xml

@ -0,0 +1,31 @@
<?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.scmvehrebatecheckapply.ScmVehrebateCheckapplyMapper">
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.anrui.scm.api.scmvehrebatecheckapply.ScmVehrebateCheckapplyVo">
SELECT
svc.*,
SUM(svr.`estimateRebate`) estimateRebate,
SUM(svr.`uploadMoney`) uploadMoney,
SUM(svr.`stayDetermineMoney`) stayDetermineMoney,
SUM(svr.`adjustmentMoney`) adjustmentMoney,
SUM(svr.`money`) money
FROM
scm_vehrebate_checkapply svc
LEFT JOIN scm_vehrebate_checkapplydetail svcd
ON svc.`sid` = svcd.`mainSid`
LEFT JOIN scm_veh_rebate svr
ON svr.`sid` = svcd.`vehRebateSid`
<where>
${ew.sqlSegment}
</where>
</select>
<select id="selectListAllVo" resultType="com.yxt.anrui.scm.api.scmvehrebatecheckapply.ScmVehrebateCheckapplyVo">
SELECT * FROM scm_vehrebate_checkapply
<where>
${ew.sqlSegment}
</where>
</select>
</mapper>

99
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyRest.java

@ -0,0 +1,99 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.scm.biz.scmvehrebatecheckapply;
import com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailDetailsVo;
import com.yxt.anrui.scm.biz.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailService;
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.Arrays;
import java.util.List;
import com.yxt.anrui.scm.api.scmvehrebatecheckapply.ScmVehrebateCheckapply;
import com.yxt.anrui.scm.api.scmvehrebatecheckapply.ScmVehrebateCheckapplyQuery;
import com.yxt.anrui.scm.api.scmvehrebatecheckapply.ScmVehrebateCheckapplyVo;
import com.yxt.anrui.scm.api.scmvehrebatecheckapply.ScmVehrebateCheckapplyDetailsVo;
import com.yxt.anrui.scm.api.scmvehrebatecheckapply.ScmVehrebateCheckapplyDto;
import com.yxt.anrui.scm.api.scmvehrebatecheckapply.ScmVehrebateCheckapplyFeign;
/**
* Project: anrui-scm(单车返利核对) <br/>
* File: ScmVehrebateCheckapplyFeignFallback.java <br/>
* Class: com.yxt.anrui.scm.biz.scmvehrebatecheckapply.ScmVehrebateCheckapplyRest <br/>
* Description: 单车返利核对申请表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-08-29 16:01:00 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Api(tags = "单车返利核对申请表")
@RestController("com.yxt.anrui.scm.biz.scmvehrebatecheckapply.ScmVehrebateCheckapplyRest")
@RequestMapping("v1/scmvehrebatecheckapply")
public class ScmVehrebateCheckapplyRest implements ScmVehrebateCheckapplyFeign {
@Autowired
private ScmVehrebateCheckapplyService scmVehrebateCheckapplyService;
@Autowired
private ScmVehrebateCheckapplydetailService scmVehrebateCheckapplydetailService;
@Override
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
public ResultBean<PagerVo<ScmVehrebateCheckapplyVo>> listPage(@RequestBody PagerQuery<ScmVehrebateCheckapplyQuery> pq){
ResultBean rb = ResultBean.fireFail();
PagerVo<ScmVehrebateCheckapplyVo> pv = scmVehrebateCheckapplyService.listPageVo(pq);
return rb.success().setData(pv);
}
@Override
@ApiOperation("新增或修改")
@PostMapping("/save")
public ResultBean save(@RequestBody ScmVehrebateCheckapplyDto dto){
return scmVehrebateCheckapplyService.saveOrUpdateDto(dto);
}
@Override
@ApiOperation("根据sid批量删除")
@PostMapping("/delBySids")
public ResultBean delBySids(@RequestBody String[] sids){
return scmVehrebateCheckapplyService.delAll(sids);
}
@Override
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
public ResultBean<ScmVehrebateCheckapplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
return scmVehrebateCheckapplyService.fetchDetailsBySid(sid);
}
}

246
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyService.java

@ -0,0 +1,246 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.scm.biz.scmvehrebatecheckapply;
import cn.hutool.core.bean.BeanUtil;
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.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetail;
import com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailDetailsVo;
import com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailDto;
import com.yxt.anrui.scm.biz.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailService;
import com.yxt.common.core.result.ResultBean;
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.vo.PagerVo;
import com.yxt.anrui.scm.api.scmvehrebatecheckapply.ScmVehrebateCheckapply;
import com.yxt.anrui.scm.api.scmvehrebatecheckapply.ScmVehrebateCheckapplyQuery;
import com.yxt.anrui.scm.api.scmvehrebatecheckapply.ScmVehrebateCheckapplyVo;
import com.yxt.anrui.scm.api.scmvehrebatecheckapply.ScmVehrebateCheckapplyDetailsVo;
import com.yxt.anrui.scm.api.scmvehrebatecheckapply.ScmVehrebateCheckapplyDto;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
/**
* Project: anrui-scm(单车返利核对) <br/>
* File: ScmVehrebateCheckapplyService.java <br/>
* Class: com.yxt.anrui.scm.biz.scmvehrebatecheckapply.ScmVehrebateCheckapplyService <br/>
* Description: 单车返利核对申请表 业务逻辑. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-08-29 16:01:01 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Service
public class ScmVehrebateCheckapplyService extends MybatisBaseService<ScmVehrebateCheckapplyMapper, ScmVehrebateCheckapply> {
@Autowired
ScmVehrebateCheckapplydetailService scmVehrebateCheckapplydetailService;
private QueryWrapper<ScmVehrebateCheckapply> createQueryWrapper(ScmVehrebateCheckapplyQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
QueryWrapper<ScmVehrebateCheckapply> qw = new QueryWrapper<>();
return qw;
}
public PagerVo<ScmVehrebateCheckapplyVo> listPageVo(PagerQuery<ScmVehrebateCheckapplyQuery> pq) {
ScmVehrebateCheckapplyQuery query = pq.getParams();
QueryWrapper<ScmVehrebateCheckapply> qw = new QueryWrapper<>();
if (StringUtils.isNotBlank(query.getBrandSid())) {
qw.eq("svc.brandSid", query.getBrandSid());
}
if (StringUtils.isNotBlank(query.getCheckApply())) {
qw.like("svc.checkApply", query.getCheckApply());
}
String createStartTime = query.getCreateStartTime();
String createEndTime = query.getCreateEndTime();
qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (svc.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(createEndTime), "date_format (svc.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
);
qw.eq("svc.createOrgSid", query.getCreateOrgSid());
IPage<ScmVehrebateCheckapply> page = PagerUtil.queryToPage(pq);
IPage<ScmVehrebateCheckapplyVo> pagging = baseMapper.selectPageVo(page, qw);
List<ScmVehrebateCheckapplyVo> records = pagging.getRecords();
for (ScmVehrebateCheckapplyVo record : records) {
record.setEstimateRebate(record.getEstimateRebate().substring(0,record.getEstimateRebate().lastIndexOf(".")));
record.setUploadMoney(record.getUploadMoney().substring(0,record.getUploadMoney().lastIndexOf(".")));
record.setStayDetermineMoney(record.getStayDetermineMoney().substring(0,record.getStayDetermineMoney().lastIndexOf(".")));
record.setAdjustmentMoney(record.getAdjustmentMoney().substring(0,record.getAdjustmentMoney().lastIndexOf(".")));
record.setMoney(record.getMoney().substring(0,record.getMoney().lastIndexOf(".")));
}
PagerVo<ScmVehrebateCheckapplyVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public ResultBean saveOrUpdateDto(ScmVehrebateCheckapplyDto dto) {
ResultBean rb = ResultBean.fireFail();
String dtoSid = dto.getSid();
List<ScmVehrebateCheckapplydetailDto> scmWhenVehrebateCheckapplydetailDetails = dto.getScmWhenVehrebateCheckapplydetailDetails();
List<ScmVehrebateCheckapplydetailDto> scmLastVehrebateCheckapplydetailDetails = dto.getScmLastVehrebateCheckapplydetailDetails();
if (scmWhenVehrebateCheckapplydetailDetails.size() < 1 && scmLastVehrebateCheckapplydetailDetails.size() < 1) {
return rb.setMsg("请选择已核对单车返利信息");
}
if (StringUtils.isBlank(dtoSid)) {
String sid = this.insertByDto(dto).getData();
if (scmWhenVehrebateCheckapplydetailDetails.size() > 0) {
for (ScmVehrebateCheckapplydetailDto scmVehrebateCheckapplydetail : scmWhenVehrebateCheckapplydetailDetails) {
for (String vehRebateSid : scmVehrebateCheckapplydetail.getVehRebateSids()) {
ScmVehrebateCheckapplydetail scmVehrebateCheckapplydetail1 = new ScmVehrebateCheckapplydetail();
scmVehrebateCheckapplydetail1.setVehRebateSid(vehRebateSid);
scmVehrebateCheckapplydetail1.setMainSid(sid);
scmVehrebateCheckapplydetailService.save(scmVehrebateCheckapplydetail1);
}
}
}
if (scmLastVehrebateCheckapplydetailDetails.size() > 0) {
for (ScmVehrebateCheckapplydetailDto scmVehrebateCheckapplydetail : scmLastVehrebateCheckapplydetailDetails) {
for (String vehRebateSid : scmVehrebateCheckapplydetail.getVehRebateSids()) {
ScmVehrebateCheckapplydetail scmVehrebateCheckapplydetail1 = new ScmVehrebateCheckapplydetail();
scmVehrebateCheckapplydetail1.setVehRebateSid(vehRebateSid);
scmVehrebateCheckapplydetail1.setMainSid(sid);
scmVehrebateCheckapplydetailService.save(scmVehrebateCheckapplydetail1);
}
}
}
return rb.success().setMsg("添加成功");
}
ScmVehrebateCheckapply scmVehrebateCheckapply = fetchBySid(dtoSid);
if (scmVehrebateCheckapply == null) {
return rb.setMsg("该核对申请单不存在");
}
this.updateByDto(dto);
scmVehrebateCheckapplydetailService.delByMainSid(dtoSid);
if (scmWhenVehrebateCheckapplydetailDetails.size() > 0) {
for (ScmVehrebateCheckapplydetailDto scmVehrebateCheckapplydetail : scmWhenVehrebateCheckapplydetailDetails) {
for (String vehRebateSid : scmVehrebateCheckapplydetail.getVehRebateSids()) {
ScmVehrebateCheckapplydetail scmVehrebateCheckapplydetail1 = new ScmVehrebateCheckapplydetail();
scmVehrebateCheckapplydetail1.setVehRebateSid(vehRebateSid);
scmVehrebateCheckapplydetail1.setMainSid(dtoSid);
scmVehrebateCheckapplydetailService.save(scmVehrebateCheckapplydetail1);
}
}
}
if (scmLastVehrebateCheckapplydetailDetails.size() > 0) {
for (ScmVehrebateCheckapplydetailDto scmVehrebateCheckapplydetail : scmLastVehrebateCheckapplydetailDetails) {
for (String vehRebateSid : scmVehrebateCheckapplydetail.getVehRebateSids()) {
ScmVehrebateCheckapplydetail scmVehrebateCheckapplydetail1 = new ScmVehrebateCheckapplydetail();
scmVehrebateCheckapplydetail1.setVehRebateSid(vehRebateSid);
scmVehrebateCheckapplydetail1.setMainSid(dtoSid);
scmVehrebateCheckapplydetailService.save(scmVehrebateCheckapplydetail1);
}
}
}
return rb.success().setMsg("修改成功");
}
public ResultBean<String> insertByDto(ScmVehrebateCheckapplyDto dto) {
ResultBean rb = ResultBean.fireFail();
ScmVehrebateCheckapply entity = new ScmVehrebateCheckapply();
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.insert(entity);
return rb.success().setData(entity.getSid());
}
public void updateByDto(ScmVehrebateCheckapplyDto dto) {
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
return;
}
ScmVehrebateCheckapply entity = fetchBySid(dtoSid);
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.updateById(entity);
}
public ScmVehrebateCheckapplyDetailsVo fetchDetailsVoBySid(String sid) {
ScmVehrebateCheckapply entity = fetchBySid(sid);
ScmVehrebateCheckapplyDetailsVo vo = new ScmVehrebateCheckapplyDetailsVo();
BeanUtil.copyProperties(entity, vo);
return vo;
}
public ResultBean delAll(String[] sids) {
ResultBean rb = ResultBean.fireFail();
delBySids(sids);
for (String sid : sids) {
scmVehrebateCheckapplydetailService.delByMainSid(sid);
}
return rb.success().setMsg("删除成功");
}
public ResultBean<ScmVehrebateCheckapplyDetailsVo> fetchDetailsBySid(String sid) {
ResultBean rb = ResultBean.fireFail();
ScmVehrebateCheckapplyDetailsVo scmVehrebateCheckapplyDetailsVo = new ScmVehrebateCheckapplyDetailsVo();
ScmVehrebateCheckapply scmVehrebateCheckapply = fetchBySid(sid);
BeanUtil.copyProperties(scmVehrebateCheckapply,scmVehrebateCheckapplyDetailsVo);
List<ScmVehrebateCheckapplydetailDetailsVo> scmWhenVehrebateCheckapplydetailDetailsVos = scmVehrebateCheckapplydetailService.fetchWhenDetailsVoBySid(sid);
if (scmWhenVehrebateCheckapplydetailDetailsVos.size() > 0){
for (ScmVehrebateCheckapplydetailDetailsVo scmWhenVehrebateCheckapplydetailDetailsVo : scmWhenVehrebateCheckapplydetailDetailsVos) {
String vehRebateSid = scmWhenVehrebateCheckapplydetailDetailsVo.getVehRebateSid();
String[] vehRebateSids = vehRebateSid.split(",");
scmWhenVehrebateCheckapplydetailDetailsVo.setVehRebateSids(Arrays.asList(vehRebateSids));
scmWhenVehrebateCheckapplydetailDetailsVo.setWithRebate(scmWhenVehrebateCheckapplydetailDetailsVo.getWithRebate().substring(0,scmWhenVehrebateCheckapplydetailDetailsVo.getWithRebate().lastIndexOf(".")));
scmWhenVehrebateCheckapplydetailDetailsVo.setUploadMoney(scmWhenVehrebateCheckapplydetailDetailsVo.getUploadMoney().substring(0,scmWhenVehrebateCheckapplydetailDetailsVo.getUploadMoney().lastIndexOf(".")));
scmWhenVehrebateCheckapplydetailDetailsVo.setStayDetermineMoney(scmWhenVehrebateCheckapplydetailDetailsVo.getStayDetermineMoney().substring(0,scmWhenVehrebateCheckapplydetailDetailsVo.getStayDetermineMoney().lastIndexOf(".")));
scmWhenVehrebateCheckapplydetailDetailsVo.setAdjustmentMoney(scmWhenVehrebateCheckapplydetailDetailsVo.getAdjustmentMoney().substring(0,scmWhenVehrebateCheckapplydetailDetailsVo.getAdjustmentMoney().lastIndexOf(".")));
scmWhenVehrebateCheckapplydetailDetailsVo.setMoney(scmWhenVehrebateCheckapplydetailDetailsVo.getMoney().substring(0,scmWhenVehrebateCheckapplydetailDetailsVo.getMoney().lastIndexOf(".")));
}
}
scmVehrebateCheckapplyDetailsVo.setScmWhenVehrebateCheckapplydetailDetails(scmWhenVehrebateCheckapplydetailDetailsVos);
List<ScmVehrebateCheckapplydetailDetailsVo> scmLastVehrebateCheckapplydetailDetailsVos = scmVehrebateCheckapplydetailService.fetchLastDetailsVoBySid(sid);
if (scmLastVehrebateCheckapplydetailDetailsVos.size() > 0){
for (ScmVehrebateCheckapplydetailDetailsVo scmLastVehrebateCheckapplydetailDetailsVo : scmLastVehrebateCheckapplydetailDetailsVos) {
String vehRebateSid = scmLastVehrebateCheckapplydetailDetailsVo.getVehRebateSid();
String[] vehRebateSids = vehRebateSid.split(",");
scmLastVehrebateCheckapplydetailDetailsVo.setVehRebateSids(Arrays.asList(vehRebateSids));
scmLastVehrebateCheckapplydetailDetailsVo.setWithRebate(scmLastVehrebateCheckapplydetailDetailsVo.getWithRebate().substring(0,scmLastVehrebateCheckapplydetailDetailsVo.getWithRebate().lastIndexOf(".")));
scmLastVehrebateCheckapplydetailDetailsVo.setUploadMoney(scmLastVehrebateCheckapplydetailDetailsVo.getUploadMoney().substring(0,scmLastVehrebateCheckapplydetailDetailsVo.getUploadMoney().lastIndexOf(".")));
scmLastVehrebateCheckapplydetailDetailsVo.setStayDetermineMoney(scmLastVehrebateCheckapplydetailDetailsVo.getStayDetermineMoney().substring(0,scmLastVehrebateCheckapplydetailDetailsVo.getStayDetermineMoney().lastIndexOf(".")));
scmLastVehrebateCheckapplydetailDetailsVo.setAdjustmentMoney(scmLastVehrebateCheckapplydetailDetailsVo.getAdjustmentMoney().substring(0,scmLastVehrebateCheckapplydetailDetailsVo.getAdjustmentMoney().lastIndexOf(".")));
scmLastVehrebateCheckapplydetailDetailsVo.setMoney(scmLastVehrebateCheckapplydetailDetailsVo.getMoney().substring(0,scmLastVehrebateCheckapplydetailDetailsVo.getMoney().lastIndexOf(".")));
String palceGenDate = scmLastVehrebateCheckapplydetailDetailsVo.getPalceGenDate();
Date parse = DateUtil.parse(palceGenDate);
int year = DateUtil.year(parse);
int month = DateUtil.month(parse) + 1;
String palceGenDateCopy = year + "年" + month + "月";
scmLastVehrebateCheckapplydetailDetailsVo.setPalceGenDateCopy(palceGenDateCopy);
}
}
scmVehrebateCheckapplyDetailsVo.setScmLastVehrebateCheckapplydetailDetails(scmLastVehrebateCheckapplydetailDetailsVos);
return rb.success().setData(scmVehrebateCheckapplyDetailsVo);
}
}

74
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailMapper.java

@ -0,0 +1,74 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.scm.biz.scmvehrebatecheckapplydetail;
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.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailDetailsVo;
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.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetail;
import com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailVo;
import java.util.List;
/**
* Project: anrui-scm(单车返利核对) <br/>
* File: ScmVehrebateCheckapplydetailMapper.java <br/>
* Class: com.yxt.anrui.scm.biz.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailMapper <br/>
* Description: 单车返利核对申请表_返利列表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-08-29 16:01:01 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Mapper
public interface ScmVehrebateCheckapplydetailMapper extends BaseMapper<ScmVehrebateCheckapplydetail> {
//@Update("update scm_vehrebate_checkapplydetail set name=#{msg} where id=#{id}")
//IPage<ScmVehrebateCheckapplydetailVo> voPage(IPage<ScmVehrebateCheckapplydetail> page, @Param(Constants.WRAPPER) QueryWrapper<ScmVehrebateCheckapplydetail> qw);
IPage<ScmVehrebateCheckapplydetailVo> selectPageVo(IPage<ScmVehrebateCheckapplydetail> page, @Param(Constants.WRAPPER) Wrapper<ScmVehrebateCheckapplydetail> qw);
List<ScmVehrebateCheckapplydetailVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<ScmVehrebateCheckapplydetail> qw);
@Select("select * from scm_vehrebate_checkapplydetail")
List<ScmVehrebateCheckapplydetailVo> selectListVo();
@Delete("delete from scm_vehrebate_checkapplydetail where mainSid = #{sid}")
void delByMainSid(String sid);
List<ScmVehrebateCheckapplydetailDetailsVo> fetchWhenDetailsVoBySid(String sid);
List<ScmVehrebateCheckapplydetailDetailsVo> fetchLastDetailsVoBySid(String sid);
}

59
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailMapper.xml

@ -0,0 +1,59 @@
<?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.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailMapper">
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo"
resultType="com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailVo">
SELECT * FROM scm_vehrebate_checkapplydetail
<where>
${ew.sqlSegment}
</where>
</select>
<select id="selectListAllVo"
resultType="com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailVo">
SELECT * FROM scm_vehrebate_checkapplydetail
<where>
${ew.sqlSegment}
</where>
</select>
<select id="fetchWhenDetailsVoBySid"
resultType="com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailDetailsVo">
SELECT svr.rebateTypeKey,
svr.`rebateTypeValue`,
SUM(svr.`estimateRebate`) withRebate,
COUNT(*) num,
GROUP_CONCAT(svc.`vehRebateSid`) vehRebateSid,
SUM(svr.`uploadMoney`) uploadMoney,
SUM(svr.`stayDetermineMoney`) stayDetermineMoney,
SUM(svr.`adjustmentMoney`) adjustmentMoney,
SUM(svr.`money`) money
FROM scm_vehrebate_checkapplydetail svc
LEFT JOIN scm_veh_rebate svr
ON svr.`sid` = svc.`vehRebateSid`
WHERE svc.`mainSid` = #{sid}
AND DATE_FORMAT(svr.palceGenDate, '%Y%m') = DATE_FORMAT(CURDATE(), '%Y%m')
GROUP BY svr.`rebateTypeKey`
</select>
<select id="fetchLastDetailsVoBySid"
resultType="com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailDetailsVo">
SELECT svr.palceGenDate,
SUM(svr.`estimateRebate`) withRebate,
COUNT(*) withholdingAmount,
COUNT(*) uploadAmount,
GROUP_CONCAT(svc.`vehRebateSid`) vehRebateSid,
SUM(svr.`uploadMoney`) uploadMoney,
SUM(svr.`stayDetermineMoney`) stayDetermineMoney,
SUM(svr.`adjustmentMoney`) adjustmentMoney,
SUM(svr.`money`) money
FROM scm_vehrebate_checkapplydetail svc
LEFT JOIN scm_veh_rebate svr
ON svr.`sid` = svc.`vehRebateSid`
WHERE svc.`mainSid` = #{sid}
AND DATE_FORMAT(svr.palceGenDate, '%Y%m') != DATE_FORMAT(CURDATE(), '%Y%m')
GROUP BY svr.palceGenDate
</select>
</mapper>

91
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailRest.java

@ -0,0 +1,91 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.scm.biz.scmvehrebatecheckapplydetail;
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.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetail;
import com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailQuery;
import com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailVo;
import com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailDetailsVo;
import com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailDto;
import com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailFeign;
/**
* Project: anrui-scm(单车返利核对) <br/>
* File: ScmVehrebateCheckapplydetailFeignFallback.java <br/>
* Class: com.yxt.anrui.scm.biz.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailRest <br/>
* Description: 单车返利核对申请表_返利列表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-08-29 16:01:01 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Api(tags = "单车返利核对申请表_返利列表")
@RestController("com.yxt.anrui.scm.biz.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailRest")
@RequestMapping("v1/scmvehrebatecheckapplydetail")
public class ScmVehrebateCheckapplydetailRest implements ScmVehrebateCheckapplydetailFeign {
@Autowired
private ScmVehrebateCheckapplydetailService scmVehrebateCheckapplydetailService;
@Override
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
public ResultBean<PagerVo<ScmVehrebateCheckapplydetailVo>> listPage(@RequestBody PagerQuery<ScmVehrebateCheckapplydetailQuery> pq){
ResultBean rb = ResultBean.fireFail();
PagerVo<ScmVehrebateCheckapplydetailVo> pv = scmVehrebateCheckapplydetailService.listPageVo(pq);
return rb.success().setData(pv);
}
@Override
@ApiOperation("新增或修改")
@PostMapping("/save")
public ResultBean save(@RequestBody ScmVehrebateCheckapplydetailDto dto){
ResultBean rb = ResultBean.fireFail();
scmVehrebateCheckapplydetailService.saveOrUpdateDto(dto);
return rb.success();
}
@Override
@ApiOperation("根据sid批量删除")
@PostMapping("/delBySids")
public ResultBean delBySids(@RequestBody String[] sids){
ResultBean rb = ResultBean.fireFail();
scmVehrebateCheckapplydetailService.delBySids(sids);
return rb.success();
}
}

115
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailService.java

@ -0,0 +1,115 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.scm.biz.scmvehrebatecheckapplydetail;
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.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetail;
import com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailQuery;
import com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailVo;
import com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailDetailsVo;
import com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailDto;
import com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailFeign;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* Project: anrui-scm(单车返利核对) <br/>
* File: ScmVehrebateCheckapplydetailService.java <br/>
* Class: com.yxt.anrui.scm.biz.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailService <br/>
* Description: 单车返利核对申请表_返利列表 业务逻辑. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-08-29 16:01:01 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Service
public class ScmVehrebateCheckapplydetailService extends MybatisBaseService<ScmVehrebateCheckapplydetailMapper, ScmVehrebateCheckapplydetail> {
private QueryWrapper<ScmVehrebateCheckapplydetail> createQueryWrapper(ScmVehrebateCheckapplydetailQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
QueryWrapper<ScmVehrebateCheckapplydetail> qw = new QueryWrapper<>();
return qw;
}
public PagerVo<ScmVehrebateCheckapplydetailVo> listPageVo(PagerQuery<ScmVehrebateCheckapplydetailQuery> pq) {
ScmVehrebateCheckapplydetailQuery query = pq.getParams();
QueryWrapper<ScmVehrebateCheckapplydetail> qw = createQueryWrapper(query);
IPage<ScmVehrebateCheckapplydetail> page = PagerUtil.queryToPage(pq);
IPage<ScmVehrebateCheckapplydetailVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<ScmVehrebateCheckapplydetailVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public void saveOrUpdateDto(ScmVehrebateCheckapplydetailDto dto){
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
this.insertByDto(dto);
return;
}
this.updateByDto(dto);
}
public void insertByDto(ScmVehrebateCheckapplydetailDto dto){
ScmVehrebateCheckapplydetail entity = new ScmVehrebateCheckapplydetail();
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.insert(entity);
}
public void updateByDto(ScmVehrebateCheckapplydetailDto dto){
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
return;
}
ScmVehrebateCheckapplydetail entity = fetchBySid(dtoSid);
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.updateById(entity);
}
public void delByMainSid(String sid) {
baseMapper.delByMainSid(sid);
}
public List<ScmVehrebateCheckapplydetailDetailsVo> fetchWhenDetailsVoBySid(String sid) {
return baseMapper.fetchWhenDetailsVoBySid(sid);
}
public List<ScmVehrebateCheckapplydetailDetailsVo> fetchLastDetailsVoBySid(String sid) {
return baseMapper.fetchLastDetailsVoBySid(sid);
}
}

3
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithMapper.java

@ -69,4 +69,7 @@ public interface ScmVehRebateWithMapper extends BaseMapper<ScmVehRebateWith> {
void delByMainSid(String dtoSid);
List<ScmVehRebateWithDetailsVo> fetchByMainSid(String sid);
@Select("select vehRebateSid from scm_veh_rebate_with where mainSid = #{businessSid}")
List<String> fetchVehReBateSidByMainSid(String businessSid);
}

2
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithMapper.xml

@ -20,7 +20,7 @@
<select id="fetchByMainSid" resultType="com.yxt.anrui.scm.api.scmvehrebatewith.ScmVehRebateWithDetailsVo">
SELECT svr.rebateTypeKey,
svr.`rebateTypeValue`,
SUM(svr.`estimateRebate`) estimateRebate,
SUM(svr.`estimateRebate`) withRebate,
COUNT(*) num,
GROUP_CONCAT(svrw.`vehRebateSid`) vehRebateSid
FROM scm_veh_rebate_with svrw

4
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithService.java

@ -151,4 +151,8 @@ public class ScmVehRebateWithService extends MybatisBaseService<ScmVehRebateWith
}
return rb.success().setData(scmVehRebateDetailsVos);
}
public List<String> fetchVehReBateSidByMainSid(String businessSid) {
return baseMapper.fetchVehReBateSidByMainSid(businessSid);
}
}

58
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyMapper.xml

@ -1,28 +1,42 @@
<?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.scmvehrebatewithapply.ScmVehRebateWithApplyMapper">
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.anrui.scm.api.scmvehrebatewithapply.ScmVehRebateWithApplyVo">
SELECT * FROM scm_veh_rebate_with_apply <where> ${ew.sqlSegment} </where>
</select>
<select id="selectListAllVo" resultType="com.yxt.anrui.scm.api.scmvehrebatewithapply.ScmVehRebateWithApplyVo">
SELECT * FROM scm_veh_rebate_with_apply <where> ${ew.sqlSegment} </where>
</select>
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.anrui.scm.api.scmvehrebatewithapply.ScmVehRebateWithApplyVo">
SELECT
svrwa.*,
SUM(svr.`estimateRebate`) withRebateTotal
FROM
scm_veh_rebate_with_apply svrwa
LEFT JOIN scm_veh_rebate_with svrw
ON svrwa.`sid` = svrw.`mainSid`
LEFT JOIN scm_veh_rebate svr
ON svr.`sid` = svrw.`vehRebateSid`
<where>
${ew.sqlSegment}
</where>
</select>
<update id="updateFlowFiled">
UPDATE scm_veh_rebate_with_apply
SET nodeState=#{nodeState}, nodeSid=#{taskDefKey}
<if test="procDefId != null and procDefId != ''">
, procDefId=#{procDefId}
</if>
<if test="procInsId != null and procInsId != ''">
, procInstId=#{procInsId}
</if>
<if test="taskId != null and taskId != ''">
, taskId=#{taskId}
</if>
WHERE sid=#{sid}
<select id="selectListAllVo" resultType="com.yxt.anrui.scm.api.scmvehrebatewithapply.ScmVehRebateWithApplyVo">
SELECT * FROM scm_veh_rebate_with_apply
<where>
${ew.sqlSegment}
</where>
</select>
<update id="updateFlowFiled">
UPDATE scm_veh_rebate_with_apply
SET nodeState=#{nodeState}, nodeSid=#{taskDefKey}
<if test="procDefId != null and procDefId != ''">
, procDefId=#{procDefId}
</if>
<if test="procInsId != null and procInsId != ''">
, procInstId=#{procInsId}
</if>
<if test="taskId != null and taskId != ''">
, taskId=#{taskId}
</if>
WHERE sid=#{sid}
</update>
</mapper>

27
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyService.java

@ -45,8 +45,8 @@ import com.yxt.anrui.scm.api.scmvehrebatewith.ScmVehRebateWithDto;
import com.yxt.anrui.scm.api.scmvehrebatewithapply.flow.GetNodeQuery;
import com.yxt.anrui.scm.api.scmvehrebatewithapply.flow.GetNodeVo;
import com.yxt.anrui.scm.api.scmvehrebatewithapply.flow.SubmitScmVehRebateWithApplyDto;
import com.yxt.anrui.scm.biz.scmvehrebate.ScmVehRebateService;
import com.yxt.anrui.scm.biz.scmvehrebatewith.ScmVehRebateWithService;
import com.yxt.common.base.utils.ConstantUtils;
import com.yxt.common.core.result.ResultBean;
import org.apache.commons.lang3.StringUtils;
import com.yxt.common.base.service.MybatisBaseService;
@ -62,7 +62,6 @@ import com.yxt.anrui.scm.api.scmvehrebatewithapply.ScmVehRebateWithApplyDto;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.util.*;
import java.util.stream.Collectors;
@ -85,6 +84,8 @@ public class ScmVehRebateWithApplyService extends MybatisBaseService<ScmVehRebat
@Autowired
private ScmVehRebateWithService scmVehRebateWithService;
@Autowired
private ScmVehRebateService scmVehRebateService;
@Autowired
private SysStaffOrgFeign sysStaffOrgFeign;
@Autowired
private FlowableFeign flowableFeign;
@ -104,19 +105,24 @@ public class ScmVehRebateWithApplyService extends MybatisBaseService<ScmVehRebat
ScmVehRebateWithApplyQuery query = pq.getParams();
QueryWrapper<ScmVehRebateWithApply> qw = new QueryWrapper<>();
if (StringUtils.isNotBlank(query.getBrandSid())) {
qw.eq("brandSid", query.getBrandSid());
qw.eq("svrwa.brandSid", query.getBrandSid());
}
if (StringUtils.isNotBlank(query.getWithApply())) {
qw.like("withApply", query.getWithApply());
qw.like("svrwa.withApply", query.getWithApply());
}
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.apply(StringUtils.isNotBlank(createStartTime), "date_format (svrwa.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(createEndTime), "date_format (svrwa.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
);
qw.eq("createOrgSid", query.getCreateOrgSid());
qw.eq("svrwa.createOrgSid", query.getCreateOrgSid());
IPage<ScmVehRebateWithApply> page = PagerUtil.queryToPage(pq);
IPage<ScmVehRebateWithApplyVo> pagging = baseMapper.selectPageVo(page, qw);
for (ScmVehRebateWithApplyVo record : pagging.getRecords()) {
String withRebateTotal = record.getWithRebateTotal();
withRebateTotal = withRebateTotal.substring(0, withRebateTotal.lastIndexOf("."));
record.setWithRebateTotal(withRebateTotal);
}
PagerVo<ScmVehRebateWithApplyVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
@ -203,6 +209,9 @@ public class ScmVehRebateWithApplyService extends MybatisBaseService<ScmVehRebat
for (ScmVehRebateWithDetailsVo scmVehRebateWithDetailsVo : scmVehRebateWithDetailsVos) {
String[] vehRebateSids = scmVehRebateWithDetailsVo.getVehRebateSid().split(",");
scmVehRebateWithDetailsVo.setVehRebateSids(Arrays.asList(vehRebateSids));
String withRebate = scmVehRebateWithDetailsVo.getWithRebate();
withRebate = withRebate.substring(0, withRebate.lastIndexOf("."));
scmVehRebateWithDetailsVo.setWithRebate(withRebate);
}
scmVehRebateWithApplyDetailsVo.setScmVehRebateWiths(scmVehRebateWithDetailsVos);
return rb.success().setData(scmVehRebateWithApplyDetailsVo);
@ -310,6 +319,7 @@ public class ScmVehRebateWithApplyService extends MybatisBaseService<ScmVehRebat
public ResultBean complete(BusinessVariables bv) {
ResultBean rb = ResultBean.fireFail();
ScmVehRebateWithApply scmVehRebateWithApply = fetchBySid(bv.getBusinessSid());
List<String> vehRebateSids = scmVehRebateWithService.fetchVehReBateSidByMainSid(bv.getBusinessSid());
if (bv.getTaskId().equals(scmVehRebateWithApply.getTaskId())) {
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
if (!resultBean.getSuccess()) {
@ -317,6 +327,9 @@ public class ScmVehRebateWithApplyService extends MybatisBaseService<ScmVehRebat
}
updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
for (String vehRebateSid : vehRebateSids) {
scmVehRebateService.updateState(vehRebateSid);
}
}
return rb.success().setData(resultBean.getData());
} else {

9
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/contract/AppCommonContractFeign.java

@ -6,6 +6,8 @@ import com.yxt.anrui.base.api.commoncontract.CommonContractFeignFallback;
import com.yxt.anrui.terminal.api.autoservice.contract.flowable.ContractDto;
import com.yxt.anrui.terminal.api.autoservice.contract.flowable.ContractQuery;
import com.yxt.anrui.terminal.api.autoservice.contract.flowable.ContractTaskQuery;
import com.yxt.anrui.terminal.api.autoservice.contract.flowable.SubmitContractInfoDto;
import com.yxt.anrui.terminal.api.supplychain.modelAdjust.SubmitModelModPriceDto;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
@ -15,6 +17,8 @@ import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.cloud.openfeign.SpringQueryMap;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
/**
* Project: anrui-base(安瑞基础) <br/>
* File: CommonContractFeign.java <br/>
@ -52,6 +56,11 @@ public interface AppCommonContractFeign {
@ResponseBody
public ResultBean saveContractInfo(@RequestBody CrmCustomerFileDto dto);
@ApiOperation("移动端-提交合同审核流程")
@PostMapping("/submitContractInfo")
@ResponseBody
public ResultBean submitContractInfo(@Valid @RequestBody SubmitContractInfoDto dto);
@ApiOperation("办理")
@PutMapping("/agreeContractInfo")
@ResponseBody

6
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/contract/AppCommonContractFeignFallback.java

@ -4,6 +4,7 @@ import com.yxt.anrui.base.api.commoncontract.*;
import com.yxt.anrui.terminal.api.autoservice.contract.flowable.ContractDto;
import com.yxt.anrui.terminal.api.autoservice.contract.flowable.ContractQuery;
import com.yxt.anrui.terminal.api.autoservice.contract.flowable.ContractTaskQuery;
import com.yxt.anrui.terminal.api.autoservice.contract.flowable.SubmitContractInfoDto;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
@ -45,6 +46,11 @@ public class AppCommonContractFeignFallback implements AppCommonContractFeign {
return null;
}
@Override
public ResultBean submitContractInfo(SubmitContractInfoDto dto) {
return null;
}
@Override
public ResultBean agreeContractInfo(ContractDto dto) {
return null;

21
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/contract/flowable/SubmitContractInfoDto.java

@ -0,0 +1,21 @@
package com.yxt.anrui.terminal.api.autoservice.contract.flowable;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.yxt.anrui.terminal.api.autoservice.contract.CrmCustomerFileDto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class SubmitContractInfoDto extends CrmCustomerFileDto {
private static final long serialVersionUID = -6589984457477863174L;
@ApiModelProperty("意见")
private String comment;
@ApiModelProperty("流程实例id")
@JsonProperty("procInsId")
private String instanceId;
@ApiModelProperty("任务id")
private String taskId;
}

3
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/insurance/InsuranceInfoDto.java

@ -31,5 +31,8 @@ public class InsuranceInfoDto implements Dto {
@JsonProperty(value = "saleOrderSid")
private String salesOrderSid;
@JsonProperty("numberKey")
private String insuranceNumKey;
}

2
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/insurance/InsuranceInfoVo.java

@ -33,4 +33,6 @@ public class InsuranceInfoVo implements Vo {
@ApiModelProperty(value = "备注")
private String remarks;
private String numberKey;
}

6
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/contract/AppCommonContractRest.java

@ -10,6 +10,7 @@ import com.yxt.anrui.terminal.api.autoservice.contract.CrmCustomerFileDto;
import com.yxt.anrui.terminal.api.autoservice.contract.flowable.ContractDto;
import com.yxt.anrui.terminal.api.autoservice.contract.flowable.ContractQuery;
import com.yxt.anrui.terminal.api.autoservice.contract.flowable.ContractTaskQuery;
import com.yxt.anrui.terminal.api.autoservice.contract.flowable.SubmitContractInfoDto;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
@ -59,6 +60,11 @@ public class AppCommonContractRest implements AppCommonContractFeign {
return appCommonContractService.saveContractInfo(dto);
}
@Override
public ResultBean submitContractInfo(SubmitContractInfoDto dto) {
return appCommonContractService.submitContractInfo(dto);
}
@Override
public ResultBean agreeContractInfo(ContractDto dto) {
return appCommonContractService.agreeContractInfo(dto);

19
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/contract/AppCommonContractService.java

@ -3,10 +3,7 @@ package com.yxt.anrui.terminal.biz.autoservice.contract;
import cn.hutool.core.bean.BeanUtil;
import com.yxt.anrui.base.api.commoncontract.*;
import com.yxt.anrui.base.api.commoncontract.flowable.CommonContractCompleteDto;
import com.yxt.anrui.base.api.commoncontract.flowable.CommonContractNodeQuery;
import com.yxt.anrui.base.api.commoncontract.flowable.CommonContractNodeVo;
import com.yxt.anrui.base.api.commoncontract.flowable.CommonContractTaskQuery;
import com.yxt.anrui.base.api.commoncontract.flowable.*;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
@ -16,9 +13,11 @@ import com.yxt.anrui.terminal.api.autoservice.contract.CrmCustomerFileDto;
import com.yxt.anrui.terminal.api.autoservice.contract.flowable.ContractDto;
import com.yxt.anrui.terminal.api.autoservice.contract.flowable.ContractQuery;
import com.yxt.anrui.terminal.api.autoservice.contract.flowable.ContractTaskQuery;
import com.yxt.anrui.terminal.api.autoservice.contract.flowable.SubmitContractInfoDto;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import lombok.Data;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -86,6 +85,18 @@ public class AppCommonContractService {
return rb.success();
}
public ResultBean submitContractInfo(SubmitContractInfoDto dto) {
ResultBean rb = ResultBean.fireFail();
AppSubmitContractInfoDto appSubmitContractInfoDto = new AppSubmitContractInfoDto();
BeanUtil.copyProperties(dto, appSubmitContractInfoDto);
ResultBean resultBean = commonContractFeign.submitContractInfo(appSubmitContractInfoDto);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
return rb.success();
}
public ResultBean agreeContractInfo(ContractDto dto) {
ResultBean rb = ResultBean.fireFail();
//根据用户sid获取staffSid

Loading…
Cancel
Save