From 9fc920af96a16dc32e6dc813ec9dbf832c936dd9 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Fri, 30 Jun 2023 15:54:12 +0800 Subject: [PATCH 01/20] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basemodelmodprice/BaseModelModpriceService.java | 2 ++ .../BusHandoverPrepareService.java | 5 +++++ .../BusVehicleInformationHandoverMapper.java | 1 + .../BusVehicleInformationHandoverMapper.xml | 8 ++++++++ .../BusVehicleInformationHandoverService.java | 4 ++++ .../AppFinCollectionConfirmationFeign.java | 2 +- .../AppFinCollectionConfirmationFeignFallback.java | 2 +- .../AppFinCollectionConfirmationRest.java | 2 +- .../AppFinCollectionConfirmationService.java | 13 +++++++++++-- 9 files changed, 34 insertions(+), 5 deletions(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceService.java index da818d2c7b..8cfbfd9fff 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceService.java @@ -230,6 +230,8 @@ public class BaseModelModpriceService extends MybatisBaseService vinSidList = busHandoverPrepareVehicleList.stream().map(v->v.getVinSid()).collect(Collectors.toList()); //查询车辆的随车资料是否都已移交 List countList = busVehicleInformationHandoverService.selectByVinSid(vinSidList); + List countList1 = busVehicleInformationHandoverService.selectByVinSid1(vinSidList); + countList1.removeAll(Collections.singleton(null)); + if(countList1.size() != vinSidList.size()){ + return rb.setMsg("车辆中包含随车资料记录为空的车辆，请检查"); + } if(!countList.isEmpty()){ return rb.setMsg("车辆："+String.join(",",countList)+"随车资料未完成交接"); } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformationhandover/BusVehicleInformationHandoverMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformationhandover/BusVehicleInformationHandoverMapper.java index 0137c7d195..b0ba9e7019 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformationhandover/BusVehicleInformationHandoverMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformationhandover/BusVehicleInformationHandoverMapper.java @@ -26,6 +26,7 @@ public interface BusVehicleInformationHandoverMapper extends BaseMapper selectByVinSid(@Param("list") List vinSidList); + List selectByVinSid1(@Param("list") List vinSidList); IPage selectAppPageVo(IPage page, @Param(Constants.WRAPPER)QueryWrapper qw); diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformationhandover/BusVehicleInformationHandoverMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformationhandover/BusVehicleInformationHandoverMapper.xml index 2e68287e0d..59f8c0f168 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformationhandover/BusVehicleInformationHandoverMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformationhandover/BusVehicleInformationHandoverMapper.xml @@ -57,6 +57,14 @@ #{item} + + SELECT sid, - collectionBankNum, - auditState, - paymentState, - collectionBank, - collectionTypeValue, - collectionDate, - payerName, - collectionMoney, - remarks, - balance, - createDate, - createDept, - receivingName, - payAccount, - payBank, - createByName, - billNo, - purchaseSystemName + collectionBankNum, + auditState, + paymentState, + collectionBank, + collectionTypeValue, + collectionDate, + payerName, + collectionMoney, + remarks, + balance, + createDate, + createDept, + receivingName, + payAccount, + payBank, + createByName, + billNo, + purchaseSystemName FROM fin_collection_confirmation ${ew.sqlSegment} and concat(IFNULL(billNo - , '') - , ifnull(payerName - , '')) LIKE concat('%' - , #{name} - , '%') + , '') + , ifnull(payerName + , '')) LIKE concat('%' + , #{name} + , '%') ORDER BY - id DESC + id DESC @@ -154,8 +154,8 @@ - update fin_selected_receivables_detailed set VIN = #{vinNo} where contractNo = #{contractNo} and VIN = #{temporaryNo} + update fin_selected_receivables_detailed + set VIN = #{vinNo} + where contractNo = #{contractNo} + and VIN = #{temporaryNo} + + \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationRest.java index 92073ec555..40802f1039 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationRest.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationRest.java @@ -255,4 +255,11 @@ public class FinCollectionConfirmationRest implements FinCollectionConfirmationF public ResultBean selectCollectionMoneys(String contractId, List busVinSidList) { return finCollectionConfirmationService.selectCollectionMoneys(contractId,busVinSidList); } + + @Override + public ResultBean> jyddkydjListPage(PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = finCollectionConfirmationService.jyddkydjListPage(pq); + return rb.success().setData(pv); + } } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java index 88037d4850..c7a1dc6f97 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java @@ -57,6 +57,7 @@ import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeig import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign; import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo; import com.yxt.anrui.crm.api.crmcustomertemp.CustomerQuery; +import com.yxt.anrui.fin.api.finbillapplication.FinBillApplicationVo; import com.yxt.anrui.fin.api.fincollectionconfirmation.*; import com.yxt.anrui.fin.api.fincollectionconfirmation.app.AppBusArrearsCarryMoneyVo; import com.yxt.anrui.fin.api.fincollectionconfirmation.app.FinConfirmDto; @@ -75,6 +76,7 @@ import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; +import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserVo; import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutionsFeign; @@ -372,7 +374,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService finSelectedReceivablesDetailedDtos = dto.getFinSelectedReceivablesDetaileds(); @@ -380,12 +382,12 @@ public class FinCollectionConfirmationService extends MybatisBaseService "订金".equals(b.getReceivablesName())) .collect(Collectors.toList()); dingList.removeAll(Collections.singleton(null)); - if(!dingList.isEmpty()){ - for (int i = 0; i 0){ + if (subscriptionMoney.compareTo(currentReceivableMoney) > 0) { return rb.setMsg("订金不允许多收，请检查"); } @@ -398,7 +400,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService stringList = finSelectedReceivablesDetailedDtos.stream().map(v->v.getReceivablesSid()).collect(Collectors.toList()); + List stringList = finSelectedReceivablesDetailedDtos.stream().map(v -> v.getReceivablesSid()).collect(Collectors.toList()); stringList.removeAll(Collections.singleton(null)); - if(!stringList.isEmpty()){ + if (!stringList.isEmpty()) { List stringList1 = stringList.stream().distinct().collect(Collectors.toList()); - if(stringList.size() != stringList1.size()){ + if (stringList.size() != stringList1.size()) { return rb.setMsg("认款选择的数据存在问题，请检查是否重复"); } } @@ -1436,13 +1438,13 @@ public class FinCollectionConfirmationService extends MybatisBaseService busDeliveredResultBean = busDeliveredFeign.selectByBusVinSid(finUncollectedReceivablesDetailed.getBusVinSid()); - if(busDeliveredResultBean.getData() == null){ + if (busDeliveredResultBean.getData() == null) { if (leftAll.compareTo(rightAll) <= 0) {//推送待出库 BusDeliveredDto busDeliveredDto = new BusDeliveredDto(); busDeliveredDto.setSubscriptionKey(VehicleStateTempOrLast.PaymentEnum.PAY_MODELS.getCode()); @@ -1633,8 +1635,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService selectCollectionMoneys(String contractId, List busVinSidList) { ResultBean rb = ResultBean.fireFail(); - String moneyAll = baseMapper.selectCollectionMoneys(contractId,busVinSidList); + String moneyAll = baseMapper.selectCollectionMoneys(contractId, busVinSidList); return rb.success().setData(moneyAll); } + + public PagerVo jyddkydjListPage(PagerQuery pq) { + FinCollectionConfirmationJYDDKYDJQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + //========================================数据授权开始 + if (StringUtils.isNotBlank(query.getMenuUrl()) || StringUtils.isNotBlank(query.getMenuSid())) { + //======================= + PrivilegeQuery privilegeQuery = new PrivilegeQuery(); + privilegeQuery.setOrgPath(query.getOrgPath()); + privilegeQuery.setMenuUrl(query.getMenuUrl()); + privilegeQuery.setMenuSid(query.getMenuSid()); + privilegeQuery.setUserSid(query.getCreateBySid()); + ResultBean defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); + if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { + //数据权限ID(1集团、2事业部、3分公司、4部门、5个人) + String orgSidPath = query.getOrgPath(); + orgSidPath = orgSidPath + "/"; + int i1 = orgSidPath.indexOf("/"); + int i2 = orgSidPath.indexOf("/", i1 + 1); + int i3 = orgSidPath.indexOf("/", i2 + 1); + int i4 = orgSidPath.indexOf("/", i3 + 1); + String orgLevelKey = defaultIdReltBean.getData(); + if ("1".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i1); + qw.like("fcc.orgSidPath", orgSidPath); + } else if ("2".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i2); + qw.like("fcc.orgSidPath", orgSidPath); + } else if ("3".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i3); + qw.like("fcc.orgSidPath", orgSidPath); + } else if ("4".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i4); + qw.like("fcc.orgSidPath", orgSidPath); + } else if ("5".equals(orgLevelKey)) { + qw.eq("fcc.createBySid", query.getCreateBySid()); + } else { + PagerVo p = new PagerVo<>(); + return p; + } + } else { + PagerVo p = new PagerVo<>(); + return p; + } + } + qw.gt("fcc.balance", 0); + if (StringUtils.isNotBlank(query.getStaffDeptName())){ + qw.like("fcc.staffDeptName",query.getStaffDeptName()); + } + if (StringUtils.isNotBlank(query.getStaffName())){ + qw.like("fcc.staffName",query.getStaffName()); + } + if (StringUtils.isNotBlank(query.getBillNo())){ + qw.like("fcc.billNo",query.getBillNo()); + } + if (StringUtils.isNotBlank(query.getPayerName())){ + qw.like("fcc.payerName",query.getPayerName()); + } + if (StringUtils.isNotBlank(query.getPhone())){ + qw.like("bd.draweeMobile",query.getPhone()); + } + String collectionStartDate = query.getCollectionStartDate(); + String collectionEndDate = query.getCollectionEndDate(); + qw.apply(StringUtils.isNotEmpty(collectionStartDate), "date_format (fcc.collectionDate,'%Y-%m-%d') >= date_format('" + collectionStartDate + "','%Y-%m-%d')"). + apply(StringUtils.isNotEmpty(collectionEndDate), "date_format (fcc.collectionDate,'%Y-%m-%d') <= date_format('" + collectionEndDate + "','%Y-%m-%d')" + ); + String collectionSmallMoney = query.getCollectionSmallMoney(); + String collectionBigMoney = query.getCollectionBigMoney(); + qw.between("fcc.balance",collectionSmallMoney,collectionBigMoney); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.jyddkydjListPage(page, qw); + List records = pagging.getRecords(); + for (FinCollectionConfirmationJYDDKYDJVo record : records) { + String useOrgSid = record.getUseOrgSid(); + String useOrgName = sysOrganizationFeign.fetchBySid(useOrgSid).getData().getName(); + record.setUseOrgName(useOrgName); + } + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } } \ No newline at end of file From 6c4f9d585fa777b188e74861e275f9605b4a442b Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Mon, 3 Jul 2023 08:48:27 +0800 Subject: [PATCH 03/20] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinSelectedReceivablesDetailedMapper.xml | 3 +-- ...FinSelectedReceivablesDetailedService.java | 20 +++++++++++++++---- .../CollectedReceivablesDetailedVo.java | 1 - .../AppFinCollectionConfirmationService.java | 7 +++++-- 4 files changed, 22 insertions(+), 9 deletions(-) diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml index ab5569fd64..75cb51a568 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml @@ -303,9 +303,8 @@ fd.useOrgSid from fin_selected_receivables_detailed fd left join fin_uncollected_receivables_detailed furd on furd.sid = fd.receivablesSid - where fd.receivablesName != '订金' and fd.auditState = 3 - ${ew.sqlSegment} + ${ew.sqlSegment} and fd.receivablesName != '订金' and fd.auditState = 3 and concat(IFNULL(fd.customerName , '') diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java index 8155f9087b..30fb8057ef 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java @@ -332,9 +332,9 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService qw = new QueryWrapper<>(); if (StringUtils.isNotBlank(pagerQuery.getParams().getPurchaseSystemSid())) { - qw.eq("purchaseSystemSid", pagerQuery.getParams().getPurchaseSystemSid()); + qw.eq("furd.purchaseSystemSid", pagerQuery.getParams().getPurchaseSystemSid()); } else { - qw.eq("purchaseSystemSid", "0"); + qw.eq("furd.purchaseSystemSid", "0"); } String useOrgSid = ""; String orgPath = pagerQuery.getParams().getOrgPath(); @@ -345,10 +345,10 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService stringList = baseMapper.selectUnSelectList(pagerQuery.getParams().getPurchaseSystemSid(),userSid,useOrgSid); @@ -396,6 +396,18 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService resultBean = busSalesOrderVehicleFeign.details(busVinSid); diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/CollectedReceivablesDetailedVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/CollectedReceivablesDetailedVo.java index e4d28ca5c9..059d3d74eb 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/CollectedReceivablesDetailedVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/CollectedReceivablesDetailedVo.java @@ -41,7 +41,6 @@ public class CollectedReceivablesDetailedVo implements Vo { @ApiModelProperty("剩余金额") - @JsonProperty("receivable") private String reveivableMoney; @ApiModelProperty("业务车辆sid") private String busVinSid; diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/collectionConfirm/AppFinCollectionConfirmationService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/collectionConfirm/AppFinCollectionConfirmationService.java index 5f98afaa9b..6cd1a9854c 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/collectionConfirm/AppFinCollectionConfirmationService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/collectionConfirm/AppFinCollectionConfirmationService.java @@ -233,7 +233,10 @@ public class AppFinCollectionConfirmationService { ResultBean> rb = ResultBean.fireFail(); PagerQuery pq = CoverUtils.getPagerQuery(pagerQuery); ResultBean> paymentDetailsList = finSelectedReceivablesDetailedFeign.selectPageList(pq); - PagerVo vo = CoverUtils.selectPagerVo(paymentDetailsList.getData()); - return rb.success().setData(vo); + List voList = Optional.ofNullable(paymentDetailsList.getData().getRecords()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), CollectedReceivablesDetailedVo.class)).collect(Collectors.toList()); + PagerVo v = new PagerVo<>(); + BeanUtil.copyProperties(paymentDetailsList.getData(), v); + v.setRecords(voList); + return rb.success().setMsg("当前共查询到" + v.getTotal() + "条记录").setData(v); } } \ No newline at end of file From 7573775f53a30aac14a891870380288c8f6f1cc5 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Mon, 3 Jul 2023 09:04:56 +0800 Subject: [PATCH 04/20] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=8C=82=E8=BD=A6?= =?UTF-8?q?=E5=87=BA=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anrui-scm-ui/src/views/guache/guachechuku/trailerout.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anrui-scm/anrui-scm-ui/src/views/guache/guachechuku/trailerout.vue b/anrui-scm/anrui-scm-ui/src/views/guache/guachechuku/trailerout.vue index 6776536132..2cf9c8c5ec 100644 --- a/anrui-scm/anrui-scm-ui/src/views/guache/guachechuku/trailerout.vue +++ b/anrui-scm/anrui-scm-ui/src/views/guache/guachechuku/trailerout.vue @@ -181,7 +181,7 @@ export default { this.centerDialogVisible = true var params = { deployId: row.procDefId, - procInsId: row.procInstId, + procInsId: row.procInstSid, token: getStorage() } this.url = '/#/flow/flowRecordForBusiness?data=' + encodeURI((JSON.stringify(params))) From 313f63bec5eb2c60cec0e6e74dbcfd66de31f166 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Mon, 3 Jul 2023 09:10:38 +0800 Subject: [PATCH 05/20] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../buscenter/api/bussalesorder/SolutionsDetailsssVo.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/SolutionsDetailsssVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/SolutionsDetailsssVo.java index 805fa62282..b59cc1dd92 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/SolutionsDetailsssVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/SolutionsDetailsssVo.java @@ -158,4 +158,7 @@ public class SolutionsDetailsssVo { @ApiModelProperty("上装成交价") private String szPrice; + @ApiModelProperty("实际首付比例") + private String downPayAmountsRatio; + } From a7a8643ecb493a3b9993ed0efcc12816efc37cc3 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Mon, 3 Jul 2023 09:23:57 +0800 Subject: [PATCH 06/20] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AD=98=E6=94=BE?= =?UTF-8?q?=E5=9C=B0=E7=82=B9=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scm/biz/scmvehiclegression/ScmVehicleGressionService.java | 4 ++++ .../scmvehiclegressionveh/ScmVehicleGressionVehMapper.java | 2 ++ .../biz/scmvehiclegressionveh/ScmVehicleGressionVehMapper.xml | 4 ++++ .../scmvehiclegressionveh/ScmVehicleGressionVehService.java | 4 ++++ 4 files changed, 14 insertions(+) diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java index e4ef3ba5d5..13151e08e0 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java @@ -299,6 +299,10 @@ public class ScmVehicleGressionService extends MybatisBaseService iPage = baseMapper.selectCarTransferList(page, qw); List records = iPage.getRecords(); for (ScmVehicleGressionPageVo record : records) { + //根据sid查询该申请下的车辆 + List vinList = scmVehicleGressionVehService.selectByMainSid(record.getSid()); + String vin = String.join(",",vinList); + record.setVin(vin); if(query.getUserSid().equals(record.getCreateBySid())){ record.setAllowModify(true); }else{ diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegressionveh/ScmVehicleGressionVehMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegressionveh/ScmVehicleGressionVehMapper.java index f03111cbe3..f9d4396fd3 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegressionveh/ScmVehicleGressionVehMapper.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegressionveh/ScmVehicleGressionVehMapper.java @@ -75,4 +75,6 @@ public interface ScmVehicleGressionVehMapper extends BaseMapper fetchVoByVins(@Param("vin") String vin); + + List selectByMainSid(String sid); } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegressionveh/ScmVehicleGressionVehMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegressionveh/ScmVehicleGressionVehMapper.xml index b24c451ba2..7846687368 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegressionveh/ScmVehicleGressionVehMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegressionveh/ScmVehicleGressionVehMapper.xml @@ -12,4 +12,8 @@ SELECT * FROM scm_vehicle_gression_veh ${ew.sqlSegment} + + \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegressionveh/ScmVehicleGressionVehService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegressionveh/ScmVehicleGressionVehService.java index 072bb77240..cd7155f848 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegressionveh/ScmVehicleGressionVehService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegressionveh/ScmVehicleGressionVehService.java @@ -126,4 +126,8 @@ public class ScmVehicleGressionVehService extends MybatisBaseService selectByMainSid(String sid) { + return baseMapper.selectByMainSid(sid); + } } \ No newline at end of file From 3b259ac156bbc87871b5a658f43b8bc54c0d09cd Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Mon, 3 Jul 2023 09:39:20 +0800 Subject: [PATCH 07/20] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=9C=AA=E5=94=AE?= =?UTF-8?q?=E4=B9=B0=E6=96=AD=E7=BB=88=E6=AD=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseVehicleActualSalesService.java | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java index 311f51669d..644bfbb727 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java @@ -812,7 +812,7 @@ public class BaseVehicleActualSalesService extends MybatisBaseService resultBean = flowableFeign.breakProcess(flowTaskVo); @@ -826,7 +826,24 @@ public class BaseVehicleActualSalesService extends MybatisBaseService resultBean = flowableFeign.breakProcess(flowTaskVo); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + Map paramMap = BeanUtil.beanToMap(resultBean.getData()); + updateFlowFiled(paramMap); + //更新车辆状态为未买断 + String settlementStatus = VehicleState.BuyoutEnum.UN_BUYOUT.getCode(); + String settlementStatusValue = VehicleState.BuyoutEnum.UN_BUYOUT.getRemarks(); + updateByVinNo(baseVehicleActualSales.getSid(), settlementStatus, settlementStatusValue); + return rb.success().setData(resultBean.getData()); + } } + } return rb.setMsg("操作失败!提交的数据不一致!"); } From b950c424d1ac34767dec34118c336fe7fe595e15 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Mon, 3 Jul 2023 10:05:29 +0800 Subject: [PATCH 08/20] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basetraileroutapply/BaseTrailerOutApply.java | 4 ++++ .../BaseTrailerOutApplyDetailsVo.java | 4 ++++ .../BaseTrailerOutApplyDto.java | 4 ++++ .../BaseTrailerOutApplyService.java | 7 +++++-- .../finbillapplication/FinBillApplicationDto.java | 4 ++-- .../FinBillApplicationService.java | 14 +++++++++++--- 6 files changed, 30 insertions(+), 7 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetraileroutapply/BaseTrailerOutApply.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetraileroutapply/BaseTrailerOutApply.java index da6e120b12..5174d26e65 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetraileroutapply/BaseTrailerOutApply.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetraileroutapply/BaseTrailerOutApply.java @@ -76,6 +76,10 @@ public class BaseTrailerOutApply extends BaseEntity { private String gcVinNo; // 挂车车架号 @ApiModelProperty("业务状态 001正常开票 002包牌开票 003欠款开票") private String businessState; // 业务状态 001正常开票 002包牌开票 003欠款开票 + @ApiModelProperty(value = "开票名称sid") + private String openTickSid; + @ApiModelProperty(value = "开票名称") + private String openTickName; @ApiModelProperty("开票单位") private String invoiceTitle; // 开票单位 @ApiModelProperty("开票类型key") diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetraileroutapply/BaseTrailerOutApplyDetailsVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetraileroutapply/BaseTrailerOutApplyDetailsVo.java index 206c4f9a00..8b9041d73b 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetraileroutapply/BaseTrailerOutApplyDetailsVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetraileroutapply/BaseTrailerOutApplyDetailsVo.java @@ -83,6 +83,10 @@ public class BaseTrailerOutApplyDetailsVo implements Vo { private String gcVinNo; // 挂车车架号 @ApiModelProperty("业务状态 001正常开票 002包牌开票 003欠款开票") private String businessState; // 业务状态 001正常开票 002包牌开票 003欠款开票 + @ApiModelProperty(value = "开票名称sid") + private String openTickSid; + @ApiModelProperty(value = "开票名称") + private String openTickName; @ApiModelProperty("开票单位") private String invoiceTitle; // 开票单位 @ApiModelProperty("开票类型key") diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetraileroutapply/BaseTrailerOutApplyDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetraileroutapply/BaseTrailerOutApplyDto.java index f7bfb72f21..b4ebc039cb 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetraileroutapply/BaseTrailerOutApplyDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetraileroutapply/BaseTrailerOutApplyDto.java @@ -81,6 +81,10 @@ public class BaseTrailerOutApplyDto implements Dto { private String gcVinNo; // 挂车车架号 @ApiModelProperty("业务状态 001正常开票 002包牌开票 003欠款开票") private String businessState; // 业务状态 001正常开票 002包牌开票 003欠款开票 + @ApiModelProperty(value = "开票名称sid") + private String openTickSid; + @ApiModelProperty(value = "开票名称") + private String openTickName; @ApiModelProperty("开票单位") private String invoiceTitle; // 开票单位 @ApiModelProperty("开票类型key") diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetraileroutapply/BaseTrailerOutApplyService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetraileroutapply/BaseTrailerOutApplyService.java index 79fb508ff1..ec6061d21f 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetraileroutapply/BaseTrailerOutApplyService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetraileroutapply/BaseTrailerOutApplyService.java @@ -311,11 +311,14 @@ public class BaseTrailerOutApplyService extends MybatisBaseService Date: Mon, 3 Jul 2023 10:11:51 +0800 Subject: [PATCH 09/20] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseManufactorSubscription.java | 11 +++++++++++ .../BaseManufactorSubscriptionFeign.java | 2 +- .../BaseManufactorSubscriptionFeignFallback.java | 2 +- .../base/api/busvehicleorder/BusVehicleOrder.java | 2 ++ .../api/busvehicleorder/BusVehicleOrderFeign.java | 2 +- .../busvehicleorder/BusVehicleOrderFeignFallback.java | 2 +- .../BaseManufactorSubscriptionRest.java | 4 ++-- .../BaseManufactorSubscriptionService.java | 3 ++- .../base/biz/busvehicleorder/BusVehicleOrderRest.java | 4 ++-- .../biz/busvehicleorder/BusVehicleOrderService.java | 3 ++- .../scm/api/scmapplyinbound/ScmApplyInbound.java | 2 ++ .../scm/api/scmapplyinbound/ScmApplyInboundFeign.java | 2 +- .../scmapplyinbound/ScmApplyInboundFeignFallback.java | 2 +- .../scm/biz/scmapplyinbound/ScmApplyInboundMapper.xml | 3 +++ .../scm/biz/scmapplyinbound/ScmApplyInboundRest.java | 4 ++-- .../biz/scmapplyinbound/ScmApplyInboundService.java | 4 +++- 16 files changed, 37 insertions(+), 15 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufactorsubscription/BaseManufactorSubscription.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufactorsubscription/BaseManufactorSubscription.java index bd47e59111..2a351f2eeb 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufactorsubscription/BaseManufactorSubscription.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufactorsubscription/BaseManufactorSubscription.java @@ -48,6 +48,9 @@ import io.swagger.annotations.ApiModelProperty; public class BaseManufactorSubscription extends BaseEntity { private static final long serialVersionUID = 1L; + @ApiModelProperty("作废说明") + private String cancalRemarks; + @ApiModelProperty("采购类型key") private String applyTypeKey; @ApiModelProperty("采购类型value") @@ -84,6 +87,14 @@ public class BaseManufactorSubscription extends BaseEntity { @ApiModelProperty("创建组织名称") private String createOrgName; // 创建组织名称 + public String getCancalRemarks() { + return cancalRemarks; + } + + public void setCancalRemarks(String cancalRemarks) { + this.cancalRemarks = cancalRemarks; + } + /** * @return 打款状态 */ diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufactorsubscription/BaseManufactorSubscriptionFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufactorsubscription/BaseManufactorSubscriptionFeign.java index e76f8b8d30..47d3ba1011 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufactorsubscription/BaseManufactorSubscriptionFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufactorsubscription/BaseManufactorSubscriptionFeign.java @@ -84,5 +84,5 @@ public interface BaseManufactorSubscriptionFeign { @ApiOperation("作废") @PostMapping("/cancel") - ResultBean cancel(@RequestParam("sid") String sid); + ResultBean cancel(@RequestParam("sid") String sid,@RequestParam("cancalRemarks")String cancalRemarks); } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufactorsubscription/BaseManufactorSubscriptionFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufactorsubscription/BaseManufactorSubscriptionFeignFallback.java index 2990f76696..a2bec28ffe 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufactorsubscription/BaseManufactorSubscriptionFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufactorsubscription/BaseManufactorSubscriptionFeignFallback.java @@ -95,7 +95,7 @@ public class BaseManufactorSubscriptionFeignFallback implements BaseManufactorSu } @Override - public ResultBean cancel(String sid) { + public ResultBean cancel(String sid,String cancalRemarks) { return null; } } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrder.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrder.java index 8715a3dab5..86964f0349 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrder.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrder.java @@ -124,4 +124,6 @@ public class BusVehicleOrder extends BaseEntity { private String subscriptionDate; private String lockingNum; + + private String cancalRemarks; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderFeign.java index 357c37020c..76408bfeda 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderFeign.java @@ -142,6 +142,6 @@ public interface BusVehicleOrderFeign { @ApiOperation("作废采购订单") @PostMapping("/cancal") @ResponseBody - ResultBean cancal(@RequestParam("sid")String sid); + ResultBean cancal(@RequestParam("sid")String sid,@RequestParam("cancalRemarks")String cancalRemarks); } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderFeignFallback.java index aed6676aae..5ef98b05b6 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderFeignFallback.java @@ -135,7 +135,7 @@ public class BusVehicleOrderFeignFallback implements BusVehicleOrderFeign { } @Override - public ResultBean cancal(String sid) { + public ResultBean cancal(String sid,String cancalRemarks) { return null; } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufactorsubscription/BaseManufactorSubscriptionRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufactorsubscription/BaseManufactorSubscriptionRest.java index d6a523c512..b2d5238611 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufactorsubscription/BaseManufactorSubscriptionRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufactorsubscription/BaseManufactorSubscriptionRest.java @@ -147,7 +147,7 @@ public class BaseManufactorSubscriptionRest implements BaseManufactorSubscriptio } @Override - public ResultBean cancel(String sid) { - return baseManufactorSubscriptionService.cancel(sid); + public ResultBean cancel(String sid,String cancalRemarks) { + return baseManufactorSubscriptionService.cancel(sid,cancalRemarks); } } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufactorsubscription/BaseManufactorSubscriptionService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufactorsubscription/BaseManufactorSubscriptionService.java index 3bc4b01d00..2db1f602d8 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufactorsubscription/BaseManufactorSubscriptionService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufactorsubscription/BaseManufactorSubscriptionService.java @@ -334,7 +334,7 @@ public class BaseManufactorSubscriptionService extends MybatisBaseService , procInsId=#{procInsId} + + , cancalRemarks=#{cancalRemarks} + WHERE sid=#{sid} diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundRest.java index 194756ca9c..8dd2b73cc9 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundRest.java @@ -117,7 +117,7 @@ public class ScmApplyInboundRest implements ScmApplyInboundFeign { } @Override - public ResultBean cancal(String sid) { - return scmApplyInboundService.cancal(sid); + public ResultBean cancal(String sid,String cancalRemarks) { + return scmApplyInboundService.cancal(sid,cancalRemarks); } } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java index 1fc94336d4..b6253c997a 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java @@ -972,7 +972,7 @@ public class ScmApplyInboundService extends MybatisBaseService map = BeanUtil.beanToMap(resultBean.getData()); + map.put("cancalRemarks",cancalRemarks); updateFlowFiled(map); return rb.success().setData(resultBean.getData()); } else { scmApplyInbound.setNodeState("终止"); scmApplyInbound.setTaskDefKey("Event_end"); + scmApplyInbound.setCancalRemarks(cancalRemarks); baseMapper.updateById(scmApplyInbound); } return rb.success(); From 781d720a07f94039f6b934e11c59a2e1ad6983b0 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Mon, 3 Jul 2023 10:36:45 +0800 Subject: [PATCH 10/20] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/api/basevehicle/BaseDiscountpackageGetVehQuery.java | 3 +++ .../yxt/anrui/base/biz/basevehicle/BaseVehicleService.java | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseDiscountpackageGetVehQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseDiscountpackageGetVehQuery.java index fc42999f7f..c1c6ab23c7 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseDiscountpackageGetVehQuery.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseDiscountpackageGetVehQuery.java @@ -79,4 +79,7 @@ public class BaseDiscountpackageGetVehQuery implements Query { private String solidStartDate; @ApiModelProperty(value = "买断结束日期") private String solidEndDate; + + @ApiModelProperty(value = "车架号") + private String vinNo; } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java index 3a1727651a..a3a5825406 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java @@ -3540,6 +3540,10 @@ public class BaseVehicleService extends MybatisBaseService Date: Mon, 3 Jul 2023 10:51:42 +0800 Subject: [PATCH 11/20] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/sysflowableconfig/SysFlowableConfigService.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigService.java index 0df635d53f..d539b52b71 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigService.java @@ -1,6 +1,7 @@ package com.yxt.anrui.portal.biz.sysflowableconfig; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateUtil; import com.yxt.anrui.portal.api.sysflowableconfig.*; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.core.result.ResultBean; @@ -31,6 +32,10 @@ public class SysFlowableConfigService extends MybatisBaseService Date: Mon, 3 Jul 2023 10:52:17 +0800 Subject: [PATCH 12/20] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=8E=82=E5=AE=B6?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E8=AE=A4=E6=AC=BE=E3=80=81=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=AE=A1=E7=90=86=E3=80=81=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E7=AE=A1=E7=90=86--=E4=BD=9C=E5=BA=9F=E5=92=8C=E7=BB=88?= =?UTF-8?q?=E6=AD=A2=E5=A2=9E=E5=8A=A0=E5=A1=AB=E5=86=99=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cheliangcaigou/cheliangcaigou.vue | 49 +++++++++---- .../ruzhang/ruzhangguanli/ruzhangguanli.vue | 69 ++++++++++++------- .../changjiaxitong/manufacturers.vue | 47 +++++++++---- 3 files changed, 114 insertions(+), 51 deletions(-) diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangcaigou/cheliangcaigou.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangcaigou/cheliangcaigou.vue index 908a4b2d51..e34cd3f368 100644 --- a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangcaigou/cheliangcaigou.vue +++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangcaigou/cheliangcaigou.vue @@ -51,7 +51,7 @@ @@ -88,6 +88,20 @@ + + + + + + + + + + + 确 定 + 取 消 + + @@ -117,6 +131,7 @@ export default { viewState: 1, // 1、列表 2、添加 3、修改 4、查看 isSearchShow: false, // 显示隐藏 tableLoading: false, + dialogVisible: false, // 下拉框 billType_list: [], // 单据类型 // 列表数据 @@ -149,7 +164,10 @@ export default { orgPath: '' } }, - row: {} + formobj: { + sid: '', + cancalRemarks: '' + } } }, created() { @@ -178,18 +196,21 @@ export default { this.$refs['divadd'].showEdit(row) }, handleCancellation(row) { - const tip = '请确认是否删除所选 ' + this.sids.length + ' 条记录?' - this.$confirm(tip, '提示', { - confirmButtonText: '确定', - cancelButtonText: '取消', - type: 'warning' - }).then(() => { - req.cancal({ sid: row.sid }).then((res) => { - if (res.success) { - this.$message({ showClose: true, type: 'success', message: '操作成功' }) - this.loadList() - } - }) + this.dialogVisible = true + this.cancalRemarks = '' + this.formobj.sid = row.sid + }, + handleConfirm() { + if (this.formobj.cancalRemarks === '') { + this.$message({ showClose: true, type: 'error', message: '请填写作废说明' }) + return + } + req.cancal(this.formobj).then((res) => { + if (res.success) { + this.dialogVisible = false + this.$message({ showClose: true, type: 'success', message: '操作成功' }) + this.loadList() + } }) }, handleLooK(row) { diff --git a/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangguanli.vue b/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangguanli.vue index d733998022..7d02411f6f 100644 --- a/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangguanli.vue +++ b/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangguanli.vue @@ -44,7 +44,7 @@ @@ -85,6 +85,20 @@ + + + + + + + + + + + 确 定 + 取 消 + + @@ -118,6 +132,7 @@ export default { viewState: 1, // 1、列表 2、添加 3、修改 4、查看 isSearchShow: false, // 显示隐藏 tableLoading: false, + dialogVisible: false, // 列表数据 dataList: [], btnList: [ @@ -132,7 +147,6 @@ export default { multipleSelection: [], // sid数组 sids: [], // 用于导出的时候保存已选择SID - sides: '', // 一条数据的sid queryParams: { current: 1, size: 10, @@ -147,7 +161,10 @@ export default { pcApplicationCode: '' } }, - row: {} + formobj: { + sid: '', + cancalRemarks: '' + } } }, created() { @@ -213,8 +230,6 @@ export default { aa.push(element.sid) }) this.sids = aa - this.row = row - this.sides = this.sids.join() // 将sid数组的元素转化成字符串 console.log('获取sids数组', this.sids) }, toEdit(row) { @@ -229,18 +244,21 @@ export default { this.$refs['divinfo'].showInfo(sid, row) }, toTermination(row) { - const tip = '请确认是否终止该记录?' - this.$confirm(tip, '提示', { - confirmButtonText: '确定', - cancelButtonText: '取消', - type: 'warning' - }).then(() => { - req.cancal({ sid: row.sid }).then((res) => { - if (res.success) { - this.$message({ showClose: true, type: 'success', message: '操作成功' }) - this.loadList() - } - }) + this.dialogVisible = true + this.formobj.sid = row.sid + this.formobj.cancalRemarks = '' + }, + handleConfirm() { + if (this.formobj.cancalRemarks === '') { + this.$message({ showClose: true, type: 'error', message: '请填写终止说明' }) + return + } + req.cancal(this.formobj).then((res) => { + if (res.success) { + this.$message({ showClose: true, type: 'success', message: '操作成功' }) + this.dialogVisible = false + this.loadList() + } }) }, hangleLook(row) { @@ -272,16 +290,19 @@ export default { }, // 加载分页列表 loadList() { - const _this = this this.tableLoading = true req.listPage(this.queryParams).then(resp => { - console.log('查询列表', resp) - _this.tableLoading = false - const data = resp.data - _this.queryParams.total = data.total - _this.dataList = data.records + this.tableLoading = false + if (resp.success) { + const data = resp.data + this.queryParams.total = data.total + this.dataList = data.records + } else { + this.queryParams.total = 0 + this.dataList = [] + } }).catch(() => { - _this.tableLoading = false + this.tableLoading = false }) }, // 序号 diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/changjiaxitong/manufacturers.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/changjiaxitong/manufacturers.vue index 79631ef3d6..2eb4757493 100644 --- a/anrui-scm/anrui-scm-ui/src/views/supplychain/changjiaxitong/manufacturers.vue +++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/changjiaxitong/manufacturers.vue @@ -113,6 +113,20 @@ + + + + + + + + + + + 确 定 + 取 消 + + @@ -150,7 +164,7 @@ export default { isSearchShow: false, searchxianshitit: '显示查询条件', dialogImgVisible: false, - dialogFileVisible: false, + dialogVisible: false, // 查询条件 ----------- tableKey: 0, list: [], @@ -202,6 +216,10 @@ export default { }, dialogImageUrl: '', imgList: [], + formobj: { + sid: '', + cancalRemarks: '' + }, rules: {} } }, @@ -307,18 +325,21 @@ export default { }) }, handCancellation(row) { - const tip = '请确认是否作废该记录?' - this.$confirm(tip, '提示', { - confirmButtonText: '确定', - cancelButtonText: '取消', - type: 'warning' - }).then(() => { - req.cancel({ sid: row.sid }).then((res) => { - if (res.success) { - this.$message({ showClose: true, type: 'success', message: '操作成功' }) - this.getList() - } - }) + this.dialogVisible = true + this.cancalRemarks = '' + this.formobj.sid = row.sid + }, + handleConfirm() { + if (this.formobj.cancalRemarks === '') { + this.$message({ showClose: true, type: 'error', message: '请填写作废说明' }) + return + } + req.cancel(this.formobj).then((res) => { + if (res.success) { + this.dialogVisible = false + this.$message({ showClose: true, type: 'success', message: '操作成功' }) + this.getList() + } }) }, handleGetCheck(row) { From 324c1c6edeab091e518713fbbc880bc42df68a3f Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Mon, 3 Jul 2023 11:04:59 +0800 Subject: [PATCH 13/20] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/sysflowableconfig/SysFlowableConfigService.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigService.java index d539b52b71..b3396408b1 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigService.java @@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateUtil; import com.yxt.anrui.portal.api.sysflowableconfig.*; import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.result.ResultBean; import org.springframework.stereotype.Service; @@ -36,12 +37,19 @@ public class SysFlowableConfigService extends MybatisBaseService Date: Mon, 3 Jul 2023 11:08:25 +0800 Subject: [PATCH 14/20] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=8C=82=E8=BD=A6?= =?UTF-8?q?=E5=87=BA=E5=BA=93--=E5=A2=9E=E5=8A=A0=E5=BC=80=E7=A5=A8?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/guache/guachechuku/traileroutAdd.vue | 18 ++++++++++++++---- .../guache/guachechuku/traileroutInfo.vue | 18 ++++++++++++++---- .../guachechukuFlow/chukuDaiBanInfo.vue | 14 +++++++++++--- .../workFlow/guachechukuFlow/chukuEdit.vue | 14 +++++++++++--- .../guachechukuFlow/chukuYiBanInfo.vue | 14 +++++++++++--- 5 files changed, 61 insertions(+), 17 deletions(-) diff --git a/anrui-scm/anrui-scm-ui/src/views/guache/guachechuku/traileroutAdd.vue b/anrui-scm/anrui-scm-ui/src/views/guache/guachechuku/traileroutAdd.vue index b37e53b169..d31f841509 100644 --- a/anrui-scm/anrui-scm-ui/src/views/guache/guachechuku/traileroutAdd.vue +++ b/anrui-scm/anrui-scm-ui/src/views/guache/guachechuku/traileroutAdd.vue @@ -71,8 +71,8 @@ -
开票信息
- {{ formobj.openTickRemarks }} +
开票名称
+ {{ formobj.openTickName }} @@ -82,6 +82,12 @@ + + +
开票信息
+ {{ formobj.openTickRemarks }} + +
备注
@@ -153,7 +159,9 @@ export default { nodeSid: '', procDefId: '', procInstSid: '', - taskId: '' + taskId: '', + openTickName: '', + openTickSid: '' } } }, @@ -270,7 +278,9 @@ export default { nodeSid: '', procDefId: '', procInstSid: '', - taskId: '' + taskId: '', + openTickName: '', + openTickSid: '' } this.submitdisabled = false this.$refs['form_obj'].resetFields() diff --git a/anrui-scm/anrui-scm-ui/src/views/guache/guachechuku/traileroutInfo.vue b/anrui-scm/anrui-scm-ui/src/views/guache/guachechuku/traileroutInfo.vue index 706683c4f9..7f620e3e7e 100644 --- a/anrui-scm/anrui-scm-ui/src/views/guache/guachechuku/traileroutInfo.vue +++ b/anrui-scm/anrui-scm-ui/src/views/guache/guachechuku/traileroutInfo.vue @@ -67,8 +67,8 @@ -
开票信息
- {{ formobj.openTickRemarks }} +
开票名称
+ {{ formobj.openTickName }} @@ -78,6 +78,12 @@ + + +
开票信息
+ {{ formobj.openTickRemarks }} + +
备注
@@ -147,7 +153,9 @@ export default { nodeSid: '', procDefId: '', procInstSid: '', - taskId: '' + taskId: '', + openTickName: '', + openTickSid: '' } } }, @@ -215,7 +223,9 @@ export default { nodeSid: '', procDefId: '', procInstSid: '', - taskId: '' + taskId: '', + openTickName: '', + openTickSid: '' } this.$emit('doback') } diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/guachechukuFlow/chukuDaiBanInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/guachechukuFlow/chukuDaiBanInfo.vue index 6245e4423f..021c752079 100644 --- a/anrui-scm/anrui-scm-ui/src/views/workFlow/guachechukuFlow/chukuDaiBanInfo.vue +++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/guachechukuFlow/chukuDaiBanInfo.vue @@ -69,8 +69,8 @@ -
开票信息
- {{ formobj.openTickRemarks }} +
开票名称
+ {{ formobj.openTickName }} @@ -80,6 +80,12 @@ + + +
开票信息
+ {{ formobj.openTickRemarks }} + +
备注
@@ -174,7 +180,9 @@ export default { nodeSid: '', procDefId: '', procInstSid: '', - taskId: '' + taskId: '', + openTickName: '', + openTickSid: '' }, operation: '', // 点击操作按钮 dialogList: { diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/guachechukuFlow/chukuEdit.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/guachechukuFlow/chukuEdit.vue index 68da1a292a..335692355e 100644 --- a/anrui-scm/anrui-scm-ui/src/views/workFlow/guachechukuFlow/chukuEdit.vue +++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/guachechukuFlow/chukuEdit.vue @@ -70,8 +70,8 @@ -
开票信息
- {{ formobj.openTickRemarks }} +
开票名称
+ {{ formobj.openTickName }} @@ -81,6 +81,12 @@ + + +
开票信息
+ {{ formobj.openTickRemarks }} + +
备注
@@ -152,7 +158,9 @@ export default { nodeSid: '', procDefId: '', procInstSid: '', - taskId: '' + taskId: '', + openTickName: '', + openTickSid: '' } } }, diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/guachechukuFlow/chukuYiBanInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/guachechukuFlow/chukuYiBanInfo.vue index 0945feba97..dd9c698ed6 100644 --- a/anrui-scm/anrui-scm-ui/src/views/workFlow/guachechukuFlow/chukuYiBanInfo.vue +++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/guachechukuFlow/chukuYiBanInfo.vue @@ -67,8 +67,8 @@ -
开票信息
- {{ formobj.openTickRemarks }} +
开票名称
+ {{ formobj.openTickName }} @@ -78,6 +78,12 @@ + + +
开票信息
+ {{ formobj.openTickRemarks }} + +
备注
@@ -147,7 +153,9 @@ export default { nodeSid: '', procDefId: '', procInstSid: '', - taskId: '' + taskId: '', + openTickName: '', + openTickSid: '' }, // 环节所需参数 linkByParameter: { From f106e472e7fe871a66de66ad4d8294c5205a6ba8 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Mon, 3 Jul 2023 11:09:56 +0800 Subject: [PATCH 15/20] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../portal/biz/sysflowableconfig/SysFlowableConfigService.java | 1 + 1 file changed, 1 insertion(+) diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigService.java index b3396408b1..23c1f0c076 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigService.java @@ -58,6 +58,7 @@ public class SysFlowableConfigService extends MybatisBaseService Date: Mon, 3 Jul 2023 11:13:28 +0800 Subject: [PATCH 16/20] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=AD=98=E6=94=BE?= =?UTF-8?q?=E5=9C=B0=E7=82=B9=E5=8F=98=E6=9B=B4--=E5=88=86=E9=A1=B5?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0=E8=BD=A6=E6=9E=B6=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplychain/cunfangdidianbiangeng/cunfangdidianbiangeng.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/cunfangdidianbiangeng/cunfangdidianbiangeng.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/cunfangdidianbiangeng/cunfangdidianbiangeng.vue index 1a7cb802d9..9cdc0ba630 100644 --- a/anrui-scm/anrui-scm-ui/src/views/supplychain/cunfangdidianbiangeng/cunfangdidianbiangeng.vue +++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/cunfangdidianbiangeng/cunfangdidianbiangeng.vue @@ -67,7 +67,7 @@ - + From 6d3b1db20e326b36e23c3e7a0aa5a107afa89bfd Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Mon, 3 Jul 2023 11:20:03 +0800 Subject: [PATCH 17/20] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../portal/biz/sysflowableconfig/SysFlowableConfigService.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigService.java index 23c1f0c076..b0dc328425 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigService.java @@ -32,6 +32,9 @@ public class SysFlowableConfigService extends MybatisBaseService rb = ResultBean.fireFail(); SysFlowableConfigVo sysFlowableConfigVo = baseMapper.initDetails(userSid); if(sysFlowableConfigVo != null){ + if(StringUtils.isBlank(sysFlowableConfigVo.getStartDate())){ + sysFlowableConfigVo.setStartDate(DateUtil.format(new Date(),"yyyy-MM-dd HH:mm")); + } sysFlowableConfigVo.setStartDateLong(System.currentTimeMillis()); }else{ sysFlowableConfigVo = new SysFlowableConfigVo(); From 349fa9df1586505bc616bf81937ef3b086c760f5 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Mon, 3 Jul 2023 11:49:43 +0800 Subject: [PATCH 18/20] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=86=85=E9=83=A8?= =?UTF-8?q?=E6=8E=A5=E6=94=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/bustransferrecords/BusTransferRecordsService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsService.java index 2cdab59d1c..60f405218f 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsService.java @@ -67,7 +67,7 @@ public class BusTransferRecordsService extends MybatisBaseService Date: Mon, 3 Jul 2023 11:52:58 +0800 Subject: [PATCH 19/20] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bussalesorder/BusSalesOrderService.java | 38 +------------------ 1 file changed, 2 insertions(+), 36 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java index 1f3d488a3c..cf37683f16 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java @@ -4970,41 +4970,6 @@ public class BusSalesOrderService extends MybatisBaseService vinList = appOrderModelInfoVo.getVinListsVos(); - for (int i = 0; i < vinList.size(); i++) { - UnCollectionDto unCollectionDto = new UnCollectionDto(); - //合同sid - unCollectionDto.setContractSid(commonContract.getSid()); - //合同编号 - unCollectionDto.setContractNo(commonContract.getContractNo()); - //客户名称 - unCollectionDto.setCustomerName(appOrderDetailsVo.getName()); - //客户sid - unCollectionDto.setCustomerSid(appOrderDetailsVo.getCustomerSid()); - //客户类型 - unCollectionDto.setCustomerClass(appOrderDetailsVo.getCustomerKey()); - //客户类型 - unCollectionDto.setCustomerClassKey(appOrderDetailsVo.getCustomerType()); - //客户头像 - unCollectionDto.setCustomerImage(appOrderDetailsVo.getCustomerImage()); - unCollectionDto.setReceivablesName("车款"); - unCollectionDto.setCustomerPhone(appOrderDetailsVo.getPhone()); - unCollectionDto.setUseOrgSid(appOrderDetailsVo.getUseOrgSid()); - unCollectionDto.setVinNo(vinList.get(i).getVinNo()); - unCollectionDto.setCurrentReceivableMoney(money); - unCollectionDto.setUserSid(userSid); - unCollectionDto.setReveivableMoney(money); - unCollectionDto.setBusVinSid(vinList.get(i).getSid()); - unCollectionDto.setPayType(appOrderDetailsVo.getPayType()); - unCollectionDto.setPayTypeKey(appOrderDetailsVo.getPayTypeKey()); - unCollectionDto.setPurchaseSystemName(appOrderDetailsVo.getPurchaseSystemName()); - unCollectionDto.setPurchaseSystemSid(appOrderDetailsVo.getPurchaseSystemSid()); - finUncollectedDetailedFeign.saveUnCollection(unCollectionDto); - } - }*/ //添加推送至款项确认的应收未收明细中 List vinList = appOrderModelInfoVo.getVinListsVos(); //更新销售订单的临时号 @@ -5021,7 +4986,6 @@ public class BusSalesOrderService extends MybatisBaseService Date: Mon, 3 Jul 2023 12:00:17 +0800 Subject: [PATCH 20/20] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fin/api/finbillapplication/FinBillApplicationDto.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDto.java index 1f7783ed86..78a97a7414 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDto.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDto.java @@ -79,12 +79,12 @@ public class FinBillApplicationDto implements Dto { private String totalBillMoney; @ApiModelProperty("申请日期") private String applyDate; + @ApiModelProperty("流程状态") + private String nodeState; /* @ApiModelProperty("流程定义的id") private String procDefId; @ApiModelProperty("环节定义的sid") private String nodeSid; - @ApiModelProperty("流程状态") - private String nodeState; @ApiModelProperty("流程实例的sid") private String procInstSid;*/ @ApiModelProperty(value = "是否延迟开票")