Browse Source

Merge remote-tracking branch 'origin/master'

master
yunuo970428 3 years ago
parent
commit
269e60c8bd
  1. 9
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeign.java
  2. 8
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/ContractTemplateEnum.java
  3. 3
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemiddleman/BaseMiddlemanService.java
  4. 80
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java
  5. 0
      anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles.ftl
  6. 0
      anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles_black.ftl
  7. 0
      anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar.ftl
  8. 0
      anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar_black.ftl
  9. 9
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeign.java
  10. 9
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapplydetails/BusDeliveredApplyDetailsFeign.java
  11. 23
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java
  12. 2
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/app/FinConfirmDto.java
  13. 20
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
  14. 37
      anrui-portal/anrui-portal-biz/pom.xml
  15. 2
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundRest.java
  16. 12
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java
  17. 9
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/contract/AppCommonContractFeign.java
  18. 42
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/AppBusDeliveredApplyFeign.java

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

@ -151,10 +151,15 @@ public interface CommonContractFeign {
@ResponseBody
public ResultBean<PagerVo<AppCommonContractPageVo>> getContractList(@RequestBody PagerQuery<AppCommonContractQuery> pagerQuery);
/* @ApiOperation("移动端-初始化合同审核")
@GetMapping("/getContractInfo/{contractSid}/{userSid}")
@ResponseBody
public ResultBean<AppCommonContractInitVo> getContractInfo(@PathVariable("contractSid") String contractSid, @PathVariable("userSid") String userSid);
*/
@ApiOperation("移动端-初始化合同审核")
@GetMapping("/getContractInfo/{contractSid}/{userSid}")
@GetMapping("/getContractInfo")
@ResponseBody
public ResultBean<AppCommonContractInitVo> getContractInfo(@PathVariable("contractSid") String contractSid, @PathVariable("userSid") String userSid);
public ResultBean<AppCommonContractInitVo> getContractInfo(@RequestParam("contractSid") String contractSid, @RequestParam("userSid") String userSid);
@ApiOperation("移动端-保存合同审核")
@PostMapping("/saveContractInfo")

8
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/ContractTemplateEnum.java

@ -8,10 +8,10 @@ package com.yxt.anrui.base.api.commoncontract;
*/
public enum ContractTemplateEnum {
CARSALECONTRACTNEW("car_sale_contract_new", "新车买卖合同(现车)"),
CARSALECONTRACTNEWBLANK("car_sale_contract_new_blank", "新车买卖合同(现车)(空)"), // 空白
CARSALECONTRACTBOOK("car_sale_contract_book", "新车买卖合同(订车)"),
CARSALECONTRACTBOOKBLANK("car_sale_contract_book_blank", "新车买卖合同(订车)(空)"), // 空白
CARSALECONTRACTNEW("car_sale_contract_new", "新车买卖合同(现车)"),
CARSALECONTRACTNEWBLANK("car_sale_contract_new_blank", "新车买卖合同(现车空)"), // 空白
CARSALECONTRACTBOOK("car_sale_contract_book", "新车买卖合同(订车)"),
CARSALECONTRACTBOOKBLANK("car_sale_contract_book_blank", "新车买卖合同(订车空)"), // 空白
CUSTOMERINVOICINGAPPLICATION("customer_invoicing_application", "客户开票申请书"),
VEHICLEREGISTRATION("vehicle_registration", "车辆登记合同"),
ENTRUSTPICKUPAUTHORIZATION("entrust_pickup_authorization", "委托提车授权书"),

3
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemiddleman/BaseMiddlemanService.java

@ -82,6 +82,9 @@ public class BaseMiddlemanService extends MybatisBaseService<BaseMiddlemanMapper
orgPath = sysStaffOrgFeign.getOrgSidByPath(params.getOrgPath()).getData();
qw.eq("useOrgSid", orgPath);
}
if (StringUtils.isNotBlank(params.getUserSid())) {
qw.eq("createBySid", params.getUserSid());
}
}
IPage<BaseMiddlemanVo> pagging = baseMapper.selectPageVo(page, qw, params.getName());
PagerVo<BaseMiddlemanVo> p = PagerUtil.pageToVo(pagging, null);

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

@ -58,6 +58,7 @@ import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.DateUtils;
import com.yxt.common.base.utils.MoneyToChineseUtils;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.base.utils.WordConvertUtils;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
@ -79,6 +80,8 @@ import java.util.*;
import java.util.concurrent.*;
import java.util.stream.Collectors;
import static cn.hutool.core.util.ClassLoaderUtil.getClassLoader;
/**
* Project: anrui-base(安瑞基础) <br/>
* File: CommonContractService.java <br/>
@ -733,7 +736,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
*
* @param dto
*/
private String genCarSaleContract(PrintConfirmDto dto, Map<String, Object> map, AppOrderDetailsVo appOrderDetailsVo) {
/* private String genCarSaleContract(PrintConfirmDto dto, Map<String, Object> map, AppOrderDetailsVo appOrderDetailsVo) {
String url = "";
String typeName = "";
if ("现车".equals(appOrderDetailsVo.getOrderType())) {
@ -745,6 +748,29 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
Map<String, String> resultMap = docPdfComponent.createDocToPdf(map, typeName, docName);
url = resultMap.get("prefixTemplateUrl");
return url;
}*/
private String genCarSaleContract(PrintConfirmDto dto, Map<String, Object> map, AppOrderDetailsVo appOrderDetailsVo) {
File file = null;
if ("现车".equals(appOrderDetailsVo.getOrderType())) {
//获取模板
file = new File(getClass().getClassLoader().getResource("ftl/existingvehicles.ftl").getFile());
} else {
//获取模板
file = new File(getClass().getClassLoader().getResource("ftl/orderacar.ftl").getFile());
}
String dir = getClassLoader().getResource("ftl").getPath();
//生成word文件名
String targetPath = docPdfComponent.getUploadTemplateUrl();
String dateStr = DateUtil.format(new Date(), "yyyyMMdd");
long seconds = System.currentTimeMillis();
String typeName = dateStr + seconds + ".doc";
WordConvertUtils.creatWord(map, file, targetPath, typeName, dir);
//新生成的word路径
String wordPath = targetPath + typeName;
//生成出门证文件名
String pdfName = dateStr + seconds + ".pdf";
WordConvertUtils.doc2pdf(wordPath, targetPath, pdfName);
return pdfName;
}
/**
@ -755,7 +781,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
* @param appOrderDetailsVo
* @return
*/
private String genCarSaleContractBlank(PrintConfirmDto dto, Map<String, Object> map, AppOrderDetailsVo appOrderDetailsVo) {
/*private String genCarSaleContractBlank(PrintConfirmDto dto, Map<String, Object> map, AppOrderDetailsVo appOrderDetailsVo) {
String url = "";
String typeName = "";
String docName = "";
@ -776,6 +802,38 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
url += map2.get("prefixTemplateUrl");
}
return url;
}*/
private String genCarSaleContractBlank(PrintConfirmDto dto, Map<String, Object> map, AppOrderDetailsVo appOrderDetailsVo) {
String url = "";
File file = null;
map.put("totalPrice", "");
map.put("priceRemarks", "");
map.put("depositTotal", "");
// 涉及高低开票的,需要打印两套合同,一套按照成交价打印(记账用),一套为价格空白的合同(开票用)
if ("1".equals(dto.getDiscountKey())) {
// 现车
if ("现车".equals(appOrderDetailsVo.getOrderType())) {
//获取模板
file = new File(getClass().getClassLoader().getResource("ftl/existingvehicles_black.ftl").getFile());
} else {
// 订车获取模板
file = new File(getClass().getClassLoader().getResource("ftl/orderacar_black.ftl").getFile());
}
String dir = getClassLoader().getResource("ftl").getPath();
//生成word文件名
String targetPath = docPdfComponent.getUploadTemplateUrl();
String dateStr = DateUtil.format(new Date(), "yyyyMMdd");
long seconds = System.currentTimeMillis();
String typeName = dateStr + seconds + ".doc";
WordConvertUtils.creatWord(map, file, targetPath, typeName, dir);
//新生成的word路径
String wordPath = targetPath + typeName;
//生成合同文件名
String pdfName = dateStr + seconds + ".pdf";
WordConvertUtils.doc2pdf(wordPath, targetPath, pdfName);
url = pdfName;
}
return url;
}
/**
@ -1337,13 +1395,9 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
} else {
printConfirmVo.setName(MessageFormat.format("《{0}》", ContractTemplateEnum.CARSALECONTRACTBOOK.getName()));
}
printConfirmVo.setDownloadUrl(future1.get());
printConfirmVo.setDownloadUrl(docPdfComponent.getPrefixTemplateUrl() + future1.get());
list.add(printConfirmVo);
if (StringUtils.isNotBlank(future1.get())) {
if (future1.get().contains(docPdfComponent.getPrefixTemplateUrl())) {
url = future1.get().replace(docPdfComponent.getPrefixTemplateUrl(), "");
}
}
url = future1.get();
}
Future<String> future2 = pool.submit(() -> {
return genCarSaleContractBlank(dto, map, appOrderDetailsVo);
@ -1355,13 +1409,9 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
} else {
printConfirmVo.setName(MessageFormat.format("《{0}》", ContractTemplateEnum.CARSALECONTRACTBOOKBLANK.getName()));
}
printConfirmVo.setDownloadUrl(future2.get());
printConfirmVo.setDownloadUrl(docPdfComponent.getPrefixTemplateUrl() + future2.get());
list.add(printConfirmVo);
if (StringUtils.isNotBlank(future2.get())) {
if (future2.get().contains(docPdfComponent.getPrefixTemplateUrl())) {
url = url + "," + future2.get().replace(docPdfComponent.getPrefixTemplateUrl(), "");
}
}
url = url + "," + future2.get();
}
//生成合同数据
//根据销售订单sid查询合同表中是否存在
@ -1493,9 +1543,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
unCollectionDto.setCurrentReceivableMoney(depositInfo.getDeposit());
finUncollectedDetailedFeign.saveUnCollection(unCollectionDto);
}
}
return commonContract.getSid();
});
}

0
anrui-base/anrui-base-biz/src/main/resources/新车买卖合同(现车).ftl → anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles.ftl

0
anrui-base/anrui-base-biz/src/main/resources/新车买卖合同(现车)(空).ftl → anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles_black.ftl

0
anrui-base/anrui-base-biz/src/main/resources/新车买卖合同(订车).ftl → anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar.ftl

0
anrui-base/anrui-base-biz/src/main/resources/新车买卖合同(订车)(空).ftl → anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar_black.ftl

9
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeign.java

@ -181,10 +181,15 @@ public interface BusDeliveredApplyFeign {
@ResponseBody
public ResultBean<PagerVo<AppDeliveredApplyPageVo>> getRetrievalApplyList(@RequestBody PagerQuery<AppDeliveredApplyPageQuery> pagerQuery);
/* @ApiOperation("手机端-初始化 出库申请")
@GetMapping("/getRetrievalApplyInfoBySid/{sid}")
@ResponseBody
public ResultBean<AppDeliveredApplyInfoVo> getRetrievalApplyInfoBySid(@PathVariable("sid") String sid);
*/
@ApiOperation("手机端-初始化 出库申请")
@GetMapping("/getRetrievalApplyInfoBySid/{sid}")
@GetMapping("/getRetrievalApplyInfoBySid")
@ResponseBody
public ResultBean<AppDeliveredApplyInfoVo> getRetrievalApplyInfoBySid(@PathVariable("sid") String sid);
public ResultBean<AppDeliveredApplyInfoVo> getRetrievalApplyInfoBySid(@RequestParam("sid") String sid);
@ApiOperation("手机端-保存 出库申请")
@PostMapping("/saveRetrievalApplyInfo")

9
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapplydetails/BusDeliveredApplyDetailsFeign.java

@ -71,8 +71,13 @@ public interface BusDeliveredApplyDetailsFeign {
@ResponseBody
public ResultBean<BusDeliveredApplyDetailsDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
@ApiOperation("初始化 出库申请 车架号")
/* @ApiOperation("初始化 出库申请 车架号")
@GetMapping("/getRetrievalCarVin/{sid}")
@ResponseBody
public ResultBean<List<AppCarVinListVo>> getRetrievalCarVin(@PathVariable("sid") String sid);
public ResultBean<List<AppCarVinListVo>> getRetrievalCarVin(@PathVariable("sid") String sid);*/
@ApiOperation("初始化 出库申请 车架号")
@GetMapping("/getRetrievalCarVin")
@ResponseBody
public ResultBean<List<AppCarVinListVo>> getRetrievalCarVin(@RequestParam("sid") String sid);
}

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

@ -65,6 +65,7 @@ import com.yxt.anrui.crm.api.crmcustomertemp.AppCrmCustomerTempInfoVo;
import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign;
import com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationFeign;
import com.yxt.anrui.fin.api.fincollectionconfirmation.app.FinConfirmDto;
import com.yxt.anrui.fin.api.fincollectionconfirmation.app.FinSelectDto;
import com.yxt.anrui.flowable.api.flow.FlowableFeign;
import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
import com.yxt.anrui.flowable.api.flowcomment.FlowComment;
@ -2021,10 +2022,30 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
finConfirmDto.setCollectionMoney(busDeposit.getDeposit().toString());
//分公司sid
finConfirmDto.setUseOrgSid(busDeposit.getOrgSid());
finConfirmDto.setPayerName(busDeposit.getDraweeName());
//余额
finConfirmDto.setBanlance(busDeposit.getDeposit().toString());
//创建人sid
finConfirmDto.setCreateBySid(busMainDeposit.getCreateBySid());
List<FinSelectDto> list = new ArrayList<>();
if (StringUtils.isNotBlank(busDeposit.getVehicleNum())) {
List<BusDepositCustomerVo> customerList = busDepositCustomerService.selectListByBillSid(bv.getBusinessSid());
for (int i = 0; i < Integer.valueOf(busDeposit.getVehicleNum()); i++) {
FinSelectDto finSelectDto = new FinSelectDto();
BusDepositCustomerVo bus = customerList.get(0);
if (bus != null) {
finSelectDto.setCustomerName(bus.getCustomerName());
finSelectDto.setCustomerSid(bus.getCustomerSid());
finSelectDto.setCustomerPhone(bus.getCustomerMobile());
finSelectDto.setCurrentReceivableMoney(busDeposit.getDeposit().divide(new BigDecimal(busDeposit.getVehicleNum())).toString());
finSelectDto.setSubscriptionDate(DateUtil.today());
finSelectDto.setReceivablesName("订金");
list.add(finSelectDto);
}
}
}
finConfirmDto.setFinSelectList(list);
finCollectionConfirmationFeign.saveFinConfirm(finConfirmDto);
}
if (DictCommonEnum.DepositBillType.JYDD_DC.getCode().equals(busMainDeposit.getDepositBillTypeKey())) {
//更新已选择的车架号的状态为简易订单锁定

2
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/app/FinConfirmDto.java

@ -50,4 +50,6 @@ public class FinConfirmDto implements Dto {
private List<FinSelectDto> finSelectList = new ArrayList<>();
private String banlance;
}

20
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

@ -34,6 +34,7 @@ import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo;
import com.yxt.anrui.base.api.commonappendix.CommonAttachTypeEnum;
import com.yxt.anrui.fin.api.fincollectionconfirmation.*;
import com.yxt.anrui.fin.api.fincollectionconfirmation.app.FinConfirmDto;
import com.yxt.anrui.fin.api.fincollectionconfirmation.app.FinSelectDto;
import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.AppFinSelectedReceivablesDetailedDto;
import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailed;
import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedDto;
@ -61,9 +62,7 @@ import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.*;
/**
* Project: anrui-fin(销售相关) <br/>
@ -344,11 +343,12 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
QueryWrapper<AppFinCollectionConfirmationPageVo> qw = appBuildQueryWrapper(pagerQuery.getParams());
IPage<AppFinCollectionConfirmationPageVo> collectionConfirmList = baseMapper.getCollectionConfirmList(page, qw);
for (AppFinCollectionConfirmationPageVo record : collectionConfirmList.getRecords()) {
BigDecimal balance = record.getBalance();
BigDecimal balance = record.getBalance();//余额
int i = 0;
if(balance != null){
if (balance != null) {
i = balance.intValue();
}
//审核状态:1待审核/2已驳回/3已审核
int collectionBillState = record.getAuditState();
if (i <= 0) {
if (collectionBillState == 1 && collectionBillState == 3) {
@ -741,8 +741,16 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
public ResultBean saveFinConfirm(FinConfirmDto dto) {
ResultBean rb = ResultBean.fireFail();
FinCollectionConfirmation confirmation = new FinCollectionConfirmation();
BeanUtil.copyProperties(dto, confirmation);
BeanUtil.copyProperties(dto, confirmation, "sid");
baseMapper.insert(confirmation);
List<FinSelectDto> finSelectList = dto.getFinSelectList();
finSelectList.removeAll(Collections.singleton(null));
for (FinSelectDto d : finSelectList) {
FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = new FinSelectedReceivablesDetailed();
BeanUtil.copyProperties(d, finSelectedReceivablesDetailed, "sid");
finSelectedReceivablesDetailed.setCollSid(confirmation.getSid());
finSelectedReceivablesDetailedService.insert(finSelectedReceivablesDetailed);
}
return rb.success();
}
}

37
anrui-portal/anrui-portal-biz/pom.xml

@ -89,6 +89,43 @@
<version>1.18.24</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>javax.xml</groupId>
<artifactId>jaxb-impl</artifactId>
<version>2.1</version>
</dependency>
<dependency>
<groupId>javax.xml</groupId>
<artifactId>jaxb-api</artifactId>
<version>2.1</version>
</dependency>
<dependency>
<groupId>javax.xml.ws</groupId>
<artifactId>jaxws-api</artifactId>
<version>2.3.1</version>
</dependency>
<dependency>
<groupId>javax.jws</groupId>
<artifactId>javax.jws-api</artifactId>
<version>1.1</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-core</artifactId>
<version>2.3.0.1</version>
</dependency>
<dependency>
<groupId>javax.xml.soap</groupId>
<artifactId>javax.xml.soap-api</artifactId>
<version>1.4.0</version>
</dependency>
<dependency>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
<version>1.1.1</version>
</dependency>
</dependencies>
<build>

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

@ -64,7 +64,7 @@ public class ScmApplyInboundRest implements ScmApplyInboundFeign {
@Override
public ResultBean submitRecordApplication(SubmitScmApplyInboundDto dto) {
return new ResultBean().success().setData(scmApplyInboundService.submitRecordApplication(dto));
return scmApplyInboundService.submitRecordApplication(dto);
}
@Override

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

@ -382,7 +382,10 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
List<ScmApplyInboundVehicleDto> vehicleList = dto.getVehicleList();
if (StringUtils.isBlank(busSid)) {
Map<String, Object> variables = BeanUtil.beanToMap(dto);
ResultBean resultBean = saveOrUpdateApplyInBound(dto);//insert
ResultBean<String> resultBean = saveOrUpdateApplyInBound(dto);
if (!resultBean.getSuccess()){
return ResultBean.fireFail().setMsg(resultBean.getMsg());
}
String businessSid = resultBean.getData().toString();
ScmApplyInbound scmApplyInbound = fetchBySid(businessSid);
List<ScmApplyInboundVehicleDto> scmApplyInboundVehicleDtos1 = new ArrayList<>();
@ -459,7 +462,7 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
dto.setNum(String.valueOf(scmApplyInboundVehicleDtos2.size()));
ResultBean<String> stringResultBean = saveOrUpdateApplyInBound(dto);
if (!stringResultBean.getSuccess()){
return new ResultBean().setMsg(stringResultBean.getMsg());
return ResultBean.fireFail().setMsg(stringResultBean.getMsg());
}
ResultBean<UpdateFlowFieldVo> resultBean1 = flowableFeign.startProcess(bv);
UpdateFlowFieldVo uff = resultBean1.getData();
@ -468,7 +471,10 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
} else if (StringUtils.isNotBlank(businessTaskid) && businessTaskid.equals(dto.getTaskId())) {//只有数据一致的时候才能进行下一步
dto.setVehicleList(scmApplyInboundVehicleDtos2);
dto.setNum(String.valueOf(scmApplyInboundVehicleDtos2.size()));
saveOrUpdateApplyInBound(dto);
ResultBean<String> stringResultBean = saveOrUpdateApplyInBound(dto);
if (!stringResultBean.getSuccess()){
return ResultBean.fireFail().setMsg(stringResultBean.getMsg());
}
bv.setTaskDefKey(entity.getTaskDefKey());
bv.setComment(StringUtils.isNotBlank(dto.getComment()) ? dto.getComment() : "重新提交");
bv.setInstanceId(entity.getProcInsId());

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

@ -7,7 +7,6 @@ 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;
@ -46,10 +45,16 @@ public interface AppCommonContractFeign {
@ResponseBody
public ResultBean<PagerVo<AppCommonContractPageVo>> getContractList(@RequestBody PagerQuery<AppCommonContractQuery> pagerQuery);
@ApiOperation("移动端-初始化合同审核")
/* @ApiOperation("移动端-初始化合同审核")
@GetMapping("/getContractInfo/{contractSid}/{userSid}")
@ResponseBody
public ResultBean<CommonContractInitVo> getContractInfo(@PathVariable("contractSid") String contractSid, @PathVariable("userSid") String userSid);
*/
@ApiOperation("移动端-初始化合同审核")
@GetMapping("/getContractInfo")
@ResponseBody
public ResultBean<CommonContractInitVo> getContractInfo(@RequestParam("contractSid") String contractSid, @RequestParam("userSid") String userSid);
@ApiOperation("移动端-保存合同审核")
@PostMapping("/saveContractInfo")

42
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/AppBusDeliveredApplyFeign.java

@ -25,20 +25,12 @@
*********************************************************/
package com.yxt.anrui.terminal.api.autoservice.retrieval;
import com.yxt.anrui.buscenter.api.busdelivered.AppBusDeliveredPageQuery;
import com.yxt.anrui.buscenter.api.busdelivered.AppBusDeliveredPageVo;
import com.yxt.anrui.buscenter.api.busdelivered.AppDeliveredDetailsQuery;
import com.yxt.anrui.buscenter.api.busdelivered.AppDeliveredDetailsVo;
import com.yxt.anrui.buscenter.api.busdeliveredapply.AppDeliveredApplyDto;
import com.yxt.anrui.buscenter.api.busdeliveredapply.AppDeliveredApplyInfoVo;
import com.yxt.anrui.buscenter.api.busdeliveredapply.AppDeliveredApplyPageQuery;
import com.yxt.anrui.buscenter.api.busdeliveredapply.AppDeliveredApplyPageVo;
import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.AppCarVinListVo;
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.ApiModelProperty;
import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
@ -81,28 +73,46 @@ public interface AppBusDeliveredApplyFeign {
@ResponseBody
public ResultBean<PagerVo<DeliveredApplyPageVo>> getRetrievalApplyList(@RequestBody PagerQuery<DeliveredApplyPageQuery> pagerQuery);
@ApiOperation("手机端-初始化 出库申请")
/* @ApiOperation("手机端-初始化 出库申请")
@GetMapping("/getRetrievalApplyInfoBySid/{sid}")
@ResponseBody
public ResultBean<DeliveredApplyInfoVo> getRetrievalApplyInfoBySid(@PathVariable("sid") String sid);
public ResultBean<DeliveredApplyInfoVo> getRetrievalApplyInfoBySid(@PathVariable("sid") String sid);*/
@ApiOperation("手机端-初始化 出库申请")
@GetMapping("/getRetrievalApplyInfoBySid")
@ResponseBody
public ResultBean<DeliveredApplyInfoVo> getRetrievalApplyInfoBySid(@RequestParam("sid") String sid);
/* @ApiOperation("手机端-出库申请 详情")
@GetMapping("/getRetrievalDetail/{sid}")
@ResponseBody
public ResultBean<DeliveredApplyDetailsVo> getRetrievalDetail(@PathVariable("sid") String sid);*/
@ApiOperation("手机端-出库申请 详情")
@GetMapping("/getRetrievalDetail/{sid}")
@GetMapping("/getRetrievalDetail")
@ResponseBody
public ResultBean<DeliveredApplyDetailsVo> getRetrievalDetail(@PathVariable("sid") String sid);
public ResultBean<DeliveredApplyDetailsVo> getRetrievalDetail(@RequestParam("sid") String sid);
@ApiOperation("手机端-保存 出库申请")
@PostMapping("/saveRetrievalApplyInfo")
@ResponseBody
public ResultBean saveRetrievalApplyInfo(@RequestBody DeliveredApplyDto deliveredApplyDto);
@ApiOperation("初始化 出库申请 车架号")
/* @ApiOperation("初始化 出库申请 车架号")
@GetMapping("/getRetrievalCarVin/{sid}")
@ResponseBody
public ResultBean<List<AppCarVinListVo>> getRetrievalCarVin(@PathVariable("sid") String sid);
public ResultBean<List<AppCarVinListVo>> getRetrievalCarVin(@PathVariable("sid") String sid);*/
@ApiOperation("初始化 出库申请 车架号")
@GetMapping("/getRetrievalCarVin")
@ResponseBody
public ResultBean<List<AppCarVinListVo>> getRetrievalCarVin(@RequestParam("sid") String sid);
/* @ApiOperation("删除 出库申请记录")
@DeleteMapping("/deleteRetrievalInfo/{sid}")
@ResponseBody
public ResultBean deleteRetrievalInfo(@PathVariable("sid") String sid);*/
@ApiOperation("删除 出库申请记录")
@DeleteMapping("/deleteRetrievalInfo/{sid}")
@DeleteMapping("/deleteRetrievalInfo")
@ResponseBody
public ResultBean deleteRetrievalInfo(@PathVariable("sid") String sid);
public ResultBean deleteRetrievalInfo(@RequestParam("sid") String sid);
}
Loading…
Cancel
Save