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

Merge remote-tracking branch 'origin/master'

zhanglei
yunuo970428 3 years ago
parent
a52183d4f5 e4ddf570db
commit
54bdbbfa3e
9 changed files with 219 additions and 163 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. 9
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/BaseAccadjApplyFeign.java
  2. 142
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/BaseAccadjApplyFeignFallback.java
  3. 6
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/flow/GetNodeQuery.java
  4. 8
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/flow/GetNodeQuery.java
  5. 6
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyRest.java
  6. 174
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java
  7. 34
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java
  8. 1
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderService.java
  9. 2
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceService.java

9
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/BaseAccadjApplyFeign.java
View File

@ -25,13 +25,10 @@
*********************************************************/
package com.yxt.anrui.base.api.baseaccadjapply;
import com.yxt.anrui.base.api.baseaccadjapply.flow.BaseAccAdjApplyCompleteDto;
import com.yxt.anrui.base.api.baseaccadjapply.flow.BaseAccAdjApplyTaskQuery;
import com.yxt.anrui.base.api.baseaccadjapply.flow.SubmitBaseAccAdjApplyDto;
import com.yxt.anrui.base.api.baseaccadjapply.flow.*;
import com.yxt.anrui.base.api.baseinternalpurchase.BaseInternalPurchaseDetailsVo;
import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleDetailsVo;
import com.yxt.anrui.base.api.baseshuntinginvoicingapply.flow.BaseShuntingInvoicingApplyCompleteDto;
import com.yxt.anrui.base.api.busvehicleapply.flow.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import com.yxt.common.core.query.PagerQuery;
@ -113,8 +110,8 @@ public interface BaseAccadjApplyFeign {
ResultBean<List<GetNodeVo>> getPreviousNodesForReject(@Valid @SpringQueryMap GetNodeQuery query);
@ApiOperation(value = "获取下一个环节")
@GetMapping(value = "/getNextNodesForSubmit")
ResultBean<List<GetNodeVo>> getNextNodesForSubmit(@Valid @SpringQueryMap GetNodeQuery query);
@PostMapping(value = "/getNextNodesForSubmit")
ResultBean<List<GetNodeVo>> getNextNodesForSubmit(@Valid @RequestBody GetNodeQuery query);
@ApiOperation(value = "驳回任务")
@PostMapping(value = "/reject")

142
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/BaseAccadjApplyFeignFallback.java
View File

@ -54,75 +54,75 @@ import java.util.List;
@Component
public class BaseAccadjApplyFeignFallback implements BaseAccadjApplyFeign {
@Override
public ResultBean<PagerVo<BaseAccadjApplyVo>> listPage(PagerQuery<BaseAccadjApplyQuery> pq){
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui-base/baseaccadjapply/listPage无法访问");
}
@Override
public ResultBean save(BaseAccadjApplyDto dto){
return ResultBean.fireFail().setMsg("接口anrui-base/baseaccadjapply/save无法访问");
}
@Override
public ResultBean delBySids( String[] sids){
return ResultBean.fireFail().setMsg("接口anrui-base/baseaccadjapply/delBySids无法访问");
}
@Override
public ResultBean<BaseAccadjApplyDetailsVo> fetchDetailsBySid(String sid){
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui-base/baseaccadjapply/fetchDetailsBySid无法访问");
}
@Override
public ResultBean<PagerVo<BaseInternalPurchaseVehicleDetailsVo>> fetchVeh(PagerQuery<BaseAccadjApplyByVehQuery> pq) {
return null;
}
@Override
public ResultBean submitAccAdjApply(SubmitBaseAccAdjApplyDto dto) {
return null;
}
@Override
public ResultBean complete(BaseAccAdjApplyCompleteDto query) {
return null;
}
@Override
public ResultBean InitiatorToAnswer(BaseAccAdjApplyCompleteDto query) {
return null;
}
@Override
public ResultBean companyToFinancialCenter(BaseAccAdjApplyCompleteDto query) {
return null;
}
@Override
public ResultBean<List<GetNodeVo>> getPreviousNodesForReject(GetNodeQuery query) {
return null;
}
@Override
public ResultBean<List<GetNodeVo>> getNextNodesForSubmit(GetNodeQuery query) {
return null;
}
@Override
public ResultBean taskReject(BaseAccAdjApplyTaskQuery query) {
return null;
}
@Override
public ResultBean revokeProcess(BaseAccAdjApplyTaskQuery query) {
return null;
}
@Override
public ResultBean breakProcess(BaseAccAdjApplyTaskQuery query) {
return null;
}
@Override
public ResultBean<PagerVo<BaseAccadjApplyVo>> listPage(PagerQuery<BaseAccadjApplyQuery> pq) {
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui-base/baseaccadjapply/listPage无法访问");
}
@Override
public ResultBean save(BaseAccadjApplyDto dto) {
return ResultBean.fireFail().setMsg("接口anrui-base/baseaccadjapply/save无法访问");
}
@Override
public ResultBean delBySids(String[] sids) {
return ResultBean.fireFail().setMsg("接口anrui-base/baseaccadjapply/delBySids无法访问");
}
@Override
public ResultBean<BaseAccadjApplyDetailsVo> fetchDetailsBySid(String sid) {
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui-base/baseaccadjapply/fetchDetailsBySid无法访问");
}
@Override
public ResultBean<PagerVo<BaseInternalPurchaseVehicleDetailsVo>> fetchVeh(PagerQuery<BaseAccadjApplyByVehQuery> pq) {
return null;
}
@Override
public ResultBean submitAccAdjApply(SubmitBaseAccAdjApplyDto dto) {
return null;
}
@Override
public ResultBean complete(BaseAccAdjApplyCompleteDto query) {
return null;
}
@Override
public ResultBean InitiatorToAnswer(BaseAccAdjApplyCompleteDto query) {
return null;
}
@Override
public ResultBean companyToFinancialCenter(BaseAccAdjApplyCompleteDto query) {
return null;
}
@Override
public ResultBean<List<com.yxt.anrui.base.api.baseaccadjapply.flow.GetNodeVo>> getPreviousNodesForReject(com.yxt.anrui.base.api.baseaccadjapply.flow.GetNodeQuery query) {
return null;
}
@Override
public ResultBean<List<com.yxt.anrui.base.api.baseaccadjapply.flow.GetNodeVo>> getNextNodesForSubmit(com.yxt.anrui.base.api.baseaccadjapply.flow.GetNodeQuery query) {
return null;
}
@Override
public ResultBean taskReject(BaseAccAdjApplyTaskQuery query) {
return null;
}
@Override
public ResultBean revokeProcess(BaseAccAdjApplyTaskQuery query) {
return null;
}
@Override
public ResultBean breakProcess(BaseAccAdjApplyTaskQuery query) {
return null;
}
}

6
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/flow/GetNodeQuery.java
View File

@ -1,10 +1,12 @@
package com.yxt.anrui.base.api.baseaccadjapply.flow;
import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicle;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import java.util.List;
import java.util.Map;
/**
@ -20,6 +22,6 @@ public class GetNodeQuery implements Query {
@NotBlank(message = "参数错误：taskDefKey")
private String taskDefKey;
@ApiModelProperty(value = "分支字段及业务字段")
private Map<String, Object> formVariables;
@ApiModelProperty("调账车辆列表")
private List<BaseInternalPurchaseVehicle> baseInternalPurchaseVehicles; // 调账车辆列表
}

8
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/flow/GetNodeQuery.java
View File

@ -7,6 +7,7 @@ import lombok.Data;
import javax.validation.constraints.NotBlank;
import java.util.List;
import java.util.Map;
/**
* @Author dimengzhe
@ -21,9 +22,8 @@ public class GetNodeQuery implements Query {
private String taskDefKey;
@ApiModelProperty(value = "业务sid")
private String businessSid;
@ApiModelProperty("调账车辆列表")
private List<BaseInternalPurchaseVehicle> baseInternalPurchaseVehicles; // 调账车辆列表
/* @ApiModelProperty(value = "分支字段及业务字段")
private Map<String, Object> formVariables;*/
@ApiModelProperty(value = "分支字段及业务字段")
private Map<String, Object> formVariables;
}

6
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyRest.java
View File

@ -27,12 +27,8 @@ package com.yxt.anrui.base.biz.baseaccadjapply;
import cn.hutool.core.bean.BeanUtil;
import com.yxt.anrui.base.api.baseaccadjapply.*;
import com.yxt.anrui.base.api.baseaccadjapply.flow.BaseAccAdjApplyCompleteDto;
import com.yxt.anrui.base.api.baseaccadjapply.flow.BaseAccAdjApplyTaskQuery;
import com.yxt.anrui.base.api.baseaccadjapply.flow.SubmitBaseAccAdjApplyDto;
import com.yxt.anrui.base.api.baseaccadjapply.flow.*;
import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleDetailsVo;
import com.yxt.anrui.base.api.busvehicleapply.flow.GetNodeQuery;
import com.yxt.anrui.base.api.busvehicleapply.flow.GetNodeVo;
import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
import com.yxt.common.core.query.PagerQuery;

174
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java
View File

@ -28,16 +28,17 @@ package com.yxt.anrui.base.biz.baseaccadjapply;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.TypeReference;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.base.api.baseaccadjapply.*;
import com.yxt.anrui.base.api.baseaccadjapply.flow.BaseAccAdjApplyTaskQuery;
import com.yxt.anrui.base.api.baseaccadjapply.flow.GetNodeQuery;
import com.yxt.anrui.base.api.baseaccadjapply.flow.GetNodeVo;
import com.yxt.anrui.base.api.baseaccadjapply.flow.SubmitBaseAccAdjApplyDto;
import com.yxt.anrui.base.api.baseaccadjapplyeveh.BaseAccadjApplyeVeh;
import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicle;
import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleDetailsVo;
import com.yxt.anrui.base.api.busvehicleapply.flow.GetNodeQuery;
import com.yxt.anrui.base.api.busvehicleapply.flow.GetNodeVo;
import com.yxt.anrui.base.biz.baseaccadjapplyeveh.BaseAccadjApplyeVehService;
import com.yxt.anrui.base.biz.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleService;
import com.yxt.anrui.base.biz.basevehicle.BaseVehicleService;
@ -45,6 +46,7 @@ import com.yxt.anrui.base.common.enums.VehicleState;
import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
import com.yxt.anrui.fin.api.kingdee.KingDeeResult;
import com.yxt.anrui.fin.api.kingdee.saloutstock.SalOutStock;
import com.yxt.anrui.fin.api.kingdee.stkinstock.StkInStock;
import com.yxt.anrui.flowable.api.flow.FlowableFeign;
import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign;
@ -318,7 +320,7 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
bv.setComment("重新提交");
bv.setInstanceId(dto.getInstanceId());
List<BaseInternalPurchaseVehicle> baseInternalPurchaseVehicles = new ArrayList<>();
return complete(bv,baseInternalPurchaseVehicles);
return complete(bv, baseInternalPurchaseVehicles);
}
return rb;
}
@ -361,26 +363,33 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
return baseMapper.updateFlowFiled(map);
}
public ResultBean complete(BusinessVariables bv,List<BaseInternalPurchaseVehicle> baseInternalPurchaseVehicles) {
public ResultBean complete(BusinessVariables bv, List<BaseInternalPurchaseVehicle> baseInternalPurchaseVehicles) {
ResultBean rb = ResultBean.fireFail();
BaseAccadjApply baseAccadjApply = fetchBySid(bv.getBusinessSid());
String callInOrgSid = baseAccadjApply.getCallInOrgSid();
String callOutOrgSid = baseAccadjApply.getCallOutOrgSid();
List<String> purchaseSids = baseAccadjApplyeVehService.fetchByMainSid(baseAccadjApply.getSid());
Boolean i = false;
if (baseInternalPurchaseVehicles.size() > 0){
for (BaseInternalPurchaseVehicle baseInternalPurchaseVehicle : baseInternalPurchaseVehicles) {
String witPinMoney = baseInternalPurchaseVehicle.getWitPinMoney();
String sid = baseInternalPurchaseVehicle.getSid();
BaseInternalPurchaseVehicle baseInternalPurchaseVehicle1 = baseInternalPurchaseVehicleService.fetchBySid(sid);
String witPinMoney1 = baseInternalPurchaseVehicle1.getWitPinMoney();
if (!witPinMoney.equals(witPinMoney1)){
i = true;
break;
if (baseInternalPurchaseVehicles != null){
if (baseInternalPurchaseVehicles.size() > 0) {
for (BaseInternalPurchaseVehicle baseInternalPurchaseVehicle : baseInternalPurchaseVehicles) {
String witPinMoney = baseInternalPurchaseVehicle.getWitPinMoney();
String sid = baseInternalPurchaseVehicle.getSid();
BaseInternalPurchaseVehicle baseInternalPurchaseVehicle1 = baseInternalPurchaseVehicleService.fetchBySid(sid);
String witPinMoney1 = baseInternalPurchaseVehicle1.getWitPinMoney();
if (!witPinMoney.equals(witPinMoney1)) {
i = true;
break;
}
}
}
}
bv.getFormVariables().put("isAdj",i);
Map<String, Object> map = new HashMap<>();
Map<String, Object> formVariables = bv.getFormVariables();
if (formVariables == null){
map.put("isAdj", i);
bv.setFormVariables(map);
}
if (bv.getTaskId().equals(baseAccadjApply.getTaskId())) {
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
if (!resultBean.getSuccess()) {
@ -395,8 +404,67 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
baseVehicleService.updateVehicleState(VehicleState.StockEnum.STOCK.getCode(), VehicleState.StockEnum.STOCK.getRemarks(), baseInternalPurchaseVehicle.getVinNo(), callInOrgSid);
}
try {
List<String> stringList = baseAccadjApplyeVehService.fetchByMainSid(baseAccadjApply.getSid());
List<BaseInternalPurchaseVehicle> baseInternalPurchaseVehicles1 = new ArrayList<>();
for (String s : stringList) {
BaseInternalPurchaseVehicle baseInternalPurchaseVehicle = baseInternalPurchaseVehicleService.fetchBySid(s);
baseInternalPurchaseVehicles1.add(baseInternalPurchaseVehicle);
}
//推送金蝶采购退库单
StkInStock stkInStock=new StkInStock();
/**
* // 入库日期:FDate (必填项)
*/
stkInStock.setFDate(DateUtil.now());
/**
* // 采购部门:FPurchaseDeptId (必填项)
*/
stkInStock.setFPurchaseDeptId("05.04");
/**
* //采购组织:FPurchaseOrgId (必填项)
*/
stkInStock.setFPurchaseOrgId("100012");
/**
* // 供应商:FSupplierId (必填项)
*/
stkInStock.setFSupplierId("010001");
/**
* //分配目标组织:TOrgId (必填项)
*/
stkInStock.setTOrgId("100012");
/**
* // 物料列表:FInStockEntry (必填项)
*/
List<StkInStock.FInStockEntry> fInStockEntry=new ArrayList<>();
for (BaseInternalPurchaseVehicle baseInternalPurchaseVehicle : baseInternalPurchaseVehicles1) {
StkInStock.FInStockEntry sf=new StkInStock.FInStockEntry();
/**
* 车辆类型
*/
sf.setCllx("03");
/**
* // 批号:FLot
*/
sf.setFLot("11112222");
/**
* // 物料编码:FMaterialId (必填项)
*/
sf.setFMaterialId(baseInternalPurchaseVehicle.getVinNo());
/**
* // 仓库:FStockId
*/
sf.setFStockId("CK001");
/**
* 物料分组
*/
sf.setWlfz("01");
fInStockEntry.add(sf);
}
stkInStock.setFInStockEntry(fInStockEntry);
finKingDeeFeign.draftStkInStock(stkInStock);
//推送金蝶销售出库单
SalOutStock salOutStock = createSalOutStock(baseAccadjApply);
ResultBean<List<KingDeeResult>> listResultBean = finKingDeeFeign.draftSalOutStock(salOutStock);
finKingDeeFeign.draftSalOutStock(salOutStock);
} catch (Exception e) {
e.printStackTrace();
}
@ -411,6 +479,12 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
SalOutStock salOutStock = new SalOutStock();
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
Date date = new Date();
List<String> stringList = baseAccadjApplyeVehService.fetchByMainSid(baseAccadjApply.getSid());
List<BaseInternalPurchaseVehicle> baseInternalPurchaseVehicles = new ArrayList<>();
for (String s : stringList) {
BaseInternalPurchaseVehicle baseInternalPurchaseVehicle = baseInternalPurchaseVehicleService.fetchBySid(s);
baseInternalPurchaseVehicles.add(baseInternalPurchaseVehicle);
}
/**
* 日期:FDate (必填项)
*/
@ -433,37 +507,39 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
//salOutStock.setFStockOrgId("101");
List<SalOutStock.FEntity> fEntity = new ArrayList<>();
SalOutStock.FEntity fe = new SalOutStock.FEntity();
/**
* 物料编码:FMaterialID
*/
fe.setFMaterialID(" JX091054");
/**
* 库存单位:FUnitID (必填项)
*/
fe.setFUnitID("liang");
/**
* 实发数量:FRealQty
*/
fe.setFRealQty(1.0);
/**
* 批号:FLot
*/
fe.setFlot("1233321");
/**
* 货主:FOwnerID (必填项)
*/
fe.setFOwnerID("101");
/**
* 仓库:FStockID
*/
fe.setFStockID("CK001");
/**
* 库存状态:FStockStatusID
*/
fe.setFStockStatusID("KCZT01_SYS");
fEntity.add(fe);
for (BaseInternalPurchaseVehicle baseInternalPurchaseVehicle : baseInternalPurchaseVehicles) {
SalOutStock.FEntity fe = new SalOutStock.FEntity();
/**
* 物料编码:FMaterialID
*/
fe.setFMaterialID(" JX091054");
/**
* 库存单位:FUnitID (必填项)
*/
fe.setFUnitID("liang");
/**
* 实发数量:FRealQty
*/
fe.setFRealQty(1.0);
/**
* 批号:FLot
*/
fe.setFlot("1233321");
/**
* 货主:FOwnerID (必填项)
*/
fe.setFOwnerID("101");
/**
* 仓库:FStockID
*/
//fe.setFStockID("CK001");
fe.setFStockID(baseInternalPurchaseVehicle.getInventoryLocationSid());
/**
* 库存状态:FStockStatusID
*/
fe.setFStockStatusID("KCZT01_SYS");
fEntity.add(fe);
}
salOutStock.setFEntity(fEntity);
return salOutStock;
}
@ -579,19 +655,19 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
bv.setModelId(ProcDefEnum.BASEACCADJAPPLY.getProDefId());
List<BaseInternalPurchaseVehicle> baseInternalPurchaseVehicles = query.getBaseInternalPurchaseVehicles();
Boolean i = false;
if (baseInternalPurchaseVehicles.size() > 0){
if (baseInternalPurchaseVehicles.size() > 0) {
for (BaseInternalPurchaseVehicle baseInternalPurchaseVehicle : baseInternalPurchaseVehicles) {
String witPinMoney = baseInternalPurchaseVehicle.getWitPinMoney();
String sid = baseInternalPurchaseVehicle.getSid();
BaseInternalPurchaseVehicle baseInternalPurchaseVehicle1 = baseInternalPurchaseVehicleService.fetchBySid(sid);
String witPinMoney1 = baseInternalPurchaseVehicle1.getWitPinMoney();
if (!witPinMoney.equals(witPinMoney1)){
if (!witPinMoney.equals(witPinMoney1)) {
i = true;
break;
}
}
}
bv.getFormVariables().put("isAdj",i);
bv.getFormVariables().put("isAdj", i);
ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv);
//判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
List<GetNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList());

34
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java
View File

@ -26,6 +26,7 @@
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;
@ -529,26 +530,12 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
appMap.put("sid",bv.getBusinessSid());
bv.getFormVariables().put("app",appMap);
//================添加app相关参数
/* BaseOutsourcingApplicationDto dto = baseMapper.getBySid(bv.getBusinessSid());
ResultBean<List<GetNodeVo>> nextNodesForSubmit = getNextNodesForSubmit(dto);
List<GetNodeVo> datas = nextNodesForSubmit.getData();
GetNodeVo getNodeVo = datas.get(0);
List<String> candidateGroups = getNodeVo.getCandidateGroups();
UserQuery userQuery = new UserQuery();
userQuery.setRoleSid(candidateGroups.get(0));
userQuery.setOrgSidPath(bv.getOrgSidPath());
List<SysUserVo> sysUserVos = sysUserFeign.getUserByRole(userQuery).getData();
ResultBean<UpdateFlowFieldVo> rb = flowableFeign.handleProsess(bv);
if(sysUserVos.size()==0){
bv.setTaskDefKey(rb.getData().getTaskDefKey());
bv.setTaskId(rb.getData().getTaskId());
return complete(bv);
}*/
BaseOutsourcingApplicationDto dto= baseMapper.getBySid(bv.getBusinessSid());
ResultBean<UpdateFlowFieldVo> rb = complete_handleProsess(bv,dto);
/* String taskDefKey = rb.getData().getTaskDefKey();
String taskDefKey = rb.getData().getTaskDefKey();
Map<String, Object> stringObjectMap = BeanUtil.beanToMap(rb.getData());
updateFlowFiled(stringObjectMap);
if ("Event_end".equals(taskDefKey)) {
BigDecimal deposit = booad.getDeposit();
if ("1".equals(booad.getIsBeforePayment())) {
@ -573,12 +560,12 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
return rb.setMsg("验车单业务模块的数据推送失败!");
}
}
try{
/*try{
StkInStock stkInStock= createStkInStock(booad);
finKingDeeFeign.draftStkInStock(stkInStock);
}catch (Exception e){
}
}*/
}else{
//======================添加消息推送开始
UpdateFlowFieldVo uff = rb.getData();
@ -594,10 +581,9 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
messageFlowableQuery.setMsgContent(baseOutsourcingApplication.getCreateByName()+"提交的"+messageFlowableQuery.getModuleName()+",请审批");
messageFlowableQuery.setMsgTitle("供应链");
ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
// String msgSid = getMessage(uff, appMap, baseOutsourcingApplication);
//======================添加消息推送结束
}
*/
return rb;
} else {
return ResultBean.fireFail().setMsg("操作失败，提交的数据不一致!");
@ -605,15 +591,11 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
}
public ResultBean<UpdateFlowFieldVo> complete_handleProsess(BusinessVariables bv, BaseOutsourcingApplicationDto dto) {
ResultBean<List<GetNodeVo>> nextNodesForSubmit = getNextNodesForSubmit(dto);
List<GetNodeVo> datas = nextNodesForSubmit.getData();
GetNodeVo getNodeVo = datas.get(0);
List<String> candidateGroups = getNodeVo.getCandidateGroups();
ResultBean<UpdateFlowFieldVo> rb = flowableFeign.handleProsess(bv);
Map<String, Object> stringObjectMap = BeanUtil.beanToMap(rb.getData());
updateFlowFiled(stringObjectMap);
//消息推送===========开始
UpdateFlowFieldVo uff = rb.getData();
/* UpdateFlowFieldVo uff = rb.getData();
if (!"Event_end".equals(uff.getTaskDefKey())) {
BaseOutsourcingApplication baseOutsourcingApplication = fetchBySid(bv.getBusinessSid());
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
@ -628,7 +610,7 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
messageFlowableQuery.setMsgContent(baseOutsourcingApplication.getCreateByName()+"提交的"+messageFlowableQuery.getModuleName()+",请审批");
messageFlowableQuery.setMsgTitle("供应链");
ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
}
}*/
//消息推送结束=====
return rb;
}

1
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderService.java
View File

@ -264,6 +264,7 @@ public class BusVehicleOrderService extends MybatisBaseService<BusVehicleOrderMa
scmApplyInbound.setInsideCode(busVehicleApplyDetail.getInsideCode());
scmApplyInbound.setManPurOrderTypeKey(ManPurOrderType.ManOrderType.PC_ORDER.getCode());
scmApplyInbound.setManPurOrderTypeValue(ManPurOrderType.ManOrderType.PC_ORDER.getRemarks());
scmApplyInbound.setUseOrgSid(dto.getCreateOrgSid());
scmApplyInboundFeign.saveOrUpdateApplyInBound(scmApplyInbound);
}
return rb.success();

2
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceService.java
View File

@ -148,6 +148,8 @@ public class BusSalesOrderPriceService extends MybatisBaseService<BusSalesOrderP
bigDecimalFinalPrice = bigDecimalFinalPrice.add(new BigDecimal(topPrice));
}
}
}else{
return rb.setMsg("请先完善车型信息");
}
if (StringUtils.isNotBlank(vo.getTransactionPrice())) {

Write Preview
Loading…
Cancel
Save