Browse Source

Merge remote-tracking branch 'origin/master'

zhanglei
yunuo970428 3 years ago
parent
commit
c61ca1ddab
  1. 2
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplication.java
  2. 2
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationDto.java
  3. 4
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleDto.java
  4. 2
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufactorsubscription/BaseManufactorSubscriptionService.java
  5. 29
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigRest.java
  6. 34
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java
  7. 15
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java
  8. 3
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderMapper.xml
  9. 118
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignService.java
  10. 1
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/entrybill/entrybilldata.json
  11. 1
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/entrybill/entrybilldata_FEntityDetail.json
  12. 1
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/entrybill/entrybilldata_FEntityPlan.json
  13. 11
      anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java
  14. 13
      anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java
  15. 5
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExamineFeign.java
  16. 5
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExamineFeignFallback.java
  17. 4
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinspectitem/ScmVehinspectItemFeign.java
  18. 5
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinspectitem/ScmVehinspectItemFeignFallback.java
  19. 6
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineRest.java
  20. 5
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinspectitem/ScmVehinspectItemRest.java

2
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplication.java

@ -70,6 +70,8 @@ public class BaseOutsourcingApplication extends BaseEntity {
private String modelSid; // 车型sid
@ApiModelProperty("车型名称")
private String modelName; // 车型名称
@ApiModelProperty("常用配置sid")
private String configSid; // 常用配置sid
@ApiModelProperty("常用配置名称")
private String configName; // 常用配置名称
@ApiModelProperty("采购价格")

2
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationDto.java

@ -80,6 +80,8 @@ public class BaseOutsourcingApplicationDto implements Dto {
private String modelSid; // 车型sid
@ApiModelProperty("车型名称")
private String modelName; // 车型名称
@ApiModelProperty("常用配置sid")
private String configSid; // 常用配置sid
@ApiModelProperty("常用配置名称")
private String configName; // 常用配置名称
@ApiModelProperty("采购价格")

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

@ -105,4 +105,8 @@ public class BaseVehicleDto implements Dto {
private String insideCode;
@ApiModelProperty(value = "运费")
private Integer freight;
@ApiModelProperty(value = "合格证状态key")
private String certificateState = "0001";
@ApiModelProperty(value = "合格证状态value")
private String certificateStateValue = "虚拟";
}

2
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufactorsubscription/BaseManufactorSubscriptionService.java

@ -235,7 +235,7 @@ public class BaseManufactorSubscriptionService extends MybatisBaseService<BaseMa
listDto.setOrderTypeKey("001");
listDto.setInsideCode(vo.getInsideCode());
listDto.setOrderStatus("待办");
listDto.setSubscriptionDate(baseManufactorSubscription.getSubscriptionDate());
listDto.setSubscriptionDate(DateUtil.today());
dtoList.add(listDto);
}
busVehicleOrderService.saveVehicleOrder(dtoList);

29
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigRest.java

@ -84,8 +84,8 @@ public class BaseModelConfigRest implements BaseModelConfigFeign {
configName += dto.getCarColor() + "/";
}
//缓速器
if (StringUtils.isNotBlank(dto.getSlowMachine()) && "有".equals(dto.getSlowMachine())) {
configName += "缓速器/";
if (StringUtils.isNotBlank(dto.getSlowMachine())) {
configName += dto.getSlowMachine() + "/";
}
//后视镜
if (StringUtils.isNotBlank(dto.getRearViewMirror())) {
@ -104,9 +104,6 @@ public class BaseModelConfigRest implements BaseModelConfigFeign {
configName += dto.getRearAxleRatio() + "/";
}
//空调
/*if (StringUtils.isNotBlank(dto.getAirConditioner()) && "有".equals(dto.getAirConditioner())) {
configName += "空调/";
}*/
if (StringUtils.isNotBlank(dto.getAirConditioner())) {
configName += dto.getAirConditioner() + "/";
}
@ -127,9 +124,6 @@ public class BaseModelConfigRest implements BaseModelConfigFeign {
configName += dto.getSeat() + "/";
}
//护轮罩
/*if (StringUtils.isNotBlank(dto.getTireCover()) && "有".equals(dto.getTireCover())) {
configName += "护轮罩/";
}*/
if (StringUtils.isNotBlank(dto.getTireCover())) {
configName += dto.getTireCover() + "/";
}
@ -150,9 +144,6 @@ public class BaseModelConfigRest implements BaseModelConfigFeign {
configName += dto.getConfiguringBao() + "/";
}
//独立热源
/*if (StringUtils.isNotBlank(dto.getIndependentSources()) && "有".equals(dto.getIndependentSources())) {
configName += "独立热源/";
}*/
if (StringUtils.isNotBlank(dto.getIndependentSources())) {
configName += dto.getIndependentSources() + "/";
}
@ -206,9 +197,6 @@ public class BaseModelConfigRest implements BaseModelConfigFeign {
configName += dto.getCarColor() + "/";
}
//缓速器
/*if (StringUtils.isNotBlank(dto.getSlowMachine()) && "有".equals(dto.getSlowMachine())) {
configName += "缓速器/";
}*/
if (StringUtils.isNotBlank(dto.getSlowMachine())) {
configName += dto.getSlowMachine() + "/";
}
@ -229,9 +217,6 @@ public class BaseModelConfigRest implements BaseModelConfigFeign {
configName += dto.getRearAxleRatio() + "/";
}
//空调
/*if (StringUtils.isNotBlank(dto.getAirConditioner()) && "有".equals(dto.getAirConditioner())) {
configName += "空调/";
}*/
if (StringUtils.isNotBlank(dto.getAirConditioner())) {
configName += dto.getAirConditioner() + "/";
}
@ -252,9 +237,6 @@ public class BaseModelConfigRest implements BaseModelConfigFeign {
configName += dto.getSeat() + "/";
}
//护轮罩
/* if (StringUtils.isNotBlank(dto.getTireCover()) && "有".equals(dto.getTireCover())) {
configName += "护轮罩/";
}*/
if (StringUtils.isNotBlank(dto.getTireCover())) {
configName += dto.getTireCover() + "/";
}
@ -275,9 +257,6 @@ public class BaseModelConfigRest implements BaseModelConfigFeign {
configName += dto.getConfiguringBao() + "/";
}
//独立热源
/*if (StringUtils.isNotBlank(dto.getIndependentSources()) && "有".equals(dto.getIndependentSources())) {
configName += "独立热源/";
}*/
if (StringUtils.isNotBlank(dto.getIndependentSources())) {
configName += dto.getIndependentSources() + "/";
}
@ -286,9 +265,6 @@ public class BaseModelConfigRest implements BaseModelConfigFeign {
configName += dto.getFuelTank() + "/";
}
//多媒体
/*if (StringUtils.isNotBlank(dto.getMultimedia()) && "有".equals(dto.getMultimedia())) {
configName += "多媒体/";
}*/
if (StringUtils.isNotBlank(dto.getMultimedia())) {
configName += dto.getMultimedia() + "/";
}
@ -427,7 +403,6 @@ public class BaseModelConfigRest implements BaseModelConfigFeign {
/**
* 更多配置分页列表(非本公司的)
*
* @param pagerQuery
* @return
*/
/* @Override

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

@ -70,7 +70,9 @@ import com.yxt.anrui.portal.api.sysuser.UserQuery;
import com.yxt.anrui.portal.config.DictCommonType;
import com.yxt.anrui.scm.api.scmapplyinboundvehicle.ScmApplyInboundVehicleDto;
import com.yxt.anrui.scm.api.scmvehicleexamine.ScmEntryVehicleExamineDto;
import com.yxt.anrui.scm.api.scmvehicleexamine.ScmVehicleExamineFeign;
import com.yxt.anrui.scm.api.scmvehinspectitem.ScmVehinspectItemDto;
import com.yxt.anrui.scm.api.scmvehinspectitem.ScmVehinspectItemFeign;
import com.yxt.common.base.utils.DateUtils;
import org.apache.commons.lang3.StringUtils;
import com.yxt.common.base.service.MybatisBaseService;
@ -119,6 +121,10 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
private FinPaymentrecordFeign finPaymentrecordFeign;
@Autowired
private CommonAppendixService commonAppendixService;
@Autowired
private ScmVehicleExamineFeign scmVehicleExamineFeign;
@Autowired
private ScmVehinspectItemFeign scmVehinspectItemFeign;
private QueryWrapper<BaseOutsourcingApplication> createQueryWrapper(BaseOutsourcingApplicationQuery query) {
// todo: 这里根据具体业务调整查询条件
@ -417,7 +423,7 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
* @return
*/
public ResultBean complete(BusinessVariables bv) {
BaseOutsourcingApplicationDto booad = baseMapper.getBySid(bv.getBusinessSid());
BaseOutsourcingApplication booad = fetchBySid(bv.getBusinessSid());
String businessTaskid = booad.getTaskId();
if (businessTaskid.equals(bv.getTaskId())) { //只有数据一致的时候才能进行下一步
ResultBean<UpdateFlowFieldVo> rb = flowableFeign.handleProsess(bv);
@ -440,6 +446,32 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
finPaymentrecordDto.setCost(Integer.parseInt(booad.getTotalExpenseAmount().toString()));
//finPaymentrecordDto.setBusSid();
finPaymentrecordFeign.save(finPaymentrecordDto);
//验车数据推送
List<BaseOutsourcingApplicationVehicleVo> baseOutsourcingApplicationVehicleVos = baseOutsourcingApplicationVehicleService.fetchByOutAppSid(bv.getBusinessSid());
for (BaseOutsourcingApplicationVehicleVo baseOutsourcingApplicationVehicleVo : baseOutsourcingApplicationVehicleVos) {
ScmEntryVehicleExamineDto scmEntryVehicleExamineDto = new ScmEntryVehicleExamineDto();
//配置的名称
scmEntryVehicleExamineDto.setConfigName(booad.getConfigName());
scmEntryVehicleExamineDto.setConfigSid(booad.getConfigSid());
scmEntryVehicleExamineDto.setModelName(booad.getModelName());
scmEntryVehicleExamineDto.setModelSid(booad.getModelSid());
//订单类型
scmEntryVehicleExamineDto.setPurchaseTypeKey("03");
scmEntryVehicleExamineDto.setPurchaseType("排产");
scmEntryVehicleExamineDto.setUserSid(bv.getUserSid());
scmEntryVehicleExamineDto.setVinNo(baseOutsourcingApplicationVehicleVo.getVinNo());
scmEntryVehicleExamineDto.setInspectionResult("1");
ResultBean<String> resultBean1 = scmVehicleExamineFeign.saveEntryCarInspectedInfo(scmEntryVehicleExamineDto);
if (!resultBean1.getSuccess()) {
return rb.setMsg("验车业务模块的数据推送失败!");
}
ScmVehinspectItemDto scmVehinspectItemDto = new ScmVehinspectItemDto();
scmVehinspectItemDto.setVehInspectSid(resultBean1.getData());
ResultBean resultBean = scmVehinspectItemFeign.saveItem(scmVehinspectItemDto);
if (!resultBean.getSuccess()) {
return rb.setMsg("验车单业务模块的数据推送失败!");
}
}
}
return rb;
} else {

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

@ -7,9 +7,11 @@ import com.yxt.anrui.base.api.basemodelconfig.BaseModelConfig;
import com.yxt.anrui.base.api.basevehicle.*;
import com.yxt.anrui.base.api.basevehicle.app.AppBaseVehicleOrderVo;
import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrand;
import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificate;
import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel;
import com.yxt.anrui.base.biz.basemodelconfig.BaseModelConfigService;
import com.yxt.anrui.base.biz.basevehiclebrand.BaseVehicleBrandService;
import com.yxt.anrui.base.biz.basevehiclecertificate.BaseVehicleCertificateService;
import com.yxt.anrui.base.biz.basevehiclemodel.BaseVehicleModelService;
import com.yxt.anrui.base.biz.busvehicleinquiry.BusVehicleInquiryService;
import com.yxt.anrui.base.common.enums.VehicleState;
@ -81,6 +83,9 @@ public class BaseVehicleRest implements BaseVehicleFeign {
@Autowired
private BusVehicleInquiryService busVehicleInquiryService;
@Autowired
private BaseVehicleCertificateService baseVehicleCertificateService;
@Override
public ResultBean<PagerVo<BaseVehicleVo>> pagerList(@RequestBody PagerQuery<BaseVehicleQuery> pagerQuery) {
ResultBean<PagerVo<BaseVehicleVo>> rb = ResultBean.fireFail();
@ -111,7 +116,15 @@ public class BaseVehicleRest implements BaseVehicleFeign {
baseVehicle.setVehicleStateValue(VehicleState.StockEnum.STOCK.getRemarks());
baseVehicle.setSettlementStatus(VehicleState.BuyoutEnum.UN_BUYOUT.getCode());
boolean isSave = baseVehicleService.save(baseVehicle);
BaseVehicleCertificate baseVehicleCertificate = new BaseVehicleCertificate();
if (StringUtils.isNotBlank(dto.getVinNo())){
baseVehicleCertificate.setVinNo(dto.getVinNo());
baseVehicleCertificate.setCertificateState(dto.getCertificateState());
baseVehicleCertificate.setCertificateStateValue(dto.getCertificateStateValue());
baseVehicleCertificateService.save(baseVehicleCertificate);
}else {
return rb.setMsg("车架号不能为空");
}
return rb.success().setData(baseVehicle.getSid()).setMsg("保存成功");
}

3
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderMapper.xml

@ -182,7 +182,8 @@
bvm.vehicleName modelName,
bva.applicationCode,
bvo.remarks,
bvo.lockingNum
bvo.lockingNum,
bvo.subscriptionDate
FROM bus_vehicle_order bvo
LEFT JOIN bus_vehicle_apply_detail bvm ON bvo.purchaseApplyMediumModelSid = bvm.sid
LEFT JOIN bus_vehicle_apply bva ON bvo.purchaseRequisitionSid = bva.sid

118
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignService.java

@ -7,6 +7,7 @@ import com.yxt.anrui.fin.api.kingdee.appayable.APPayable;
import com.yxt.anrui.fin.api.kingdee.kingdeedata.Data;
import com.yxt.anrui.fin.biz.kingdee.entrybill.EntryBillCastToKingDeeBillFields;
import com.yxt.common.core.result.ResultBean;
import org.apache.commons.io.FileUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
@ -22,10 +23,12 @@ import java.util.Map;
@Service
public class FinKingDeeFeignService {
private static final Logger log = LoggerFactory.getLogger(FinKingDeeFeignService.class);
public String readJsonFile(String Filename) { //#传文件的路径
public String readJsonFile(String filename) { //#传文件的路径
String jsonStr = "";
try {
File file = ResourceUtils.getFile("classpath:"+Filename);
File file = new File(filename) ;
String content = FileUtils.readFileToString(file,"UTF-8");
/* File file = ResourceUtils.getFile("classpath:"+Filename);
FileInputStream fis = new FileInputStream(file);
InputStreamReader isr = new InputStreamReader(fis);
BufferedReader br = new BufferedReader(isr);
@ -33,12 +36,12 @@ public class FinKingDeeFeignService {
StringBuffer sb = new StringBuffer();
while((data = br.readLine()) != null) {
sb.append((String) data);
}
jsonStr = sb.toString();
}*/
/* jsonStr = sb.toString();
br.close();
isr.close();
fis.close();
return jsonStr;
fis.close();*/
return content;
} catch (IOException e) {
e.printStackTrace();
return null;
@ -51,103 +54,12 @@ public class FinKingDeeFeignService {
*/
public ResultBean draftEntryBill(APPayable aPPayable) {
ResultBean rb=ResultBean.fireFail();
String readJsonFile = readJsonFile("kingdeetemplete/entrybilldata.json");
log.info(readJsonFile);
readJsonFile = readJsonFile.replace("@KD_Creator", "zs");
//单据类型:FBillTypeID (必填项)
readJsonFile = readJsonFile.replace("@KD_FBillTypeID", "YFD01_SYS");
//业务日期:FDATE (必填项)
readJsonFile = readJsonFile.replace("@KD_FDATE", aPPayable.getApplicationDate());
//单据状态:FDOCUMENTSTATUS (必填项)
readJsonFile = readJsonFile.replace("@KD_FDOCUMENTSTATUS", "Z");
//供应商:FSUPPLIERID (必填项)
readJsonFile = readJsonFile.replace("@KD_FSUPPLIERID", "010001");
//币别:FCURRENCYID (必填项)
readJsonFile = readJsonFile.replace("@KD_FCURRENCYID", "PRE001");
//付款条件:FPayConditon
readJsonFile = readJsonFile.replace("@KD_FPayConditon", "");
//业务类型:FBUSINESSTYPE (必填项)
readJsonFile = readJsonFile.replace("@KD_FBUSINESSTYPE", "CG");
//结算组织:FSETTLEORGID (必填项)
readJsonFile = readJsonFile.replace("@KD_FSETTLEORGID", "101");
//付款组织:FPAYORGID (必填项)
readJsonFile = readJsonFile.replace("@KD_FPAYORGID", "101");
//采购部门:FPURCHASEDEPTID (必填项)
readJsonFile = readJsonFile.replace("@KD_FPURCHASEDEPTID", "01");
//作废状态:FCancelStatus (必填项)
readJsonFile = readJsonFile.replace("@KD_FCancelStatus", "A");
log.info(readJsonFile);
String fEntityDetail_ = readJsonFile("kingdeetemplete/entrybilldata_FEntityDetail.json");
StringBuilder sb=new StringBuilder();
for(int i=0;i<1;i++){
String fEntityDetail=fEntityDetail_.toString();
log.info(fEntityDetail);
//物料编码:FMATERIALID
fEntityDetail = fEntityDetail.replace("@KD_FMATERIALID", " JX091054");
//物料说明:FMaterialDesc
fEntityDetail = fEntityDetail.replace("@KD_FMaterialDesc", "X牵引6*4-550超");
//计价单位:FPRICEUNITID
fEntityDetail = fEntityDetail.replace("@KD_FPRICEUNITID", " liang");
//单价:FPrice
fEntityDetail = fEntityDetail.replace("@KD_FPrice", "312500.0");
//计价数量:FPriceQty
fEntityDetail = fEntityDetail.replace("@KD_FPriceQty", "2.0");
//含税单价:FTaxPrice
fEntityDetail = fEntityDetail.replace("@KD_FMATERIALID", "350000.0");
//含税净价:FPriceWithTax
fEntityDetail = fEntityDetail.replace("@KD_FMATERIALID", "346500.0");
//税率(%):FEntryTaxRate
fEntityDetail = fEntityDetail.replace("@KD_FMATERIALID", "12.0");
//运输编号:F_PMZC_Assistant
fEntityDetail = fEntityDetail.replace("@KD_F_PMZC_Assistant", "1904110789");
//物流车辆:F_PMZC_Base
fEntityDetail = fEntityDetail.replace("@KD_F_PMZC_Base", "0001F");
//物流项目:F_PMZC_Base1
fEntityDetail = fEntityDetail.replace("@KD_F_PMZC_Base1", "01.001");
//折扣率(%):FEntryDiscountRate
fEntityDetail = fEntityDetail.replace("@KD_FEntryDiscountRate", "1.0");
//折扣额:FDISCOUNTAMOUNTFOR
fEntityDetail = fEntityDetail.replace("@KD_FDISCOUNTAMOUNTFOR", "7000.0");
//不含税金额:FNoTaxAmountFor_D
fEntityDetail = fEntityDetail.replace("@KD_FNoTaxAmountFor_D", "618750.0");
//税额:FTAXAMOUNTFOR_D
fEntityDetail = fEntityDetail.replace("@KD_FTAXAMOUNTFOR_D", "74250.0");
//价税合计:FALLAMOUNTFOR_D
fEntityDetail = fEntityDetail.replace("@KD_F_PMZC_Base1", "693000.0");
//库存单位:FStockUnitId
fEntityDetail = fEntityDetail.replace("@KD_FStockUnitId", "liang");
//库存数量:FStockQty
fEntityDetail = fEntityDetail.replace("@KD_FStockQty", "2.0");
//库存基本数量:FStockBaseQty
fEntityDetail = fEntityDetail.replace("@KD_F_PMZC_Base1", "2.0");
//计价基本分母:FPriceBaseDen
fEntityDetail = fEntityDetail.replace("@KD_FPriceBaseDen", "1.0");
//库存基本分子:FStockBaseNum
fEntityDetail = fEntityDetail.replace("@KD_FStockBaseNum", "1.0");
log.info(fEntityDetail);
sb.append(fEntityDetail).append(",");
}
String sbs=sb.substring(0,sb.length()-1);
readJsonFile.replace("@KD_FEntityDetail",sbs);
String fEntityPlan_ = readJsonFile("kingdeetemplete/entrybilldata_FEntityPlan.json");
StringBuilder sb_fEntityPlan=new StringBuilder();
for(int i=0;i<1;i++){
String fEntityPlan=fEntityPlan_.toString();
log.info(fEntityPlan);
//应付金额:FPAYAMOUNTFOR
fEntityPlan = fEntityPlan.replace("@KD_FPAYAMOUNTFOR", "693000.00");
//应付比例(%):FPAYRATE
fEntityPlan = fEntityPlan.replace("@KD_FPAYRATE", "100.00000");
//表头计划 - 到期日:FENDDATE
fEntityPlan = fEntityPlan.replace("@KD_FENDDATE", "2022-07-22 00:00:00");
log.info(fEntityPlan);
sb_fEntityPlan.append(fEntityPlan).append(",");
}
String sb_fEntityPlans=sb_fEntityPlan.substring(0,sb_fEntityPlan.length()-1);
readJsonFile.replace("@KD_FEntityPlan",sb_fEntityPlans);
String readJsonFile = readJsonFile("./src/main/java/com/yxt/anrui/fin/biz/kingdee/entrybill/entrybilldata.json");
String fEntityDetail_ = readJsonFile("./src/main/java/com/yxt/anrui/fin/biz/kingdee/entrybill/entrybilldata_FEntityDetail.json");
String fEntityPlan_ = readJsonFile("./src/main/java/com/yxt/anrui/fin/biz/kingdee/entrybill/entrybilldata_FEntityPlan.json");
Map<String,Object> map=new HashMap<>();
map.put("@KD_FDATE",aPPayable.getApplicationDate());
APPayable.cloneKingDeeParams(map,readJsonFile,fEntityDetail_,fEntityPlan_);
try {
return saveBill(KingDeeBillId.AP_PAYABLE.getID(),readJsonFile);
} catch (Exception e) {

1
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/entrybill/entrybilldata.json

@ -0,0 +1 @@
{"Creator":"","NeedUpDateFields":[],"NeedReturnFields":[],"IsDeleteEntry":"True","SubSystemId":"","IsVerifyBaseDataField":"false","IsEntryBatchFill":"True","ValidateFlag":"True","NumberSearch":"True","InterationFlags":"","Model":{"FID":0,"FBillTypeID":{"FNUMBER":"@KD_FBillTypeID"},"FISINIT":false,"FDATE":"@KD_FDATE","FENDDATE_H":"","FDOCUMENTSTATUS":"@KD_FDOCUMENTSTATUS","FSUPPLIERID":{"FNumber":"@KD_FSUPPLIERID"},"FCURRENCYID":{"FNumber":"@KD_FCURRENCYID"},"FPayConditon":{"FNumber":"@KD_FPayConditon"},"FISPRICEEXCLUDETAX":true,"FBUSINESSTYPE":"@KD_FBUSINESSTYPE","FISTAX":true,"FSETTLEORGID":{"FNumber":"@KD_FSETTLEORGID"},"FPAYORGID":{"FNumber":"@KD_FPAYORGID"},"FSetAccountType":"","FISTAXINCOST":false,"FAP_Remark":"","FISHookMatch":false,"FPURCHASEDEPTID":{"FNumber":"@KD_FPURCHASEDEPTID"},"FCancelStatus":"@KD_FCancelStatus","FISBYIV":false,"FISGENHSADJ":false,"FISINVOICEARLIER":false,"F_PAEZ_Text":"","F_PMZC_Assistant1":{"FNumber":""},"FsubHeadSuppiler":{"FORDERID":{"FNumber":""},"FTRANSFERID":{"FNumber":""},"FChargeId":{"FNumber":""}},"FsubHeadFinc":{"FACCNTTIMEJUDGETIME":"","FMAINBOOKSTDCURRID":{"FNumber":""},"FEXCHANGETYPE":{"FNumber":""},"FExchangeRate":1.0,"FTaxAmountFor":0,"FNoTaxAmountFor":0},"FEntityDetail":[@KD_FEntityDetail],"FEntityPlan": [@KD_FEntityPlan]}}

1
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/entrybill/entrybilldata_FEntityDetail.json

@ -0,0 +1 @@
{"FMATERIALID":{"FNumber":"@KD_FMATERIALID"},"FMaterialDesc":"@KD_FMaterialDesc","FPRICEUNITID":{"FNumber":"@KD_FPRICEUNITID"},"FPrice":@KD_FPrice@,"FPriceQty":@KD_FPriceQty,"FTaxPrice":@KD_FTaxPrice@,"FPriceWithTax":@KD_FPriceWithTax,"FEntryTaxRate":@KD_FEntryTaxRate,"F_PMZC_Assistant":{"FNumber":"@KD_F_PMZC_Assistant"},"F_PMZC_Base":{"FNUMBER":"@KD_F_PMZC_Base"},"F_PMZC_Base1":{"FNUMBER":"@KD_F_PMZC_Base1"},"FEntryDiscountRate":@KD_FEntryDiscountRate,"FDISCOUNTAMOUNTFOR":@KD_FDISCOUNTAMOUNTFOR,"FNoTaxAmountFor_D":@KD_FNoTaxAmountFor_D,"FTAXAMOUNTFOR_D":@KD_FTAXAMOUNTFOR_D,"FALLAMOUNTFOR_D":@KD_FALLAMOUNTFOR_D,"FINCLUDECOST":false,"FISOUTSTOCK":false,"FIsFree":false,"FStockUnitId":{"FNumber":"@KD_FStockUnitId"},"FStockQty":@KD_FStockQty,"FStockBaseQty":@KD_FStockBaseQty,"FPriceBaseDen":@KD_FPriceBaseDen,"FStockBaseNum":@KD_FStockBaseNum}

1
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/entrybill/entrybilldata_FEntityPlan.json

@ -0,0 +1 @@
{"FENDDATE":"@KD_FENDDATE","FPAYAMOUNTFOR":@KD_FPAYAMOUNTFOR,"FPAYRATE":@KD_FPAYRATE}

11
anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java

@ -312,6 +312,9 @@ public class FlowableRest implements FlowableFeign {
if (StringUtils.isBlank(fl.getBusinessSid())) {
return rb.setMsg("businessSid 不能为空!");
}
if( fl.getValues()==null){
fl.setValues(new HashMap<String,Object>());
}
fl.getValues().put("businessSid",fl.getBusinessSid());
UpdateFlowFieldVo vo = new UpdateFlowFieldVo();
ResultBean<FlowProcinst> flowProcinstById = flowableService.getFlowProcinstById(fl.getInstanceId());
@ -320,7 +323,7 @@ public class FlowableRest implements FlowableFeign {
}
ResultBean<List<LatestTaskVo>> resultBean = flowtaskService.revokeProcess(fl);
if (!resultBean.getSuccess()) {
return rb;
return rb.setMsg(resultBean.getMsg());
}
String nodeState = resultBean.getData().get(0).getName_();
String taskDefKey = resultBean.getData().get(0).getTask_def_key_();
@ -345,6 +348,9 @@ public class FlowableRest implements FlowableFeign {
if (StringUtils.isBlank(fl.getBusinessSid())) {
return rb.setMsg("businessSid 不能为空!");
}
if( fl.getValues()==null){
fl.setValues(new HashMap<String,Object>());
}
fl.getValues().put("businessSid",fl.getBusinessSid());
ResultBean<List<LatestTaskVo>> resultBean = flowtaskService.taskReject(fl);
@ -372,6 +378,9 @@ public class FlowableRest implements FlowableFeign {
if (StringUtils.isBlank(fl.getBusinessSid())) {
return rb.setMsg("businessSid 不能为空!");
}
if( fl.getValues()==null){
fl.setValues(new HashMap<String,Object>());
}
fl.getValues().put("businessSid",fl.getBusinessSid());
UpdateFlowFieldVo vo = new UpdateFlowFieldVo();
ResultBean<UpdateFlowFieldVo> resultBean = flowableService.breakProcess(fl);

13
anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java

@ -237,6 +237,7 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
* @return
*/
public ResultBean<FlowRecordVo> businessFlowRecord(String procInsId, String deployId) {
ResultBean<FlowRecordVo> rb=ResultBean.fireFail();
FlowRecordVo flowRecordVo = new FlowRecordVo();
if (StringUtils.isNotBlank(procInsId)) {
List<HistoricActivityInstance> list = historyService
@ -300,7 +301,7 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
}
flowRecordVo.setFlowList(hisFlowList);
}
return new ResultBean(flowRecordVo);
return rb.success().setData(flowRecordVo);
}
/**
@ -1156,7 +1157,12 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
private String getTaskId(String currentActivityId, String processInstanceId, String processDefinitionId) {
BpmnModel bpmnModel = repositoryService.getBpmnModel(processDefinitionId);
FlowNode flowNode = (FlowNode) bpmnModel.getFlowElement(currentActivityId);
SequenceFlow sequenceFlow = flowNode.getIncomingFlows().get(0);
List<SequenceFlow> list=flowNode.getIncomingFlows();
if(list.size()==0){
return "";
}
SequenceFlow sequenceFlow = list.get(0);
// 获取上一个节点的activityId
String sourceRef = sequenceFlow.getSourceRef();
HistoricActivityInstance historicActivityInstance = historyService.createHistoricActivityInstanceQuery().activityId(sourceRef)
@ -1183,6 +1189,9 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
// taskService.addComment(currentTask.getId(), execution.getProcessInstanceId(), body.get("msg").toString());
// FlowNode flowNode2 = (FlowNode)bpmnModel.getFlowElement(sourceRef);
String taskId = getTaskId(currentActivityId, historicTaskInstance.getProcessInstanceId(), historicTaskInstance.getProcessDefinitionId());
if(StringUtils.isBlank(taskId)){
return new ResultBean<List<LatestTaskVo>>().fail().setMsg("流程找不到上一环节,撤回操作失败!").setData(new ArrayList<>());
}
HistoricTaskInstance historicTaskInstance1 = historyService.createHistoricTaskInstanceQuery().taskId(taskId).singleResult();
String assignee = historicTaskInstance1.getAssignee();
String userSid = flowTaskVo.getUserSid();

5
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExamineFeign.java

@ -74,6 +74,11 @@ public interface ScmVehicleExamineFeign {
@ResponseBody
public ResultBean<ScmVehicleExamineDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
@ApiOperation("PC端-推送验车数据")
@PostMapping("/saveEntryCarInspectedInfo")
@ResponseBody
public ResultBean<String> saveEntryCarInspectedInfo(@RequestBody ScmEntryVehicleExamineDto scmEntryVehicleExamineDto);
@ApiOperation("PC端-获取验车管理列表")
@PostMapping("/selectCarInspectedList")
@ResponseBody

5
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExamineFeignFallback.java

@ -68,6 +68,11 @@ public class ScmVehicleExamineFeignFallback implements ScmVehicleExamineFeign {
return rb.setMsg("接口scm/scmvehicleexamine/fetchDetailsBySid无法访问");
}
@Override
public ResultBean<String> saveEntryCarInspectedInfo(ScmEntryVehicleExamineDto scmEntryVehicleExamineDto) {
return null;
}
@Override
public ResultBean<PagerVo<ScmVehicleExaminePageVo>> selectCarInspectedList(PagerQuery<ScmVehicleExaminePageQuery> pagerQuery) {
return null;

4
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinspectitem/ScmVehinspectItemFeign.java

@ -62,6 +62,10 @@ public interface ScmVehinspectItemFeign {
@ResponseBody
public ResultBean save(@RequestBody ScmVehinspectItemDto dto);
@ApiOperation("推送验车单数据")
@PostMapping("/saveItem")
@ResponseBody
public ResultBean saveItem(@RequestBody ScmVehinspectItemDto dto);
/**
* Pc端根据验车单sid初始化车辆检查表

5
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinspectitem/ScmVehinspectItemFeignFallback.java

@ -54,6 +54,11 @@ public class ScmVehinspectItemFeignFallback implements ScmVehinspectItemFeign {
return ResultBean.fireFail().setMsg("接口anrui-scm/scmvehinspectitem/save无法访问");
}
@Override
public ResultBean saveItem(ScmVehinspectItemDto dto) {
return null;
}
@Override
public ResultBean<List<ScmVehinspectItemInfoVo>> getVehinspectItemInfo(String vehInspectSid) {
return null;

6
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineRest.java

@ -28,6 +28,7 @@ package com.yxt.anrui.scm.biz.scmvehicleexamine;
import com.alibaba.nacos.api.config.filter.IFilterConfig;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.scm.api.scmvehicleexamine.*;
import com.yxt.anrui.scm.api.scmvehinspectitem.ScmVehinspectItemDto;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.base.utils.StringUtils;
import com.yxt.common.core.query.PagerQuery;
@ -95,6 +96,11 @@ public class ScmVehicleExamineRest implements ScmVehicleExamineFeign {
return rb.success().setData(vo);
}
@Override
public ResultBean<String> saveEntryCarInspectedInfo(ScmEntryVehicleExamineDto scmEntryVehicleExamineDto) {
return scmVehicleExamineService.saveEntryCarInspectedInfo(scmEntryVehicleExamineDto);
}
@Override
@ApiOperation("PC端-获取验车管理列表")
@PostMapping("/selectCarInspectedList")

5
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinspectitem/ScmVehinspectItemRest.java

@ -65,6 +65,11 @@ public class ScmVehinspectItemRest implements ScmVehinspectItemFeign {
return scmVehinspectItemService.saveItem(dto);
}
@Override
public ResultBean saveItem(ScmVehinspectItemDto dto) {
return scmVehinspectItemService.saveItem(dto);
}
@Override
public ResultBean<List<ScmVehinspectItemInfoVo>> getVehinspectItemInfo(String vehInspectSid) {
ResultBean rb = ResultBean.fireFail();

Loading…
Cancel
Save