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

挂车出库申请

master
God 2 years ago
parent
05051e70ce
commit
d9f3b48dfe
11 changed files with 359 additions and 68 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetraileroutapply/BaseTrailerOutApplyVo.java
  2. 3
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetraileroutapply/flowable/BaseTrailerOutApplyCompleteDto.java
  3. 2
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetraileroutapply/BaseTrailerOutApplyMapper.java
  4. 78
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetraileroutapply/BaseTrailerOutApplyMapper.xml
  5. 4
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetraileroutapply/BaseTrailerOutApplyRest.java
  6. 175
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetraileroutapply/BaseTrailerOutApplyService.java
  7. 4
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java
  8. 8
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyMapper.xml
  9. 4
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyService.java
  10. 29
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
  11. 116
      工作内容需要的文档/单据模板/销售订单审批下载模板/xsddsp.ftl

4
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetraileroutapply/BaseTrailerOutApplyVo.java
View File

@ -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;
}

3
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetraileroutapply/flowable/BaseTrailerOutApplyCompleteDto.java
View File

@ -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;

2
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetraileroutapply/BaseTrailerOutApplyMapper.java
View File

@ -69,4 +69,6 @@ public interface BaseTrailerOutApplyMapper extends BaseMapper<BaseTrailerOutAppl
int selectBySid(String join);
int updateFlowFiled(Map<String, Object> map);
int selectByGcSid(String gcSid);
}

78
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetraileroutapply/BaseTrailerOutApplyMapper.xml
View File

@ -1,41 +1,55 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yxt.anrui.base.biz.basetraileroutapply.BaseTrailerOutApplyMapper">
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.anrui.base.api.basetraileroutapply.BaseTrailerOutApplyVo">
SELECT * FROM base_trailer_out_apply <where> ${ew.sqlSegment} </where>
</select>
<select id="selectListAllVo" resultType="com.yxt.anrui.base.api.basetraileroutapply.BaseTrailerOutApplyVo">
SELECT * FROM base_trailer_out_apply <where> ${ew.sqlSegment} </where>
</select>
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.anrui.base.api.basetraileroutapply.BaseTrailerOutApplyVo">
SELECT * FROM base_trailer_out_apply
<where>
${ew.sqlSegment}
</where>
</select>
<select id="selectListAllVo" resultType="com.yxt.anrui.base.api.basetraileroutapply.BaseTrailerOutApplyVo">
SELECT * FROM base_trailer_out_apply
<where>
${ew.sqlSegment}
</where>
</select>
<select id="selectNum" resultType="int">
select IFNULL(CAST(REPLACE(MAX(billNo), #{bill}, '') AS SIGNED), 0) as code
from base_trailer_out_apply
where billNo LIKE concat(#{bill}, '%')
<select id="selectNum" resultType="int">
select IFNULL(CAST(REPLACE(MAX(billNo), #{bill}, '') AS SIGNED), 0) as code
from base_trailer_out_apply
where billNo LIKE concat(#{bill}, '%')
</select>
<select id="selectBySid" resultType="int">
SELECT COUNT(*)
FROM base_trailer_out_apply
WHERE nodeState != '待提交'
<select id="selectBySid" resultType="int">
SELECT COUNT(*)
FROM base_trailer_out_apply
WHERE nodeState != '待提交'
and find_in_set(sid, #{list})
</select>
</select>
<update id="updateFlowFiled">
UPDATE base_trailer_out_apply
SET nodeState=#{nodeState}, nodeSid=#{taskDefKey}
<if test="procDefId != null and procDefId != ''">
, procDefId=#{procDefId}
</if>
<if test="procInsId != null and procInsId != ''">
, procInstSid=#{procInsId}
</if>
<if test="taskId != null and taskId != ''">
, taskId=#{taskId}
</if>
WHERE sid=#{sid}
</update>
<update id="updateFlowFiled">
UPDATE base_trailer_out_apply
SET nodeState=#{nodeState}, nodeSid=#{taskDefKey}
<if test="procDefId != null and procDefId != ''">
, procDefId=#{procDefId}
</if>
<if test="procInsId != null and procInsId != ''">
, procInstSid=#{procInsId}
</if>
<if test="taskId != null and taskId != ''">
, taskId=#{taskId}
</if>
WHERE sid=#{sid}
</update>
<select id="selectByGcSid" resultType="int">
SELECT COUNT(*)
FROM base_trailer_out_apply
WHERE gcSid = #{gcSid}
AND nodeState != "待提交"
AND nodeState != "终止"
</select>
</mapper>

4
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetraileroutapply/BaseTrailerOutApplyRest.java
View File

@ -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

175
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetraileroutapply/BaseTrailerOutApplyService.java
View File

@ -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<BaseTrailerOu
private CommonAppendixService commonAppendixService;
@Autowired
private FileUploadComponent fileUploadComponent;
@Autowired
private BaseVehicleOutService baseVehicleOutService;
@Autowired
private BaseVehicleOutApplyService baseVehicleOutApplyService;
@Autowired
private BasePurchaseSystemService basePurchaseSystemService;
@Autowired
private FinVehicleInvoiceFeign finVehicleInvoiceFeign;
@Resource
private FinKingDeeFeign finKingDeeFeign;
@Autowired
private FinCompanyInvoicingFeign finCompanyInvoicingFeign;
@Autowired
private CrmCustomerTempFeign crmCustomerTempFeign;
private QueryWrapper<BaseTrailerOutApply> createQueryWrapper(BaseTrailerOutApplyQuery query) {
// todo: 这里根据具体业务调整查询条件
@ -169,15 +198,21 @@ public class BaseTrailerOutApplyService extends MybatisBaseService<BaseTrailerOu
return p;
}
public String saveOrUpdateDto(BaseTrailerOutApplyDto dto) {
public ResultBean<String> 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<BaseTrailerOu
//合格证附件
List<CommonAppendixVo> appAppendixList = commonAppendixService.getAppAppendixList(baseTrailer.getSid(), "挂车合格证照片");
List<String> 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<BaseTrailerOu
}
}
vo.setHgzFiles(hgzFiles);
vo.setCreateTime(DateUtil.formatDate(entity.getCreateTime()));
return vo;
}
@ -296,7 +332,7 @@ public class BaseTrailerOutApplyService extends MybatisBaseService<BaseTrailerOu
//合格证附件
List<CommonAppendixVo> appAppendixList = commonAppendixService.getAppAppendixList(baseTrailer.getSid(), "挂车合格证照片");
List<String> 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<BaseTrailerOu
return rb.setMsg("操作失败!提交的数据不一致");
}
//新增修改保存
String businessSid = saveOrUpdateDto(dto);
ResultBean<String> 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<BaseTrailerOu
UpdateFlowFieldVo ufVo = resultBean.getData();
updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
BaseVehicle baseVehicle = baseVehicleService.fetchBySid(baseTrailerOutApply.getZcSid());
//生成单据编号
String billNo = "";
BasePurchaseSystemDetailsVo basePurchaseSystemDetailsVo = basePurchaseSystemService.fetchDetailsByDeptSid(baseVehicle.getPurchaseSystemSid()).getData();
String date = DateUtil.format(DateUtil.date(), "yyyyMM");
billNo = "XSCKD" + basePurchaseSystemDetailsVo.getOrgCode() + date;
String i = baseVehicleOutService.selectNum(billNo);
if (StringUtils.isNotBlank(i)) {
billNo = Rule.getBillNo(billNo, Integer.valueOf(i).intValue());
} else {
billNo = Rule.getBillNo(billNo, 0);
}
BaseVehicleOutDetailsVo baseVehicleOutDetailsVo = baseVehicleOutService.selByOrgSidAndVehSid(baseTrailerOutApply.getUseOrgSid(), baseTrailerOutApply.getZcSid());
BaseVehicleOutApply baseVehicleOutApply = baseVehicleOutApplyService.fetchBySid(baseVehicleOutDetailsVo.getMainSid());
//出库主表信息录入
baseVehicleOutApply.setSid(UUID.randomUUID().toString());
baseVehicleOutApply.setBillNo(billNo);
//保存车辆出库单主表
baseVehicleOutApplyService.save(baseVehicleOutApply);
BaseVehicleOut baseVehicleOut = new BaseVehicleOut();
baseVehicleOut.setCreateBySid(baseVehicleOutApply.getCreateBySid());
baseVehicleOut.setZcMGroupCode("99.02");
baseVehicleOut.setZcMGroupName("挂车");
baseVehicleOut.setVinNo(baseTrailerOutApply.getGcVinNo());
baseVehicleOut.setVinSid(baseTrailerOutApply.getZcSid());
baseVehicleOut.setPrice(new BigDecimal(baseTrailerOutApply.getOneBillMoney()));
//出库单子表关联主表sid
baseVehicleOut.setMainSid(baseVehicleOutApply.getSid());
baseVehicleOut.setManPurOrderTypeKey(baseVehicle.getManPurOrderTypeKey());
baseVehicleOut.setManPurOrderTypeValue(baseVehicle.getManPurOrderTypeValue());
baseVehicleOut.setMaterialCode(baseTrailerOutApply.getGcVinNo().substring(baseTrailerOutApply.getGcVinNo().length() - 8) + "G");
baseVehicleOut.setMaterialName("挂车");
baseVehicleOut.setMaterialTypeKey("002");
baseVehicleOut.setMaterialTypeValue("挂车");
baseVehicleOut.setMaterialSid(baseTrailerOutApply.getGcSid());
baseVehicleOut.setCwCustomerNo(baseVehicleOutDetailsVo.getCwCustomerNo());
//保存车辆出库单子表
baseVehicleOutService.save(baseVehicleOut);
//推送金蝶挂车销售出库单
SalOutStock salOutStock = createSzOrGcSalOutStockNew(baseVehicle, baseVehicleOut, baseVehicleOutApply);
finKingDeeFeign.draftSalOutStock(salOutStock);
BaseTrailer baseTrailer = baseTrailerService.fetchBySid(baseTrailerOutApply.getGcSid());
baseTrailer.setStockStateKey(VehicleState.StockEnum.OUT_STOCK.getCode());
baseTrailer.setStockStateValue(VehicleState.StockEnum.OUT_STOCK.getRemarks());
baseTrailer.setDealPrice(baseVehicleOut.getPrice());
baseTrailer.setIssueDate(DateUtil.formatDate(new Date()));
baseTrailerService.saveOrUpdate(baseTrailer);
FinVehicleInvoiceDto finVehicleInvoiceDto = new FinVehicleInvoiceDto();
finVehicleInvoiceDto.setInvoiceTitle(baseTrailerOutApply.getInvoiceTitle());
finVehicleInvoiceDto.setContractNo(baseTrailerOutApply.getContractNo());
finVehicleInvoiceDto.setCustomerName(baseTrailerOutApply.getCustomerName());
finVehicleInvoiceDto.setVehicleSid(baseTrailer.getSid());
finVehicleInvoiceDto.setVIN(baseTrailer.getVinNo());
finVehicleInvoiceDto.setInvoiceTypeKey(baseTrailerOutApply.getBillTypeKey());
finVehicleInvoiceDto.setInvoiceType(baseTrailerOutApply.getBillTypeValue());
finVehicleInvoiceDto.setInvoiceAmount(baseTrailer.getDealPrice());
finVehicleInvoiceDto.setBillingStateKey("001");
finVehicleInvoiceDto.setBillingState("未开票");
finVehicleInvoiceDto.setTransferStateKey("001");
finVehicleInvoiceDto.setTransferState("未移交");
finVehicleInvoiceDto.setVehicleType("挂车");
FinBillVehicleDetailsVo finBillVehicleDetailsVo = finBillVehicleFeign.fetchByVehSid(baseTrailerOutApply.getZcSid()).getData();
String billAppSid = finBillVehicleDetailsVo.getBillAppSid();
FinBillApplicationDetailsVo finBillApplicationDetailsVo = finBillApplicationFeign.fetchDetailsBySid(billAppSid).getData();
finVehicleInvoiceDto.setBillingSid(finBillApplicationDetailsVo.getSid());
finVehicleInvoiceDto.setInvoicingName(finBillVehicleDetailsVo.getOpenTickName());
finVehicleInvoiceDto.setCreateBySid(finBillApplicationDetailsVo.getCreateBySid());
finVehicleInvoiceDto.setBusinessStateKey(finBillApplicationDetailsVo.getBillStateKey());
finVehicleInvoiceDto.setBusinessState(finBillApplicationDetailsVo.getBillStateValue());
finVehicleInvoiceDto.setUseOrgSid(finBillApplicationDetailsVo.getUseOrgSid());
FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingFeign.fetchDetailsBySid(finBillVehicleDetailsVo.getOpenTickSid()).getData();
if (StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getBankAccount())) {
finVehicleInvoiceDto.setAddress(finCompanyInvoicingDetailsVo.getAddress());
finVehicleInvoiceDto.setTelPhone(finCompanyInvoicingDetailsVo.getPhone());
finVehicleInvoiceDto.setOpeningBank(finCompanyInvoicingDetailsVo.getBankName());
finVehicleInvoiceDto.setBankNum(finCompanyInvoicingDetailsVo.getBankAccount());
finVehicleInvoiceDto.setTaxpayerNo(finCompanyInvoicingDetailsVo.getTaxpayerNo());
finVehicleInvoiceDto.setIsTakeTicket("是");
} else {
CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(finBillVehicleDetailsVo.getOpenTickSid()).getData();
finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile());
finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber());
finVehicleInvoiceDto.setIsTakeTicket("是");
}
finVehicleInvoiceFeign.saveOrUpdate(finVehicleInvoiceDto);
} else {
//极光推送
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
@ -635,4 +760,42 @@ public class BaseTrailerOutApplyService extends MybatisBaseService<BaseTrailerOu
}
return rb.setMsg("操作失败!提交的数据不一致!");
}
private SalOutStock createSzOrGcSalOutStockNew(BaseVehicle baseVehicle, BaseVehicleOut baseVehicleOut, BaseVehicleOutApply baseVehicleOutApply) {
SalOutStock salOutStock = new SalOutStock();
//单据编号
salOutStock.setFBillNo(baseVehicleOutApply.getBillNo());
//日期
salOutStock.setFDate(DateUtil.today());
//分公司id
BasePurchaseSystemDetailsVo basePurchaseSystemDetailsVo = basePurchaseSystemService.fetchDetailsByDeptSid(baseVehicle.getPurchaseSystemSid()).getData();
salOutStock.setFSaleOrgId(basePurchaseSystemDetailsVo.getOrgCode());
//客户
salOutStock.setFCustomerID(baseVehicleOut.getCwCustomerNo());
//销售部门id
String orgDeptSid = baseVehicleOutApply.getOrgSid();
ResultBean<SysOrganizationVo> 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<SalOutStock.FEntity> 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;
}
}

4
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java
View File

@ -2121,4 +2121,8 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
}
return rb.success();
}
public String selectNum(String billNo) {
return baseMapper.selectNum(billNo);
}
}

8
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyMapper.xml
View File

@ -35,8 +35,8 @@
bv.modelConfigSid,
bvc.sid AS vehModelConfigSid
FROM
base_vehicle_out_apply bvoa
LEFT JOIN base_vehicle_out bvo
base_vehicle_out bvo
LEFT JOIN base_vehicle_out_apply bvoa
ON bvoa.`sid` = bvo.`mainSid`
LEFT JOIN base_vehicle bv
ON bv.sid = bvo.vinSid
@ -61,8 +61,8 @@
SELECT
COUNT(*)
FROM
base_vehicle_out_apply bvoa
LEFT JOIN base_vehicle_out bvo
base_vehicle_out bvo
LEFT JOIN base_vehicle_out_apply bvoa
ON bvoa.`sid` = bvo.`mainSid`
LEFT JOIN base_vehicle bv
ON bv.sid = bvo.vinSid

4
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyService.java
View File

@ -124,7 +124,7 @@ public class BaseVehicleOutApplyService extends MybatisBaseService<BaseVehicleOu
QueryWrapper<BaseVehicleOutApply> qw = createQueryWrapper(query);
IPage<BaseVehicleOutApply> page = PagerUtil.queryToPage(pq);
IPage<BaseVehicleOutApplyVoNew> pagging = baseMapper.selectPageVo(page, qw);
int countTotal = baseMapper.selectPageVoCount(qw);
//int countTotal = baseMapper.selectPageVoCount(qw);
List<BaseVehicleOutApplyVoNew> records = pagging.getRecords();
for (BaseVehicleOutApplyVoNew record : records) {
String createOrgSid = record.getCreateOrgSid();
@ -136,7 +136,7 @@ public class BaseVehicleOutApplyService extends MybatisBaseService<BaseVehicleOu
}
}
PagerVo<BaseVehicleOutApplyVoNew> p = PagerUtil.pageToVo(pagging, null);
p.setTotal(countTotal);
//p.setTotal(countTotal);
return p;
}

29
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
View File

@ -6045,6 +6045,17 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
//车型
BusSalesOrderModel busSalesOrderModel = busSalesOrderModelService.selectByOrderSid(busSalesOrder.getSid());
dataMap.put("vehModel", busSalesOrderModel.getModelName());
//车架号
String vinNo = "";
List<BusSalesOrderVehicle> 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<BusSalesOrderMapper
return rb.success().setData("template/" + dateStr + "/" + pdfName);
}
/*public static String image2Base64(String imgUrl) {
byte[] data = null;
// 读取图片字节数组
try {
InputStream in = new FileInputStream(imgUrl);
System.out.println("文件大小（字节）=" + in.available());
data = new byte[in.available()];
in.read(data);
in.close();
} catch (IOException e) {
e.printStackTrace();
}
// 对字节数组进行Base64编码，得到Base64编码的字符串
java.util.Base64.Encoder encoder = Base64.getEncoder();
String base64Str = encoder.encodeToString(data);
return base64Str;
}*/
public static String image2Base64(String imgUrl) {
URL url = null;
InputStream is = null;

116
工作内容需要的文档/单据模板/销售订单审批下载模板/xsddsp.ftl
View File

@ -1267,6 +1267,64 @@
</w:p>
</w:tc>
</w:tr>
<w:tr wsp:rsidR="00F15DA9" wsp:rsidRPr="000E03BD" wsp:rsidTr="000E03BD">
<w:tc>
<w:tcPr>
<w:tcW w:w="1929" w:type="dxa"/>
<w:gridSpan w:val="3"/>
<w:shd w:val="clear" w:color="auto" w:fill="auto"/>
</w:tcPr>
<w:p wsp:rsidR="00F15DA9" wsp:rsidRPr="000E03BD" wsp:rsidRDefault="00000000"
wsp:rsidP="000E03BD">
<w:pPr>
<w:jc w:val="right"/>
<w:rPr>
<w:rFonts w:ascii="宋体" w:fareast="宋体" w:h-ansi="宋体"/>
<wx:font wx:val="宋体"/>
<w:sz w:val="15"/>
<w:sz-cs w:val="15"/>
</w:rPr>
</w:pPr>
<w:r wsp:rsidRPr="000E03BD">
<w:rPr>
<w:rFonts w:ascii="宋体" w:fareast="宋体" w:h-ansi="宋体" w:hint="fareast"/>
<wx:font wx:val="宋体"/>
<w:sz w:val="15"/>
<w:sz-cs w:val="15"/>
</w:rPr>
<w:t>车架号</w:t>
</w:r>
</w:p>
</w:tc>
<w:tc>
<w:tcPr>
<w:tcW w:w="6593" w:type="dxa"/>
<w:gridSpan w:val="13"/>
<w:shd w:val="clear" w:color="auto" w:fill="auto"/>
</w:tcPr>
<w:p wsp:rsidR="00F15DA9" wsp:rsidRPr="000E03BD" wsp:rsidRDefault="00000000"
wsp:rsidP="000E03BD">
<w:pPr>
<w:jc w:val="left"/>
<w:rPr>
<w:rFonts w:ascii="宋体" w:fareast="宋体" w:h-ansi="宋体"/>
<wx:font wx:val="宋体"/>
<w:sz w:val="15"/>
<w:sz-cs w:val="15"/>
</w:rPr>
</w:pPr>
<w:r wsp:rsidRPr="000E03BD">
<w:rPr>
<w:rFonts w:ascii="宋体" w:fareast="宋体" w:h-ansi="宋体" w:cs="宋体"/>
<wx:font wx:val="宋体"/>
<w:sz w:val="15"/>
<w:sz-cs w:val="15"/>
</w:rPr>
<w:t>${vinNo!}</w:t>
</w:r>
</w:p>
</w:tc>
</w:tr>
<w:tr wsp:rsidR="00000000" wsp:rsidRPr="000E03BD" wsp:rsidTr="000E03BD">
<w:tc>
<w:tcPr>
@ -1439,6 +1497,64 @@
</w:p>
</w:tc>
</w:tr>
<w:tr wsp:rsidR="00F15DA9" wsp:rsidRPr="000E03BD" wsp:rsidTr="000E03BD">
<w:tc>
<w:tcPr>
<w:tcW w:w="1929" w:type="dxa"/>
<w:gridSpan w:val="3"/>
<w:shd w:val="clear" w:color="auto" w:fill="auto"/>
</w:tcPr>
<w:p wsp:rsidR="00F15DA9" wsp:rsidRPr="000E03BD" wsp:rsidRDefault="00000000"
wsp:rsidP="000E03BD">
<w:pPr>
<w:jc w:val="right"/>
<w:rPr>
<w:rFonts w:ascii="宋体" w:fareast="宋体" w:h-ansi="宋体"/>
<wx:font wx:val="宋体"/>
<w:sz w:val="15"/>
<w:sz-cs w:val="15"/>
</w:rPr>
</w:pPr>
<w:r wsp:rsidRPr="000E03BD">
<w:rPr>
<w:rFonts w:ascii="宋体" w:fareast="宋体" w:h-ansi="宋体" w:hint="fareast"/>
<wx:font wx:val="宋体"/>
<w:sz w:val="15"/>
<w:sz-cs w:val="15"/>
</w:rPr>
<w:t>订金结转</w:t>
</w:r>
</w:p>
</w:tc>
<w:tc>
<w:tcPr>
<w:tcW w:w="6593" w:type="dxa"/>
<w:gridSpan w:val="13"/>
<w:shd w:val="clear" w:color="auto" w:fill="auto"/>
</w:tcPr>
<w:p wsp:rsidR="00F15DA9" wsp:rsidRPr="000E03BD" wsp:rsidRDefault="00000000"
wsp:rsidP="000E03BD">
<w:pPr>
<w:jc w:val="left"/>
<w:rPr>
<w:rFonts w:ascii="宋体" w:fareast="宋体" w:h-ansi="宋体"/>
<wx:font wx:val="宋体"/>
<w:sz w:val="15"/>
<w:sz-cs w:val="15"/>
</w:rPr>
</w:pPr>
<w:r wsp:rsidRPr="000E03BD">
<w:rPr>
<w:rFonts w:ascii="宋体" w:fareast="宋体" w:h-ansi="宋体" w:cs="宋体"/>
<wx:font wx:val="宋体"/>
<w:sz w:val="15"/>
<w:sz-cs w:val="15"/>
</w:rPr>
<w:t>${djjz!}</w:t>
</w:r>
</w:p>
</w:tc>
</w:tr>
<w:tr wsp:rsidR="00F15DA9" wsp:rsidRPr="000E03BD" wsp:rsidTr="000E03BD">
<w:tc>
<w:tcPr>

Write Preview
Loading…
Cancel
Save