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

Merge remote-tracking branch 'origin/master'

master
yunuo970428 2 years ago
parent
3cc477d783 b05d752d54
commit
aff5997497
16 changed files with 163 additions and 114 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/basevehicleout/BaseVehicleOutVoExecl.java
  2. 9
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.java
  3. 77
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.xml
  4. 61
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java
  5. 8
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java
  6. 2
      anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles.ftl
  7. 2
      anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles_black.ftl
  8. 2
      anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar.ftl
  9. 2
      anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar_black.ftl
  10. 2
      anrui-base/anrui-base-biz/src/main/resources/ftl/receiveCar.ftl
  11. 2
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
  12. 38
      anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java
  13. 35
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/ScmVehInventorymonthVoExcel.java
  14. 2
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthMapper.java
  15. 16
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthMapper.xml
  16. 15
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthService.java

4
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutVoExecl.java
View File

@ -25,6 +25,8 @@ public class BaseVehicleOutVoExecl{
private String insideCode; // 内部编码
@ExportEntityMap(CnName = "销售类型", EnName = "type")
private String type;
@ExportEntityMap(CnName = "采购类型", EnName = "manPurOrderTypeValue")
private String manPurOrderTypeValue;
@ExportEntityMap(CnName = "销售日期", EnName = "saleDate")
private String saleDate;
@ExportEntityMap(CnName = "成交价", EnName = "price")
@ -61,6 +63,4 @@ public class BaseVehicleOutVoExecl{
private String rebateMoneyTwo;
@ExportEntityMap(CnName = "内部引荐人姓名", EnName = "innerName")
private String innerName;
@ExportEntityMap(CnName = "采购类型", EnName = "manPurOrderTypeValue")
private String manPurOrderTypeValue;
}

9
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.java
View File

@ -1,13 +1,12 @@
package com.yxt.anrui.base.biz.basevehicleout;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOut;
import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutDetailsVo;
import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutVo;
import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutVoExecl;
import com.yxt.anrui.base.api.basedistributor.BaseDistributorExportVo;
import com.yxt.anrui.base.api.basevehicleout.*;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
@ -40,5 +39,5 @@ public interface BaseVehicleOutMapper extends BaseMapper<BaseVehicleOut> {
BaseVehicleOutDetailsVo selByOrgSidAndVehSid(@Param("useOrgSid") String useOrgSid,@Param("vehSid") String vehSid);
BaseVehicleOutVoExecl selByExcel(String sid);
List<BaseVehicleOutVoExecl> selByExcel(@Param(Constants.WRAPPER) Wrapper<BaseVehicleOutVoExecl> qw);
}

77
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.xml
View File

@ -126,43 +126,46 @@
</select>
<select id="selByExcel" resultType="com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutVoExecl">
SELECT so.name AS createOrgName,
bvo.vinNo,
bv.configName AS modelConfig,
bv.insideCode,
bvo.type,
bvo.saleDate,
bvo.price,
bvo.orgName,
bvo.staffName,
bvo.concatNo,
CASE
bvo.isTerminal
WHEN 1
THEN '是'
WHEN 0
THEN '否'
END AS isTerminal,
bvo.customerName,
bvo.mobile,
bvo.trailerOrInstallName,
bvo.trailerOrInstallCode,
bvo.trailerOrInstallDealPrice,
bvo.giftsDescription,
bvo.salesAllowance,
bvo.middleOne,
bvo.rebateMoneyOne,
bvo.middleTwo,
bvo.rebateMoneyTwo,
bvoa.innerName,
bvo.manPurOrderTypeValue
SELECT
so.name AS createOrgName,
bvo.vinNo,
bv.configName AS modelConfig,
bv.insideCode,
bvo.type,
bvo.saleDate,
bvo.price,
bvo.orgName,
bvo.staffName,
bvo.concatNo,
CASE
bvo.isTerminal
WHEN 1
THEN '是'
WHEN 0
THEN '否'
END AS isTerminal,
bvo.customerName,
bvo.mobile,
bvo.trailerOrInstallName,
bvo.trailerOrInstallCode,
bvo.trailerOrInstallDealPrice,
bvo.giftsDescription,
bvo.salesAllowance,
bvo.middleOne,
bvo.rebateMoneyOne,
bvo.middleTwo,
bvo.rebateMoneyTwo,
bvoa.innerName,
bvo.manPurOrderTypeValue
FROM base_vehicle_out bvo
LEFT JOIN base_vehicle bv
ON bv.sid = bvo.vinSid
LEFT JOIN anrui_portal.sys_organization so
ON bvo.createOrgSid = so.sid
LEFT JOIN base_vehicle_out_apply bvoa
ON bvo.mainSid = bvoa.sid
WHERE bvo.sid = #{sid}
LEFT JOIN base_vehicle bv
ON bv.sid = bvo.vinSid
LEFT JOIN anrui_portal.sys_organization so
ON bvo.createOrgSid = so.sid
LEFT JOIN base_vehicle_out_apply bvoa
ON bvo.mainSid = bvoa.sid
<where>
${ew.sqlSegment}
</where>
</select>
</mapper>

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

@ -5,6 +5,7 @@ import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.base.api.basedistributor.BaseDistributorExportVo;
import com.yxt.anrui.base.api.basemiddleman.BaseMiddleman;
import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo;
import com.yxt.anrui.base.api.basetrailer.BaseTrailer;
@ -1122,11 +1123,61 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
return rb.success();
}
public List<BaseVehicleOutVoExecl> listExcel(BaseVehicleOutQuery baseVehicleOutQuery) {
List<BaseVehicleOutVoExecl> baseVehicleOutVoExecls = new ArrayList<>();
/*BaseVehicleOutVoExecl baseVehicleOutVoExecl = baseMapper.selByExcel(baseVehicleOutQuery);
baseVehicleOutVoExecl.setRankNo(id);
baseVehicleOutVoExecls.add(baseVehicleOutVoExecl);*/
public List<BaseVehicleOutVoExecl> listExcel(BaseVehicleOutQuery params) {
QueryWrapper<BaseVehicleOutVoExecl> qw = new QueryWrapper<>();
if (params != null) {
String orgSidPath = params.getOrgSidPath();
SysOrganizationVo data = sysOrganizationFeign.selectByOrgSidPath(orgSidPath).getData();
String orgLevelKey = data.getOrgLevelKey();
if ("2".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, 73);
qw.like("so.orgSidPath", orgSidPath);
} else if ("3".equals(orgLevelKey)) {
qw.eq("bvo.createOrgSid", params.getCreateOrgSid());
}
//车架号
if (StringUtils.isNotBlank(params.getVinNo())) {
qw.like("bvo.vinNo", params.getVinNo());
}
//销售类型
if (StringUtils.isNotBlank(params.getTypeKey())) {
qw.eq("bvo.typeKey", params.getTypeKey());
}
//销售日期开始-销售日期结束
qw.apply(StringUtils.isNotBlank(params.getSaleDateStart()), "date_format (bvo.saleDate,'%Y-%m-%d') >= date_format('" + params.getSaleDateStart() + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(params.getSaleDateEnd()), "date_format (bvo.saleDate,'%Y-%m-%d') <= date_format('" + params.getSaleDateEnd() + "','%Y-%m-%d')"
);
//合同编号
if (StringUtils.isNotBlank(params.getConcatNo())) {
qw.like("bvo.concatNo", params.getConcatNo());
}
//客户名称
if (StringUtils.isNotBlank(params.getCustomerName())) {
qw.like("bvo.customerName", params.getCustomerName());
}
//销售部门
if (StringUtils.isNotBlank(params.getOrgDeptSid())) {
qw.eq("bvo.orgSid", params.getOrgDeptSid());
}
//销售人员
if (StringUtils.isNotBlank(params.getStaffSid())) {
qw.eq("bvo.staffSid", params.getStaffSid());
}
//内部编码
if (StringUtils.isNotBlank(params.getInsideCode())) {
qw.like("bv.insideCode", params.getInsideCode());
}
//分公司
if (StringUtils.isNotBlank(params.getOrgSid())) {
qw.eq("bvo.createOrgSid", params.getOrgSid());
}
}
List<BaseVehicleOutVoExecl> baseVehicleOutVoExecls = baseMapper.selByExcel(qw);
int id = 1;
for (BaseVehicleOutVoExecl baseVehicleOutVoExecl : baseVehicleOutVoExecls) {
baseVehicleOutVoExecl.setRankNo(id);
id = id + 1;
}
return baseVehicleOutVoExecls;
}
}

8
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java
View File

@ -1600,10 +1600,12 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
return rb.setMsg(crmResultBean.getMsg());
}
CrmCustomerTempVo crmCustomerTempVo = crmResultBean.getData();
//身份证号
String idNo = crmCustomerTempVo.getIDNumber();
if (StringUtils.isBlank(idNo)) {
return rb.setMessage(sid).setMsg("请先在客户洽谈的基础信息中补全客户的身份证号").setCode("515");
//身份证号
if("1".equals(crmCustomerTempVo.getCustomerTypeKey())){
if (StringUtils.isBlank(idNo)) {
return rb.setMessage(sid).setMsg("请先在客户洽谈的基础信息中补全客户的身份证号").setCode("515");
}
}
//查询销售订单的车型信息
AppOrderModelInfoVo appOrderModelInfoVo = appOrderDetailsVo.getModelInfo();

2
anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles.ftl
View File

@ -812,7 +812,7 @@
<w:sz w:val="20"/>
<w:sz-cs w:val="20"/>
</w:rPr>
<w:t>身份证号码：</w:t>
<w:t>证件号码：</w:t>
</w:r>
<w:r>
<w:rPr>

2
anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles_black.ftl
View File

@ -812,7 +812,7 @@
<w:sz w:val="20"/>
<w:sz-cs w:val="20"/>
</w:rPr>
<w:t>身份证号码：</w:t>
<w:t>证件号码：</w:t>
</w:r>
<w:r>
<w:rPr>

2
anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar.ftl
View File

@ -928,7 +928,7 @@
<w:sz w:val="20"/>
<w:sz-cs w:val="20"/>
</w:rPr>
<w:t>身份证号码：</w:t>
<w:t>证件号码：</w:t>
</w:r>
<w:r>
<w:rPr>

2
anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar_black.ftl
View File

@ -928,7 +928,7 @@
<w:sz w:val="20"/>
<w:sz-cs w:val="20"/>
</w:rPr>
<w:t>身份证号码：</w:t>
<w:t>证件号码：</w:t>
</w:r>
<w:r>
<w:rPr>

2
anrui-base/anrui-base-biz/src/main/resources/ftl/receiveCar.ftl
View File

@ -996,7 +996,7 @@
<w:sz w:val="28"/>
<w:sz-cs w:val="28"/>
</w:rPr>
<w:t>身份证号码：</w:t>
<w:t>证件号码：</w:t>
</w:r>
<w:r>
<w:rPr>

2
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
View File

@ -359,7 +359,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
BeanUtil.copyProperties(dto, finCollectionConfirmation, "sid");
if(StringUtils.isBlank(finCollectionConfirmation.getStaffUserSid())){
finCollectionConfirmation.setStaffName(finCollectionConfirmation.getCreateByName());
finCollectionConfirmation.setStaffUserSid(finCollectionConfirmation.getCreateBySid());
finCollectionConfirmation.setStaffUserSid(dto.getUserSid());
finCollectionConfirmation.setStaffDeptName(finCollectionConfirmation.getCreateDept());
finCollectionConfirmation.setStaffDeptSid(finCollectionConfirmation.getCreateDeptSid());
}

38
anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java
View File

@ -37,19 +37,33 @@ public enum ProcDefEnum {
SCMSPECIALREBATECHEDISTRIBUTE("专项返利分配申请", "process_h3w1aval:1:615004"),
SCMCOLLECTIONREBATEWITHAPPLY("回款返利预提申请", "process_k4lodiyg:1:630004"),
SCMCOLLECTIONREBATECHECKAPPLY("回款返利核对申请", "process_fgrv1mbv:1:630008"),
CONTRACTAPPLY("合同审核", "process_gd8c9xd5:1:545008"),
CONTRACTAPPLY("合同审核", "process_gd8c9xd5:2:932504"),
BASEDISPACKAGEAPPLY("优惠包申请流程", "process_l8i6tqho:1:967504"),
/******************************测试流程id*********************************************/
/*ORDERDEPOSITAPPROVE("简易订单-订金收取", "process_pkyns85b:4:575004"),
/* ORDERDEPOSITAPPROVE("简易订单-订金收取", "process_pkyns85b:4:575004"),
ORDERDEPOSITVEHICLEAPPROVE("简易订单-车辆预定", "process_pkyns85b:5:575008"),
ORDERAPPROVE("订单审批", "order_approve_96asleqi:1:227504"),
SALESPOLICY("销售政策审批流程", "process_biw9gfh7:3:917504"),
FINBILLAPPLICATION("开票申请流程", "process_t5ksueur:1:252833"),
BUSCENTERADVANCEGINVOICEAPPLY("提前开票申请流程", "advance_ginvoiceapply:1:242664"),
ARREARSCARRYVEHICLE("欠款提车审批流程", "process_8ax1xxn3:1:795004"),
VEHICLEAPPLY("排产申请流程", "process_9egcg169:12:735004"),
SCMCARTRANSFER("库存地点变更申请", "process_3bc4p2em:8:725008"),
BASEVEHICLEACTUALSALES("未售买断", "process_6qx07b75:8:725012"),
FINCOSTAPPLY("费用申请", "process_u0pahv0s:6:725016"),
FINPAYAPPLY("付款申请", "process_gin2tntb:4:725020"),
RECORDAPPLICATION("入库申请", "process_xbwq2c7p:3:675024"),
SCMVEHICLERETURN("采购退库", "process_md8aeoap:2:722508"),
SEALAPPLY("盖章申请", "process_7h0z66tp:1:240064"),
SALESORDER("销售订单审批流程", "process_p5ils2rn:7:1123496"),
BUSDELIVEREDAPPLY("出库申请", "process_wgt1n66l:2:357504"),
SALESORDER("销售订单审批流程", "process_p5ils2rn:7:827504"),
BASEOUTSOURCINGAPPLICATION("外采申请", "process_5tqysnjc:5:722504"),
BASEMODELMODPRICE("车型调价申请", "process_kydcif7k:7:722512"),
BASEINTERNALPURCHASE("调车申请", "process_i6luw5xq:3:722516"),
BASEACCADJAPPLY("调账申请", "process_r6pyzqoz:2:722520"),
BUSDELIVEREDAPPLY("出库申请", "process_wgt1n66l:3:770004"),
BASESHUNINVOICAPPLY("调车开票申请", "process_u4xrvaso:1:400008"),
BASEVEHINSTALLMODPRICE("上装调价申请", "process_s0a0svth:1:492508"),
SCMVEHREBATEWITHAPPLY("单车返利预提申请", "process_qegarc7r:1:535004"),
@ -60,21 +74,7 @@ public enum ProcDefEnum {
SCMCOLLECTIONREBATEWITHAPPLY("回款返利预提申请", "process_k4lodiyg:1:630004"),
SCMCOLLECTIONREBATECHECKAPPLY("回款返利核对申请", "process_fgrv1mbv:1:630008"),
CONTRACTAPPLY("合同审核", "process_gd8c9xd5:1:545008"),
SCMCARTRANSFER("库存地点变更申请", "process_3bc4p2em:8:860004"), //TODO:测试
BASEVEHICLEACTUALSALES("未售买断", "process_6qx07b75:9:852504"),//ToDo:测试
VEHICLEAPPLY("排产申请流程", "process_9egcg169:12:910004"),//TODO:测试
FINCOSTAPPLY("费用申请","process_u0pahv0s:6:902504"),//ToDo:测试
FINPAYAPPLY("付款申请","process_gin2tntb:4:902508"),//ToDo:测试
ARREARSCARRYVEHICLE("欠款提车审批流程", "process_8ax1xxn3:2:862512"),//测试（新）2022、11、22
BUSCENTERADVANCEGINVOICEAPPLY("提前开票申请流程", "process_zt1gov6e:4:862504"), //测试
FINBILLAPPLICATION("开票申请流程", "process_sndce6s9:2:937504"),//测试（新）2022、11、22
BASEOUTSOURCINGAPPLICATION("外采申请", "process_5tqysnjc:5:867504"),//测试外采流程定义id
BASEMODELMODPRICE("车型调价申请", "process_kydcif7k:7:867520"),//测试车型调价流程定义id
BASEINTERNALPURCHASE("调车申请", "process_i6luw5xq:4:892504"),//测试调车流程定义id
BASEACCADJAPPLY("调账申请", "process_r6pyzqoz:2:867516"), //测试调账流程定义id
SCMVEHICLERETURN("采购退库", "process_md8aeoap:2:867508"),//测试采购退库流程定义id
SALESPOLICY("销售政策审批流程", "process_biw9gfh7:2:867524"),//测试销售政策流程定义id
BASEDISPACKAGEAPPLY("优惠包申请流程", "process_l8i6tqho:1:967504"),//测试优惠包申请流程定义id*/
BASEDISPACKAGEAPPLY("优惠包申请流程", "process_l8i6tqho:1:967504"),*/
;
ProcDefEnum(String proDefName, String proDefId) {

35
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/ScmVehInventorymonthVoExcel.java
View File

@ -27,6 +27,7 @@ package com.yxt.anrui.scm.api.scmvehinventorymonth;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.yxt.common.core.utils.ExportEntityMap;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
@ -54,22 +55,20 @@ public class ScmVehInventorymonthVoExcel{
private String sid;
@ExportEntityMap(CnName = "序号", EnName = "rankNo")
private Integer rankNo;
@ExportEntityMap(CnName = "编号", EnName = "billNo")
private String billNo; // 编号（yyyyMMdd）
@ExportEntityMap(CnName = "生成日期", EnName = "createTime")
private String createTime;
@ExportEntityMap(CnName = "生成人", EnName = "createByName")
private String createByName;
@ExportEntityMap(CnName = "应盘(台)", EnName = "totalNumber")
private String totalNumber;
@ExportEntityMap(CnName = "实盘(台)", EnName = "actualNumber")
private String actualNumber;
@ExportEntityMap(CnName = "未盘(台)", EnName = "surplusNumber")
private String surplusNumber;
@ExportEntityMap(CnName = "盘盈(台)", EnName = "profitNumber")
private String profitNumber;
@ExportEntityMap(CnName = "盘亏(台)", EnName = "lossNumber")
private String lossNumber;
@ExportEntityMap(CnName = "盘损(台)", EnName = "damageNumber")
private String damageNumber;
@ExportEntityMap(CnName = "车架号", EnName = "vinNo")
private String vinNo; // 车架号
@ExportEntityMap(CnName = "盘库日期", EnName = "InventoryDate")
@JsonProperty("InventoryDate")
private String InventoryDate; // 盘库日期
@ExportEntityMap(CnName = "存放地点", EnName = "location")
private String location; // 存放地点
@ApiModelProperty("盘库人员")
@ExportEntityMap(CnName = "盘库人员", EnName = "InventoryName")
@JsonProperty("InventoryName")
private String InventoryName; // 盘库人员
@ExportEntityMap(CnName = "盘库结果", EnName = "InventoryState")
@JsonProperty("InventoryState")
private String InventoryState; // 盘库结果
@ExportEntityMap(CnName = "备注", EnName = "remarks")
private String remarks; // 备注
}

2
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthMapper.java
View File

@ -77,5 +77,5 @@ public interface ScmVehInventorymonthMapper extends BaseMapper<ScmVehInventorymo
@Select("select * from scm_veh_inventorymonth order by id desc")
List<AppScmVehInventorymonthVo> selectListAll();
ScmVehInventorymonthVoExcel selByExcel(String sid);
List<ScmVehInventorymonthVoExcel> selByExcel(String sid);
}

16
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthMapper.xml
View File

@ -61,11 +61,15 @@
</select>
<select id="selByExcel" resultType="com.yxt.anrui.scm.api.scmvehinventorymonth.ScmVehInventorymonthVoExcel">
SELECT sid,
billNo,
createTime,
createByName
FROM scm_veh_inventorymonth
WHERE sid = #{sid}
SELECT svi.`vinNo`,
svi.`InventoryDate`,
svi.`location`,
svi.`InventoryName`,
svi.`InventoryState`,
svi.`remarks`
FROM scm_vehicle_inventory svi
LEFT JOIN scm_veh_inventorymonth svim
ON svi.`mainSid` = svim.`sid`
WHERE svi.mainSid = #{sid}
</select>
</mapper>

15
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthService.java
View File

@ -412,21 +412,12 @@ public class ScmVehInventorymonthService extends MybatisBaseService<ScmVehInvent
}
public List<ScmVehInventorymonthVoExcel> listExcel(String[] sids) {
List<ScmVehInventorymonthVoExcel> scmVehInventorymonthVoExcels = new ArrayList<>();
int id = 1;
for (String sid : sids) {
ScmVehInventorymonthVoExcel scmVehInventorymonthVoExcel = baseMapper.selByExcel(sid);
String mainSid = scmVehInventorymonthVoExcel.getSid();
AppVehInventorymonthVo vo = scmVehicleInventoryService.getMonthByMainSid(mainSid);
scmVehInventorymonthVoExcel.setSurplusNumber(String.valueOf(vo.getSurplusNumber()));
scmVehInventorymonthVoExcel.setTotalNumber(String.valueOf(vo.getTotalNumber()));
scmVehInventorymonthVoExcel.setLossNumber(String.valueOf(vo.getLossNumber()));
scmVehInventorymonthVoExcel.setDamageNumber(String.valueOf(vo.getDamageNumber()));
scmVehInventorymonthVoExcel.setProfitNumber(String.valueOf(vo.getProfitNumber()));
scmVehInventorymonthVoExcel.setActualNumber(String.valueOf(vo.getProfitNumber() + vo.getNormalNumber() + vo.getDamageNumber() + vo.getLossNumber()));
String sid = sids[0];
List<ScmVehInventorymonthVoExcel> scmVehInventorymonthVoExcels = baseMapper.selByExcel(sid);
for (ScmVehInventorymonthVoExcel scmVehInventorymonthVoExcel : scmVehInventorymonthVoExcels) {
scmVehInventorymonthVoExcel.setRankNo(id);
id = id + 1;
scmVehInventorymonthVoExcels.add(scmVehInventorymonthVoExcel);
}
return scmVehInventorymonthVoExcels;
}

Write Preview
Loading…
Cancel
Save