From d9f3b48dfe1ef79802e910f5730c926dcfb71a0c Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Wed, 14 Jun 2023 18:06:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8C=82=E8=BD=A6=E5=87=BA=E5=BA=93=E7=94=B3?= =?UTF-8?q?=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseTrailerOutApplyVo.java | 4 + .../BaseTrailerOutApplyCompleteDto.java | 3 - .../BaseTrailerOutApplyMapper.java | 2 + .../BaseTrailerOutApplyMapper.xml | 78 ++++---- .../BaseTrailerOutApplyRest.java | 4 +- .../BaseTrailerOutApplyService.java | 175 +++++++++++++++++- .../basevehicleout/BaseVehicleOutService.java | 4 + .../BaseVehicleOutApplyMapper.xml | 8 +- .../BaseVehicleOutApplyService.java | 4 +- .../bussalesorder/BusSalesOrderService.java | 29 ++- .../销售订单审批下载模板/xsddsp.ftl | 116 ++++++++++++ 11 files changed, 359 insertions(+), 68 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetraileroutapply/BaseTrailerOutApplyVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetraileroutapply/BaseTrailerOutApplyVo.java index 14dcaad902..a0a174d3ec 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetraileroutapply/BaseTrailerOutApplyVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetraileroutapply/BaseTrailerOutApplyVo.java @@ -77,4 +77,8 @@ public class BaseTrailerOutApplyVo implements Vo { private String oneBillMoney; @ApiModelProperty("开票信息") private String openTickRemarks; + @ApiModelProperty(value = "流程id") + private String procDefId; + @ApiModelProperty(value = "实例id") + private String procInstSid; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetraileroutapply/flowable/BaseTrailerOutApplyCompleteDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetraileroutapply/flowable/BaseTrailerOutApplyCompleteDto.java index 73e6ecfc19..70f40321d9 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetraileroutapply/flowable/BaseTrailerOutApplyCompleteDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetraileroutapply/flowable/BaseTrailerOutApplyCompleteDto.java @@ -20,9 +20,6 @@ public class BaseTrailerOutApplyCompleteDto implements Dto { @ApiModelProperty(value = "用户sid") @NotBlank(message = "参数错误：userSid") private String userSid; - @ApiModelProperty(value = "用户全路径sid") - @NotBlank(message = "参数错误：orgSidPath") - private String orgSidPath; @ApiModelProperty(value = "节点id") @NotBlank(message = "参数错误：taskDefKey") private String taskDefKey; diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetraileroutapply/BaseTrailerOutApplyMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetraileroutapply/BaseTrailerOutApplyMapper.java index 9d8df32ddc..c803daecf3 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetraileroutapply/BaseTrailerOutApplyMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetraileroutapply/BaseTrailerOutApplyMapper.java @@ -69,4 +69,6 @@ public interface BaseTrailerOutApplyMapper extends BaseMapper map); + + int selectByGcSid(String gcSid); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetraileroutapply/BaseTrailerOutApplyMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetraileroutapply/BaseTrailerOutApplyMapper.xml index 667e5d8760..9d88f21198 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetraileroutapply/BaseTrailerOutApplyMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetraileroutapply/BaseTrailerOutApplyMapper.xml @@ -1,41 +1,55 @@ - - - - - + + + + + - + select IFNULL(CAST(REPLACE(MAX(billNo), #{bill}, '') AS SIGNED), 0) as code + from base_trailer_out_apply + where billNo LIKE concat(#{bill}, '%') - + SELECT COUNT(*) + FROM base_trailer_out_apply + WHERE nodeState != '待提交' and find_in_set(sid, #{list}) - + + + + UPDATE base_trailer_out_apply + SET nodeState=#{nodeState}, nodeSid=#{taskDefKey} + + , procDefId=#{procDefId} + + + , procInstSid=#{procInsId} + + + , taskId=#{taskId} + + WHERE sid=#{sid} + - - UPDATE base_trailer_out_apply - SET nodeState=#{nodeState}, nodeSid=#{taskDefKey} - - , procDefId=#{procDefId} - - - , procInstSid=#{procInsId} - - - , taskId=#{taskId} - - WHERE sid=#{sid} - + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetraileroutapply/BaseTrailerOutApplyRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetraileroutapply/BaseTrailerOutApplyRest.java index 71299eb873..6c25560392 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetraileroutapply/BaseTrailerOutApplyRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetraileroutapply/BaseTrailerOutApplyRest.java @@ -74,9 +74,7 @@ public class BaseTrailerOutApplyRest implements BaseTrailerOutApplyFeign { @ApiOperation("新增或修改") @PostMapping("/save") public ResultBean save(@RequestBody BaseTrailerOutApplyDto dto){ - ResultBean rb = ResultBean.fireFail(); - baseTrailerOutApplyService.saveOrUpdateDto(dto); - return rb.success(); + return baseTrailerOutApplyService.saveOrUpdateDto(dto); } @Override 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 60c4e068d3..bf1bf9688f 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 @@ -30,25 +30,35 @@ import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo; import com.yxt.anrui.base.api.basetrailer.BaseTrailer; import com.yxt.anrui.base.api.basetrailer.BaseTrailerDetailsVo; +import com.yxt.anrui.base.api.basetrailermodel.BaseTrailerModel; import com.yxt.anrui.base.api.basetraileroutapply.*; import com.yxt.anrui.base.api.basetraileroutapply.flowable.BaseTrailerOutApplyNodeQuery; import com.yxt.anrui.base.api.basetraileroutapply.flowable.BaseTrailerOutApplyNodeVo; import com.yxt.anrui.base.api.basetraileroutapply.flowable.BaseTrailerOutApplyTaskQuery; import com.yxt.anrui.base.api.basetraileroutapply.flowable.SubmitBaseTrailerOutApplyDto; import com.yxt.anrui.base.api.basevehicle.BaseVehicle; +import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOut; +import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutDetailsVo; +import com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApply; import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo; +import com.yxt.anrui.base.biz.basepurchasesystem.BasePurchaseSystemService; import com.yxt.anrui.base.biz.basetrailer.BaseTrailerService; import com.yxt.anrui.base.biz.basevehicle.BaseVehicleService; +import com.yxt.anrui.base.biz.basevehicleout.BaseVehicleOutService; +import com.yxt.anrui.base.biz.basevehicleoutapply.BaseVehicleOutApplyService; import com.yxt.anrui.base.biz.commonappendix.CommonAppendixService; import com.yxt.anrui.base.common.enums.BillTypeEnum; +import com.yxt.anrui.base.common.enums.VehicleState; import com.yxt.anrui.base.common.utils.Rule; import com.yxt.anrui.base.common.utils.domain.BillNo; import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.BusArrearsCarryVehicleApplyVo; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign; import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPrice; +import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign; import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo; import com.yxt.anrui.fin.api.finbillapplication.FinBillApplication; import com.yxt.anrui.fin.api.finbillapplication.FinBillApplicationDetailsVo; @@ -60,7 +70,11 @@ import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleDetailsVo; import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleFeign; import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleVo; import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingDetailsVo; +import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingFeign; import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoiceDto; +import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoiceFeign; +import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign; +import com.yxt.anrui.fin.api.kingdee.saloutstock.SalOutStock; import com.yxt.anrui.flowable.api.flow.FlowProcessMapQuery; import com.yxt.anrui.flowable.api.flow.FlowableFeign; import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; @@ -91,6 +105,7 @@ import com.yxt.common.core.vo.PagerVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import java.math.BigDecimal; import java.util.*; import java.util.stream.Collectors; @@ -137,6 +152,20 @@ public class BaseTrailerOutApplyService extends MybatisBaseService createQueryWrapper(BaseTrailerOutApplyQuery query) { // todo: 这里根据具体业务调整查询条件 @@ -169,15 +198,21 @@ public class BaseTrailerOutApplyService extends MybatisBaseService saveOrUpdateDto(BaseTrailerOutApplyDto dto) { + ResultBean rb = ResultBean.fireFail(); String dtoSid = dto.getSid(); if (StringUtils.isBlank(dtoSid)) { + String gcSid = dto.getGcSid(); + int i = baseMapper.selectByGcSid(gcSid); + if (i > 0) { + return rb.setMsg("该挂车出库申请已存在"); + } dto.setNodeState("待提交"); String sid = this.insertByDto(dto); - return sid; + return rb.success().setData(sid); } this.updateByDto(dto); - return dtoSid; + return rb.success().setData(dtoSid); } public String insertByDto(BaseTrailerOutApplyDto dto) { @@ -208,7 +243,7 @@ public class BaseTrailerOutApplyService extends MybatisBaseService appAppendixList = commonAppendixService.getAppAppendixList(baseTrailer.getSid(), "挂车合格证照片"); List hgzFiles = new ArrayList<>(); - if (!appAppendixList.isEmpty()){ + if (!appAppendixList.isEmpty()) { for (CommonAppendixVo commonAppendixVo : appAppendixList) { String filePath = commonAppendixVo.getFilePath(); String urlPrefix = fileUploadComponent.getUrlPrefix(); @@ -217,6 +252,7 @@ public class BaseTrailerOutApplyService extends MybatisBaseService appAppendixList = commonAppendixService.getAppAppendixList(baseTrailer.getSid(), "挂车合格证照片"); List hgzFiles = new ArrayList<>(); - if (!appAppendixList.isEmpty()){ + if (!appAppendixList.isEmpty()) { for (CommonAppendixVo commonAppendixVo : appAppendixList) { String filePath = commonAppendixVo.getFilePath(); String urlPrefix = fileUploadComponent.getUrlPrefix(); @@ -343,7 +379,11 @@ public class BaseTrailerOutApplyService extends MybatisBaseService resultBean = saveOrUpdateDto(dto); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + String businessSid = resultBean.getData(); //创建BusinessVariables实体对象 BusinessVariables bv = new BusinessVariables(); //流程中的参数赋值、若有网关，则赋值网关中判断的字段。 @@ -456,6 +496,91 @@ public class BaseTrailerOutApplyService extends MybatisBaseService resultBean = sysOrganizationFeign.fetchBySid(orgDeptSid); + if (resultBean.getSuccess()) { + SysOrganizationVo vo = resultBean.getData(); + if (vo != null) { + salOutStock.setFSaleDeptID(vo.getOrgCode()); + } + } + //项目类别key和项目类别type + salOutStock.setF_PAEZ_AssistantType("payType"); + //销售类型-外采挂车映射 + salOutStock.setF_PAEZ_AssistantKey("009"); + //物料列表 + List fEntityList = new ArrayList<>(); + SalOutStock.FEntity fEntity = new SalOutStock.FEntity(); + //单价 + fEntity.setFPrice(baseVehicleOut.getPrice().toString()); + //物料编码 + fEntity.setFMaterialID(baseVehicleOut.getMaterialCode()); + //仓库id + fEntity.setFStockID("ARZSCK"); + fEntityList.add(fEntity); + salOutStock.setFEntity(fEntityList); + return salOutStock; + } } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java index 4ad967a2d9..13571ac674 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java @@ -2121,4 +2121,8 @@ public class BaseVehicleOutService extends MybatisBaseService qw = createQueryWrapper(query); IPage page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); - int countTotal = baseMapper.selectPageVoCount(qw); + //int countTotal = baseMapper.selectPageVoCount(qw); List records = pagging.getRecords(); for (BaseVehicleOutApplyVoNew record : records) { String createOrgSid = record.getCreateOrgSid(); @@ -136,7 +136,7 @@ public class BaseVehicleOutApplyService extends MybatisBaseService p = PagerUtil.pageToVo(pagging, null); - p.setTotal(countTotal); + //p.setTotal(countTotal); return p; } 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 6747d847e1..621b6ba7e0 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 @@ -6045,6 +6045,17 @@ public class BusSalesOrderService extends MybatisBaseService busSalesOrderVehicles = busSalesOrderVehicleService.selectByOrderSid(sid); + if (!busSalesOrderVehicles.isEmpty()){ + for (BusSalesOrderVehicle busSalesOrderVehicle : busSalesOrderVehicles) { + vinNo = vinNo + busSalesOrderVehicle.getLinkNo() + ","; + } + } + if (StringUtils.isNotBlank(vinNo)){ + dataMap.put("vinNo",vinNo); //TODO + } //销售指导价 BusSalesOrderPrice busSalesOrderPrice = busSalesOrderPriceService.selectBySalesOrderSid(busSalesOrder.getSid()); dataMap.put("salePrice", busSalesOrderPrice.getSingleGuildPrice().toString()); @@ -6194,24 +6205,6 @@ public class BusSalesOrderService extends MybatisBaseService + + + + + + + + + + + + + + + + + + + + + + + + 车架号 + + + + + + + + + + + + + + + + + + + + + + + + + + + ${vinNo!} + + + + @@ -1439,6 +1497,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + 订金结转 + + + + + + + + + + + + + + + + + + + + + + + + + + + ${djjz!} + + + +