diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstateDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstateDto.java
index cf2352da3e..5da41e79fa 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstateDto.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstateDto.java
@@ -49,13 +49,14 @@ import lombok.Data;
@ApiModel(value = "车辆临时状态表 数据传输对象", description = "车辆临时状态表 数据传输对象")
public class BaseVehicleTempstateDto implements Dto {
- private String sid; // sid
+ private static final long serialVersionUID = 600474885071180898L;
+ private String sid;
- @ApiModelProperty("车辆sid")
- private String vehSid; // 车辆sid
- @ApiModelProperty("数据字典项key,如移位申请中 001 状态")
- private String tempStateKey; // 数据字典项key,如移位申请中 001 状态
- @ApiModelProperty("业务sid")
- private String busSid; // 业务sid
+ @ApiModelProperty("车辆sid")
+ private String vehSid;
+ @ApiModelProperty("数据字典项key,如移位申请中 001 状态")
+ private String tempStateKey;
+ @ApiModelProperty("业务sid")
+ private String busSid;
}
\ No newline at end of file
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstateFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstateFeign.java
index 9aaf8857f6..b0a59fcd83 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstateFeign.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstateFeign.java
@@ -33,6 +33,8 @@ import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
+import java.util.List;
+
/**
* Project: comc(comc)
* File: BaseVehicleTempstateFeign.java
@@ -78,4 +80,13 @@ public interface BaseVehicleTempstateFeign {
@DeleteMapping("/delByBusSid")
@ResponseBody
public ResultBean delByBusSid(@RequestParam("businessSid") String businessSid);
+
+ @ApiOperation("查询所有审批中的车架号")
+ @GetMapping("/selectAll/{s}")
+ @ResponseBody
+ ResultBean> selectAll(@PathVariable("s") String s);
+ @ApiOperation("查询所有审批中的车架号")
+ @GetMapping("/selectAllOne/{s}")
+ @ResponseBody
+ ResultBean> selectAllOne(@PathVariable("s") String s);
}
\ No newline at end of file
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstateFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstateFeignFallback.java
index 5f714cdcf0..103d5d1df2 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstateFeignFallback.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstateFeignFallback.java
@@ -74,4 +74,14 @@ public class BaseVehicleTempstateFeignFallback implements BaseVehicleTempstateFe
public ResultBean delByBusSid(String businessSid) {
return null;
}
+
+ @Override
+ public ResultBean> selectAll(String s) {
+ return null;
+ }
+
+ @Override
+ public ResultBean> selectAllOne(String s) {
+ return null;
+ }
}
\ No newline at end of file
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstateVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstateVo.java
index 1fd32c6ca5..c3f5c33b99 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstateVo.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstateVo.java
@@ -49,13 +49,13 @@ import lombok.Data;
@ApiModel(value = "车辆临时状态表 视图数据对象", description = "车辆临时状态表 视图数据对象")
public class BaseVehicleTempstateVo implements Vo {
- private String sid; // sid
+ private String sid;
- @ApiModelProperty("车辆sid")
- private String vehSid; // 车辆sid
- @ApiModelProperty("数据字典项key,如移位申请中 001 状态")
- private String tempStateKey; // 数据字典项key,如移位申请中 001 状态
- @ApiModelProperty("业务sid")
- private String busSid; // 业务sid
+ @ApiModelProperty("车辆sid")
+ private String vehSid;
+ @ApiModelProperty("数据字典项key,如移位申请中 001 状态")
+ private String tempStateKey;
+ @ApiModelProperty("业务sid")
+ private String busSid;
}
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDetailsVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDetailsVo.java
index 8c5be40ead..99b2d7706f 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDetailsVo.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDetailsVo.java
@@ -56,4 +56,5 @@ public class BusVehicleApplyDetailsVo implements Vo {
private String userSids;
private String userNames;
+ private String nodeState;
}
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/AppCrmCustomerFileDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/AppCrmCustomerFileDto.java
index 0d6606959f..c7eb542d2b 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/AppCrmCustomerFileDto.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/AppCrmCustomerFileDto.java
@@ -1,11 +1,9 @@
package com.yxt.anrui.base.api.commoncontract;
-import com.fasterxml.jackson.annotation.JsonProperty;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import java.math.BigDecimal;
import java.util.List;
@Data
@@ -14,23 +12,23 @@ public class AppCrmCustomerFileDto implements Dto {
@ApiModelProperty("合同sid")
private String contractSid;
- @ApiModelProperty("单台价格")
- private BigDecimal price;
+/* @ApiModelProperty("单台价格")
+ private BigDecimal price;*/
- @ApiModelProperty("数量")
- private String number;
+/* @ApiModelProperty("数量")
+ private String number;*/
- @ApiModelProperty("车型")
- private String model;
+/* @ApiModelProperty("车型")
+ private String model;*/
- @ApiModelProperty("乙方名称")
- private String partyB;
+/* @ApiModelProperty("乙方名称")
+ private String partyB;*/
- @ApiModelProperty("合同编号")
- private String contractId;
+/* @ApiModelProperty("合同编号")
+ private String contractId;*/
- @ApiModelProperty("合同价格")
- private String contractPrice;
+/* @ApiModelProperty("合同价格")
+ private String contractPrice;*/
@ApiModelProperty("新车买卖合同")
private List contractImages;
@@ -41,8 +39,8 @@ public class AppCrmCustomerFileDto implements Dto {
@ApiModelProperty("身份证图片")
private List idCardImages;
- @ApiModelProperty("客户类型")
- private String customerKey;
+ /* @ApiModelProperty("客户类型")
+ private String customerKey;*/
@ApiModelProperty("任务id")
private String taskId;
@@ -56,8 +54,8 @@ public class AppCrmCustomerFileDto implements Dto {
@ApiModelProperty("是否是档案库里的身份证")
private boolean idCardArchives;
- @ApiModelProperty("客户sid")
- private String customerSid;
+/* @ApiModelProperty("客户sid")
+ private String customerSid;*/
@ApiModelProperty("合同附件")
private String appdixUrl;
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/DictCommonEnum.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/DictCommonEnum.java
index 6024f10f92..96a15661f0 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/DictCommonEnum.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/DictCommonEnum.java
@@ -78,4 +78,20 @@ public class DictCommonEnum {
}
}
+ @Getter
+ public static enum ScmFileType {
+ BD_IMAGE("04", "保单照片"),
+ XC_IMAGE("05", "现场照片"),
+ ;
+
+ private final String code;
+ private final String remarks;
+
+ ScmFileType(String code, String remarks) {
+ this.code = code;
+ this.remarks = remarks;
+ }
+
+ }
+
}
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufactorsubscription/BaseManufactorSubscriptionService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufactorsubscription/BaseManufactorSubscriptionService.java
index ef13b2d40d..f10f6e4375 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufactorsubscription/BaseManufactorSubscriptionService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufactorsubscription/BaseManufactorSubscriptionService.java
@@ -30,6 +30,7 @@ import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.base.api.basemanufactorsubscription.*;
+import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApply;
import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApplyDetailsVo;
import com.yxt.anrui.base.api.busvehicleapplydetail.BusVehicleApplyDetailVo;
import com.yxt.anrui.base.api.busvehicleorder.BusVehicleOrderListDto;
@@ -214,6 +215,11 @@ public class BaseManufactorSubscriptionService extends MybatisBaseService
and bvc.useOrgSid = #{orgSid}
+ and length(bvc.guidedPrice)>0
ORDER BY nowCarNum DESC
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml
index c0a884fdd7..3752cda217 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml
@@ -572,7 +572,7 @@
(SELECT count(*)
FROM base_vehmodel_config bvc
WHERE bvc.modelSid = bvm.sid
- AND bvc.useOrgSid = #{useOrgSid}) AS
+ AND bvc.useOrgSid = #{useOrgSid} and length(bvc.guidedPrice)>0) AS
configNum,
(SELECT count(*)
FROM base_vehicle bv
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 4b9ef582f4..f83bd8ee25 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
@@ -16,6 +16,7 @@ import com.yxt.anrui.base.biz.basemodelconfig.BaseModelConfigService;
import com.yxt.anrui.base.biz.basevehiclebrand.BaseVehicleBrandService;
import com.yxt.anrui.base.biz.basevehiclecertificate.BaseVehicleCertificateService;
import com.yxt.anrui.base.biz.basevehiclemodel.BaseVehicleModelService;
+import com.yxt.anrui.base.biz.basevehicletempstate.BaseVehicleTempstateService;
import com.yxt.anrui.base.biz.busvehicleinquiry.BusVehicleInquiryService;
import com.yxt.anrui.base.common.enums.OperVehicleState;
import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
@@ -28,7 +29,10 @@ import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import io.swagger.annotations.Api;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
@@ -88,6 +92,9 @@ public class BaseVehicleRest implements BaseVehicleFeign {
*/
@Autowired
private FinKingDeeFeign finKingDeeFeign;
+ @Autowired
+ private BaseVehicleTempstateService baseVehicleTempstateService;
+
@Override
public ResultBean> pagerList(@RequestBody PagerQuery pagerQuery) {
ResultBean> rb = ResultBean.fireFail();
@@ -847,7 +854,9 @@ public class BaseVehicleRest implements BaseVehicleFeign {
return rb.setMsg("用户sid不能为空");
}
PagerVo page = new PagerVo<>();
- IPage iPage = baseVehicleService.getPcVinByWarehouseSid(pagerQuery);
+ //查询在申请的存放地点变更车辆的车辆sid
+ List stringList = baseVehicleTempstateService.selectAll("001");
+ IPage iPage = baseVehicleService.getPcVinByWarehouseSid(pagerQuery,stringList);
PagerVo pagerVo = PagerUtil.pageToVo(iPage, page);
return new ResultBean>().success().setData(pagerVo);
}
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
index 1a5f121dee..b78d00dbb2 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
@@ -1434,7 +1434,7 @@ public class BaseVehicleService extends MybatisBaseService> getVinByWarehouseSid(String warehouseSid, String userSid) {
ResultBean rb = ResultBean.fireFail();
QueryWrapper qw = new QueryWrapper<>();
- List carSidList = baseVehicleTempstateService.selectAll();
+ List carSidList = baseVehicleTempstateService.selectAll("001");
ResultBean resultBean = sysStaffOrgFeign.getPathSidByUserSid(userSid);
if (StringUtils.isNotBlank(resultBean.getData())) {
qw.eq("bv.createOrgSid", resultBean.getData());
@@ -1769,7 +1769,7 @@ public class BaseVehicleService extends MybatisBaseService getPcVinByWarehouseSid(PagerQuery pagerQuery) {
+ public IPage getPcVinByWarehouseSid(PagerQuery pagerQuery, List vinList) {
IPage page = PagerUtil.queryToPage(pagerQuery);
QueryWrapper qw = new QueryWrapper();
VinByWarehouseQuery params = pagerQuery.getParams();
@@ -1784,6 +1784,9 @@ public class BaseVehicleService extends MybatisBaseService 0) {
qw.notIn("bv.vinNo", params.getVins());
}
+ if (vinList.size() > 0) {
+ qw.notIn("bv.sid", vinList);
+ }
qw.eq("bv.isDelete", 0);
//库存或调入或采购退库中
qw.and(wrapper -> wrapper.eq("bv.vehicleState", VehicleState.StockEnum.STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.DR_STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.RETURNING_STOCK.getCode()));
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicletempstate/BaseVehicleTempstateMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicletempstate/BaseVehicleTempstateMapper.java
index 9f36382c09..7565988222 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicletempstate/BaseVehicleTempstateMapper.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicletempstate/BaseVehicleTempstateMapper.java
@@ -62,10 +62,12 @@ public interface BaseVehicleTempstateMapper extends BaseMapper selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw);
- @Select("select * from base_vehicle_tempstate")
- List selectListVo();
+ @Select("select * from base_vehicle_tempstate where tempStateKey = #{state} ")
+ List selectListVo(String state);
@Delete("delete from base_vehicle_tempstate where busSid=#{businessSid}")
void deleteByBusSid(@Param("businessSid") String businessSid);
+ @Select("select * from base_vehicle_tempstate where tempStateKey = #{state} ")
+ List selectAllOne(String s);
}
\ No newline at end of file
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicletempstate/BaseVehicleTempstateRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicletempstate/BaseVehicleTempstateRest.java
index 86ee6f35de..3fff9ffad3 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicletempstate/BaseVehicleTempstateRest.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicletempstate/BaseVehicleTempstateRest.java
@@ -34,6 +34,8 @@ import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import java.util.List;
+
/**
* Project: comc(comc)
@@ -98,4 +100,18 @@ public class BaseVehicleTempstateRest implements BaseVehicleTempstateFeign {
baseVehicleTempstateService.delByBusSid(businessSid);
return rb.success();
}
+
+ @Override
+ public ResultBean> selectAll(String s) {
+ ResultBean> rb = ResultBean.fireFail();
+ List stringList = baseVehicleTempstateService.selectAllOne(s);
+ return rb.success().setData(stringList);
+ }
+
+ @Override
+ public ResultBean> selectAllOne(String s) {
+ ResultBean> rb = ResultBean.fireFail();
+ List stringList = baseVehicleTempstateService.selectAll(s);
+ return rb.success().setData(stringList);
+ }
}
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicletempstate/BaseVehicleTempstateService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicletempstate/BaseVehicleTempstateService.java
index 34c64b2f51..d54a22d901 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicletempstate/BaseVehicleTempstateService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicletempstate/BaseVehicleTempstateService.java
@@ -29,14 +29,11 @@ import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.base.api.basevehicletempstate.*;
-import org.apache.commons.lang3.StringUtils;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery;
-import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
-
-
+import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
@@ -109,9 +106,9 @@ public class BaseVehicleTempstateService extends MybatisBaseService selectAll() {
+ public List selectAll(String state) {
List list = new ArrayList<>();
- List baseVehicleTempstateVos = baseMapper.selectListVo();
+ List baseVehicleTempstateVos = baseMapper.selectListVo(state);
if (baseVehicleTempstateVos.size() > 0) {
for (BaseVehicleTempstateVo baseVehicleTempstateVo : baseVehicleTempstateVos) {
list.add(baseVehicleTempstateVo.getVehSid());
@@ -119,4 +116,8 @@ public class BaseVehicleTempstateService extends MybatisBaseService selectAllOne(String s) {
+ return baseMapper.selectAllOne(s);
+ }
}
\ No newline at end of file
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyMapper.java
index 0adec1b570..b726ee1f6d 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyMapper.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyMapper.java
@@ -45,4 +45,6 @@ public interface BusVehicleApplyMapper extends BaseMapper {
int abandonApply(@Param("sidsList") List sidsList);
int selectByNodeState(String join);
+
+ int selectCountBySids(String join);
}
\ No newline at end of file
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyMapper.xml
index ed118cd389..be49b046c9 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyMapper.xml
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyMapper.xml
@@ -94,4 +94,11 @@
where nodeState <> '已办结'
and find_in_set(sid, #{join})
+
+
\ No newline at end of file
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java
index 632fb0a95f..732268ad54 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java
@@ -831,10 +831,19 @@ public class BusVehicleApplyService extends MybatisBaseService 0) {
- return rb.setMsg("作废的数据中包含流程未完结的数据,不允许作废");
+ return rb.setMsg("选择作废的数据中包含流程未完结的数据,不允许作废");
+ }
+ //查询需要作废的数据中是否包含已认款的
+ int counts = baseMapper.selectCountBySids(StringUtils.join(sids, ","));
+ if(counts>0){
+ return rb.setMsg("选择作废的数据中包含已认款的数据,不允许作废");
}
List sidsList = Arrays.asList(sids);
int i = baseMapper.abandonApply(sidsList);
return rb.success();
}
+
+ public BusVehicleApply selectByCode(String proSchAppNo) {
+ return baseMapper.selectByCode(proSchAppNo);
+ }
}
\ No newline at end of file
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.xml
index bb429d6cd4..9928c5f680 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.xml
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.xml
@@ -90,7 +90,7 @@
, #{names}
, '%')
- order by id
+ order by id desc
@@ -112,7 +112,8 @@
staffSid as userSid,
customerTypeKey as customerKey,
modelSid,
- configSid
+ configSid,
+ customerSid
FROM common_contract
WHERE sid = #{contractSid}
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java
index 6cacfbe296..2951c79e80 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java
@@ -1087,13 +1087,6 @@ public class CommonContractService extends MybatisBaseService {
aa.push(element.sid)
+ bb.push(element.state)
})
this.sids = aa
+ this.nodeState_list = bb
console.log('获取sids数组', this.sids)
},
// 序号
@@ -442,6 +460,9 @@ export default {
},
handleEdit(row) {
this.dialogVisible = true
+ this.$nextTick(() => {
+ this.$refs['form_obj'].clearValidate()
+ })
const aa = []
aa.push(row.sid)
this.sids = aa
@@ -451,6 +472,9 @@ export default {
this.$message({ showClose: true, type: 'error', message: '请选择至少一条以上记录进行批量处理' })
return
}
+ this.$nextTick(() => {
+ this.$refs['form_obj'].clearValidate()
+ })
this.dialogVisible = true
},
backData(val) {
@@ -480,10 +504,47 @@ export default {
}
})
},
+ doCancellation() {
+ if (this.sids.length === 0) {
+ this.$message({ showClose: true, type: 'error', message: '请选择至少一条记录进行作废操作' })
+ return
+ }
+ if (this.nodeState_list.length > 0) {
+ for (var i = 0; i < this.nodeState_list.length; i++) {
+ if (this.nodeState_list[i] !== '未支付') {
+ this.$message({ showClose: true, type: 'error', message: '因选择的记录中包含已支付的,操作失败' })
+ return
+ }
+ }
+ }
+ const tip = '请确认是否作废所选 ' + this.sids.length + ' 条记录?'
+ this.$confirm(tip, '提示', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning'
+ }).then(() => {
+ const loading = this.$loading({
+ lock: true,
+ text: 'Loading',
+ spinner: 'el-icon-loading',
+ background: 'rgba(0, 0, 0, 0.7)'
+ })
+ req.abandonApply(this.sids).then(resp => {
+ loading.close()
+ if (resp.success) {
+ this.$message({ type: 'success', message: resp.msg, showClose: true })
+ this.getList()
+ }
+ }).catch(e => {
+ loading.close()
+ })
+ }).catch(() => {})
+ },
handColse() {
this.dialogVisible = false
this.formobj = {}
this.diploma_list = []
+ this.$refs['form_obj'].resetFields()
},
doClose() {
this.$store.dispatch('tagsView/delView', this.$route)
diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordFeign.java
index 86c681ce8c..b258baa7c4 100644
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordFeign.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordFeign.java
@@ -70,7 +70,7 @@ public interface FinPaymentrecordFeign {
ResultBean update(@RequestBody FinPaymentrecordUpdateDto dto);
@ApiOperation("作废")
- @PutMapping("/updateState/{sid}")
+ @PostMapping("/updateState")
@ResponseBody
- ResultBean updateState(@PathVariable("sid")String sid);
+ ResultBean updateState(@RequestBody String[] sids);
}
\ No newline at end of file
diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordFeignFallback.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordFeignFallback.java
index 1582131aaa..3b775375e0 100644
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordFeignFallback.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordFeignFallback.java
@@ -66,7 +66,7 @@ public class FinPaymentrecordFeignFallback implements FinPaymentrecordFeign {
}
@Override
- public ResultBean updateState(String sid) {
+ public ResultBean updateState(String[] sids) {
return null;
}
}
\ No newline at end of file
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordMapper.java
index a6ff9cb5a6..0b16ddb732 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordMapper.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordMapper.java
@@ -65,7 +65,7 @@ public interface FinPaymentrecordMapper extends BaseMapper {
List selectApplySids(@Param("list") List sids);
- int updateStateBySid(@Param("sid") String sid, @Param("state") int i);
+ int updateStateBySid(@Param("sid")String sid, @Param("state") int i);
List selectApplySidBySid(List sids);
}
\ No newline at end of file
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordMapper.xml
index d2abe5608e..fac18a24e4 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordMapper.xml
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordMapper.xml
@@ -12,7 +12,8 @@
fp.payRemark,
case fp.state
when 1 then '未支付'
- when 2 then '已支付' end as state,
+ when 2 then '已支付'
+ when 3 then '作废' end as state,
DATE_FORMAT(fp.createTime, '%Y-%m-%d') as createTime,
fp.busSid billNo,
fp.costTitleValue,
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordRest.java
index bc430d871a..f508d1b341 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordRest.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordRest.java
@@ -73,7 +73,7 @@ public class FinPaymentrecordRest implements FinPaymentrecordFeign {
}
@Override
- public ResultBean updateState(String sid) {
- return finPaymentrecordService.updateState(sid);
+ public ResultBean updateState(String[] sids) {
+ return finPaymentrecordService.updateState(sids);
}
}
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 9e12d9ddb7..dcf276dd4f 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
@@ -31,6 +31,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.base.api.basemanufactorsubscription.BaseManufUpdateDto;
import com.yxt.anrui.base.api.basemanufactorsubscription.BaseManufactorSubscriptionFeign;
+import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApplyDetailsVo;
+import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApplyFeign;
+import com.yxt.anrui.base.common.enums.DictCommonEnum;
import com.yxt.anrui.base.common.enums.ManPurOrderType;
import com.yxt.anrui.fin.api.finpaymentapply.FinPaymentapply;
import com.yxt.anrui.fin.api.finpaymentrecord.*;
@@ -49,6 +52,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
@@ -78,6 +82,8 @@ public class FinPaymentrecordService extends MybatisBaseService listPageVo(PagerQuery pq) {
FinPaymentrecordQuery query = pq.getParams();
@@ -126,7 +132,6 @@ public class FinPaymentrecordService extends MybatisBaseService sids = dto.getSids();
//判断选择的sids的付款申请的收款单位是否一致
List applySids = baseMapper.selectApplySids(sids);
-// List applyCodes = finPaymentapplyService.selectCodeBySid(applySids);
if (applySids.size() > 1) {
applySids = applySids.stream().distinct().collect(Collectors.toList());
if (applySids.size() > 1) {
@@ -246,17 +251,34 @@ public class FinPaymentrecordService extends MybatisBaseService sidsList = Arrays.asList(sids);
+ for (String s : sidsList) {
+ FinPaymentrecord finPaymentrecord = fetchBySid(s);
+ if (!DictCommonEnum.costType.CG_TYPE.getCode().equals(finPaymentrecord.getCostTypeKey())) {
+ return rb.setMsg("选择的数据中包含款项类别非排产的数据");
+ } else {
+ ResultBean resultBean = busVehicleApplyFeign.fetchSid(finPaymentrecord.getApplySid());
+ BusVehicleApplyDetailsVo busVehicleApplyDetailsVo = resultBean.getData();
+ if (busVehicleApplyDetailsVo != null) {
+ if (!"作废".equals(busVehicleApplyDetailsVo.getNodeState())) {
+ return rb.setMsg("选择的数据中包含未作废的厂家采购");
+ }
+ }
+ }
+ if (finPaymentrecord.getState() == 2) {
+ return rb.setMsg("选择的数据中包含已打款的数据,不能作废");
+ }
+ }
+ for (String s : sidsList) {
+ int i = baseMapper.updateStateBySid(s, 3);
}
- int i = baseMapper.updateStateBySid(sid, 3);
return rb.success();
}
}
\ No newline at end of file
diff --git a/anrui-gateway/pom.xml b/anrui-gateway/pom.xml
index 2fad28d007..c5a2189111 100644
--- a/anrui-gateway/pom.xml
+++ b/anrui-gateway/pom.xml
@@ -31,6 +31,7 @@
org.projectlombok
lombok
+ 1.18.24
true
@@ -65,6 +66,7 @@
org.springframework.boot
spring-boot-maven-plugin
+ 2.5.6
diff --git a/anrui-gateway/src/main/resources/application-devv.yml b/anrui-gateway/src/main/resources/application-devv.yml
index b4cd9fb9f3..b1765f73e1 100644
--- a/anrui-gateway/src/main/resources/application-devv.yml
+++ b/anrui-gateway/src/main/resources/application-devv.yml
@@ -4,16 +4,16 @@ spring:
cloud:
nacos:
discovery:
- server-addr: 127.0.0.1:8848
+ server-addr: 39.104.100.138:8848
redis:
database: 3 # Redis数据库索引(默认为0)
- host: 127.0.0.1
+ host: 39.104.100.138
jedis:
pool:
max-active: -1 #连接池最大连接数(使用负值表示没有限制)
max-idle: 8 #连接池中的最大空闲连接
max-wait: -1 # 连接池最大阻塞等待时间(使用负值表示没有限制)
min-idle: 0 # 连接池中的最小空闲连接
- password: 123456
+ password:
port: 6379
timeout: 0 # 连接超时时间(毫秒)
\ No newline at end of file
diff --git a/anrui-gateway/src/main/resources/application-test.yml b/anrui-gateway/src/main/resources/application-test.yml
index efaa1c666f..8515161e26 100644
--- a/anrui-gateway/src/main/resources/application-test.yml
+++ b/anrui-gateway/src/main/resources/application-test.yml
@@ -4,16 +4,16 @@ spring:
cloud:
nacos:
discovery:
- server-addr: 39.104.100.138:8848
+ server-addr: 172.18.0.5:8848
redis:
database: 3 # Redis数据库索引(默认为0)
- host: 39.104.100.138
+ host: 172.18.0.7
jedis:
pool:
max-active: -1 #连接池最大连接数(使用负值表示没有限制)
max-idle: 8 #连接池中的最大空闲连接
max-wait: -1 # 连接池最大阻塞等待时间(使用负值表示没有限制)
min-idle: 0 # 连接池中的最小空闲连接
- password: 123456
+ password:
port: 6379
timeout: 0 # 连接超时时间(毫秒)
\ No newline at end of file
diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserVo.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserVo.java
index dd7ddae285..df03f08fe6 100644
--- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserVo.java
+++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserVo.java
@@ -2,6 +2,7 @@ package com.yxt.anrui.portal.api.sysuser;
import com.fasterxml.jackson.annotation.JsonProperty;
+import com.yxt.anrui.portal.api.sysuser.app.OrgList;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -80,4 +81,8 @@ public class SysUserVo implements Vo {
private String token;
@ApiModelProperty(value = "角色sids")
private List roleSids = new ArrayList<>();
+
+ private List orgList = new ArrayList<>();
+ private String defaultOrgPath;
+ private String defaultOrgPathName;
}
diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/OrgList.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/OrgList.java
new file mode 100644
index 0000000000..39509c80fe
--- /dev/null
+++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/OrgList.java
@@ -0,0 +1,17 @@
+package com.yxt.anrui.portal.api.sysuser.app;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/9/21 9:26
+ * @Description
+ */
+@Data
+public class OrgList implements Vo {
+ private static final long serialVersionUID = -2867882982421321776L;
+
+ private String orgName;
+ private String orgPath;
+}
diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java
index ae3f0e87ab..7ecd5563b7 100644
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java
@@ -5,6 +5,8 @@ import com.yxt.anrui.portal.api.sysorganization.*;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo;
import com.yxt.anrui.portal.biz.sysstaffinfo.SysStaffinfoService;
import com.yxt.anrui.portal.biz.sysstafforg.SysStaffOrgService;
+import com.yxt.anrui.portal.biz.sysuser.SysUserService;
+import com.yxt.common.base.config.RedisUtil;
import com.yxt.common.base.config.component.FileUploadComponent;
import com.yxt.common.base.utils.QRCodeUtil;
import com.yxt.common.base.utils.StringUtils;
@@ -19,10 +21,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.io.File;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+
+import static java.util.stream.Collectors.toList;
/**
* Project: anrui_portal(门户建设)
@@ -50,6 +51,10 @@ public class SysOrganizationRest implements SysOrganizationFeign {
private SysStaffinfoService sysStaffinfoService;
@Autowired
private FileUploadComponent fileUploadComponent;
+ @Autowired
+ private SysUserService sysUserService;
+ @Autowired
+ private RedisUtil redisUtil;
@Override
public ResultBean> listPage(@RequestBody PagerQuery pq) {
@@ -98,6 +103,8 @@ public class SysOrganizationRest implements SysOrganizationFeign {
@Transactional(rollbackFor = Exception.class)
public ResultBean update(SysOrganizationDto dto, String sid) {
ResultBean rb = ResultBean.fireFail();
+ //查询该机构下的所有分管人员
+ List stringList = sysStaffOrgService.selectByOrgSid(sid);
//根据组织sid查询组织信息
SysOrganization sysOrganization = sysOrganizationService.fetchBySid(sid);
if (sysOrganization == null) {
@@ -131,6 +138,42 @@ public class SysOrganizationRest implements SysOrganizationFeign {
}
}
sysOrganizationService.updateBySid(dto.toMap(), sid);
+ //==========================添加清空变化的用户的token
+ //查询分管人员
+ List stringList1 = new ArrayList<>();
+ List reduce1 = new ArrayList<>();
+ if(StringUtils.isNotBlank(fgStaffSid)){
+ stringList1 = Arrays.asList(fgStaffSid.split(","));
+ reduce1 = stringList1.stream().filter(item -> !stringList.contains(item)).collect(toList());
+ }else{
+ reduce1 = stringList;
+ }
+ String orgSid1 = sysStaffOrgService.getOrgByOrgSid(sid);
+ if(reduce1.size()>0){
+ for (String s : reduce1){
+ //查询该人员的组织机构list
+ List sysStaffOrgVos = sysStaffOrgService.selectByStaffS(s);
+ List orgList = new ArrayList<>();
+ if (sysStaffOrgVos.size() > 0) {
+ for (SysStaffOrgVo vv : sysStaffOrgVos) {
+ String orgSid = sysStaffOrgService.getOrgByOrgSid(vv.getOrgSid());
+ SysOrganization ss = sysOrganizationService.fetchBySid(orgSid);
+ if (ss != null) {
+ orgList.add(orgSid);
+ } else {
+ continue;
+ }
+ }
+ }
+ if(!orgList.contains(orgSid1)){
+ //根据staffSid查询token
+ String token = sysUserService.selectByStaffsid(s).getToken();
+ //清空该token
+ redisUtil.remove(token);
+ }
+ }
+
+ }
return rb.success();
}
diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java
index cfce32800f..ca0e262de6 100644
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java
@@ -14,6 +14,7 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo;
import com.yxt.anrui.portal.biz.sysstaffinfo.SysStaffinfoService;
import com.yxt.anrui.portal.biz.sysstafforg.SysStaffOrgService;
import com.yxt.anrui.portal.biz.sysuser.SysUserService;
+import com.yxt.common.base.config.RedisUtil;
import com.yxt.common.base.config.component.FileUploadComponent;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
@@ -27,6 +28,8 @@ import org.springframework.transaction.annotation.Transactional;
import java.util.*;
+import static java.util.stream.Collectors.toList;
+
/**
* Project: anrui_portal(门户建设)
* File: SysOrganizationService.java
@@ -52,6 +55,8 @@ public class SysOrganizationService extends MybatisBaseService listPage(PagerQuery pq) {
SysOrganizationQuery query = pq.getParams();
@@ -163,14 +168,28 @@ public class SysOrganizationService extends MybatisBaseService0){
- return rb.setMsg(sysStaffinfo.getName()+"已在本部门,不能设置分管");
+ if (count > 0) {
+ return rb.setMsg(sysStaffinfo.getName() + "已在本部门,不能设置分管");
}
}
+ //查询该人员的组织机构list
+ List sysStaffOrgVos = sysStaffOrgService.selectByStaffS(sid);
+ List orgList = new ArrayList<>();
+ if (sysStaffOrgVos.size() > 0) {
+ for (SysStaffOrgVo vv : sysStaffOrgVos) {
+ String orgSid = sysStaffOrgService.getOrgByOrgSid(vv.getOrgSid());
+ SysOrganization sysOrganization = fetchBySid(orgSid);
+ if (sysOrganization != null) {
+ orgList.add(orgSid);
+ } else {
+ continue;
+ }
+ }
+ }
//添加员工与组织的关联关系
SysStaffOrg sysStaffOrg = new SysStaffOrg();
sysStaffOrg.setManageType(manageType);
@@ -193,7 +212,31 @@ public class SysOrganizationService extends MybatisBaseService sysStaffOrgVos1 = sysStaffOrgService.selectByStaffS(sid);
+ List orgList1 = new ArrayList<>();
+ if (sysStaffOrgVos1.size() > 0) {
+ for (SysStaffOrgVo vv : sysStaffOrgVos1) {
+ String orgSid = sysStaffOrgService.getOrgByOrgSid(vv.getOrgSid());
+ SysOrganization sysOrganization = fetchBySid(orgSid);
+ if (sysOrganization != null) {
+ orgList1.add(orgSid);
+ } else {
+ continue;
+ }
+ }
+ }
+ List reduce1 = orgList1.stream().filter(item -> !orgList.contains(item)).collect(toList());
+ if (reduce1.size() > 0) {
+ //根据staffSid查询token
+ String token = sysUserService.selectByStaffsid(sid).getToken();
+ //清空该token
+ redisUtil.remove(token);
+ }
+
+
}
+
return rb.success();
}
diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java
index 770f90ecaa..65c1fdcd12 100644
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java
@@ -12,6 +12,7 @@ import com.yxt.anrui.portal.api.sysstaffinfo.app.AppSysStaffVo;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgDetailsVo;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgDto;
+import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo;
import com.yxt.anrui.portal.api.sysstaffpost.SysStaffPost;
import com.yxt.anrui.portal.api.sysstaffpost.SysStaffPostDetailsVo;
import com.yxt.anrui.portal.api.sysstaffpost.SysStaffPostDto;
@@ -24,6 +25,7 @@ import com.yxt.anrui.portal.biz.sysstafforg.SysStaffOrgService;
import com.yxt.anrui.portal.biz.sysstaffpost.SysStaffPostService;
import com.yxt.anrui.portal.biz.sysuser.SysUserService;
import com.yxt.anrui.portal.biz.sysuserrole.SysUserRoleService;
+import com.yxt.common.base.config.RedisUtil;
import com.yxt.common.base.config.component.FileUploadComponent;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.Encodes;
@@ -39,6 +41,8 @@ import org.springframework.stereotype.Service;
import java.text.SimpleDateFormat;
import java.util.*;
+import static java.util.stream.Collectors.toList;
+
/**
* Project: anrui_portal(门户建设)
* File: SysStaffinfoService.java
@@ -71,6 +75,8 @@ public class SysStaffinfoService extends MybatisBaseService selectAppContactsList() {
List list = baseMapper.selectAppContactsList();
@@ -413,6 +419,20 @@ public class SysStaffinfoService extends MybatisBaseService sysStaffOrgVos = sysStaffOrgService.selectByStaffS(sid);
+ List orgList = new ArrayList<>();
+ if (sysStaffOrgVos.size() > 0) {
+ for (SysStaffOrgVo vv : sysStaffOrgVos) {
+ String orgSid = sysStaffOrgService.getOrgByOrgSid(vv.getOrgSid());
+ SysOrganization sysOrganization = sysOrganizationService.fetchBySid(orgSid);
+ if (sysOrganization != null) {
+ orgList.add(orgSid);
+ } else {
+ continue;
+ }
+ }
+ }
//根据员工sid查询员工的信息
SysStaffinfo sysStaffinfo = fetchBySid(sid);
if (sysStaffinfo == null) {
@@ -507,6 +527,10 @@ public class SysStaffinfoService extends MybatisBaseService staffOrgResultBean = sysStaffOrgService.selectAllByStaffSid(sid);
+ sysStaffOrg = staffOrgResultBean.getData();
+ }
BeanUtil.copyProperties(sysStaffOrgDto,sysStaffOrg);
sysStaffOrg.setManageType("3");
sysStaffOrgService.updateById(sysStaffOrg);
@@ -519,6 +543,26 @@ public class SysStaffinfoService extends MybatisBaseService sysStaffOrgVos1 = sysStaffOrgService.selectByStaffS(sid);
+ List orgList1 = new ArrayList<>();
+ if (sysStaffOrgVos1.size() > 0) {
+ for (SysStaffOrgVo vv : sysStaffOrgVos1) {
+ String orgSid = sysStaffOrgService.getOrgByOrgSid(vv.getOrgSid());
+ SysOrganization sysOrganization = sysOrganizationService.fetchBySid(orgSid);
+ if (sysOrganization != null) {
+ orgList1.add(orgSid);
+ } else {
+ continue;
+ }
+ }
+ }
+ List reduce1 = orgList.stream().filter(item -> !orgList1.contains(item)).collect(toList());
+ if (reduce1.size() > 0) {
+ //根据staffSid查询token
+ String token = sysUserService.selectByStaffsid(sid).getToken();
+ //清空该token
+ redisUtil.remove(token);
+ }
return rb.success().setMsg("更新员工信息成功");
}
diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgMapper.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgMapper.java
index 89a9592faa..9384ef8d24 100644
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgMapper.java
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgMapper.java
@@ -98,4 +98,8 @@ public interface SysStaffOrgMapper extends BaseMapper {
int selectByStaffAndOrg(@Param("sid") String sid, @Param("staffSid") String zgStaffSid, @Param("type") String type);
int deleteByStaffSidAndType(@Param("sid") String sid, @Param("staffSid") String zgStaffSid, @Param("type") String type);
+
+ List selectByStaffS(String staffSid);
+
+ List selectByOrgSid(String sid);
}
\ No newline at end of file
diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgMapper.xml b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgMapper.xml
index 70cdf21134..1cbe120b0e 100644
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgMapper.xml
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgMapper.xml
@@ -82,4 +82,14 @@
and manageType = #{type}
and orgSidPath = #{sid}
+
+
+
+
\ No newline at end of file
diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgService.java
index 1711acf2be..79cdc7715c 100644
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgService.java
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgService.java
@@ -273,4 +273,12 @@ public class SysStaffOrgService extends MybatisBaseService selectByStaffS(String staffSid) {
+ return baseMapper.selectByStaffS(staffSid);
+ }
+
+ public List selectByOrgSid(String sid) {
+ return baseMapper.selectByOrgSid(sid);
+ }
}
\ No newline at end of file
diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java
index 792a819089..692a819b4b 100644
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java
@@ -15,6 +15,7 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo;
import com.yxt.anrui.portal.api.sysstaffpost.SysStaffPostDetailsVo;
import com.yxt.anrui.portal.api.sysuser.*;
import com.yxt.anrui.portal.api.sysuser.app.AppUserOrgInfoVo;
+import com.yxt.anrui.portal.api.sysuser.app.OrgList;
import com.yxt.anrui.portal.api.sysuser.wx.WxHomePageVo;
import com.yxt.anrui.portal.api.sysuser.wx.WxMySysUserInfoVo;
import com.yxt.anrui.portal.api.sysuser.wx.WxSysUserVo;
@@ -303,6 +304,7 @@ public class SysUserService extends MybatisBaseService {
userInfoOneVo.setRoleName("");
String dwjb = "";
// 系统管理员(没有对应的人员和单位)
+ //是否是管理员:1管理员,2一般用户,0是超级管理员,3尚无单位人员
if ("0".equals(user.getIsAdmin())) {
userInfoOneVo.setName("系统管理员");
userInfoOneVo.setMobile("");
@@ -318,6 +320,7 @@ public class SysUserService extends MybatisBaseService {
userInfoOneVo.setStaffSid(staffVo.getSid());
userInfoOneVo.setOrgNamePath(sysStaffOrg.getOrgNamePath());
userInfoOneVo.setOrgSidPath(sysStaffOrg.getOrgSidPath());
+
}
// 尚无单位人员,没有单位和部门信息
if ("3".equals(user.getIsAdmin())) {
@@ -330,18 +333,27 @@ public class SysUserService extends MybatisBaseService {
SysStaffPostDetailsVo staffPostDetailsVo = sysStaffPostService.getPostByStaffSid(user.getStaffSid());
userInfoOneVo.setPostSid(staffPostDetailsVo.getPostSid());
userInfoOneVo.setPostName(staffPostDetailsVo.getName());
- if (orgVoList.size() > 0) { // 手机端销售人员用到orgsid,目前按唯一算
+ if (orgVoList.size() > 0) {
SysStaffOrgVo sysStaffOrgVo = orgVoList.get(0);
userInfoOneVo.setDepartmentName(sysStaffOrgVo.getOrgName());
userInfoOneVo.setDepartmentSid(sysStaffOrgVo.getOrgSid());
String psid = sysOrganizationService.fetchBySid(sysStaffOrgVo.getOrgSid()).getPsid();
String name = sysOrganizationService.fetchBySid(psid).getName();
-// userInfoOneVo.setPNameAndDepartmentNameAndPostName(name + "-" + sysStaffOrgVo.getOrgName() + " " + userInfoOneVo.getPostName());
userInfoOneVo.setPNameAndDepartmentNameAndPostName(name + "-" + sysStaffOrgVo.getOrgName());
userInfoOneVo.setOrganizationSid(sysStaffOrgVo.getOrgSid());
userInfoOneVo.setOrganizationName(sysStaffOrgVo.getOrgName());
userInfoOneVo.setOrgNamePath(sysStaffOrg.getOrgNamePath());
userInfoOneVo.setOrgSidPath(sysStaffOrg.getOrgSidPath());
+ //根据orgSidPath查询分公司sid=====
+ String orgSid = sysStaffOrgService.getOrgByOrgSid(sysStaffOrgVo.getOrgSid());
+ SysOrganization sysOrganization = sysOrganizationService.fetchBySid(orgSid);
+ if (sysOrganization != null) {
+ userInfoOneVo.setDefaultOrgPathName(sysOrganization.getName());
+// userInfoOneVo.setDefaultOrgPath(sysStaffOrgVo.getOrgSidPath());
+ userInfoOneVo.setDefaultOrgPath(sysOrganization.getSid());
+ } else {
+ userInfoOneVo.setDefaultOrgPathName("暂无组织机构");
+ }
}
}
}
@@ -350,6 +362,24 @@ public class SysUserService extends MybatisBaseService {
userInfoOneVo.setRoleSids(roleSids);
String roleName = sysRoleService.selectByUserSid(user.getSid());
userInfoOneVo.setRoleName(roleName);
+ List sysStaffOrgVos = sysStaffOrgService.selectByStaffS(user.getStaffSid());
+ List orgList = new ArrayList<>();
+ if (sysStaffOrgVos.size() > 0) {
+ for (SysStaffOrgVo vv : sysStaffOrgVos) {
+ OrgList orgList1 = new OrgList();
+ String orgSid = sysStaffOrgService.getOrgByOrgSid(vv.getOrgSid());
+ SysOrganization sysOrganization = sysOrganizationService.fetchBySid(orgSid);
+ if (sysOrganization != null) {
+ orgList1.setOrgName(sysOrganization.getName());
+// orgList1.setOrgPath(vv.getOrgSidPath());
+ orgList1.setOrgPath(sysOrganization.getSid());
+ }else{
+ continue;
+ }
+ orgList.add(orgList1);
+ }
+ }
+ userInfoOneVo.setOrgList(orgList);
return userInfoOneVo;
}
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateFeignFallback.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateFeignFallback.java
index b5486e8fc3..007f7ca771 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateFeignFallback.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateFeignFallback.java
@@ -30,8 +30,6 @@ import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import org.springframework.stereotype.Component;
-import java.util.List;
-
/**
* Project: anrui-scm(专项返利管理)
* File: ScmSpecialRebateFeignFallback.java
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 15c4c2380b..0698099b28 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
@@ -52,40 +52,41 @@ import java.util.List;
@ApiModel(value = "移位单 视图数据详情", description = "移位单 视图数据详情")
public class AppScmVehicleGressionDetailsVo implements Vo {
- private String sid; // sid
+ private static final long serialVersionUID = -8794600411504248824L;
+ /*private String sid;
@ApiModelProperty("车辆sid")
- private String vehicleSid; // 车辆sid
+ private String vehicleSid;
@ApiModelProperty("车架号")
- private String vinNo; // 车架号
+ private String vinNo;
@ApiModelProperty("车架号")
- private List vins; // 车架号
+ private List vins;*/
@ApiModelProperty("申请编号")
- private String applicantNo; // 申请编号
+ private String applicantNo;
@ApiModelProperty("申请人")
private String applicantName;
@ApiModelProperty("申请编日期")
private String applicantDate;
@ApiModelProperty("现存地点")
- private String location; // 现存地点
+ private String location;
@ApiModelProperty("现存地点")
private String locationSid;
- @ApiModelProperty("现存地点")
- private String locationKey;
+ /* @ApiModelProperty("现存地点")
+ private String locationKey;*/
@ApiModelProperty("目标地点")
- private String targetLocation; // 目标地点
+ private String targetLocation;
@ApiModelProperty("目标地点")
private String targetLocationSid;
- @ApiModelProperty("目标地点")
- private String targetLocationKey;
+ /* @ApiModelProperty("目标地点")
+ private String targetLocationKey;*/
@ApiModelProperty("变更原因")
- private String changeReason; // 变更原因
+ private String changeReason;
@ApiModelProperty("申请经费")
- private String applicantFunds; // 申请经费
+ private String applicantFunds;
@ApiModelProperty("经办人")
- private String operator; // 经办人
+ private String operator;
@ApiModelProperty("保险状态")
- private String InsuranceState; // 保险状态
+ private String InsuranceState;
@ApiModelProperty("保险状态")
private String InsuranceStateKey;
@ApiModelProperty("临牌状态")
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 74a388848b..0314848f00 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
@@ -55,29 +55,14 @@ public class AppScmVehicleGressionDto implements Dto {
private static final long serialVersionUID = -5753948406322577902L;
private String sid;
+ @ApiModelProperty("用户sid")
private String userSid;
-// @ApiModelProperty("车辆sid")
-// private String vehicleSid;
-// @ApiModelProperty("车架号")
-// private String vinNo;
-// @ApiModelProperty("车架号")
-// private List vins;
- @ApiModelProperty("申请编号")
- private String applicantNo;
- // @ApiModelProperty("申请人")
-// private String applicantName;
-// @ApiModelProperty("申请日期")
-// private String applicantDate;
@ApiModelProperty("现存地点")
private String location;
- @ApiModelProperty("现存放地点")
- private String locationKey;
@ApiModelProperty("现存放地点sid")
private String locationSid;
@ApiModelProperty("目标地点")
private String targetLocation;
- @ApiModelProperty("目标库")
- private String targetLocationKey;
@ApiModelProperty("目标库sid")
private String targetLocationSid;
@ApiModelProperty("变更原因")
@@ -99,14 +84,6 @@ public class AppScmVehicleGressionDto implements Dto {
private String proCardState;
@ApiModelProperty("临牌状态")
private String proCardStateKey;
-// @ApiModelProperty("临牌")
-// private String temporaryCard;
-// @ApiModelProperty("保单照片")
-// private List policyImage;
-
- @ApiModelProperty("车架号")
- private List scmVehicleGressionVehs;
-
@ApiModelProperty("调出方负责人名称")
private String staffName;
@ApiModelProperty("调出方负责人用户sid")
@@ -115,5 +92,28 @@ public class AppScmVehicleGressionDto implements Dto {
private String address;
@ApiModelProperty("经纬度")
private String locationCode;
+ @ApiModelProperty("车架号")
+ private List scmVehicleGressionVehs;
+ // @ApiModelProperty("车辆sid")
+// private String vehicleSid;
+// @ApiModelProperty("车架号")
+// private String vinNo;
+// @ApiModelProperty("车架号")
+// private List vins;
+ /* @ApiModelProperty("申请编号")
+ private String applicantNo;*/
+ // @ApiModelProperty("申请人")
+// private String applicantName;
+// @ApiModelProperty("申请日期")
+// private String applicantDate;
+/* @ApiModelProperty("现存放地点")
+ private String locationKey;*/
+ /* @ApiModelProperty("目标库")
+ private String targetLocationKey;*/
+// @ApiModelProperty("临牌")
+// private String temporaryCard;
+// @ApiModelProperty("保单照片")
+// private List policyImage;
+
}
\ No newline at end of file
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 bfdd483443..7240b1d090 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
@@ -33,7 +33,7 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import javax.validation.constraints.NotBlank;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -53,41 +53,34 @@ import java.util.List;
@ApiModel(value = "移位单 视图数据对象", description = "移位单 视图数据对象")
public class AppScmVehicleGressionInfoVo implements Vo {
- private String sid; // sid
-
- @ApiModelProperty("车辆sid")
- private String vehicleSid; // 车辆sid
- @ApiModelProperty("车架号")
- private String vinNo; // 车架号
+ private static final long serialVersionUID = 4484553821363324415L;
+ private String sid;
@ApiModelProperty("车架号")
- private List vins; // 车架号
+ private List vins;
@ApiModelProperty("申请编号")
- private String applicantNo; // 申请编号
+ private String applicantNo;
@ApiModelProperty("申请人")
private String applicantName;
@ApiModelProperty("申请编日期")
private String applicantDate;
@ApiModelProperty("现存地点")
- private String location; // 现存地点
+ private String location;
@ApiModelProperty("现存地点")
private String locationSid;
- @ApiModelProperty("现存地点")
- private String locationKey;
@ApiModelProperty("目标地点")
- private String targetLocation; // 目标地点
+ private String targetLocation;
@ApiModelProperty("目标地点")
private String targetLocationSid;
- @ApiModelProperty("目标地点")
- private String targetLocationKey;
+
@ApiModelProperty("变更原因")
- private String changeReason; // 变更原因
+ private String changeReason;
@ApiModelProperty("申请经费")
- private String applicantFunds; // 申请经费
+ private String applicantFunds;
@ApiModelProperty("经办人")
- private String operator; // 经办人
+ private String operator;
@ApiModelProperty("保险状态")
@JsonProperty("InsuranceState")
- private String InsuranceState; // 保险状态
+ private String InsuranceState;
@ApiModelProperty("保险状态")
@JsonProperty("InsuranceStateKey")
private String InsuranceStateKey;
@@ -96,28 +89,37 @@ public class AppScmVehicleGressionInfoVo implements Vo {
@ApiModelProperty("临牌状态")
private String proCardStateKey;
@ApiModelProperty("临牌")
- private String temporaryCard; // 临牌
+ private String temporaryCard;
@ApiModelProperty("审核状态")
private String nodeState;
@ApiModelProperty("用户sid")
private String userSid;
-
@ApiModelProperty("任务id")
private String taskId;
@ApiModelProperty("流程实例id")
private String procInstId;
-
- @ApiModelProperty("车架号")
- private List scmVehicleGressionVehs;
-
@ApiModelProperty("保单照片")
- private List policyImage;
+ private List policyImage = new ArrayList<>();
@ApiModelProperty("现场照片")
- private List image;
-
+ private List image = new ArrayList<>();
@ApiModelProperty("调出方负责人名称")
private String staffName;
@ApiModelProperty("调出方负责人用户sid")
private String personUserSid;
+ @ApiModelProperty("车架号")
+ private List scmVehicleGressionVehs = new ArrayList<>();
+ private String createBySid;
+
+ /* @ApiModelProperty("车辆sid")
+ private String vehicleSid;
+ @ApiModelProperty("车架号")
+ private String vinNo;*/
+
+/* @ApiModelProperty("现存地点")
+ private String locationKey;*/
+
+ /* @ApiModelProperty("目标地点")
+ private String targetLocationKey;*/
+
}
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGression.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGression.java
index 1e77163a75..c20924eb99 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGression.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGression.java
@@ -31,8 +31,6 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import javax.validation.constraints.NotBlank;
-
/**
* Project: scm(scm)
* File: ScmVehicleGression.java
@@ -52,54 +50,47 @@ import javax.validation.constraints.NotBlank;
public class ScmVehicleGression extends BaseEntity {
private static final long serialVersionUID = 1L;
- @ApiModelProperty("车辆sid")
- private String vehicleSid; // 车辆sid
- @ApiModelProperty("车架号")
- private String vinNo; // 车架号
@ApiModelProperty("申请编号")
- private String applicantNo; // 申请编号
+ private String applicantNo;
@ApiModelProperty("现存地点")
- private String location; // 现存地点
- @ApiModelProperty("现存放地点")
- private String locationKey;
+ private String location;
@ApiModelProperty("现存放地点sid")
private String locationSid;
@ApiModelProperty("目标地点")
- private String targetLocation; // 目标地点
- @ApiModelProperty("目标库")
- private String targetLocationKey;
+ private String targetLocation;
@ApiModelProperty("目标库sid")
private String targetLocationSid;
@ApiModelProperty("变更原因")
- private String changeReason; // 变更原因
+ private String changeReason;
@ApiModelProperty("申请经费")
- private String applicantFunds; // 申请经费
+ private String applicantFunds;
@ApiModelProperty("经办人")
- private String operator; // 经办人
- @ApiModelProperty("保险状态")
- private String InsuranceState; // 保险状态
+ private String operator;
@ApiModelProperty("保险状态")
- private String InsuranceStateKey; // 保险状态
- @ApiModelProperty("临牌状态")
- private String proCardState;
- @ApiModelProperty("临牌状态")
- private String proCardStateKey;
- @ApiModelProperty("临牌")
- private String temporaryCard; // 临牌
- @ApiModelProperty("申请状态(代办已办)")
- private String handleState;
- @ApiModelProperty("分公司sid")
- private String useOrgSid;
- @ApiModelProperty("部门sid")
- private String orgSid;
+ private String InsuranceState;
+ @ApiModelProperty("保险状态key")
+ private String InsuranceStateKey;
@ApiModelProperty("申请人")
- private String applicantName; // 申请人
+ private String applicantName;
@ApiModelProperty("申请日期")
- private String applicantDate; // 申请日期
+ private String applicantDate;
+ @ApiModelProperty("分公司sid")
+ private String useOrgSid;
+ @ApiModelProperty("临牌牌照号")
+ private String temporaryCard;
@ApiModelProperty("地址")
private String address;
@ApiModelProperty("经纬度")
private String locationCode;
+ @ApiModelProperty("调出方负责人名称")
+ private String staffName;
+ @ApiModelProperty("调出方负责人用户sid")
+ private String personUserSid;
+ @ApiModelProperty("临牌状态")
+ private String proCardState;
+ @ApiModelProperty("临牌状态")
+ private String proCardStateKey;
+
@ApiModelProperty(value = "节点状态")
private String nodeState;
@@ -112,9 +103,15 @@ public class ScmVehicleGression extends BaseEntity {
@ApiModelProperty(value = "任务id")
private String taskId;
- @ApiModelProperty("调出方负责人名称")
- private String staffName;
- @ApiModelProperty("调出方负责人用户sid")
- private String personUserSid;
+
+ @ApiModelProperty("申请状态(代办已办)")
+ private String handleState;
+ /* @ApiModelProperty("现存放地点sid")
+ private String locationKey;*/
+ /* @ApiModelProperty("目标库")
+ private String targetLocationKey;*/
+ /* @ApiModelProperty("部门sid")
+ private String orgSid;*/
+
}
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionFeign.java
index 0b1ff199e6..6e630ba214 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionFeign.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionFeign.java
@@ -60,7 +60,7 @@ import java.util.List;
fallback = ScmVehicleGressionFeignFallback.class)
public interface ScmVehicleGressionFeign {
- @ApiOperation("根据条件分页查询数据的列表")
+ /* @ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
@ResponseBody
public ResultBean> listPage(@RequestBody PagerQuery pq);
@@ -78,14 +78,14 @@ public interface ScmVehicleGressionFeign {
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
@ResponseBody
- public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid);
+ public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid);*/
@ApiOperation("PC端-获取车辆移位列表")
@PostMapping("/selectCarTransferList")
@ResponseBody
public ResultBean> selectCarTransferList(@RequestBody PagerQuery pagerQuery);
- @ApiOperation("PC端-获取车辆移位记录")
+ @ApiOperation("PC端-获取车辆移位记录-车辆台账")
@PostMapping("/selectCarTransferListAll")
@ResponseBody
public ResultBean> selectCarTransferListAll(@RequestBody PagerQuery pagerQuery);
@@ -101,10 +101,10 @@ public interface ScmVehicleGressionFeign {
@ResponseBody
public ResultBean> getCarTransferList(@RequestBody PagerQuery pagerQuery);
- @ApiOperation("手机端-保存车库移库信息")
+ @ApiOperation("移动端、PC端-保存车库移库信息")
@PostMapping("/saveCarTransferInfo")
@ResponseBody
- public ResultBean saveCarTransferInfo(@RequestBody AppScmVehicleGressionDto dto);
+ public ResultBean saveCarTransferInfo(@Valid @RequestBody AppScmVehicleGressionDto dto);
@ApiOperation("手机端-初始化移库申请")
@GetMapping("/getCarTransferInfo/{sid}/{userSid}")
@@ -121,7 +121,7 @@ public interface ScmVehicleGressionFeign {
@ResponseBody
public ResultBean deleteCarTransfer(@PathVariable("sid") String sid);
- @ApiOperation("手机端-保存 车辆移库 现场照片")
+ @ApiOperation("手机端-保存 车辆移库 现场照片(补录)")
@PostMapping("/saveCarTransferSiteImage")
@ResponseBody
public ResultBean saveCarTransferSiteImage(@RequestBody AppScmVehicleCarTransferSiteImageDto dto);
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionFeignFallback.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionFeignFallback.java
index ed412a3279..f18f3cd332 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionFeignFallback.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionFeignFallback.java
@@ -50,7 +50,7 @@ import java.util.List;
@Component
public class ScmVehicleGressionFeignFallback implements ScmVehicleGressionFeign {
- @Override
+ /* @Override
public ResultBean> listPage(PagerQuery pq) {
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口scm/scmvehiclegression/listPage无法访问");
@@ -70,7 +70,7 @@ public class ScmVehicleGressionFeignFallback implements ScmVehicleGressionFeign
public ResultBean fetchDetailsBySid(String sid) {
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口scm/scmvehiclegression/fetchDetailsBySid无法访问");
- }
+ }*/
@Override
public ResultBean> selectCarTransferList(PagerQuery pagerQuery) {
@@ -93,7 +93,7 @@ public class ScmVehicleGressionFeignFallback implements ScmVehicleGressionFeign
}
@Override
- public ResultBean saveCarTransferInfo(AppScmVehicleGressionDto dto) {
+ public ResultBean saveCarTransferInfo(AppScmVehicleGressionDto dto) {
return null;
}
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegressionveh/ScmVehicleGressionVeh.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegressionveh/ScmVehicleGressionVeh.java
index 6c2e7b1b94..dcf9eefd54 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegressionveh/ScmVehicleGressionVeh.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegressionveh/ScmVehicleGressionVeh.java
@@ -50,17 +50,17 @@ import lombok.Data;
public class ScmVehicleGressionVeh extends BaseEntity {
private static final long serialVersionUID = 1L;
- @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; // 临时牌照号码
+ @ApiModelProperty("移位申请单sid")
+ private String mainSid;
+ @ApiModelProperty("车辆sid")
+ private String vehSid;
+ @ApiModelProperty("车架号")
+ private String vehVin;
+ @ApiModelProperty("买断状态key")
+ private String settlementStatus;
+ @ApiModelProperty("买断状态value")
+ private String settlementStatusValue;
+/* @ApiModelProperty("临时牌照号码")
+ private String temporaryCardNo;*/
}
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 fe8e9092e5..c34508a00a 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
@@ -49,19 +49,21 @@ import lombok.Data;
@ApiModel(value = "移位申请单车架号库 数据传输对象", description = "移位申请单车架号库 数据传输对象")
public class ScmVehicleGressionVehDto implements Dto {
- private String sid; // sid
+ private static final long serialVersionUID = 5127074370901912347L;
- @ApiModelProperty("移位申请单sid")
- private String mainSid; // 移位申请单sid
@ApiModelProperty("车辆sid")
- private String vehSid; // 车辆sid
+ private String vehSid;
@ApiModelProperty("车架号")
- private String vehVin; // 车架号
+ private String vehVin;
@ApiModelProperty("买断状态key")
- private String settlementStatus; // 买断状态key
+ private String settlementStatus;
@ApiModelProperty("买断状态value")
- private String settlementStatusValue; // 买断状态value
- @ApiModelProperty("临时牌照号码")
- private String temporaryCardNo; // 临时牌照号码
+ private String settlementStatusValue;
+/* @ApiModelProperty("临时牌照号码")
+ private String temporaryCardNo;*/
+ /*private String sid;*/
+
+/* @ApiModelProperty("移位申请单sid")
+ private String mainSid;*/
}
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegressionveh/ScmVehicleGressionVehFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegressionveh/ScmVehicleGressionVehFeign.java
index 56acc73fb9..68d8b1e298 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegressionveh/ScmVehicleGressionVehFeign.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegressionveh/ScmVehicleGressionVehFeign.java
@@ -26,14 +26,7 @@
package com.yxt.anrui.scm.api.scmvehiclegressionveh;
import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import com.yxt.common.core.query.PagerQuery;
-import com.yxt.common.core.result.ResultBean;
-import com.yxt.common.core.vo.PagerVo;
import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
/**
* Project: abc(abc)
@@ -50,29 +43,11 @@ import java.util.List;
*/
@Api(tags = "移位申请单车架号库")
@FeignClient(
- contextId = "abc-ScmVehicleGressionVeh",
- name = "abc",
+ contextId = "anrui-scm-ScmVehicleGressionVeh",
+ name = "anrui-scm",
path = "v1/scmvehiclegressionveh",
fallback = ScmVehicleGressionVehFeignFallback.class)
public interface ScmVehicleGressionVehFeign {
- @ApiOperation("根据条件分页查询数据的列表")
- @PostMapping("/listPage")
- @ResponseBody
- public ResultBean> listPage(@RequestBody PagerQuery pq);
-
- @ApiOperation("新增或修改")
- @PostMapping("/save")
- @ResponseBody
- public ResultBean save(@RequestBody ScmVehicleGressionVehDto dto);
-
- @ApiOperation("根据sid删除记录")
- @DeleteMapping("/delBySids")
- @ResponseBody
- public ResultBean delBySids(@RequestBody String[] sids);
- @ApiOperation("根据SID获取一条记录")
- @GetMapping("/fetchDetailsBySid/{sid}")
- @ResponseBody
- public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid);
}
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegressionveh/ScmVehicleGressionVehFeignFallback.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegressionveh/ScmVehicleGressionVehFeignFallback.java
index 5b0da58a74..6f0d1ff9a3 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegressionveh/ScmVehicleGressionVehFeignFallback.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegressionveh/ScmVehicleGressionVehFeignFallback.java
@@ -48,25 +48,5 @@ import java.util.List;
@Component
public class ScmVehicleGressionVehFeignFallback implements ScmVehicleGressionVehFeign {
- @Override
- public ResultBean> listPage(PagerQuery pq){
- ResultBean rb = ResultBean.fireFail();
- return rb.setMsg("接口abc/scmvehiclegressionveh/listPage无法访问");
- }
-
- @Override
- public ResultBean save(ScmVehicleGressionVehDto dto){
- return ResultBean.fireFail().setMsg("接口abc/scmvehiclegressionveh/save无法访问");
- }
-
- @Override
- public ResultBean delBySids( String[] sids){
- return ResultBean.fireFail().setMsg("接口abc/scmvehiclegressionveh/delBySids无法访问");
- }
-
- @Override
- public ResultBean fetchDetailsBySid(String sid){
- ResultBean rb = ResultBean.fireFail();
- return rb.setMsg("接口abc/scmvehiclegressionveh/fetchDetailsBySid无法访问");
- }
+
}
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegressionveh/ScmVehicleGressionVehVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegressionveh/ScmVehicleGressionVehVo.java
index 1bdfa5f2e7..e865876978 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegressionveh/ScmVehicleGressionVehVo.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegressionveh/ScmVehicleGressionVehVo.java
@@ -47,21 +47,22 @@ import lombok.Data;
*/
@Data
@ApiModel(value = "移位申请单车架号库 视图数据对象", description = "移位申请单车架号库 视图数据对象")
-public class ScmVehicleGressionVehVo implements Vo {
+public class ScmVehicleGressionVehVo implements Vo {
- private String sid; // sid
+ private static final long serialVersionUID = 2859343326484666520L;
+ /* private String sid;*/
- @ApiModelProperty("移位申请单sid")
- private String mainSid; // 移位申请单sid
+/* @ApiModelProperty("移位申请单sid")
+ private String mainSid;*/
@ApiModelProperty("车辆sid")
- private String vehSid; // 车辆sid
+ private String vehSid;
@ApiModelProperty("车架号")
- private String vehVin; // 车架号
+ private String vehVin;
@ApiModelProperty("买断状态key")
- private String settlementStatus; // 买断状态key
+ private String settlementStatus;
@ApiModelProperty("买断状态value")
- private String settlementStatusValue; // 买断状态value
- @ApiModelProperty("临时牌照号码")
- private String temporaryCardNo; // 临时牌照号码
+ private String settlementStatusValue;
+/* @ApiModelProperty("临时牌照号码")
+ private String temporaryCardNo;*/
}
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/AppScmVehicleCarInventoryListPageQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/AppScmVehicleCarInventoryListPageQuery.java
index bba9e55658..b6a7ac3b1c 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/AppScmVehicleCarInventoryListPageQuery.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/AppScmVehicleCarInventoryListPageQuery.java
@@ -12,7 +12,7 @@ public class AppScmVehicleCarInventoryListPageQuery implements Query {
private String userSid;
@ApiModelProperty("优先匹配车架号 盘库人员")
- private String name;
+ private String names;
@ApiModelProperty("时间段 示例 2020-02-01至2022-03-31")
private String date;
@@ -28,8 +28,11 @@ public class AppScmVehicleCarInventoryListPageQuery implements Query {
@ApiModelProperty("存放地点sid")
private String warehouseSid;
-// @ApiModelProperty("盘库状态 通过1 不通过 2")
-// private String state;
+ @ApiModelProperty("月度盘库sid")
+ private String reportSid;
+
+ @ApiModelProperty("盘库状态 通过1 不通过 2")
+ private String state;
@ApiModelProperty("使用组织分公司sid")
private String useOrgSid;
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/AppScmVehicleStayInventoryDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/AppScmVehicleStayInventoryDto.java
index 2f22460033..bdc6a05c8a 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/AppScmVehicleStayInventoryDto.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/AppScmVehicleStayInventoryDto.java
@@ -51,11 +51,14 @@ import java.util.List;
@ApiModel(value = "待盘库记录 数据传输对象", description = "待盘库记录 数据传输对象")
public class AppScmVehicleStayInventoryDto implements Dto {
- @ApiModelProperty(value = "待盘库sid")
+ @ApiModelProperty(value = "盘库sid")
private String sid;
- @ApiModelProperty(value = "车架号")
- private String mainSid;
+ @ApiModelProperty("车架号")
+ private String vinNo; // 车架号
+
+ @ApiModelProperty("月度盘库sid")
+ private String mainSid; // 月度盘库sid
@ApiModelProperty(value = "存放地点")
private String location;
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/AppScmVehicleStayInventoryInfoVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/AppScmVehicleStayInventoryInfoVo.java
index 6a0b48701e..9448575b80 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/AppScmVehicleStayInventoryInfoVo.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/AppScmVehicleStayInventoryInfoVo.java
@@ -59,6 +59,9 @@ public class AppScmVehicleStayInventoryInfoVo implements Vo {
@ApiModelProperty("车架号")
private String vin;
+ @ApiModelProperty("月度盘库sid")
+ private String mainSid;
+
@ApiModelProperty("存放地点")
private String warehouse;
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/AppScmVehicleStayInventoryListPageVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/AppScmVehicleStayInventoryListPageVo.java
index c412232f0b..154b81f629 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/AppScmVehicleStayInventoryListPageVo.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/AppScmVehicleStayInventoryListPageVo.java
@@ -15,9 +15,15 @@ public class AppScmVehicleStayInventoryListPageVo implements Vo {
@ApiModelProperty("sid")
private String sid;
+ @ApiModelProperty("月度盘库sid")
+ private String mainSid;
+
@ApiModelProperty("车架号")
private String vin;
+ @ApiModelProperty("创建组织sid")
+ private String createOrgSid;
+
@ApiModelProperty("存放地点")
private String warehouse;
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/AppScmVehiclePatrolinspectionPageVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/AppScmVehiclePatrolinspectionPageVo.java
index 5b78e87894..a25e4df588 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/AppScmVehiclePatrolinspectionPageVo.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/AppScmVehiclePatrolinspectionPageVo.java
@@ -14,6 +14,9 @@ public class AppScmVehiclePatrolinspectionPageVo implements Vo {
@ApiModelProperty("车架号")
private String vin;
+ @ApiModelProperty("月度管理sid")
+ private String mainSid;
+
@ApiModelProperty("最新巡检日期")
private String newInspectionDate;
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/ScmVehiclePatrolinspection.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/ScmVehiclePatrolinspection.java
index 832f3dc40c..7595859b09 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/ScmVehiclePatrolinspection.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/ScmVehiclePatrolinspection.java
@@ -49,24 +49,25 @@ import lombok.Data;
@TableName("scm_vehicle_patrolinspection")
public class ScmVehiclePatrolinspection extends BaseEntity {
private static final long serialVersionUID = 1L;
-
- @ApiModelProperty("车架号")
+ @ApiModelProperty("车架号")
+ private String vinNo; // 车架号
+ @ApiModelProperty("月度管理sid")
private String mainSid; // 车架号
- @ApiModelProperty("存放地点sid")
+ @ApiModelProperty("存放地点sid")
private String locationSid; // 存放地点sid
- @ApiModelProperty("存放地点")
+ @ApiModelProperty("存放地点")
private String location; // 存放地点
- @ApiModelProperty("合格证(有/无)")
- private String certificate; // 合格证(有/无)
- @ApiModelProperty("巡检日期")
+ @ApiModelProperty("巡检日期")
private String patrolInspectionDate; // 巡检日期
- @ApiModelProperty("巡检人员")
+ @ApiModelProperty("巡检人员")
private String patrolInspectionName; // 巡检人员
- @ApiModelProperty("巡检状态(通过/不通过)")
+ @ApiModelProperty("巡检状态(通过/不通过)")
private String patrolInspectionState; // 巡检状态(通过/不通过)
- @ApiModelProperty("创建组织")
+ @ApiModelProperty("巡检状态(通过/不通过)")
+ private String patrolInspectionStateKey; // 巡检状态(通过/不通过)
+ @ApiModelProperty("创建组织")
private String createOrgSid; // 创建组织
- @ApiModelProperty("使用组织")
- private String useOrgName; // 使用组织
+ @ApiModelProperty("使用组织")
+ private String useOrgSid; // 使用组织
}
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionFeign.java
index 42e24a8798..ce1a06b55c 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionFeign.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionFeign.java
@@ -82,7 +82,7 @@ public interface ScmVehiclePatrolinspectionFeign {
@ApiOperation("手机端-巡检详情")
@PostMapping("/getInspectionInfo/{recordSid}")
@ResponseBody
- public ResultBean getInspectionInfo(@PathVariable("recordSid")String recordSid);
+ public ResultBean getInspectionInfo(@PathVariable("recordSid") String recordSid);
}
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheet.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheet.java
index 366fb8b1dc..c001b154f5 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheet.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheet.java
@@ -49,9 +49,9 @@ import lombok.Data;
@TableName("scm_vehicle_patrolinspectionsheet")
public class ScmVehiclePatrolinspectionsheet extends BaseEntity {
private static final long serialVersionUID = 1L;
- @ApiModelProperty("主表sid")
- private String patrolInspectionSid; // 主表sid
@ApiModelProperty("车架号")
+ private String vinNo; // 主表sid
+ @ApiModelProperty("巡检记录sid")
private String mainSid; // 车架号
@ApiModelProperty("车型sid")
private String modelSid; // 车型sid
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetDetailsVo.java
index 65c874cbaf..4d35ee74bc 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetDetailsVo.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetDetailsVo.java
@@ -51,10 +51,10 @@ import java.util.List;
@ApiModel(value = "巡检单 视图数据详情", description = "巡检单 视图数据详情")
public class ScmVehiclePatrolinspectionsheetDetailsVo implements Vo {
private String sid;
- @ApiModelProperty("主表sid")
- private String patrolInspectionSid; // 主表sid
@ApiModelProperty("车架号")
- private String mainSid; // 车架号
+ private String vinNo; // 车架号
+ @ApiModelProperty("巡检记录sid")
+ private String mainSid; //
@ApiModelProperty("车型sid")
private String modelSid; // 车型sid
@ApiModelProperty("车型")
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetDto.java
index 8148e6e857..dfc53d2fe4 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetDto.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetDto.java
@@ -52,10 +52,9 @@ import java.util.List;
public class ScmVehiclePatrolinspectionsheetDto implements Dto {
private String sid;
-
- @ApiModelProperty("主表sid")
- private String patrolInspectionSid; // 主表sid
@ApiModelProperty("车架号")
+ private String vinNo; // 车架号
+ @ApiModelProperty("巡检记录sid")
private String mainSid; // 车架号
@ApiModelProperty("车型sid")
private String modelSid; // 车型sid
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetFeign.java
index b16417a9f8..1fb0c4d0b9 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetFeign.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetFeign.java
@@ -84,7 +84,7 @@ public interface ScmVehiclePatrolinspectionsheetFeign {
@ResponseBody
public ResultBean getInspection(@PathVariable("recordSid") String recordSid);
- @ApiOperation("手机端-保存巡检操作")
+ @ApiOperation("手机端-提交巡检操作")
@PostMapping("/saveInspection")
@ResponseBody
public ResultBean saveInspection(@RequestBody ScmVehiclePatrolinspectionsheetDto dto);
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclestaypatrolinspection/ScmVehicleStayPatrolinspectionFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclestaypatrolinspection/ScmVehicleStayPatrolinspectionFeign.java
index d548130ff0..58ca4dfba0 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclestaypatrolinspection/ScmVehicleStayPatrolinspectionFeign.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclestaypatrolinspection/ScmVehicleStayPatrolinspectionFeign.java
@@ -74,11 +74,6 @@ public interface ScmVehicleStayPatrolinspectionFeign {
@ResponseBody
public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid);
- @ApiOperation("手机端-判断是否生成巡检记录")
- @GetMapping("/getInspectionRecords/{userSid}")
- @ResponseBody
- public ResultBean getInspectionRecords(@PathVariable("userSid") String userSid);
-
@ApiOperation("手机端-获取巡检列表")
@PostMapping("/getInspectionList")
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclestaypatrolinspection/ScmVehicleStayPatrolinspectionFeignFallback.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclestaypatrolinspection/ScmVehicleStayPatrolinspectionFeignFallback.java
index ba7a37594d..7222f21a09 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclestaypatrolinspection/ScmVehicleStayPatrolinspectionFeignFallback.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclestaypatrolinspection/ScmVehicleStayPatrolinspectionFeignFallback.java
@@ -70,11 +70,6 @@ public class ScmVehicleStayPatrolinspectionFeignFallback implements ScmVehicleSt
return rb.setMsg("接口anrui_scm/scmvehiclestaypatrolinspection/fetchDetailsBySid无法访问");
}
- @Override
- public ResultBean getInspectionRecords(String userSid) {
- return null;
- }
-
@Override
public ResultBean> getInspectionList(PagerQuery pagerQuery) {
return null;
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/AppScmVehInventorymonthInfoVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/AppScmVehInventorymonthInfoVo.java
new file mode 100644
index 0000000000..06cf8bd0d0
--- /dev/null
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/AppScmVehInventorymonthInfoVo.java
@@ -0,0 +1,35 @@
+package com.yxt.anrui.scm.api.scmvehinventorymonth;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AppScmVehInventorymonthInfoVo implements Vo {
+ private static final long serialVersionUID = -8077170646957590520L;
+
+ @ApiModelProperty("本次应盘数量")
+ private String totalNumber;
+ @ApiModelProperty("实际盘库数量")
+ private String actualNumber;
+ @ApiModelProperty("正常数量")
+ private String normalNumber;
+ @ApiModelProperty("盘盈数量")
+ private String profitNumber;
+ @ApiModelProperty("盘亏数量")
+ private String lossNumber;
+ @ApiModelProperty("盘损数量")
+ private String damageNumber;
+ @ApiModelProperty("盘盈备注")
+ private String profitRemarks;
+ @ApiModelProperty("盘亏备注")
+ private String lossRemarks;
+ @ApiModelProperty("盘损备注")
+ private String damageRemarks;
+ @ApiModelProperty("接收人")
+ private String recipient;
+ @ApiModelProperty("创建日期")
+ private String date;
+
+
+}
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/AppScmVehInventorymonthQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/AppScmVehInventorymonthQuery.java
index 3804f55d70..4326ce4092 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/AppScmVehInventorymonthQuery.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/AppScmVehInventorymonthQuery.java
@@ -26,6 +26,7 @@
package com.yxt.anrui.scm.api.scmvehinventorymonth;
+import com.fasterxml.jackson.annotation.JsonProperty;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -61,4 +62,12 @@ public class AppScmVehInventorymonthQuery implements Query {
@ApiModelProperty("使用组织名称")
private String useOrgSid;
+ @ApiModelProperty("盘库开始日期")
+ @JsonProperty("InventStartDate")
+ private String InventStartDate;
+
+ @ApiModelProperty("盘库结束日期")
+ @JsonProperty("InventEndDate")
+ private String InventEndDate;
+
}
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/AppScmVehInventorymonthVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/AppScmVehInventorymonthVo.java
index 0cacb26fc4..3a2e806918 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/AppScmVehInventorymonthVo.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/AppScmVehInventorymonthVo.java
@@ -49,16 +49,23 @@ import lombok.Data;
public class AppScmVehInventorymonthVo implements Vo {
private String sid; // sid
-
- @ApiModelProperty("编号(yyyyMMdd)")
- private String billNo; // 编号(yyyyMMdd)
- @ApiModelProperty("创建组织")
+ @ApiModelProperty("生成报告状态")
+ private String state;
+ @ApiModelProperty("编号(yyyyMMdd)")
+ private String reportId; // 编号(yyyyMMdd)
+ @ApiModelProperty("创建时间")
+ private String date; //
+ @ApiModelProperty("创建人sid")
+ private String createBySid;
+ @ApiModelProperty("创建人")
+ private String name;
+ @ApiModelProperty("创建组织")
private String createOrgSid; // 创建组织
- @ApiModelProperty("创建组织名称")
+ @ApiModelProperty("创建组织名称")
private String createOrgName; // 创建组织名称
- @ApiModelProperty("使用组织")
+ @ApiModelProperty("使用组织")
private String useOrgSid; // 使用组织
- @ApiModelProperty("使用组织名称")
+ @ApiModelProperty("使用组织名称")
private String useOrgName; // 使用组织名称
@ApiModelProperty("剩余盘库记录数量")
private String surplusNumber;
@@ -72,9 +79,10 @@ public class AppScmVehInventorymonthVo implements Vo {
private String profitNumber;
@ApiModelProperty("实盘数量")
private String actualNumber;
+ @ApiModelProperty("正常数量")
+ private String normalNumber;
@ApiModelProperty("是否显示生成报告按钮 剩余盘库记录=0时显示")
private Boolean showBtn;
-
}
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/AppVehInventorymonthVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/AppVehInventorymonthVo.java
new file mode 100644
index 0000000000..db5a5a508b
--- /dev/null
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/AppVehInventorymonthVo.java
@@ -0,0 +1,87 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmvehinventorymonth;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: aaa(aaa)
+ * File: ScmVehInventorymonthVo.java
+ * Class: com.yxt.anrui.scm.api.api.scmvehinventorymonth.ScmVehInventorymonthVo
+ * Description: 月度盘库 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-09-16 15:52:05
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "月度盘库 视图数据对象", description = "月度盘库 视图数据对象")
+public class AppVehInventorymonthVo implements Vo {
+
+ private String sid; // sid
+
+ @ApiModelProperty("编号(yyyyMMdd)")
+ private String billNo; // 编号(yyyyMMdd)
+ @ApiModelProperty("创建时间")
+ private String date; //
+ @ApiModelProperty("创建人sid")
+ private String createBySid;
+ @ApiModelProperty("创建人")
+ private String name;
+ @ApiModelProperty("创建组织")
+ private String createOrgSid; // 创建组织
+ @ApiModelProperty("创建组织名称")
+ private String createOrgName; // 创建组织名称
+ @ApiModelProperty("使用组织")
+ private String useOrgSid; // 使用组织
+ @ApiModelProperty("使用组织名称")
+ private String useOrgName; // 使用组织名称
+ @ApiModelProperty("剩余盘库记录数量")
+ private int surplusNumber;
+ @ApiModelProperty("盘库记录总数数量")
+ private int totalNumber;
+ @ApiModelProperty("盘亏数量")
+ private int lossNumber;
+ @ApiModelProperty("盘损数量")
+ private int damageNumber;
+ @ApiModelProperty("盘盈数量")
+ private int profitNumber;
+ @ApiModelProperty("实盘数量")
+ private int actualNumber;
+ @ApiModelProperty("正常数量")
+ private int normalNumber;
+ @ApiModelProperty("是否显示生成报告按钮 剩余盘库记录=0时显示")
+ private Boolean showBtn;
+
+
+}
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/AppVinAndRemarksVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/AppVinAndRemarksVo.java
new file mode 100644
index 0000000000..62dfa7391a
--- /dev/null
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/AppVinAndRemarksVo.java
@@ -0,0 +1,13 @@
+package com.yxt.anrui.scm.api.scmvehinventorymonth;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+@Data
+public class AppVinAndRemarksVo implements Vo {
+ private static final long serialVersionUID = -7810009366140799044L;
+
+ private String vinNo;
+
+ private String remarks;
+}
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/ScmVehInventorymonthFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/ScmVehInventorymonthFeign.java
index 8769eec4f1..dbc05bcfcf 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/ScmVehInventorymonthFeign.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/ScmVehInventorymonthFeign.java
@@ -88,6 +88,8 @@ public interface ScmVehInventorymonthFeign {
@ResponseBody
public ResultBean> getCarInventoryReportList(@RequestBody PagerQuery pagerQuery);
-
-
+ @ApiOperation("手机端-获取盘库报告")
+ @GetMapping("/getCarInventoryReport/{sid}")
+ @ResponseBody
+ public ResultBean getCarInventoryReport(@PathVariable("sid") String sid);
}
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/ScmVehInventorymonthFeignFallback.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/ScmVehInventorymonthFeignFallback.java
index 6d1261968f..1c53a5f3d1 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/ScmVehInventorymonthFeignFallback.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/ScmVehInventorymonthFeignFallback.java
@@ -79,4 +79,9 @@ public class ScmVehInventorymonthFeignFallback implements ScmVehInventorymonthFe
public ResultBean> getCarInventoryReportList(PagerQuery pagerQuery) {
return null;
}
+
+ @Override
+ public ResultBean getCarInventoryReport(String sid) {
+ return null;
+ }
}
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventoryreport/AppReportDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventoryreport/AppReportDto.java
new file mode 100644
index 0000000000..2f3ec069db
--- /dev/null
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventoryreport/AppReportDto.java
@@ -0,0 +1,26 @@
+package com.yxt.anrui.scm.api.scmvehinventoryreport;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.lang.ref.PhantomReference;
+import java.util.List;
+
+@Data
+public class AppReportDto implements Dto {
+
+ private static final long serialVersionUID = 7057300987973700285L;
+
+ @ApiModelProperty("盘库sid")
+ private String mainSid;
+
+ @ApiModelProperty("消息内容")
+ private String msgContent;
+
+ @ApiModelProperty("接收人sid")
+ private List list;
+
+ @ApiModelProperty("接收人id")
+ private List receiveIdList;
+}
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventoryreport/RecipientListDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventoryreport/RecipientListDto.java
new file mode 100644
index 0000000000..366b423d84
--- /dev/null
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventoryreport/RecipientListDto.java
@@ -0,0 +1,17 @@
+package com.yxt.anrui.scm.api.scmvehinventoryreport;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class RecipientListDto implements Vo {
+
+ private static final long serialVersionUID = 1105661416523691206L;
+
+ @ApiModelProperty("接收人sid")
+ private String sid; // 接收人sid
+ @ApiModelProperty("接收人姓名")
+ private String name; // 接收人姓名
+
+}
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventoryreport/ScmVehInventoryreportDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventoryreport/ScmVehInventoryreportDto.java
index 82c1289ca4..b38ddce8eb 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventoryreport/ScmVehInventoryreportDto.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventoryreport/ScmVehInventoryreportDto.java
@@ -32,6 +32,8 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.util.List;
+
/**
* Project: aaa(aaa)
* File: ScmVehInventoryreportDto.java
@@ -50,14 +52,12 @@ import lombok.Data;
public class ScmVehInventoryreportDto implements Dto {
private String sid; // sid
-
- @ApiModelProperty("月度盘库sid")
+ private String userSid;
+ @ApiModelProperty("月度盘库sid")
private String mainSid; // 月度盘库sid
- @ApiModelProperty("接收人sid")
- private String receiverSids; // 接收人sid
- @ApiModelProperty("接收人姓名")
- private String receiverNames; // 接收人姓名
- @ApiModelProperty("盘库报告内容")
+ @ApiModelProperty("接收人list")
+ private List recipientList;
+ @ApiModelProperty("盘库报告内容")
private String reportContent; // 盘库报告内容
}
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventoryreport/ScmVehInventoryreportFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventoryreport/ScmVehInventoryreportFeign.java
index bee8624419..97c4779ea7 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventoryreport/ScmVehInventoryreportFeign.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventoryreport/ScmVehInventoryreportFeign.java
@@ -75,4 +75,9 @@ public interface ScmVehInventoryreportFeign {
@GetMapping("/fetchDetailsBySid/{sid}")
@ResponseBody
public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid);
+
+ @ApiOperation("发送报告")
+ @PostMapping("/sendReport")
+ @ResponseBody
+ public ResultBean sendReport(@RequestBody ScmVehInventoryreportDto dto);
}
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventoryreport/ScmVehInventoryreportFeignFallback.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventoryreport/ScmVehInventoryreportFeignFallback.java
index 42892b19ec..c2e41d563c 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventoryreport/ScmVehInventoryreportFeignFallback.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventoryreport/ScmVehInventoryreportFeignFallback.java
@@ -69,4 +69,9 @@ public class ScmVehInventoryreportFeignFallback implements ScmVehInventoryreport
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口aaa/scmvehinventoryreport/fetchDetailsBySid无法访问");
}
+
+ @Override
+ public ResultBean sendReport(ScmVehInventoryreportDto dto) {
+ return null;
+ }
}
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/AppScmVehPatrolinspectionmonthInfoVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/AppScmVehPatrolinspectionmonthInfoVo.java
new file mode 100644
index 0000000000..e39d0809aa
--- /dev/null
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/AppScmVehPatrolinspectionmonthInfoVo.java
@@ -0,0 +1,20 @@
+package com.yxt.anrui.scm.api.scmvehpatrolinspectionmonth;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AppScmVehPatrolinspectionmonthInfoVo implements Vo {
+ private static final long serialVersionUID = -5082102320532147476L;
+
+ @ApiModelProperty("本次应巡检数量")
+ private String totalNumber;
+
+ @ApiModelProperty("实际巡检数量")
+ private String actualNumber;
+
+ @ApiModelProperty("存在的问题")
+ private String question;
+
+}
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/AppScmVehPatrolinspectionmonthQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/AppScmVehPatrolinspectionmonthQuery.java
new file mode 100644
index 0000000000..9ae483ab71
--- /dev/null
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/AppScmVehPatrolinspectionmonthQuery.java
@@ -0,0 +1,39 @@
+package com.yxt.anrui.scm.api.scmvehpatrolinspectionmonth;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AppScmVehPatrolinspectionmonthQuery implements Query {
+
+ private static final long serialVersionUID = -6285926370342867059L;
+
+ @ApiModelProperty("用户sid")
+ private String userSid;
+
+ @ApiModelProperty("报告编号/创建人")
+ private String names;
+
+ @ApiModelProperty("创建日期")
+ private String date;
+
+ @ApiModelProperty("巡检报告sid")
+ private String reportSid;
+
+ @ApiModelProperty("巡检状态")
+ private String state;
+
+ @ApiModelProperty("分公司sid")
+ private String useOrgSid;
+
+ @ApiModelProperty("盘库开始日期")
+ @JsonProperty("InventStartDate")
+ private String InventStartDate;
+
+ @ApiModelProperty("盘库结束日期")
+ @JsonProperty("InventEndDate")
+ private String InventEndDate;
+
+}
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/AppScmVehPatrolinspectionmonthVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/AppScmVehPatrolinspectionmonthVo.java
new file mode 100644
index 0000000000..67bc370179
--- /dev/null
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/AppScmVehPatrolinspectionmonthVo.java
@@ -0,0 +1,35 @@
+package com.yxt.anrui.scm.api.scmvehpatrolinspectionmonth;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AppScmVehPatrolinspectionmonthVo implements Vo {
+ private static final long serialVersionUID = -5082102320532147476L;
+
+
+ private String sid;
+ @ApiModelProperty("编号")
+ private String reportId;
+ @ApiModelProperty("创建人员")
+ private String name;
+ @ApiModelProperty("创建人sid")
+ private String createBySid;
+ @ApiModelProperty("创建时间")
+ private String date;
+ @ApiModelProperty("剩余巡检记录数量")
+ private String surplusNumber;
+ @ApiModelProperty("巡检记录总数数量")
+ private String totalNumber;
+ @ApiModelProperty("未处理数量")
+ private String unHandledNumber;
+ @ApiModelProperty("已处理数量")
+ private String processedNumber;
+ @ApiModelProperty("未巡检数量")
+ private String notHandledNumber;
+ @ApiModelProperty("实际巡检数量")
+ private String actualNumber;
+
+
+}
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonth.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonth.java
new file mode 100644
index 0000000000..b7692ba1e9
--- /dev/null
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonth.java
@@ -0,0 +1,64 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmvehpatrolinspectionmonth;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: aaa(aaa)
+ * File: ScmVehPatrolinspectionmonth.java
+ * Class: com.yxt.anrui.scm.api.scmvehpatrolinspectionmonth.ScmVehPatrolinspectionmonth
+ * Description: 月度日常管理记录.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-09-20 18:05:44
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "月度日常管理记录", description = "月度日常管理记录")
+@TableName("scm_veh_patrolinspectionmonth")
+public class ScmVehPatrolinspectionmonth extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("编号(yyyyMMdd)")
+ private String billNo; // 编号(yyyyMMdd)
+ @ApiModelProperty("创建组织")
+ private String createOrgSid; // 创建组织
+ @ApiModelProperty("创建组织名称")
+ private String createOrgName; // 创建组织名称
+ @ApiModelProperty("使用组织")
+ private String useOrgSid; // 使用组织
+ @ApiModelProperty("使用组织名称")
+ private String useOrgName; // 使用组织名称
+
+}
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthDetailsVo.java
new file mode 100644
index 0000000000..082730e97d
--- /dev/null
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthDetailsVo.java
@@ -0,0 +1,65 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmvehpatrolinspectionmonth;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: aaa(aaa)
+ * File: ScmVehPatrolinspectionmonthVo.java
+ * Class: com.yxt.anrui.scm.api.scmvehpatrolinspectionmonth.ScmVehPatrolinspectionmonthVo
+ * Description: 月度日常管理记录 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-09-20 18:05:44
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "月度日常管理记录 视图数据详情", description = "月度日常管理记录 视图数据详情")
+public class ScmVehPatrolinspectionmonthDetailsVo implements Vo {
+
+ private String sid; // sid
+
+ @ApiModelProperty("编号(yyyyMMdd)")
+ private String billNo; // 编号(yyyyMMdd)
+ @ApiModelProperty("创建组织")
+ private String createOrgSid; // 创建组织
+ @ApiModelProperty("创建组织名称")
+ private String createOrgName; // 创建组织名称
+ @ApiModelProperty("使用组织")
+ private String useOrgSid; // 使用组织
+ @ApiModelProperty("使用组织名称")
+ private String useOrgName; // 使用组织名称
+
+}
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthDto.java
new file mode 100644
index 0000000000..04cea0e507
--- /dev/null
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthDto.java
@@ -0,0 +1,65 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmvehpatrolinspectionmonth;
+
+
+import com.yxt.common.core.dto.Dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: aaa(aaa)
+ * File: ScmVehPatrolinspectionmonthDto.java
+ * Class: com.yxt.anrui.scm.api.scmvehpatrolinspectionmonth.ScmVehPatrolinspectionmonthDto
+ * Description: 月度日常管理记录 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-09-20 18:05:44
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "月度日常管理记录 数据传输对象", description = "月度日常管理记录 数据传输对象")
+public class ScmVehPatrolinspectionmonthDto implements Dto {
+
+ private String sid; // sid
+
+ @ApiModelProperty("编号(yyyyMMdd)")
+ private String billNo; // 编号(yyyyMMdd)
+ @ApiModelProperty("创建组织")
+ private String createOrgSid; // 创建组织
+ @ApiModelProperty("创建组织名称")
+ private String createOrgName; // 创建组织名称
+ @ApiModelProperty("使用组织")
+ private String useOrgSid; // 使用组织
+ @ApiModelProperty("使用组织名称")
+ private String useOrgName; // 使用组织名称
+
+}
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthFeign.java
new file mode 100644
index 0000000000..73a800f667
--- /dev/null
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthFeign.java
@@ -0,0 +1,97 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmvehpatrolinspectionmonth;
+
+import com.yxt.anrui.scm.api.scmvehinventorymonth.AppScmVehInventorymonthInfoVo;
+import com.yxt.anrui.scm.api.scmvehinventorymonth.AppScmVehInventorymonthQuery;
+import com.yxt.anrui.scm.api.scmvehinventorymonth.AppScmVehInventorymonthVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * Project: aaa(aaa)
+ * File: ScmVehPatrolinspectionmonthFeign.java
+ * Class: com.yxt.anrui.scm.api.scmvehpatrolinspectionmonth.ScmVehPatrolinspectionmonthFeign
+ * Description: 月度日常管理记录.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-09-20 18:05:44
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "月度日常管理记录")
+@FeignClient(
+ contextId = "aaa-ScmVehPatrolinspectionmonth",
+ name = "aaa",
+ path = "v1/scmvehpatrolinspectionmonth",
+ fallback = ScmVehPatrolinspectionmonthFeignFallback.class)
+public interface ScmVehPatrolinspectionmonthFeign {
+
+ @ApiOperation("根据条件分页查询数据的列表")
+ @PostMapping("/listPage")
+ @ResponseBody
+ public ResultBean> listPage(@RequestBody PagerQuery pq);
+
+ @ApiOperation("新增或修改")
+ @PostMapping("/save")
+ @ResponseBody
+ public ResultBean save(@RequestBody ScmVehPatrolinspectionmonthDto dto);
+
+ @ApiOperation("根据sid删除记录")
+ @DeleteMapping("/delBySids")
+ @ResponseBody
+ public ResultBean delBySids(@RequestBody String[] sids);
+
+ @ApiOperation("根据SID获取一条记录")
+ @GetMapping("/fetchDetailsBySid/{sid}")
+ @ResponseBody
+ public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid);
+
+ @ApiOperation("手机端-判断是否生成巡检记录")
+ @GetMapping("/getInspectionRecords/{userSid}")
+ @ResponseBody
+ public ResultBean getInspectionRecords(@PathVariable("userSid") String userSid);
+
+ @ApiOperation("手机端-获取巡检报告列表")
+ @PostMapping("/getCarInventoryReportList")
+ @ResponseBody
+ public ResultBean> getCarInspectionReportList(@RequestBody PagerQuery pagerQuery);
+
+ @ApiOperation("手机端-获取巡检报告")
+ @GetMapping("/getCarInspectionReport/{sid}")
+ @ResponseBody
+ public ResultBean getCarInspectionReport(@PathVariable("sid") String sid);
+
+}
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthFeignFallback.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthFeignFallback.java
new file mode 100644
index 0000000000..5f3a092a9e
--- /dev/null
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthFeignFallback.java
@@ -0,0 +1,87 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmvehpatrolinspectionmonth;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * Project: aaa(aaa)
+ * File: ScmVehPatrolinspectionmonthFeignFallback.java
+ * Class: com.yxt.anrui.scm.api.scmvehpatrolinspectionmonth.ScmVehPatrolinspectionmonthFeignFallback
+ * Description: 月度日常管理记录.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-09-20 18:05:44
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class ScmVehPatrolinspectionmonthFeignFallback implements ScmVehPatrolinspectionmonthFeign {
+
+ @Override
+ public ResultBean> listPage(PagerQuery pq){
+ ResultBean rb = ResultBean.fireFail();
+ return rb.setMsg("接口aaa/scmvehpatrolinspectionmonth/listPage无法访问");
+ }
+
+ @Override
+ public ResultBean save(ScmVehPatrolinspectionmonthDto dto){
+ return ResultBean.fireFail().setMsg("接口aaa/scmvehpatrolinspectionmonth/save无法访问");
+ }
+
+ @Override
+ public ResultBean delBySids( String[] sids){
+ return ResultBean.fireFail().setMsg("接口aaa/scmvehpatrolinspectionmonth/delBySids无法访问");
+ }
+
+ @Override
+ public ResultBean fetchDetailsBySid(String sid){
+ ResultBean rb = ResultBean.fireFail();
+ return rb.setMsg("接口aaa/scmvehpatrolinspectionmonth/fetchDetailsBySid无法访问");
+ }
+
+ @Override
+ public ResultBean getInspectionRecords(String userSid) {
+ return null;
+ }
+
+ @Override
+ public ResultBean> getCarInspectionReportList(PagerQuery pagerQuery) {
+ return null;
+ }
+
+ @Override
+ public ResultBean getCarInspectionReport(String sid) {
+ return null;
+ }
+}
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthQuery.java
new file mode 100644
index 0000000000..8240ed3510
--- /dev/null
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthQuery.java
@@ -0,0 +1,63 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmvehpatrolinspectionmonth;
+
+
+import com.yxt.common.core.query.Query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: aaa(aaa)
+ * File: ScmVehPatrolinspectionmonthQuery.java
+ * Class: com.yxt.anrui.scm.api.scmvehpatrolinspectionmonth.ScmVehPatrolinspectionmonthQuery
+ * Description: 月度日常管理记录 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-09-20 18:05:44
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "月度日常管理记录 查询条件", description = "月度日常管理记录 查询条件")
+public class ScmVehPatrolinspectionmonthQuery implements Query {
+
+ @ApiModelProperty("编号(yyyyMMdd)")
+ private String billNo; // 编号(yyyyMMdd)
+ @ApiModelProperty("创建组织")
+ private String createOrgSid; // 创建组织
+ @ApiModelProperty("创建组织名称")
+ private String createOrgName; // 创建组织名称
+ @ApiModelProperty("使用组织")
+ private String useOrgSid; // 使用组织
+ @ApiModelProperty("使用组织名称")
+ private String useOrgName; // 使用组织名称
+
+}
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthVo.java
new file mode 100644
index 0000000000..510c8397d7
--- /dev/null
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthVo.java
@@ -0,0 +1,65 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmvehpatrolinspectionmonth;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: aaa(aaa)
+ * File: ScmVehPatrolinspectionmonthVo.java
+ * Class: com.yxt.anrui.scm.api.scmvehpatrolinspectionmonth.ScmVehPatrolinspectionmonthVo
+ * Description: 月度日常管理记录 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-09-20 18:05:44
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "月度日常管理记录 视图数据对象", description = "月度日常管理记录 视图数据对象")
+public class ScmVehPatrolinspectionmonthVo implements Vo {
+
+ private String sid; // sid
+
+ @ApiModelProperty("编号(yyyyMMdd)")
+ private String billNo; // 编号(yyyyMMdd)
+ @ApiModelProperty("创建组织")
+ private String createOrgSid; // 创建组织
+ @ApiModelProperty("创建组织名称")
+ private String createOrgName; // 创建组织名称
+ @ApiModelProperty("使用组织")
+ private String useOrgSid; // 使用组织
+ @ApiModelProperty("使用组织名称")
+ private String useOrgName; // 使用组织名称
+
+}
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/VehPatrolinspectionmonthVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/VehPatrolinspectionmonthVo.java
new file mode 100644
index 0000000000..8be1f843c7
--- /dev/null
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/VehPatrolinspectionmonthVo.java
@@ -0,0 +1,30 @@
+package com.yxt.anrui.scm.api.scmvehpatrolinspectionmonth;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class VehPatrolinspectionmonthVo implements Vo {
+ private static final long serialVersionUID = -9027195577856709868L;
+
+ private String sid;
+ @ApiModelProperty("编号")
+ private String reportId;
+ @ApiModelProperty("创建人员")
+ private String name;
+ @ApiModelProperty("创建时间")
+ private String date;
+ @ApiModelProperty("剩余巡检记录数量")
+ private int surplusNumber;
+ @ApiModelProperty("巡检记录总数数量")
+ private int totalNumber;
+ @ApiModelProperty("未处理数量")
+ private int unHandledNumber;
+ @ApiModelProperty("已处理数量")
+ private int processedNumber;
+ @ApiModelProperty("未巡检数量")
+ private int notHandledNumber;
+ @ApiModelProperty("实际巡检数量")
+ private int actualNumber;
+}
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionreport/ScmVehPatrolinspectionreport.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionreport/ScmVehPatrolinspectionreport.java
new file mode 100644
index 0000000000..ffa0f454c2
--- /dev/null
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionreport/ScmVehPatrolinspectionreport.java
@@ -0,0 +1,62 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmvehpatrolinspectionreport;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: aaa(aaa)
+ * File: ScmVehPatrolinspectionreport.java
+ * Class: com.yxt.anrui.scm.api.scmvehpatrolinspectionreport.ScmVehPatrolinspectionreport
+ * Description: 日常管理报告.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-09-20 18:05:44
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "日常管理报告", description = "日常管理报告")
+@TableName("scm_veh_patrolinspectionreport")
+public class ScmVehPatrolinspectionreport extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("月度日常管理记录sid")
+ private String mainSid; // 月度日常管理记录sid
+ @ApiModelProperty("接收人sid")
+ private String receiverSids; // 接收人sid
+ @ApiModelProperty("接收人姓名")
+ private String receiverNames; // 接收人姓名
+ @ApiModelProperty("盘库报告内容")
+ private String reportContent; // 盘库报告内容
+
+}
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionreport/ScmVehPatrolinspectionreportDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionreport/ScmVehPatrolinspectionreportDetailsVo.java
new file mode 100644
index 0000000000..eeae5cbfd7
--- /dev/null
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionreport/ScmVehPatrolinspectionreportDetailsVo.java
@@ -0,0 +1,63 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmvehpatrolinspectionreport;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: aaa(aaa)
+ * File: ScmVehPatrolinspectionreportVo.java
+ * Class: com.yxt.anrui.scm.api.scmvehpatrolinspectionreport.ScmVehPatrolinspectionreportVo
+ * Description: 日常管理报告 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-09-20 18:05:44
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "日常管理报告 视图数据详情", description = "日常管理报告 视图数据详情")
+public class ScmVehPatrolinspectionreportDetailsVo implements Vo {
+
+ private String sid; // sid
+
+ @ApiModelProperty("月度日常管理记录sid")
+ private String mainSid; // 月度日常管理记录sid
+ @ApiModelProperty("接收人sid")
+ private String receiverSids; // 接收人sid
+ @ApiModelProperty("接收人姓名")
+ private String receiverNames; // 接收人姓名
+ @ApiModelProperty("盘库报告内容")
+ private String reportContent; // 盘库报告内容
+
+}
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionreport/ScmVehPatrolinspectionreportDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionreport/ScmVehPatrolinspectionreportDto.java
new file mode 100644
index 0000000000..bfb6c3a5ae
--- /dev/null
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionreport/ScmVehPatrolinspectionreportDto.java
@@ -0,0 +1,63 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmvehpatrolinspectionreport;
+
+
+import com.yxt.common.core.dto.Dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: aaa(aaa)
+ * File: ScmVehPatrolinspectionreportDto.java
+ * Class: com.yxt.anrui.scm.api.scmvehpatrolinspectionreport.ScmVehPatrolinspectionreportDto
+ * Description: 日常管理报告 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-09-20 18:05:44
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "日常管理报告 数据传输对象", description = "日常管理报告 数据传输对象")
+public class ScmVehPatrolinspectionreportDto implements Dto {
+
+ private String sid; // sid
+
+ @ApiModelProperty("月度日常管理记录sid")
+ private String mainSid; // 月度日常管理记录sid
+ @ApiModelProperty("接收人sid")
+ private String receiverSids; // 接收人sid
+ @ApiModelProperty("接收人姓名")
+ private String receiverNames; // 接收人姓名
+ @ApiModelProperty("盘库报告内容")
+ private String reportContent; // 盘库报告内容
+
+}
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionreport/ScmVehPatrolinspectionreportFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionreport/ScmVehPatrolinspectionreportFeign.java
new file mode 100644
index 0000000000..ff9ef6c847
--- /dev/null
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionreport/ScmVehPatrolinspectionreportFeign.java
@@ -0,0 +1,78 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmvehpatrolinspectionreport;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * Project: aaa(aaa)
+ * File: ScmVehPatrolinspectionreportFeign.java
+ * Class: com.yxt.anrui.scm.api.scmvehpatrolinspectionreport.ScmVehPatrolinspectionreportFeign
+ * Description: 日常管理报告.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-09-20 18:05:44
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "日常管理报告")
+@FeignClient(
+ contextId = "aaa-ScmVehPatrolinspectionreport",
+ name = "aaa",
+ path = "v1/scmvehpatrolinspectionreport",
+ fallback = ScmVehPatrolinspectionreportFeignFallback.class)
+public interface ScmVehPatrolinspectionreportFeign {
+
+ @ApiOperation("根据条件分页查询数据的列表")
+ @PostMapping("/listPage")
+ @ResponseBody
+ public ResultBean> listPage(@RequestBody PagerQuery pq);
+
+ @ApiOperation("新增或修改")
+ @PostMapping("/save")
+ @ResponseBody
+ public ResultBean save(@RequestBody ScmVehPatrolinspectionreportDto dto);
+
+ @ApiOperation("根据sid删除记录")
+ @DeleteMapping("/delBySids")
+ @ResponseBody
+ public ResultBean delBySids(@RequestBody String[] sids);
+
+ @ApiOperation("根据SID获取一条记录")
+ @GetMapping("/fetchDetailsBySid/{sid}")
+ @ResponseBody
+ public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid);
+}
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionreport/ScmVehPatrolinspectionreportFeignFallback.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionreport/ScmVehPatrolinspectionreportFeignFallback.java
new file mode 100644
index 0000000000..1f00b36ceb
--- /dev/null
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionreport/ScmVehPatrolinspectionreportFeignFallback.java
@@ -0,0 +1,72 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmvehpatrolinspectionreport;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * Project: aaa(aaa)
+ * File: ScmVehPatrolinspectionreportFeignFallback.java
+ * Class: com.yxt.anrui.scm.api.scmvehpatrolinspectionreport.ScmVehPatrolinspectionreportFeignFallback
+ * Description: 日常管理报告.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-09-20 18:05:44
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class ScmVehPatrolinspectionreportFeignFallback implements ScmVehPatrolinspectionreportFeign {
+
+ @Override
+ public ResultBean> listPage(PagerQuery pq){
+ ResultBean rb = ResultBean.fireFail();
+ return rb.setMsg("接口aaa/scmvehpatrolinspectionreport/listPage无法访问");
+ }
+
+ @Override
+ public ResultBean save(ScmVehPatrolinspectionreportDto dto){
+ return ResultBean.fireFail().setMsg("接口aaa/scmvehpatrolinspectionreport/save无法访问");
+ }
+
+ @Override
+ public ResultBean delBySids( String[] sids){
+ return ResultBean.fireFail().setMsg("接口aaa/scmvehpatrolinspectionreport/delBySids无法访问");
+ }
+
+ @Override
+ public ResultBean fetchDetailsBySid(String sid){
+ ResultBean rb = ResultBean.fireFail();
+ return rb.setMsg("接口aaa/scmvehpatrolinspectionreport/fetchDetailsBySid无法访问");
+ }
+}
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionreport/ScmVehPatrolinspectionreportQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionreport/ScmVehPatrolinspectionreportQuery.java
new file mode 100644
index 0000000000..880035dc9e
--- /dev/null
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionreport/ScmVehPatrolinspectionreportQuery.java
@@ -0,0 +1,61 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmvehpatrolinspectionreport;
+
+
+import com.yxt.common.core.query.Query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: aaa(aaa)
+ * File: ScmVehPatrolinspectionreportQuery.java
+ * Class: com.yxt.anrui.scm.api.scmvehpatrolinspectionreport.ScmVehPatrolinspectionreportQuery
+ * Description: 日常管理报告 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-09-20 18:05:44
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "日常管理报告 查询条件", description = "日常管理报告 查询条件")
+public class ScmVehPatrolinspectionreportQuery implements Query {
+
+ @ApiModelProperty("月度日常管理记录sid")
+ private String mainSid; // 月度日常管理记录sid
+ @ApiModelProperty("接收人sid")
+ private String receiverSids; // 接收人sid
+ @ApiModelProperty("接收人姓名")
+ private String receiverNames; // 接收人姓名
+ @ApiModelProperty("盘库报告内容")
+ private String reportContent; // 盘库报告内容
+
+}
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionreport/ScmVehPatrolinspectionreportVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionreport/ScmVehPatrolinspectionreportVo.java
new file mode 100644
index 0000000000..eb2e368e4a
--- /dev/null
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionreport/ScmVehPatrolinspectionreportVo.java
@@ -0,0 +1,63 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmvehpatrolinspectionreport;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: aaa(aaa)
+ * File: ScmVehPatrolinspectionreportVo.java
+ * Class: com.yxt.anrui.scm.api.scmvehpatrolinspectionreport.ScmVehPatrolinspectionreportVo
+ * Description: 日常管理报告 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-09-20 18:05:44
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "日常管理报告 视图数据对象", description = "日常管理报告 视图数据对象")
+public class ScmVehPatrolinspectionreportVo implements Vo {
+
+ private String sid; // sid
+
+ @ApiModelProperty("月度日常管理记录sid")
+ private String mainSid; // 月度日常管理记录sid
+ @ApiModelProperty("接收人sid")
+ private String receiverSids; // 接收人sid
+ @ApiModelProperty("接收人姓名")
+ private String receiverNames; // 接收人姓名
+ @ApiModelProperty("盘库报告内容")
+ private String reportContent; // 盘库报告内容
+
+}
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java
index 5fc43c1e48..bfc55bd077 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java
@@ -559,8 +559,8 @@ public class ScmVehicleExamineService extends MybatisBaseService
* 手机端-初始化移库申请
*
* @param sid
- * @param useOrgSid
* @return
*/
- AppScmVehicleGressionInfoVo getCarTransferInfo(@Param("sid") String sid, @Param("useOrgSid") String useOrgSid);
+ AppScmVehicleGressionInfoVo getCarTransferInfo(@Param("sid") String sid);
/**
* 手机端-车库移库详情
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionMapper.xml
index a0cfedc0ee..f8eafce122 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionMapper.xml
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionMapper.xml
@@ -75,7 +75,6 @@
SELECT *
FROM scm_vehicle_gression svg
WHERE svg.sid = #{sid}
- AND svg.useOrgSid = #{useOrgSid}