yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/master'

master
yxt_djz 2 years ago
parent
3a7bedf89a 301ef519c4
commit
91ca142ac4
18 changed files with 305 additions and 27 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java
  2. 8
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java
  3. 10
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java
  4. 1
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/flowable/BusSalesOrderFlowQuery.java
  5. 42
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/flowable/OrderFlowableQuery.java
  6. 10
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java
  7. 29
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
  8. 2
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationDetailedVo.java
  9. 2
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationDetailsVo.java
  10. 23
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
  11. 17
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeign.java
  12. 15
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeignFallback.java
  13. 3
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/flowable/SaleOrderQuery.java
  14. 42
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/flowable/SaleOrderQueryBy.java
  15. 30
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/FlowOrderVo.java
  16. 2
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationDetailedVo.java
  17. 15
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderRest.java
  18. 79
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java

2
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java
View File

@ -2082,7 +2082,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
});
}
if("2".equals(appOrderDetailsVo.getPayTypeKey())){
return rb.setMsg("贷款合同附件请线下处理");
return rb.setMsg("贷款合同附件请线下处理").setCode("1000001");
}
} catch (Exception e) {
e.printStackTrace();

8
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java
View File

@ -264,5 +264,13 @@ public interface BusSalesOrderFeign {
@ResponseBody
public ResultBean<PagerVo<AppBusSalesOrderVo>> getSaleOrdersByOrgPath(@RequestBody PagerQuery<OrderQuery> pq);
@ApiOperation("App销售订单根据组织机构查询")
@GetMapping("/selectBySid")
@ResponseBody
ResultBean<BusSalesOrder> selectBySid(@RequestParam("businessSid") String businessSid);
@ApiOperation(value = "销售支持部经理审批办理（同意）")
@PutMapping("/completeBy")
@ResponseBody
public ResultBean completeBy(@RequestBody OrderFlowableQuery orderFlowableQuery);
}

10
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java
View File

@ -239,4 +239,14 @@ public class BusSalesOrderFeignFallback implements BusSalesOrderFeign {
public ResultBean<PagerVo<AppBusSalesOrderVo>> getSaleOrdersByOrgPath(PagerQuery<OrderQuery> pq) {
return null;
}
@Override
public ResultBean<BusSalesOrder> selectBySid(String businessSid) {
return null;
}
@Override
public ResultBean completeBy(OrderFlowableQuery orderFlowableQuery) {
return null;
}
}

1
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/flowable/BusSalesOrderFlowQuery.java
View File

@ -19,7 +19,6 @@ public class BusSalesOrderFlowQuery implements Query {
@NotBlank(message = "参数错误：userSid")
private String userSid;
@ApiModelProperty(value = "用户全路径sid")
@NotBlank(message = "参数错误：orgSidPath")
private String orgSidPath;
@ApiModelProperty(value = "节点id")
@NotBlank(message = "参数错误：taskDefKey")

42
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/flowable/OrderFlowableQuery.java
View File

@ -0,0 +1,42 @@
package com.yxt.anrui.buscenter.api.bussalesorder.flowable;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
/**
* @Author dimengzhe
* @Date 2023/2/2 13:54
* @Description
*/
@Data
public class OrderFlowableQuery implements Query {
private static final long serialVersionUID = -8969469601635793219L;
@ApiModelProperty(value = "用户sid")
@NotBlank(message = "参数错误：userSid")
private String userSid;
@ApiModelProperty(value = "用户全路径sid")
private String orgSidPath;
@ApiModelProperty(value = "节点id")
@NotBlank(message = "参数错误：taskDefKey")
private String taskDefKey;
@ApiModelProperty(value = "任务id")
@NotBlank(message = "参数错误：taskId")
private String taskId;
@ApiModelProperty(value = "流程id")
@NotBlank(message = "参数错误：instanceId")
private String instanceId;
@ApiModelProperty(value = "意见")
private String comment;
@ApiModelProperty(value = "业务sid")
@NotBlank(message = "参数错误：businessSid")
private String businessSid;
@ApiModelProperty("采购系统sid")
private String purchaseSystemSid;
@ApiModelProperty("采购系统名称")
private String purchaseSystemName;
}

10
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java
View File

@ -318,4 +318,14 @@ public class BusSalesOrderRest implements BusSalesOrderFeign {
PagerVo<AppBusSalesOrderVo> pv = busSalesOrderService.getSaleOrdersByOrgPath(pq);
return rb.success().setData(pv);
}
@Override
public ResultBean<BusSalesOrder> selectBySid(String businessSid) {
return busSalesOrderService.selectBySid(businessSid);
}
@Override
public ResultBean completeBy(OrderFlowableQuery orderFlowableQuery) {
return busSalesOrderService.completeBy(orderFlowableQuery);
}
}

29
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
View File

@ -3764,6 +3764,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
IPage<AppBusSalesOrderVo> pagging = baseMapper.getSaleOrders(page, qw, pq.getParams().getName());
for (AppBusSalesOrderVo record : pagging.getRecords()) {
record.setShowStopBtn(false);
record.setShowContractBtn(false);
if (StringUtils.isNotBlank(record.getCustomerImage())) {
record.setCustomerImage(fileUploadComponent.getUrlPrefix() + record.getCustomerImage());
}
@ -3808,4 +3809,32 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
PagerVo<AppBusSalesOrderVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public ResultBean<BusSalesOrder> selectBySid(String businessSid) {
ResultBean<BusSalesOrder> rb = ResultBean.fireFail();
BusSalesOrder busSalesOrder = fetchBySid(businessSid);
if(busSalesOrder == null){
return rb;
}
return rb.success().setData(busSalesOrder);
}
public ResultBean completeBy(OrderFlowableQuery orderFlowableQuery) {
ResultBean rb = ResultBean.fireFail();
BusinessVariables bv = new BusinessVariables();
BeanUtil.copyProperties(orderFlowableQuery, bv);
bv.setModelId(ProcDefEnum.SALESORDER.getProDefId());
ResultBean resultBean = complete(bv);
if(resultBean.getSuccess()){
//更新销售订单的采购系统
//根据销售订单sid更新采购系统sid和采购系统名称
String purchaseSystemName = orderFlowableQuery.getPurchaseSystemName();
String purchaseSystemSid = orderFlowableQuery.getPurchaseSystemSid();
String salesOrderSid = orderFlowableQuery.getBusinessSid();
updatePurchaseSystem(purchaseSystemName, purchaseSystemSid, salesOrderSid);
}else{
return rb.setMsg(resultBean.getMsg());
}
return rb.success();
}
}

2
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationDetailedVo.java
View File

@ -68,5 +68,7 @@ public class AppFinCollectionConfirmationDetailedVo implements Vo {
@ApiModelProperty("采购系统名称")
private String purchaseSystemName;
private String reason;
}

2
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationDetailsVo.java
View File

@ -112,5 +112,7 @@ public class FinCollectionConfirmationDetailsVo implements Vo {
@ApiModelProperty("采购系统名称")
private String purchaseSystemName;
private String reason;
}

23
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
View File

@ -595,6 +595,13 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
finCollectionConfirmationDetailsVo.setRemittanceConfirmationAppendixs(remittanceConfirmationAppendixs);
List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.fetchByCillSid(sid);
finCollectionConfirmationDetailsVo.setFinSelectedReceivablesDetaileds(finSelectedReceivablesDetailedVos);
if(finCollectionConfirmation.getAuditState() ==2){
String confirmationDetails = finCollectionConfirmation.getConfirmName()+"于"+finCollectionConfirmation.getConfirmDate()+"已驳回，原因是："+finCollectionConfirmation.getReason();
finCollectionConfirmationDetailsVo.setReason(confirmationDetails);
}else if(finCollectionConfirmation.getAuditState() == 3){
String confirmationDetails = finCollectionConfirmation.getConfirmName()+"于"+finCollectionConfirmation.getConfirmDate()+"已确认";
finCollectionConfirmationDetailsVo.setReason(confirmationDetails);
}
return rb.success().setData(finCollectionConfirmationDetailsVo);
}
@ -703,6 +710,9 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
if (StringUtils.isNotBlank(pagerQuery.getOrgPath())) {
qw.eq("useOrgSid", pagerQuery.getOrgPath());
}
if(StringUtils.isNotBlank(pagerQuery.getUserSid())){
qw.eq("createBySid",pagerQuery.getUserSid());
}
}
qw.eq("pushMessgae", 0);
return qw;
@ -883,6 +893,15 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
images.add(url);
}
vo.setImages(images);
FinCollectionConfirmation finCollectionConfirmation = fetchBySid(query.getCollectionBillSid());
if(finCollectionConfirmation.getAuditState() ==2){
// String confirmationDetails = finCollectionConfirmation.getConfirmName()+"于"+finCollectionConfirmation.getConfirmDate()+"已驳回，原因是："+finCollectionConfirmation.getReason();
// String confirmationDetails = finCollectionConfirmation.getConfirmName()+"于"+finCollectionConfirmation.getConfirmDate()+"已驳回，原因是："+finCollectionConfirmation.getReason();
vo.setReason(finCollectionConfirmation.getReason());
}/*else if(finCollectionConfirmation.getAuditState() == 3){
String confirmationDetails = finCollectionConfirmation.getConfirmName()+"于"+finCollectionConfirmation.getConfirmDate()+"已确认";
vo.setReason(confirmationDetails);
}*/
return rb.success().setData(vo);
}
@ -1693,7 +1712,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
arReceivebill.setF_PAEZ_AssistantKey("006");
arReceivebill.setFRECEIVEBILLENTRY(fEntityList);
if (finSelectedReceivablesDetailedVos1.size() == 0 && finSelectedReceivablesDetailedVos2_1.size() == 1 &&
finSelectedReceivablesDetailedVos2.size() == 0 && finSelectedReceivablesDetailedVos2_1.size() == 0) {
finSelectedReceivablesDetailedVos2.size() == 0 && finSelectedReceivablesDetailedVos1_1.size() == 0) {
arReceivebill.setFBillNo(confirmation.getBillNo());
} else {
//单据编号
@ -1870,7 +1889,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
}
String fname = name + vin;
bdCustomer.setFName(fname);
String code = name + vin;
String code = HanZiConverterPinYin.getPinYinFirst(name) + vin;
bdCustomer.setFNumber(code);
return bdCustomer;
}

17
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeign.java
View File

@ -32,10 +32,7 @@ import com.yxt.anrui.terminal.api.autoservice.saleOrders.depositinfo.DepositInfo
import com.yxt.anrui.terminal.api.autoservice.saleOrders.depositinfo.DepositListVo;
import com.yxt.anrui.terminal.api.autoservice.saleOrders.discount.DiscountDto;
import com.yxt.anrui.terminal.api.autoservice.saleOrders.discount.DiscountVo;
import com.yxt.anrui.terminal.api.autoservice.saleOrders.flowable.SaleOrderDto;
import com.yxt.anrui.terminal.api.autoservice.saleOrders.flowable.SaleOrderQuery;
import com.yxt.anrui.terminal.api.autoservice.saleOrders.flowable.SaleOrderTaskQuery;
import com.yxt.anrui.terminal.api.autoservice.saleOrders.flowable.SubmitOrderDto;
import com.yxt.anrui.terminal.api.autoservice.saleOrders.flowable.*;
import com.yxt.anrui.terminal.api.autoservice.saleOrders.insurance.InsuranceDto;
import com.yxt.anrui.terminal.api.autoservice.saleOrders.insurance.InsuranceInfoDto;
import com.yxt.anrui.terminal.api.autoservice.saleOrders.insurance.InsuranceInfoVo;
@ -300,5 +297,17 @@ public interface AppBusSalesOrderFeign {
@ResponseBody
public ResultBean<PagerVo<BusOrderSalesVo>> getSaleOrdersByOrgPath(@RequestBody PagerQuery<BusOrderQuery> pq);
@ApiOperation("销售支持部经理获取下一环节")
@GetMapping("/getFlowOperateTitleBy")
@ResponseBody
ResultBean<FlowOrderVo> getFlowOperateTitleBy(@SpringQueryMap SaleOrderQuery query);
@ApiOperation("办理")
@PutMapping("/agreeSaleOrderInfoBy")
@ResponseBody
ResultBean agreeSaleOrderInfoBy(@RequestBody SaleOrderQueryBy dto);
}

15
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeignFallback.java
View File

@ -31,10 +31,7 @@ import com.yxt.anrui.terminal.api.autoservice.saleOrders.depositinfo.DepositInfo
import com.yxt.anrui.terminal.api.autoservice.saleOrders.depositinfo.DepositListVo;
import com.yxt.anrui.terminal.api.autoservice.saleOrders.discount.DiscountDto;
import com.yxt.anrui.terminal.api.autoservice.saleOrders.discount.DiscountVo;
import com.yxt.anrui.terminal.api.autoservice.saleOrders.flowable.SaleOrderDto;
import com.yxt.anrui.terminal.api.autoservice.saleOrders.flowable.SaleOrderQuery;
import com.yxt.anrui.terminal.api.autoservice.saleOrders.flowable.SaleOrderTaskQuery;
import com.yxt.anrui.terminal.api.autoservice.saleOrders.flowable.SubmitOrderDto;
import com.yxt.anrui.terminal.api.autoservice.saleOrders.flowable.*;
import com.yxt.anrui.terminal.api.autoservice.saleOrders.insurance.InsuranceDto;
import com.yxt.anrui.terminal.api.autoservice.saleOrders.insurance.InsuranceInfoDto;
import com.yxt.anrui.terminal.api.autoservice.saleOrders.insurance.InsuranceInfoVo;
@ -266,4 +263,14 @@ public class AppBusSalesOrderFeignFallback implements AppBusSalesOrderFeign {
public ResultBean<PagerVo<BusOrderSalesVo>> getSaleOrdersByOrgPath(PagerQuery<BusOrderQuery> pq) {
return null;
}
@Override
public ResultBean<FlowOrderVo> getFlowOperateTitleBy(SaleOrderQuery query) {
return null;
}
@Override
public ResultBean agreeSaleOrderInfoBy(SaleOrderQueryBy dto) {
return null;
}
}

3
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/flowable/SaleOrderQuery.java
View File

@ -22,4 +22,7 @@ public class SaleOrderQuery implements Query {
@ApiModelProperty(value = "0 上一环节 1下一环节")
@NotNull(message = "参数错误：next")
private Integer next;
@ApiModelProperty("组织机构全路径")
private String orgPath;
}

42
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/flowable/SaleOrderQueryBy.java
View File

@ -0,0 +1,42 @@
package com.yxt.anrui.terminal.api.autoservice.saleOrders.flowable;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
/**
* @Author dimengzhe
* @Date 2023/2/2 13:47
* @Description
*/
@Data
public class SaleOrderQueryBy implements Query {
private static final long serialVersionUID = 2845814240351212265L;
@ApiModelProperty(value = "任务id")
@NotBlank(message = "参数错误：taskId")
private String taskId;
@ApiModelProperty(value = "流程id")
@NotBlank(message = "参数错误：procInsId")
@JsonProperty("procInsId")
private String instanceId;
@ApiModelProperty(value = "意见")
private String comment;
@ApiModelProperty(value = "业务sid")
@NotBlank(message = "参数错误：businessSid")
private String businessSid;
@ApiModelProperty(value = "用户sid")
@NotBlank(message = "参数错误：userSid")
private String userSid;
@ApiModelProperty(value = "节点id")
@NotBlank(message = "参数错误：taskDefKey")
private String taskDefKey;
@ApiModelProperty("采购系统sid")
private String purchaseSystemSid;
@ApiModelProperty("采购系统名称")
private String purchaseSystemName;
}

30
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/FlowOrderVo.java
View File

@ -0,0 +1,30 @@
package com.yxt.anrui.terminal.api.autoservice.saleOrders.order;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.yxt.anrui.terminal.api.base.common.SystemVo;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* @Author dimengzhe
* @Date 2023/2/2 11:48
* @Description
*/
@Data
public class FlowOrderVo implements Vo {
private static final long serialVersionUID = -6393160265118686111L;
@ApiModelProperty("操作环节标题")
private String title;
@ApiModelProperty("采购系统下拉框")
private List<SystemVo> list;
//默认的采购系统
@ApiModelProperty("部门sid")
@JsonProperty("dictKey")
private String purchaseSystemSid;
@ApiModelProperty("采购系统名称")
@JsonProperty("dictValue")
private String purchaseSystemName;
}

2
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationDetailedVo.java
View File

@ -58,5 +58,7 @@ public class ConfirmationDetailedVo implements Vo {
private String purchaseSystemSid;
@ApiModelProperty("采购系统名称")
private String purchaseSystemName;
private String reason;
}

15
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderRest.java
View File

@ -32,10 +32,7 @@ import com.yxt.anrui.terminal.api.autoservice.saleOrders.depositinfo.DepositInfo
import com.yxt.anrui.terminal.api.autoservice.saleOrders.depositinfo.DepositListVo;
import com.yxt.anrui.terminal.api.autoservice.saleOrders.discount.DiscountDto;
import com.yxt.anrui.terminal.api.autoservice.saleOrders.discount.DiscountVo;
import com.yxt.anrui.terminal.api.autoservice.saleOrders.flowable.SaleOrderDto;
import com.yxt.anrui.terminal.api.autoservice.saleOrders.flowable.SaleOrderQuery;
import com.yxt.anrui.terminal.api.autoservice.saleOrders.flowable.SaleOrderTaskQuery;
import com.yxt.anrui.terminal.api.autoservice.saleOrders.flowable.SubmitOrderDto;
import com.yxt.anrui.terminal.api.autoservice.saleOrders.flowable.*;
import com.yxt.anrui.terminal.api.autoservice.saleOrders.insurance.InsuranceDto;
import com.yxt.anrui.terminal.api.autoservice.saleOrders.insurance.InsuranceInfoDto;
import com.yxt.anrui.terminal.api.autoservice.saleOrders.insurance.InsuranceInfoVo;
@ -354,4 +351,14 @@ public class AppBusSalesOrderRest implements AppBusSalesOrderFeign {
return appBusSalesOrderService.getSaleOrdersByOrgPath(pq);
}
@Override
public ResultBean<FlowOrderVo> getFlowOperateTitleBy(SaleOrderQuery query) {
return appBusSalesOrderService.getFlowOperateTitleBy(query);
}
@Override
public ResultBean agreeSaleOrderInfoBy(SaleOrderQueryBy dto) {
return appBusSalesOrderService.agreeSaleOrderInfoBy(dto);
}
}

79
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java
View File

@ -27,6 +27,8 @@ package com.yxt.anrui.terminal.biz.autoservice.saleOrders;
import cn.hutool.core.bean.BeanUtil;
import com.alibaba.fastjson.JSON;
import com.yxt.anrui.base.api.basepurchasesystem.AppBasePurchSystemVo;
import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeign;
import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
import com.yxt.anrui.base.api.basevehicle.app.InputVinListQuery;
import com.yxt.anrui.base.api.basevehicle.app.InputVinListVo;
@ -36,6 +38,7 @@ import com.yxt.anrui.base.api.commoncontract.PrintConfirmVo;
import com.yxt.anrui.buscenter.api.busmaindeposit.BusMainDepositFeign;
import com.yxt.anrui.buscenter.api.busmaindeposit.app.AppBusMainDepositOrderQuery;
import com.yxt.anrui.buscenter.api.busmaindeposit.app.AppBusMainDepositOrderVo;
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppBusSaleOrderInitModelInfoQuery;
import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppBusSaleOrderInitModelInfoVo;
@ -70,6 +73,8 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserVo;
import com.yxt.anrui.terminal.api.autoservice.saleOrders.flowable.*;
import com.yxt.anrui.terminal.api.autoservice.saleOrders.order.FlowOrderVo;
import com.yxt.anrui.terminal.api.autoservice.saleOrders.depositinfo.DepositInfoDto;
import com.yxt.anrui.terminal.api.autoservice.saleOrders.depositinfo.DepositInfoQuery;
import com.yxt.anrui.terminal.api.autoservice.saleOrders.depositinfo.DepositInfoVo;
@ -77,10 +82,6 @@ import com.yxt.anrui.terminal.api.autoservice.saleOrders.depositinfo.DepositList
import com.yxt.anrui.terminal.api.autoservice.saleOrders.discount.DiscountDto;
import com.yxt.anrui.terminal.api.autoservice.saleOrders.discount.DiscountListVo;
import com.yxt.anrui.terminal.api.autoservice.saleOrders.discount.DiscountVo;
import com.yxt.anrui.terminal.api.autoservice.saleOrders.flowable.SaleOrderDto;
import com.yxt.anrui.terminal.api.autoservice.saleOrders.flowable.SaleOrderQuery;
import com.yxt.anrui.terminal.api.autoservice.saleOrders.flowable.SaleOrderTaskQuery;
import com.yxt.anrui.terminal.api.autoservice.saleOrders.flowable.SubmitOrderDto;
import com.yxt.anrui.terminal.api.autoservice.saleOrders.insurance.InsuranceDto;
import com.yxt.anrui.terminal.api.autoservice.saleOrders.insurance.InsuranceInfoDto;
import com.yxt.anrui.terminal.api.autoservice.saleOrders.insurance.InsuranceInfoVo;
@ -95,6 +96,7 @@ import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.InputVinDto;
import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.InputVinQuery;
import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.InputVinVo;
import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.VinNoVo;
import com.yxt.anrui.terminal.api.base.common.SystemVo;
import com.yxt.anrui.terminal.config.CoverUtils;
import com.yxt.common.base.utils.StringUtils;
import com.yxt.common.core.query.PagerQuery;
@ -153,6 +155,8 @@ public class AppBusSalesOrderService {
private CommonContractFeign commonContractFeign;
@Autowired
private BaseVehicleFeign baseVehicleFeign;
@Autowired
private BasePurchaseSystemFeign basePurchaseSystemFeign;
/************************************* 销售订单接口 *********************************************/
@ -194,8 +198,6 @@ public class AppBusSalesOrderService {
/**
* 初始化销售订单单据信息
*
* @param saleOrderSid
* @param userSid
* @return
*/
public ResultBean<BusSalesOrderBillInfoVo> getBillInfo(OrderInitQuery orderInitQuery) {
@ -564,7 +566,7 @@ public class AppBusSalesOrderService {
PrintConfirmDto printConfirmDto = new PrintConfirmDto();
BeanUtil.copyProperties(insuranceDto, printConfirmDto);
ResultBean<List<PrintConfirmVo>> resultBean = commonContractFeign.printConfirm(printConfirmDto);
if(!resultBean.getSuccess()){
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg()).setCode(resultBean.getCode()).setMessage(resultBean.getMessage());
}
List<InsurancePrintVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), InsurancePrintVo.class)).collect(Collectors.toList());
@ -602,7 +604,7 @@ public class AppBusSalesOrderService {
public ResultBean deleteVirtualDepositList(String saleOrderSid, String virtualOrderSid, String depositRecordSid) {
ResultBean rb = ResultBean.fireFail();
ResultBean resultBean = busSalesOrderFeign.deleteVirtualDepositList(saleOrderSid, virtualOrderSid, depositRecordSid);
if(!resultBean.getSuccess()){
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
return rb.success();
@ -611,13 +613,13 @@ public class AppBusSalesOrderService {
public ResultBean<RemarksVo> getOrderRemarksInfo(String saleOrderSid) {
ResultBean<RemarksVo> rb = ResultBean.fireFail();
ResultBean<OrderRemarksVo> resultBean = busSalesOrderFeign.getOrderRemarksInfo(saleOrderSid);
if(!resultBean.getSuccess()){
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
RemarksVo remarksVo = new RemarksVo();
OrderRemarksVo orderRemarksVo = resultBean.getData();
if(orderRemarksVo != null){
BeanUtil.copyProperties(orderRemarksVo,remarksVo);
if (orderRemarksVo != null) {
BeanUtil.copyProperties(orderRemarksVo, remarksVo);
}
return rb.success().setData(remarksVo);
}
@ -629,4 +631,59 @@ public class AppBusSalesOrderService {
PagerVo<BusOrderSalesVo> vo = CoverUtils.selectPagerVo(resultBean.getData());
return rb.success().setMsg("当前共查询到" + vo.getTotal() + "条记录").setData(vo);
}
public ResultBean<FlowOrderVo> getFlowOperateTitleBy(SaleOrderQuery query) {
ResultBean<FlowOrderVo> rb = ResultBean.fireFail();
FlowOrderVo flowOrderVo = new FlowOrderVo();
//0 上一环节 1下一环节
int next = query.getNext();
BusSaleOrderNodeQuery getNodeQuery = new BusSaleOrderNodeQuery();
BeanUtil.copyProperties(query, getNodeQuery);
String data = "";
if (next == 0) {
ResultBean<List<BusSaleOrderNodeVo>> getPreviousNodesForReject = busSalesOrderFeign.getPreviousNodesForReject(getNodeQuery);
if (getPreviousNodesForReject.getSuccess()) {
getPreviousNodesForReject.getData().removeAll(Collections.singleton(null));
data = getPreviousNodesForReject.getData().get(0).getName();
} else {
return rb.setMsg(getPreviousNodesForReject.getMsg());
}
} else if (next == 1) {
ResultBean<List<BusSaleOrderNodeVo>> getNextNodesForSubmit = busSalesOrderFeign.getNextNodesForSubmit(getNodeQuery);
if (getNextNodesForSubmit.getSuccess()) {
getNextNodesForSubmit.getData().removeAll(Collections.singleton(null));
data = getNextNodesForSubmit.getData().get(0).getName();
} else {
return rb.setMsg(getNextNodesForSubmit.getMsg());
}
} else {
return rb.setMsg("参数错误：next");
}
flowOrderVo.setTitle(data);
//查询销售订单
ResultBean<BusSalesOrder> busSalesOrderResultBean = busSalesOrderFeign.selectBySid(query.getBusinessSid());
if (busSalesOrderResultBean.getSuccess()) {
BusSalesOrder busSalesOrder = busSalesOrderResultBean.getData();
flowOrderVo.setPurchaseSystemName(busSalesOrder.getPurchaseSystemName());
flowOrderVo.setPurchaseSystemSid(busSalesOrder.getPurchaseSystemSid());
//查询该分公司下的采购系统
if (StringUtils.isNotBlank(query.getOrgPath())) {
ResultBean<List<AppBasePurchSystemVo>> resultBean = basePurchaseSystemFeign.fetchDetailsByUseOrgPath(query.getOrgPath());
List<SystemVo> list = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), SystemVo.class)).collect(Collectors.toList());
flowOrderVo.setList(list);
}
}
return rb.success().setData(flowOrderVo);
}
public ResultBean agreeSaleOrderInfoBy(SaleOrderQueryBy dto) {
ResultBean rb = ResultBean.fireFail();
OrderFlowableQuery busSalesOrderFlowQuery = new OrderFlowableQuery();
BeanUtil.copyProperties(dto, busSalesOrderFlowQuery);
ResultBean resultBean = busSalesOrderFeign.completeBy(busSalesOrderFlowQuery);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
return rb.success().setData(resultBean.getData());
}
}
Write Preview
Loading…
Cancel
Save