diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java index 4682495bae..0a65364b7f 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java @@ -229,10 +229,12 @@ public class BaseVehicleRest implements BaseVehicleFeign { * 单价 对应厂家结算价 */ sf.setFPrice(baseVehicleDto.getCostPrice()+""); + /** * 车辆类型 */ - sf.setCllx("03"); + sf.setCllx("03");//TODO 需要根据车辆对应的车型 分析出车辆类型 推送到车辆台账中 规则：1.车辆类型—>优先考虑LNG的类型，然后再是牵引、载货等。 + /** * // 批号:FLot */ diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/appaybill/ApPayBill.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/appaybill/ApPayBill.java index 0e73e3adf4..e890e6f7d6 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/appaybill/ApPayBill.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/appaybill/ApPayBill.java @@ -51,9 +51,13 @@ public class ApPayBill { //采购部门:FPURCHASEDEPTID(必填项) public String FPURCHASEDEPTID="05.04"; @JsonProperty("FPAYORGID") - @NotBlank - //付款组织:FPAYORGID (必填项) - public String FPAYORGID="101"; + @NotBlank + //付款组织:FPAYORGID (必填项) + public String FPAYORGID="101"; + @JsonProperty("F_PAEZ_Assistant") + @NotBlank + //应付类别:F_PAEZ_Assistant (必填项) 默认：005 定金 + public String F_PAEZ_Assistant="005"; @JsonProperty("FPAYBILLENTRY") @NotBlank public List FPAYBILLENTRY=new ArrayList<>(); diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/bdmaterial/BdMaterial.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/bdmaterial/BdMaterial.java index 926832721f..6cb2893af7 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/bdmaterial/BdMaterial.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/bdmaterial/BdMaterial.java @@ -45,6 +45,12 @@ public class BdMaterial { @NotBlank(message = "车辆类型:F_PAEZ_Base ") @JsonProperty("F_PAEZ_Base") private String F_PAEZ_Base; + /** + *存货类别:FCategoryID (必填项) + */ + /* @NotBlank(message = "存货类别:FCategoryID ") + @JsonProperty("FCategoryID") + private String FCategoryID="CHLB01_SYS";*/ private final static BdMaterial bdMaterial = new BdMaterial(); static { /** diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java index 5ad4aae6a1..e6c94a9933 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java @@ -186,6 +186,10 @@ public class FinPaymentrecordService extends MybatisBaseService FPAYBILLENTRYs = new ArrayList<>(); if (finPaymentrecord.getCost() != null && finPaymentrecord.getCost() > 0) { diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stkInstockNumber/FinStkInstockNumberMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stkInstockNumber/FinStkInstockNumberMapper.java new file mode 100644 index 0000000000..4878641836 --- /dev/null +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stkInstockNumber/FinStkInstockNumberMapper.java @@ -0,0 +1,59 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.fin.biz.kingdee.stkInstockNumber; + +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.fin.api.fincollectionconfirmation.AppFinSelectedReceivablesPaymentDetailsQuery; +import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailed; +import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedVo; +import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppFinUncollectedReceivablesDetailedVo; +import com.yxt.anrui.fin.api.kingdee.stkInstockNumber.FinStkInstockNumber; +import org.apache.ibatis.annotations.*; + +import java.util.List; +import java.util.Map; + +/** + * Project: anrui-fin(物料 分公司和金蝶系统中入库单的编号 、id关联表)
+ * File: FinSelectedReceivablesDetailedMapper.java
+ * Class: com.yxt.anrui.fin.biz.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedMapper
+ * Description: 物料 分公司和金蝶系统中入库单的编号 、id关联表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-04-12 17:57:00
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Mapper +public interface FinStkInstockNumberMapper extends BaseMapper { + List getDatasByFMaterialId(Map param); +} \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stkInstockNumber/FinStkInstockNumberMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stkInstockNumber/FinStkInstockNumberMapper.xml new file mode 100644 index 0000000000..febb695ab6 --- /dev/null +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stkInstockNumber/FinStkInstockNumberMapper.xml @@ -0,0 +1,17 @@ + + + + + + \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stkInstockNumber/FinStkInstockNumberService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stkInstockNumber/FinStkInstockNumberService.java new file mode 100644 index 0000000000..75793c752c --- /dev/null +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stkInstockNumber/FinStkInstockNumberService.java @@ -0,0 +1,55 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.fin.biz.kingdee.stkInstockNumber; + +import com.yxt.anrui.fin.api.kingdee.push.STKInStockPushPurmrb; +import com.yxt.anrui.fin.api.kingdee.stkInstockNumber.FinStkInstockNumber; +import com.yxt.common.base.service.MybatisBaseService; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Map; + + +/** + * Project: anrui-fin(物料 分公司和金蝶系统中入库单的编号 、id关联表)
+ * File: FinSelectedReceivablesDetailedService.java
+ * Class: com.yxt.anrui.fin.biz.kingdee.stkInstockNumber.FinStkInstockNumberService
+ * Description: 物料 分公司和金蝶系统中入库单的编号 、id关联表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-04-12 17:57:00
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Service +public class FinStkInstockNumberService extends MybatisBaseService { + public List getDatasByFMaterialId(Map param) { + return baseMapper.getDatasByFMaterialId(param); + } +} \ No newline at end of file diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java index 08efb09c2e..c3dd66e0d0 100644 --- a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java +++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java @@ -25,7 +25,7 @@ public enum ProcDefEnum { BASEOUTSOURCINGAPPLICATION("外采申请", "process_5tqysnjc:4:495004"),//TODO BASEMODELMODPRICE("车型调价申请", "process_kydcif7k:6:505004"), BASEINTERNALPURCHASE("调车申请", "process_i6luw5xq:1:497508"), - SCMCARTRANSFER("库存地点变更申请", "process_3bc4p2em:7:515004"), //TODO + SCMCARTRANSFER("库存地点变更申请", "process_3bc4p2em:6:510004"), //TODO FINCOSTAPPLY("费用申请","process_u0pahv0s:5:457512"), FINPAYAPPLY("付款申请","process_gin2tntb:3:457508"), BUSDELIVEREDAPPLY("出库申请","process_wgt1n66l:2:357504"), diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionDetailsVo.java index 97b9927b07..15c4c2380b 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionDetailsVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionDetailsVo.java @@ -26,6 +26,7 @@ package com.yxt.anrui.scm.api.scmvehiclegression; +import com.yxt.anrui.scm.api.scmvehiclegressionveh.ScmVehicleGressionVehVo; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -123,4 +124,7 @@ public class AppScmVehicleGressionDetailsVo implements Vo { @ApiModelProperty("调出方负责人用户sid") private String personUserSid; + @ApiModelProperty("车架号") + private List scmVehicleGressionVehs; + } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionDto.java index fee108b20c..74a388848b 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionDto.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionDto.java @@ -27,6 +27,7 @@ package com.yxt.anrui.scm.api.scmvehiclegression; import com.fasterxml.jackson.annotation.JsonProperty; +import com.yxt.anrui.scm.api.scmvehiclegressionveh.ScmVehicleGressionVehDto; import com.yxt.common.core.dto.Dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -55,15 +56,15 @@ public class AppScmVehicleGressionDto implements Dto { private static final long serialVersionUID = -5753948406322577902L; private String sid; private String userSid; - @ApiModelProperty("车辆sid") - private String vehicleSid; - @ApiModelProperty("车架号") - private String vinNo; - @ApiModelProperty("车架号") - private List vins; +// @ApiModelProperty("车辆sid") +// private String vehicleSid; +// @ApiModelProperty("车架号") +// private String vinNo; +// @ApiModelProperty("车架号") +// private List vins; @ApiModelProperty("申请编号") private String applicantNo; -// @ApiModelProperty("申请人") + // @ApiModelProperty("申请人") // private String applicantName; // @ApiModelProperty("申请日期") // private String applicantDate; @@ -98,10 +99,13 @@ public class AppScmVehicleGressionDto implements Dto { private String proCardState; @ApiModelProperty("临牌状态") private String proCardStateKey; - @ApiModelProperty("临牌") - private String temporaryCard; - @ApiModelProperty("保单照片") - private List policyImage; +// @ApiModelProperty("临牌") +// private String temporaryCard; +// @ApiModelProperty("保单照片") +// private List policyImage; + + @ApiModelProperty("车架号") + private List scmVehicleGressionVehs; @ApiModelProperty("调出方负责人名称") private String staffName; diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionInfoVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionInfoVo.java index e1dc3442d8..bfdd483443 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionInfoVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionInfoVo.java @@ -27,6 +27,7 @@ package com.yxt.anrui.scm.api.scmvehiclegression; import com.fasterxml.jackson.annotation.JsonProperty; +import com.yxt.anrui.scm.api.scmvehiclegressionveh.ScmVehicleGressionVehVo; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -106,6 +107,9 @@ public class AppScmVehicleGressionInfoVo implements Vo { @ApiModelProperty("流程实例id") private String procInstId; + @ApiModelProperty("车架号") + private List scmVehicleGressionVehs; + @ApiModelProperty("保单照片") private List policyImage; @ApiModelProperty("现场照片") diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegressionveh/ScmVehicleGressionVehDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegressionveh/ScmVehicleGressionVehDto.java index 8a1cebafde..fe8e9092e5 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegressionveh/ScmVehicleGressionVehDto.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegressionveh/ScmVehicleGressionVehDto.java @@ -51,17 +51,17 @@ public class ScmVehicleGressionVehDto implements Dto { private String sid; // sid - @ApiModelProperty("移位申请单sid") + @ApiModelProperty("移位申请单sid") private String mainSid; // 移位申请单sid - @ApiModelProperty("车辆sid") + @ApiModelProperty("车辆sid") private String vehSid; // 车辆sid - @ApiModelProperty("车架号") + @ApiModelProperty("车架号") private String vehVin; // 车架号 - @ApiModelProperty("买断状态key") + @ApiModelProperty("买断状态key") private String settlementStatus; // 买断状态key - @ApiModelProperty("买断状态value") + @ApiModelProperty("买断状态value") private String settlementStatusValue; // 买断状态value - @ApiModelProperty("临时牌照号码") + @ApiModelProperty("临时牌照号码") private String temporaryCardNo; // 临时牌照号码 } \ No newline at end of file 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 90913744b8..995ee9b8fc 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 @@ -65,6 +65,8 @@ import com.yxt.anrui.scm.api.scmvehiclegression.flowable.GetNodeVo; import com.yxt.anrui.scm.api.scmvehiclegression.flowable.ScmCarTransferTaskQuery; import com.yxt.anrui.scm.api.scmvehiclegression.flowable.SubmitCarTransferDto; import com.yxt.anrui.scm.api.scmvehiclegressionveh.ScmVehicleGressionVeh; +import com.yxt.anrui.scm.api.scmvehiclegressionveh.ScmVehicleGressionVehDto; +import com.yxt.anrui.scm.api.scmvehiclegressionveh.ScmVehicleGressionVehVo; import com.yxt.anrui.scm.biz.scmexitpermit.ScmExitPermitService; import com.yxt.anrui.scm.biz.scmfile.ScmFileService; import com.yxt.anrui.scm.biz.scmvehiclegressionveh.ScmVehicleGressionVehService; @@ -370,7 +372,8 @@ public class ScmVehicleGressionService extends MybatisBaseService scmVehicleGressionVehDtos = dto.getScmVehicleGressionVehs(); + if (scmVehicleGressionVehDtos == null) { return rb.setMsg("请选择车架号！"); } if (dto.getLocationSid().equals(dto.getTargetLocationSid())) { @@ -384,6 +387,7 @@ public class ScmVehicleGressionService extends MybatisBaseService stringStringMap = generateBillNo(userSid); String billNo = getApplyCode(dto); scmVehicleGression.setApplicantNo(billNo); -// if ("1".equals(dto.getProCardStateKey())) { -// scmVehicleGression.setTemporaryCard(dto.getTemporaryCard()); -// } else if ("0".equals(dto.getProCardStateKey())) { -// scmVehicleGression.setTemporaryCard(""); -// } -// if ("1".equals(dto.getInsuranceStateKey())) { // 如果保单状态为否 不保存保单照片 -// List factoryImage = dto.getPolicyImage(); -// if (factoryImage.size() <= 0) { -// return rb.setMsg("保单照片不能为空"); -// } -// scmFileService.deleteByLinkSidAndType(scmVehicleGression.getSid(), type); -// for (String s : factoryImage) { -// if (s.contains(fileUploadComponent.getUrlPrefix())) { -// s1 = s.replace(fileUploadComponent.getUrlPrefix(), ""); -// } -// ScmFile scmFile = new ScmFile(); -// scmFile.setAttachType(type); -// scmFile.setFileName("保单照片"); -// scmFile.setFilePath(s1); -// scmFile.setLinkSid(scmVehicleGression.getSid()); -// scmFileService.save(scmFile); -// } -// } else if ("0".equals(dto.getInsuranceStateKey())) { -// scmFileService.deleteByLinkSidAndType(scmVehicleGression.getSid(), type); -// } - save(scmVehicleGression); //存放车架号 - List vins = dto.getVins(); - if (vins != null) { - for (String vin : vins) { - ScmVehicleGressionVeh scmVehicleGressionVeh = new ScmVehicleGressionVeh(); - scmVehicleGressionVeh.setMainSid(scmVehicleGression.getSid()); - scmVehicleGressionVeh.setVehVin(vin); - BaseVehicleVo baseVehicleVo = baseVehicleFeign.selVehicleByVinNo(vin).getData(); - scmVehicleGressionVeh.setVehSid(baseVehicleVo.getSid()); - scmVehicleGressionVeh.setSettlementStatus(baseVehicleVo.getSettlementStatus()); - scmVehicleGressionVeh.setSettlementStatusValue(baseVehicleVo.getSettlementStatusValue()); - scmVehicleGressionVeh.setTemporaryCardNo(dto.getTemporaryCard()); - scmVehicleGressionVehService.save(scmVehicleGressionVeh); - } + for (ScmVehicleGressionVehDto scmVehicleGressionVehDto : scmVehicleGressionVehDtos) { + ScmVehicleGressionVeh scmVehicleGressionVeh = new ScmVehicleGressionVeh(); + BeanUtil.copyProperties(scmVehicleGressionVehDto, scmVehicleGressionVeh, "sid"); + vinNo = scmVehicleGressionVehDto.getVehVin(); + BaseVehicleVo baseVehicleVo = baseVehicleFeign.selVehicleByVinNo(vinNo).getData(); + scmVehicleGressionVeh.setVehSid(baseVehicleVo.getSid()); + scmVehicleGressionVeh.setMainSid(scmVehicleGression.getSid()); + scmVehicleGressionVehService.save(scmVehicleGressionVeh); } + save(scmVehicleGression); } else { scmVehicleGression = fetchBySid(dto.getSid()); if (scmVehicleGression == null) { @@ -452,19 +426,15 @@ public class ScmVehicleGressionService extends MybatisBaseService vins = dto.getVins(); - if (vins != null) { - for (String vin : vins) { - ScmVehicleGressionVeh scmVehicleGressionVeh = new ScmVehicleGressionVeh(); - scmVehicleGressionVeh.setMainSid(scmVehicleGression.getSid()); - scmVehicleGressionVeh.setVehVin(vin); - BaseVehicleVo baseVehicleVo = baseVehicleFeign.selVehicleByVinNo(vin).getData(); - scmVehicleGressionVeh.setVehSid(baseVehicleVo.getSid()); - scmVehicleGressionVeh.setSettlementStatus(baseVehicleVo.getSettlementStatus()); - scmVehicleGressionVeh.setSettlementStatusValue(baseVehicleVo.getSettlementStatusValue()); - scmVehicleGressionVeh.setTemporaryCardNo(dto.getTemporaryCard()); - scmVehicleGressionVehService.save(scmVehicleGressionVeh); - } + //存放车架号 + for (ScmVehicleGressionVehDto scmVehicleGressionVehDto : scmVehicleGressionVehDtos) { + ScmVehicleGressionVeh scmVehicleGressionVeh = new ScmVehicleGressionVeh(); + BeanUtil.copyProperties(scmVehicleGressionVehDto, scmVehicleGressionVeh, "sid"); + vinNo = scmVehicleGressionVehDto.getVehVin(); + BaseVehicleVo baseVehicleVo = baseVehicleFeign.selVehicleByVinNo(vinNo).getData(); + scmVehicleGressionVeh.setVehSid(baseVehicleVo.getSid()); + scmVehicleGressionVeh.setMainSid(scmVehicleGression.getSid()); + scmVehicleGressionVehService.save(scmVehicleGressionVeh); } } return rb.success().setData(scmVehicleGression.getSid()).setMsg("保存成功"); @@ -485,8 +455,10 @@ public class ScmVehicleGressionService extends MybatisBaseService vins = scmVehicleGressionVehService.fetchVoByMainSid(sid); - vo.setVins(vins); +// List vins = scmVehicleGressionVehService.fetchVoByMainSid(sid); +// vo.setVins(vins); + List scmVehicleGressionVehVos = scmVehicleGressionVehService.selectInfoVoByMainSid(sid); + vo.setScmVehicleGressionVehs(scmVehicleGressionVehVos); vo.setApplicantName(data1.getName()); SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd"); String format = simpleDateFormat.format(new Date()); @@ -517,6 +489,8 @@ public class ScmVehicleGressionService extends MybatisBaseService policyImage = new ArrayList<>(); List image = new ArrayList<>(); AppScmVehicleGressionDetailsVo vo = baseMapper.getCarTransfer(sid); + List scmVehicleGressionVehVos = scmVehicleGressionVehService.selectInfoVoByMainSid(sid); + vo.setScmVehicleGressionVehs(scmVehicleGressionVehVos); if ("1".equals(vo.getInsuranceStateKey())) { vo.setInsuranceShow(true); } @@ -718,15 +692,18 @@ public class ScmVehicleGressionService extends MybatisBaseService vins = dto.getVins(); - for (String vin : vins) { - List sids = scmVehicleGressionVehService.fetchVoByVins(vin); - for (String sid : sids) { - List scmVehicleGressionVos = baseMapper.getlastTimeEqual(sid, dto.getTargetLocationSid()); - if (scmVehicleGressionVos.size() > 0) { - if (StringUtils.isNotBlank(scmVehicleGressionVos.get(0).getNodeState())) { - if (scmVehicleGressionVos.get(0).getNodeState().contains("已办结") || !(scmVehicleGressionVos.get(0).getNodeState().contains("终止")) || !(scmVehicleGressionVos.get(0).getNodeState().contains("申请"))) { - return rb.setMsg("该申请中" + vin + "已存在，请勿重复提交！"); + //存放车架号 + if (r == 1) { + List scmVehicleGressionVehDtos = dto.getScmVehicleGressionVehs(); + for (ScmVehicleGressionVehDto scmVehicleGressionVehDto : scmVehicleGressionVehDtos) { + List sids = scmVehicleGressionVehService.fetchVoByVins(scmVehicleGressionVehDto.getVehVin()); + for (String sid : sids) { + List scmVehicleGressionVos = baseMapper.getlastTimeEqual(sid, dto.getTargetLocationSid()); + if (scmVehicleGressionVos.size() > 0) { + if (StringUtils.isNotBlank(scmVehicleGressionVos.get(0).getNodeState())) { + if (scmVehicleGressionVos.get(0).getNodeState().contains("已办结") || !(scmVehicleGressionVos.get(0).getNodeState().contains("终止")) || !(scmVehicleGressionVos.get(0).getNodeState().contains("申请"))) { + return rb.setMsg("该申请中" + scmVehicleGressionVehDto.getVehVin() + "已存在，请勿重复提交！"); + } } } } @@ -771,7 +748,7 @@ public class ScmVehicleGressionService extends MybatisBaseService voResultBean = flowableFeign.startProcess(bv); UpdateFlowFieldVo ufVo = voResultBean.getData(); @@ -888,7 +865,7 @@ public class ScmVehicleGressionService extends MybatisBaseService stringResultBean = messageFeign.pushMessage(messageFlowableQuery); - }else{ + } else { //推送车辆台账数据 VehicleGression vehicleGression = new VehicleGression(); List list = scmVehicleGressionVehService.fetchVoByMainSid(scmVehicleGression.getSid()); @@ -1166,13 +1143,24 @@ public class ScmVehicleGressionService extends MybatisBaseService list = scmVehicleGressionVehService.fetchVoByMainSid(sid); + if (list.size() > 0) { + for (String s : list) { + vin = s + "," + vin; + List vinSids = scmVehicleGressionVehService.fetchVoByVinSids(s); + for (String vinSid : vinSids) { + BaseVehicleSelectVo data = baseVehicleFeign.details(vinSid).getData(); + ExiCarConfigDetailVo exiCarConfigDetailVo = baseVehicleFeign.selectExiCarConfig(data.getModelSid(), data.getModelConfigSid(), data.getVehModelConfigSid()).getData(); + String model = exiCarConfigDetailVo.getVehicleAlias() + exiCarConfigDetailVo.getCarColor(); + modelName = model + "," + modelName; + } + } + } + temporaryExitPermitInfo.setVinNo(vin); + temporaryExitPermitInfo.setModelName(modelName); temporaryExitPermitInfo.setReason("存放地点变更"); temporaryExitPermitInfo.setCreatName(scmVehicleGression.getOperator()); temporaryExitPermitInfo.setCarryCarName("—"); 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 a70106eb7e..f03111cbe3 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 @@ -68,7 +68,7 @@ public interface ScmVehicleGressionVehMapper extends BaseMapper selectListVo(); @Select("select * from scm_vehicle_gression_veh where mainSid =#{mainSid} ") - List fetchVoByMainSid(@Param("mainSid") String mainSid); + List fetchVoByMainSid(@Param("mainSid") String mainSid); @Delete("delete from scm_vehicle_gression_veh where mainSid =#{sid}") void deleteByMainSid(@Param("sid") String sid); 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 a42af723ec..1484a45b77 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 @@ -107,8 +107,8 @@ public class ScmVehicleGressionVehService extends MybatisBaseService fetchVoByMainSid(String mainSid) { List list = new ArrayList<>(); - List vos = baseMapper.fetchVoByMainSid(mainSid); - for (ScmVehicleGressionVehDetailsVo vo : vos) { + List vos = baseMapper.fetchVoByMainSid(mainSid); + for (ScmVehicleGressionVehVo vo : vos) { list.add(vo.getVehVin()); } return list; @@ -126,4 +126,18 @@ public class ScmVehicleGressionVehService extends MybatisBaseService fetchVoByVinSids(String vin) { + List list = new ArrayList<>(); + List vos = baseMapper.fetchVoByVins(vin); + for (ScmVehicleGressionVehDetailsVo vo : vos) { + list.add(vo.getVehSid()); + } + return list; + } + + public List selectInfoVoByMainSid(String sid) { + List vos = baseMapper.fetchVoByMainSid(sid); + return vos; + } } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppGressionDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppGressionDetailsVo.java index 49146cafdc..aee49d4eb6 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppGressionDetailsVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppGressionDetailsVo.java @@ -113,4 +113,7 @@ public class AppGressionDetailsVo implements Vo { @ApiModelProperty("现场照片") private List image; + @ApiModelProperty("车架号") + private List scmVehicleGressionVehs; + } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppGressionDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppGressionDto.java index 0f94ca66d0..c659ca0bb2 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppGressionDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppGressionDto.java @@ -21,6 +21,9 @@ public class AppGressionDto implements Dto { @ApiModelProperty("流程实例id") private String procInsId;*/ + @ApiModelProperty("车架号") + private List scmVehicleGressionVehs; + @ApiModelProperty("用户sid") private String userSid; @@ -28,13 +31,13 @@ public class AppGressionDto implements Dto { @JsonProperty("applyId") private String applicantNo; - @ApiModelProperty("申请人名称") - @JsonProperty("applyNmae") - private String applicantName; - - @ApiModelProperty("申请日期") - @JsonProperty("applyDate") - private String applicantDate; +// @ApiModelProperty("申请人名称") +// @JsonProperty("applyNmae") +// private String applicantName; +// +// @ApiModelProperty("申请日期") +// @JsonProperty("applyDate") +// private String applicantDate; @ApiModelProperty("现存放地点") @JsonProperty("nowAddress") @@ -48,12 +51,12 @@ public class AppGressionDto implements Dto { @JsonProperty("nowAddressSid") private String locationSid; - @ApiModelProperty("车架号") - @JsonProperty("vin") - private String vinNo; - - @ApiModelProperty("车架号") - private List vins; +// @ApiModelProperty("车架号") +// @JsonProperty("vin") +// private String vinNo; +// +// @ApiModelProperty("车架号") +// private List vins; @ApiModelProperty("目标库") @JsonProperty("targetAddress") @@ -87,9 +90,9 @@ public class AppGressionDto implements Dto { @JsonProperty("insuranceStateKey") private String InsuranceStateKey; - @ApiModelProperty("保单照片") - @JsonProperty("policyImage") - private List policyImage; +// @ApiModelProperty("保单照片") +// @JsonProperty("policyImage") +// private List policyImage; @ApiModelProperty("临牌状态") private String proCardState; @@ -97,12 +100,12 @@ public class AppGressionDto implements Dto { @ApiModelProperty("临牌状态") private String proCardStateKey; - @ApiModelProperty("临牌") - @JsonProperty("proCard") - private String temporaryCard; - - @ApiModelProperty("现场照片") - private List image; +// @ApiModelProperty("临牌") +// @JsonProperty("proCard") +// private String temporaryCard; +// +// @ApiModelProperty("现场照片") +// private List image; @ApiModelProperty("现场地址") private String address; @@ -110,4 +113,12 @@ public class AppGressionDto implements Dto { @ApiModelProperty("经纬度") @JsonProperty("addressCode") private String locationCode; + + @ApiModelProperty("调出方负责人名称") + @JsonProperty("personName") + private String staffName; + + @ApiModelProperty("调出方负责人用户sid") + @JsonProperty("personSid") + private String personUserSid; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppGressionInfoVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppGressionInfoVo.java index e9749fb8f5..2201e582a4 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppGressionInfoVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppGressionInfoVo.java @@ -53,6 +53,9 @@ public class AppGressionInfoVo implements Vo { @ApiModelProperty("车架号") private List vins; // 车架号 + @ApiModelProperty("车架号") + private List scmVehicleGressionVehs; + @ApiModelProperty("目标库") @JsonProperty("targetAddress") private String targetLocation; diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/VehicleGressionVehDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/VehicleGressionVehDto.java new file mode 100644 index 0000000000..67ebb06dfc --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/VehicleGressionVehDto.java @@ -0,0 +1,26 @@ +package com.yxt.anrui.terminal.api.supplychain.scmvehiclegression; + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class VehicleGressionVehDto implements Dto { + + private static final long serialVersionUID = 1981618379783367050L; + private String sid; // sid + + @ApiModelProperty("移位申请单sid") + private String mainSid; // 移位申请单sid + @ApiModelProperty("车辆sid") + private String vehSid; // 车辆sid + @ApiModelProperty("车架号") + private String vehVin; // 车架号 + @ApiModelProperty("买断状态key") + private String settlementStatus; // 买断状态key + @ApiModelProperty("买断状态value") + private String settlementStatusValue; // 买断状态value + @ApiModelProperty("临时牌照号码") + private String temporaryCardNo; // 临时牌照号码 + +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/VehicleGressionVehVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/VehicleGressionVehVo.java new file mode 100644 index 0000000000..7bc52f122b --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/VehicleGressionVehVo.java @@ -0,0 +1,27 @@ +package com.yxt.anrui.terminal.api.supplychain.scmvehiclegression; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class VehicleGressionVehVo implements Vo { + + private static final long serialVersionUID = 6115486403760079153L; + + private String sid; // sid + + @ApiModelProperty("移位申请单sid") + private String mainSid; // 移位申请单sid + @ApiModelProperty("车辆sid") + private String vehSid; // 车辆sid + @ApiModelProperty("车架号") + private String vehVin; // 车架号 + @ApiModelProperty("买断状态key") + private String settlementStatus; // 买断状态key + @ApiModelProperty("买断状态value") + private String settlementStatusValue; // 买断状态value + @ApiModelProperty("临时牌照号码") + private String temporaryCardNo; // 临时牌照号码 + +}