存放地点变更修改

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")
+    @ApiModelProperty("车辆sid")
-    private String vehSid; // 车辆sid
+    private String vehSid;
-	@ApiModelProperty("数据字典项key,如移位申请中 001 状态")
+    @ApiModelProperty("数据字典项key,如移位申请中 001 状态")
-    private String tempStateKey; // 数据字典项key,如移位申请中 001 状态
+    private String tempStateKey;
-	@ApiModelProperty("业务sid")
+    @ApiModelProperty("业务sid")
-    private String busSid; // 业务sid
+    private String busSid;
 
 }

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) <br/>
  * File: BaseVehicleTempstateFeign.java <br/>
@@ -78,4 +80,13 @@ public interface BaseVehicleTempstateFeign {
     @DeleteMapping("/delByBusSid")
     @ResponseBody
     public ResultBean delByBusSid(@RequestParam("businessSid") String businessSid);
+
+    @ApiOperation("查询所有审批中的车架号")
+    @GetMapping("/selectAll/{s}")
+    @ResponseBody
+    ResultBean<List<BaseVehicleTempstateVo>> selectAll(@PathVariable("s") String s);
+    @ApiOperation("查询所有审批中的车架号")
+    @GetMapping("/selectAllOne/{s}")
+    @ResponseBody
+    ResultBean<List<String>> selectAllOne(@PathVariable("s") String s);
 }

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<List<BaseVehicleTempstateVo>> selectAll(String s) {
+		return null;
+	}
+
+	@Override
+	public ResultBean<List<String>> selectAllOne(String s) {
+		return null;
+	}
 }

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")
+    @ApiModelProperty("车辆sid")
-    private String vehSid; // 车辆sid
+    private String vehSid;
-	@ApiModelProperty("数据字典项key,如移位申请中 001 状态")
+    @ApiModelProperty("数据字典项key,如移位申请中 001 状态")
-    private String tempStateKey; // 数据字典项key,如移位申请中 001 状态
+    private String tempStateKey;
-	@ApiModelProperty("业务sid")
+    @ApiModelProperty("业务sid")
-    private String busSid; // 业务sid
+    private String busSid;
 
 }

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

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

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml

@@ -564,6 +564,7 @@
             <if test="orgSid != null and orgSid != ''">
                 and bvc.useOrgSid = #{orgSid}
             </if>
+            and length(bvc.guidedPrice)>0
         </where>
         ORDER BY nowCarNum DESC
     </select>

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

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<PagerVo<BaseVehicleVo>> pagerList(@RequestBody PagerQuery<BaseVehicleQuery> pagerQuery) {
         ResultBean<PagerVo<BaseVehicleVo>> rb = ResultBean.fireFail();
@@ -842,7 +849,9 @@ public class BaseVehicleRest implements BaseVehicleFeign {
             return rb.setMsg("用户sid不能为空");
         }
         PagerVo<AppScmWarehouseVinVo> page = new PagerVo<>();
-        IPage<AppScmWarehouseVinVo> iPage = baseVehicleService.getPcVinByWarehouseSid(pagerQuery);
+        //查询在申请的存放地点变更车辆的车辆sid
+        List<String> stringList = baseVehicleTempstateService.selectAll("001");
+        IPage<AppScmWarehouseVinVo> iPage = baseVehicleService.getPcVinByWarehouseSid(pagerQuery,stringList);
         PagerVo<AppScmWarehouseVinVo> pagerVo = PagerUtil.pageToVo(iPage, page);
         return new ResultBean<PagerVo<AppScmWarehouseVinVo>>().success().setData(pagerVo);
     }

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<BaseVehicleMapper, Ba
             if (StringUtils.isNotBlank(params.getOrderingNo())) {
                 qw.like("bv.orderingNo", params.getOrderingNo());
             }
-            qw.eq("bv.isProblemVeh",0);
+            qw.eq("bv.isProblemVeh", 0);
 
         }
         return qw;
@@ -1663,7 +1663,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
     public ResultBean<List<AppScmWarehouseVinVo>> getVinByWarehouseSid(String warehouseSid, String userSid) {
         ResultBean rb = ResultBean.fireFail();
         QueryWrapper<BaseVehicle> qw = new QueryWrapper<>();
-        List<String> carSidList = baseVehicleTempstateService.selectAll();
+        List<String> carSidList = baseVehicleTempstateService.selectAll("001");
         ResultBean<String> resultBean = sysStaffOrgFeign.getPathSidByUserSid(userSid);
         if (StringUtils.isNotBlank(resultBean.getData())) {
             qw.eq("bv.createOrgSid", resultBean.getData());
@@ -1769,7 +1769,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         return rb.success().setData(vo);
     }
 
-    public IPage<AppScmWarehouseVinVo> getPcVinByWarehouseSid(PagerQuery<VinByWarehouseQuery> pagerQuery) {
+    public IPage<AppScmWarehouseVinVo> getPcVinByWarehouseSid(PagerQuery<VinByWarehouseQuery> pagerQuery, List<String> vinList) {
         IPage<VinByWarehouseQuery> page = PagerUtil.queryToPage(pagerQuery);
         QueryWrapper<AppScmWarehouseVinVo> qw = new QueryWrapper();
         VinByWarehouseQuery params = pagerQuery.getParams();
@@ -1784,6 +1784,9 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         if (params.getVins().size() > 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()));

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<BaseVehicleTempst
 
     List<BaseVehicleTempstateVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BaseVehicleTempstate> qw);
 
-    @Select("select * from base_vehicle_tempstate")
+    @Select("select * from base_vehicle_tempstate where tempStateKey = #{state} ")
-    List<BaseVehicleTempstateVo> selectListVo();
+    List<BaseVehicleTempstateVo> 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<BaseVehicleTempstateVo> selectAllOne(String s);
 }

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) <br/>
@@ -98,4 +100,18 @@ public class BaseVehicleTempstateRest implements BaseVehicleTempstateFeign {
         baseVehicleTempstateService.delByBusSid(businessSid);
         return rb.success();
     }
+
+    @Override
+    public ResultBean<List<BaseVehicleTempstateVo>> selectAll(String s) {
+        ResultBean<List<BaseVehicleTempstateVo>> rb = ResultBean.fireFail();
+        List<BaseVehicleTempstateVo> stringList = baseVehicleTempstateService.selectAllOne(s);
+        return rb.success().setData(stringList);
+    }
+
+    @Override
+    public ResultBean<List<String>> selectAllOne(String s) {
+        ResultBean<List<String>> rb = ResultBean.fireFail();
+        List<String> stringList = baseVehicleTempstateService.selectAll(s);
+        return rb.success().setData(stringList);
+    }
 }

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<BaseVehicleT
         baseMapper.deleteByBusSid(businessSid);
     }
 
-    public List<String> selectAll() {
+    public List<String> selectAll(String state) {
         List<String> list = new ArrayList<>();
-        List<BaseVehicleTempstateVo> baseVehicleTempstateVos = baseMapper.selectListVo();
+        List<BaseVehicleTempstateVo> 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<BaseVehicleT
         }
         return list;
     }
+
+    public List<BaseVehicleTempstateVo> selectAllOne(String s) {
+        return baseMapper.selectAllOne(s);
+    }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.xml

@@ -90,7 +90,7 @@
                   , #{names}
                   , '%')
             </if>
-            order by id
+            order by id desc
         </where>
     </select>
 

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

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

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<FinPaymentrecord> {
 
     List<String> selectApplySids(@Param("list") List<String> sids);
 
-    int updateStateBySid(@Param("sid") String sid, @Param("state") int i);
+    int updateStateBySid(@Param("sid")String sid, @Param("state") int i);
 
     List<String> selectApplySidBySid(List<String> sids);
 }

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,

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) {
+    public ResultBean updateState(String[] sids) {
-        return finPaymentrecordService.updateState(sid);
+        return finPaymentrecordService.updateState(sids);
     }
 }

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<FinPaymentrecord
     private FinKingDeeService finKingDeeService;
     @Autowired
     private ApPayBillService apPayBillService;
+    @Autowired
+    private BusVehicleApplyFeign busVehicleApplyFeign;
 
     public PagerVo<FinPaymentrecordVo> listPageVo(PagerQuery<FinPaymentrecordQuery> pq) {
         FinPaymentrecordQuery query = pq.getParams();
@@ -126,7 +132,6 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
         List<String> sids = dto.getSids();
         //判断选择的sids的付款申请的收款单位是否一致
         List<String> applySids = baseMapper.selectApplySids(sids);
-//        List<String> 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<FinPaymentrecord
     /**
      * 作废
      *
-     * @param sid
+     * @param sids
      * @return
      */
-    public ResultBean updateState(String sid) {
+    public ResultBean updateState(String[] sids) {
         ResultBean rb = ResultBean.fireFail();
         //查询是否是未打款的
-        FinPaymentrecord finPaymentrecord = fetchBySid(sid);
+        //查询选中的数据中是否包含未作废的厂家采购记录
-        if (finPaymentrecord.getState() == 2) {
+        List<String> sidsList = Arrays.asList(sids);
-            return rb.setMsg("该记录已打款，不能作废");
+        for (String s : sidsList) {
+            FinPaymentrecord finPaymentrecord = fetchBySid(s);
+            if (!DictCommonEnum.costType.CG_TYPE.getCode().equals(finPaymentrecord.getCostTypeKey())) {
+                return rb.setMsg("选择的数据中包含款项类别非排产的数据");
+            } else {
+                ResultBean<BusVehicleApplyDetailsVo> 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();
     }
 }

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(专项返利管理) <br/>
  * File: ScmSpecialRebateFeignFallback.java <br/>

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<String> vins; // 车架号
+    private List<String> 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("现存地点")
+    /* @ApiModelProperty("现存地点")
-    private String locationKey;
+     private String locationKey;*/
     @ApiModelProperty("目标地点")
-    private String targetLocation; // 目标地点
+    private String targetLocation;
     @ApiModelProperty("目标地点")
     private String targetLocationSid;
-    @ApiModelProperty("目标地点")
+   /* @ApiModelProperty("目标地点")
-    private String targetLocationKey;
+    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("临牌状态")

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<String> 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<String> policyImage;
-
-    @ApiModelProperty("车架号")
-    private List<ScmVehicleGressionVehDto> 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<ScmVehicleGressionVehDto> scmVehicleGressionVehs;
+    //    @ApiModelProperty("车辆sid")
+//    private String vehicleSid;
+//    @ApiModelProperty("车架号")
+//    private String vinNo;
+//    @ApiModelProperty("车架号")
+//    private List<String> 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<String> policyImage;
+
 
 }

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
+    private static final long serialVersionUID = 4484553821363324415L;
-
+    private String sid;
-    @ApiModelProperty("车辆sid")
-    private String vehicleSid; // 车辆sid
-    @ApiModelProperty("车架号")
-    private String vinNo; // 车架号
     @ApiModelProperty("车架号")
-    private List<String> vins; // 车架号
+    private List<String> 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,36 @@ 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<ScmVehicleGressionVehVo> scmVehicleGressionVehs;
-
     @ApiModelProperty("保单照片")
-    private List<String> policyImage;
+    private List<String> policyImage = new ArrayList<>();
     @ApiModelProperty("现场照片")
-    private List<String> image;
+    private List<String> image = new ArrayList<>();
-
     @ApiModelProperty("调出方负责人名称")
     private String staffName;
     @ApiModelProperty("调出方负责人用户sid")
     private String personUserSid;
+    @ApiModelProperty("车架号")
+    private List<ScmVehicleGressionVehVo> scmVehicleGressionVehs = new ArrayList<>();
+
+  /*  @ApiModelProperty("车辆sid")
+    private String vehicleSid;
+    @ApiModelProperty("车架号")
+    private String vinNo;*/
+
+/*    @ApiModelProperty("现存地点")
+    private String locationKey;*/
+
+    /*   @ApiModelProperty("目标地点")
+       private String targetLocationKey;*/
+
 
 }

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) <br/>
  * File: ScmVehicleGression.java <br/>
@@ -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; // 现存地点
+    private String location;
-    @ApiModelProperty("现存放地点")
-    private String locationKey;
     @ApiModelProperty("现存放地点sid")
     private String locationSid;
     @ApiModelProperty("目标地点")
-    private String targetLocation; // 目标地点
+    private String targetLocation;
-    @ApiModelProperty("目标库")
-    private String targetLocationKey;
     @ApiModelProperty("目标库sid")
     private String targetLocationSid;
     @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; // 保险状态
     @ApiModelProperty("保险状态")
-    private String InsuranceStateKey; // 保险状态
+    private String InsuranceState;
-    @ApiModelProperty("临牌状态")
+    @ApiModelProperty("保险状态key")
-    private String proCardState;
+    private String InsuranceStateKey;
-    @ApiModelProperty("临牌状态")
-    private String proCardStateKey;
-    @ApiModelProperty("临牌")
-    private String temporaryCard; // 临牌
-    @ApiModelProperty("申请状态（代办已办）")
-    private String handleState;
-    @ApiModelProperty("分公司sid")
-    private String useOrgSid;
-    @ApiModelProperty("部门sid")
-    private String orgSid;
     @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("申请状态（代办已办）")
-    @ApiModelProperty("调出方负责人用户sid")
+    private String handleState;
-    private String personUserSid;
+   /* @ApiModelProperty("现存放地点sid")
+    private String locationKey;*/
+    /*    @ApiModelProperty("目标库")
+        private String targetLocationKey;*/
+   /* @ApiModelProperty("部门sid")
+    private String orgSid;*/
+
 
 }

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<PagerVo<ScmVehicleGressionVo>> listPage(@RequestBody PagerQuery<ScmVehicleGressionQuery> pq);
@@ -78,14 +78,14 @@ public interface ScmVehicleGressionFeign {
     @ApiOperation("根据SID获取一条记录")
     @GetMapping("/fetchDetailsBySid/{sid}")
     @ResponseBody
-    public ResultBean<ScmVehicleGressionDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+    public ResultBean<ScmVehicleGressionDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);*/
 
     @ApiOperation("PC端-获取车辆移位列表")
     @PostMapping("/selectCarTransferList")
     @ResponseBody
     public ResultBean<PagerVo<ScmVehicleGressionPageVo>> selectCarTransferList(@RequestBody PagerQuery<ScmVehicleGressionPageQuery> pagerQuery);
 
-    @ApiOperation("PC端-获取车辆移位记录")
+    @ApiOperation("PC端-获取车辆移位记录-车辆台账")
     @PostMapping("/selectCarTransferListAll")
     @ResponseBody
     public ResultBean<PagerVo<ScmVehicleGressionPageVo>> selectCarTransferListAll(@RequestBody PagerQuery<ScmVehicleGressionPageQuery> pagerQuery);
@@ -101,10 +101,10 @@ public interface ScmVehicleGressionFeign {
     @ResponseBody
     public ResultBean<PagerVo<AppScmVehicleGressionPageVo>> getCarTransferList(@RequestBody PagerQuery<AppScmVehicleGressionPageQuery> pagerQuery);
 
-    @ApiOperation("手机端-保存车库移库信息")
+    @ApiOperation("移动端、PC端-保存车库移库信息")
     @PostMapping("/saveCarTransferInfo")
     @ResponseBody
-    public ResultBean saveCarTransferInfo(@RequestBody AppScmVehicleGressionDto dto);
+    public ResultBean<String> 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);

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<PagerVo<ScmVehicleGressionVo>> listPage(PagerQuery<ScmVehicleGressionQuery> pq) {
         ResultBean rb = ResultBean.fireFail();
         return rb.setMsg("接口scm/scmvehiclegression/listPage无法访问");
@@ -70,7 +70,7 @@ public class ScmVehicleGressionFeignFallback implements ScmVehicleGressionFeign
     public ResultBean<ScmVehicleGressionDetailsVo> fetchDetailsBySid(String sid) {
         ResultBean rb = ResultBean.fireFail();
         return rb.setMsg("接口scm/scmvehiclegression/fetchDetailsBySid无法访问");
-    }
+    }*/
 
     @Override
     public ResultBean<PagerVo<ScmVehicleGressionPageVo>> selectCarTransferList(PagerQuery<ScmVehicleGressionPageQuery> pagerQuery) {
@@ -93,7 +93,7 @@ public class ScmVehicleGressionFeignFallback implements ScmVehicleGressionFeign
     }
 
     @Override
-    public ResultBean saveCarTransferInfo(AppScmVehicleGressionDto dto) {
+    public ResultBean<String> saveCarTransferInfo(AppScmVehicleGressionDto dto) {
         return null;
     }
 

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")
+    @ApiModelProperty("移位申请单sid")
-    private String mainSid; // 移位申请单sid
+    private String mainSid;
-	@ApiModelProperty("车辆sid")
+    @ApiModelProperty("车辆sid")
-    private String vehSid; // 车辆sid
+    private String vehSid;
-	@ApiModelProperty("车架号")
+    @ApiModelProperty("车架号")
-    private String vehVin; // 车架号
+    private String vehVin;
-	@ApiModelProperty("买断状态key")
+    @ApiModelProperty("买断状态key")
-    private String settlementStatus; // 买断状态key
+    private String settlementStatus;
-	@ApiModelProperty("买断状态value")
+    @ApiModelProperty("买断状态value")
-    private String settlementStatusValue; // 买断状态value
+    private String settlementStatusValue;
-	@ApiModelProperty("临时牌照号码")
+/*    @ApiModelProperty("临时牌照号码")
-    private String temporaryCardNo; // 临时牌照号码
+    private String temporaryCardNo;*/
 
 }

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
+    private String settlementStatusValue;
-    @ApiModelProperty("临时牌照号码")
+/*    @ApiModelProperty("临时牌照号码")
-    private String temporaryCardNo; // 临时牌照号码
+    private String temporaryCardNo;*/
+    /*private String sid;*/
+
+/*    @ApiModelProperty("移位申请单sid")
+    private String mainSid;*/
 
 }

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) <br/>
@@ -50,29 +43,11 @@ import java.util.List;
  */
 @Api(tags = "移位申请单车架号库")
 @FeignClient(
-        contextId = "abc-ScmVehicleGressionVeh",
+        contextId = "anrui-scm-ScmVehicleGressionVeh",
-        name = "abc",
+        name = "anrui-scm",
         path = "v1/scmvehiclegressionveh",
         fallback = ScmVehicleGressionVehFeignFallback.class)
 public interface ScmVehicleGressionVehFeign {
 
-    @ApiOperation("根据条件分页查询数据的列表")
-    @PostMapping("/listPage")
-    @ResponseBody
-    public ResultBean<PagerVo<ScmVehicleGressionVehVo>> listPage(@RequestBody PagerQuery<ScmVehicleGressionVehQuery> 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<ScmVehicleGressionVehDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
 }

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<PagerVo<ScmVehicleGressionVehVo>> listPage(PagerQuery<ScmVehicleGressionVehQuery> 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<ScmVehicleGressionVehDetailsVo> fetchDetailsBySid(String sid){
-		ResultBean rb = ResultBean.fireFail();
-		return rb.setMsg("接口abc/scmvehiclegressionveh/fetchDetailsBySid无法访问");
-	}
 }

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")
+/*	@ApiModelProperty("移位申请单sid")
-    private String mainSid; // 移位申请单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
+    private String settlementStatusValue;
-	@ApiModelProperty("临时牌照号码")
+/*	@ApiModelProperty("临时牌照号码")
-    private String temporaryCardNo; // 临时牌照号码
+    private String temporaryCardNo;*/
 
 }

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<ScmVehicleExami
                         finPaymentrecordDto.setUseOrgSid(scmVehicleExamine.getUseOrgSid());
                         finPaymentrecordDto.setPayCompanySid(scmVehicleExamine.getUseOrgSid()); //付款单位sid
                         finPaymentrecordDto.setPayType(1); // 付款类别，1付款/2退款
-                        finPaymentrecordDto.setCostTypeKey(ManPurOrderType.CostTitle.CK_COSTTITLE.getCode()); // 款项类别
+                        finPaymentrecordDto.setCostTypeKey(ManPurOrderType.ManOrderType.WC_ORDER.getCode()); // 款项类别
-                        finPaymentrecordDto.setCostTypeValue(ManPurOrderType.CostTitle.CK_COSTTITLE.getRemarks());// 款项类别
+                        finPaymentrecordDto.setCostTypeValue(ManPurOrderType.ManOrderType.WC_ORDER.getRemarks());// 款项类别
                         finPaymentrecordDto.setCostTitleKey("2");// 款项名称
                         finPaymentrecordDto.setCostTitleValue("订金");//款项名称
                         finPaymentrecordDto.setReceiveBankAccount(outsourcingApplicationDetailsVo.getBankAccount()); // 收款银行账号

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionMapper.java

@@ -27,16 +27,14 @@ package com.yxt.anrui.scm.biz.scmvehiclegression;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.scm.api.scmvehiclegression.*;
-import com.yxt.common.core.result.ResultBean;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
-
 import java.util.List;
 import java.util.Map;
 
@@ -91,10 +89,9 @@ public interface ScmVehicleGressionMapper extends BaseMapper<ScmVehicleGression>
      * 手机端-初始化移库申请
      *
      * @param sid
-     * @param useOrgSid
      * @return
      */
-    AppScmVehicleGressionInfoVo getCarTransferInfo(@Param("sid") String sid, @Param("useOrgSid") String useOrgSid);
+    AppScmVehicleGressionInfoVo getCarTransferInfo(@Param("sid") String sid);
 
     /**
      * 手机端-车库移库详情

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}
     </select>
 
     <select id="getCarTransfer"

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionRest.java

@@ -81,42 +81,42 @@ public class ScmVehicleGressionRest implements ScmVehicleGressionFeign {
     @Autowired
     private ScmVehicleGressionVehService scmVehicleGressionVehService;
 
-    @Override
+    /* @Override
-    @ApiOperation("根据条件分页查询数据的列表")
+     @ApiOperation("根据条件分页查询数据的列表")
-    @PostMapping("/listPage")
+     @PostMapping("/listPage")
-    public ResultBean<PagerVo<ScmVehicleGressionVo>> listPage(@RequestBody PagerQuery<ScmVehicleGressionQuery> pq) {
+     public ResultBean<PagerVo<ScmVehicleGressionVo>> listPage(@RequestBody PagerQuery<ScmVehicleGressionQuery> pq) {
-        ResultBean rb = ResultBean.fireFail();
+         ResultBean rb = ResultBean.fireFail();
-        PagerVo<ScmVehicleGressionVo> pv = scmVehicleGressionService.listPageVo(pq);
+         PagerVo<ScmVehicleGressionVo> pv = scmVehicleGressionService.listPageVo(pq);
-        return rb.success().setData(pv);
+         return rb.success().setData(pv);
-    }
+     }
-
+
-    @Override
+     @Override
-    @ApiOperation("新增或修改")
+     @ApiOperation("新增或修改")
-    @PostMapping("/save")
+     @PostMapping("/save")
-    public ResultBean save(@RequestBody ScmVehicleGressionDto dto) {
+     public ResultBean save(@RequestBody ScmVehicleGressionDto dto) {
-        ResultBean rb = ResultBean.fireFail();
+         ResultBean rb = ResultBean.fireFail();
-        scmVehicleGressionService.saveOrUpdateDto(dto);
+         scmVehicleGressionService.saveOrUpdateDto(dto);
-        return rb.success();
+         return rb.success();
-    }
+     }
-
+
-    @Override
+     @Override
-    @ApiOperation("根据sid批量删除")
+     @ApiOperation("根据sid批量删除")
-    @PostMapping("/delBySids")
+     @PostMapping("/delBySids")
-    public ResultBean delBySids(@RequestBody String[] sids) {
+     public ResultBean delBySids(@RequestBody String[] sids) {
-        ResultBean rb = ResultBean.fireFail();
+         ResultBean rb = ResultBean.fireFail();
-        scmVehicleGressionService.delBySids(sids);
+         scmVehicleGressionService.delBySids(sids);
-        return rb.success();
+         return rb.success();
-    }
+     }
-
+
-    @Override
+     @Override
-    @ApiOperation("根据SID获取一条记录")
+     @ApiOperation("根据SID获取一条记录")
-    @GetMapping("/fetchDetailsBySid/{sid}")
+     @GetMapping("/fetchDetailsBySid/{sid}")
-    public ResultBean<ScmVehicleGressionDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid) {
+     public ResultBean<ScmVehicleGressionDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid) {
-        ResultBean rb = ResultBean.fireFail();
+         ResultBean rb = ResultBean.fireFail();
-        ScmVehicleGressionDetailsVo vo = scmVehicleGressionService.fetchDetailsVoBySid(sid);
+         ScmVehicleGressionDetailsVo vo = scmVehicleGressionService.fetchDetailsVoBySid(sid);
-        return rb.success().setData(vo);
+         return rb.success().setData(vo);
-    }
+     }
-
+ */
     @Override
     @ApiOperation("PC端-获取车辆移位列表")
     public ResultBean<PagerVo<ScmVehicleGressionPageVo>> selectCarTransferList(PagerQuery<ScmVehicleGressionPageQuery> pagerQuery) {
@@ -163,25 +163,21 @@ public class ScmVehicleGressionRest implements ScmVehicleGressionFeign {
     @Override
     @ApiOperation("手机端-保存车库移库信息")
     @PostMapping("/saveCarTransferInfo")
-    public ResultBean saveCarTransferInfo(AppScmVehicleGressionDto dto) {
+    public ResultBean<String> saveCarTransferInfo(AppScmVehicleGressionDto dto) {
         return scmVehicleGressionService.saveCarTransferInfo(dto);
     }
 
     @Override
     @ApiOperation("手机端-初始化移库申请")
     public ResultBean<AppScmVehicleGressionInfoVo> getCarTransferInfo(String sid, String userSid) {
-        ResultBean rb = ResultBean.fireFail();
+        return scmVehicleGressionService.getCarTransferInfo(sid, userSid);
-        AppScmVehicleGressionInfoVo vo = scmVehicleGressionService.getCarTransferInfo(sid, userSid);
-        return rb.success().setData(vo);
     }
 
     @Override
     @ApiOperation("手机端-车库移库详情")
     @GetMapping("/getCarTransfer/{sid}")
     public ResultBean<AppScmVehicleGressionDetailsVo> getCarTransfer(String sid) {
-        ResultBean rb = ResultBean.fireFail();
+        return scmVehicleGressionService.getCarTransfer(sid);
-        AppScmVehicleGressionDetailsVo vo = scmVehicleGressionService.getCarTransfer(sid);
-        return rb.success().setData(vo);
     }
 
     @Override

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java

@@ -34,7 +34,9 @@ import com.yxt.anrui.base.api.basevehicle.*;
 import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelFeign;
 import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateDto;
 import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateFeign;
+import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateVo;
 import com.yxt.anrui.base.common.enums.BillTypeEnum;
+import com.yxt.anrui.base.common.enums.DictCommonEnum;
 import com.yxt.anrui.base.common.utils.Rule;
 import com.yxt.anrui.base.common.utils.domain.BillNo;
 import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
@@ -51,12 +53,10 @@ import com.yxt.anrui.portal.api.dictcommon.DictCommonFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganization;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
-import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoVo;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
-import com.yxt.anrui.portal.api.sysuser.app.AppUserOrgInfoVo;
 import com.yxt.anrui.scm.api.scmexitpermit.ScmExitPermit;
 import com.yxt.anrui.scm.api.scmfile.ScmFile;
 import com.yxt.anrui.scm.api.scmvehiclegression.*;
@@ -64,7 +64,6 @@ import com.yxt.anrui.scm.api.scmvehiclegression.flowable.GetNodeQuery;
 import com.yxt.anrui.scm.api.scmvehiclegression.flowable.GetNodeVo;
 import com.yxt.anrui.scm.api.scmvehiclegression.flowable.ScmCarTransferTaskQuery;
 import com.yxt.anrui.scm.api.scmvehiclegression.flowable.SubmitCarTransferDto;
-import com.yxt.anrui.scm.api.scmvehiclegressionveh.ScmVehicleGressionVeh;
 import com.yxt.anrui.scm.api.scmvehiclegressionveh.ScmVehicleGressionVehDto;
 import com.yxt.anrui.scm.api.scmvehiclegressionveh.ScmVehicleGressionVehVo;
 import com.yxt.anrui.scm.biz.scmexitpermit.ScmExitPermitService;
@@ -73,7 +72,6 @@ import com.yxt.anrui.scm.biz.scmvehiclegressionveh.ScmVehicleGressionVehService;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
-import com.yxt.common.base.utils.WordUtils;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -352,9 +350,6 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
      */
     private QueryWrapper<AppScmVehicleGressionPageVo> appQueryWrapper(AppScmVehicleGressionPageQuery query) {
         QueryWrapper<AppScmVehicleGressionPageVo> qw = new QueryWrapper<>();
-//        if (StringUtils.isNotBlank(query.getUseOrgSid())) {
-//            qw.eq("svg.useOrgSid", query.getUseOrgSid());
-//        }
         if (StringUtils.isNotBlank(query.getUserSid())) {
             qw.eq("svg.createBySid", query.getUserSid());
         }
@@ -371,8 +366,8 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
      * @return
      */
     @Transactional(rollbackFor = Exception.class)
-    public ResultBean saveCarTransferInfo(AppScmVehicleGressionDto dto) {
+    public ResultBean<String> saveCarTransferInfo(AppScmVehicleGressionDto dto) {
-        ResultBean rb = ResultBean.fireFail();
+        ResultBean<String> rb = ResultBean.fireFail();
         List<ScmVehicleGressionVehDto> scmVehicleGressionVehDtos = dto.getScmVehicleGressionVehs();
         if (scmVehicleGressionVehDtos == null) {
             return rb.setMsg("请选择车架号！");
@@ -380,66 +375,50 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
         if (dto.getLocationSid().equals(dto.getTargetLocationSid())) {
             return rb.setMsg("目标存放地点不能与现存放地点重复！");
         }
-        if (StringUtils.isBlank(dto.getInsuranceStateKey())) {
-            return rb.setMsg("保险状态不能为空");
-        }
-        if (StringUtils.isBlank(dto.getOperator())) {
-            return rb.setMsg("经办人不能为空");
-        }
-        String s1 = "";
-        String type = "04";
-        String vinNo = "";
         String userSid = dto.getUserSid();
+        String sid = dto.getSid();
+        //获取用户信息
+        ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(userSid);
+        if (!userVoResultBean.getSuccess()) {
+            return rb.setMsg(userVoResultBean.getMsg());
+        }
+        SysUserVo sysUserVo = userVoResultBean.getData();
+        //获取分公司
         String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
-        AppUserOrgInfoVo data = sysUserFeign.getUserOrgInfoByUserSid(userSid).getData();
+        //获取当天日期
-        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+        String today = DateUtil.today();
-        ScmVehicleGression scmVehicleGression = null;
+        if (StringUtils.isBlank(sid)) {
-        if (StringUtils.isBlank(dto.getSid())) {
+            ScmVehicleGression scmVehicleGression = new ScmVehicleGression();
-            scmVehicleGression = new ScmVehicleGression();
             BeanUtil.copyProperties(dto, scmVehicleGression, "sid");
-            scmVehicleGression.setHandleState("1");
+            scmVehicleGression.setApplicantName(sysUserVo.getName());//申请人
-            scmVehicleGression.setApplicantName(data.getStaffName());
+            scmVehicleGression.setApplicantDate(today);//申请时间
-            scmVehicleGression.setApplicantDate(simpleDateFormat.format(new Date()));
+            scmVehicleGression.setUseOrgSid(useOrgSid);//分公司sid
-            scmVehicleGression.setOrgSid(data.getOrgSid());
-            scmVehicleGression.setUseOrgSid(useOrgSid);
             scmVehicleGression.setCreateBySid(dto.getUserSid());
-            //申请编号规则：单据名称大写首字母+分公司编码+年份+月份+4位顺序号
+            scmVehicleGression.setHandleState("1");
-            //获取单据名称大写首字母+分公司编码+年份+月份
+            String billNo = getApplyCode(dto);//申请编号
-//            Map<String, String> stringStringMap = generateBillNo(userSid);
-            String billNo = getApplyCode(dto);
             scmVehicleGression.setApplicantNo(billNo);
-            //存放车架号
+            int i = baseMapper.insert(scmVehicleGression);
-            for (ScmVehicleGressionVehDto scmVehicleGressionVehDto : scmVehicleGressionVehDtos) {
+            sid = scmVehicleGression.getSid();
-                ScmVehicleGressionVeh scmVehicleGressionVeh = new ScmVehicleGressionVeh();
+            if (i > 0) {
-                BeanUtil.copyProperties(scmVehicleGressionVehDto, scmVehicleGressionVeh, "sid");
+                scmVehicleGressionVehService.saveOrUpdateDto(scmVehicleGressionVehDtos, scmVehicleGression.getSid());
-                vinNo = scmVehicleGressionVehDto.getVehVin();
+            } else {
-                BaseVehicle baseVehicleVo = baseVehicleFeign.selectByVinNoAndOrgSid(vinNo,useOrgSid).getData();
+                return rb.setMsg("保存失败");
-                scmVehicleGressionVeh.setVehSid(baseVehicleVo.getSid());
-                scmVehicleGressionVeh.setMainSid(scmVehicleGression.getSid());
-                scmVehicleGressionVehService.save(scmVehicleGressionVeh);
             }
-            save(scmVehicleGression);
+
         } else {
-            scmVehicleGression = fetchBySid(dto.getSid());
+            ScmVehicleGression scmVehicleGression = fetchBySid(sid);
             if (scmVehicleGression == null) {
-                return rb.setMsg("该数据不存在");
+                return rb.setMsg("该申请不存在");
             }
-            BeanUtil.copyProperties(dto, scmVehicleGression, "sid");
+            BeanUtil.copyProperties(dto, scmVehicleGression);
-            updateById(scmVehicleGression);
+            baseMapper.updateById(scmVehicleGression);
             scmVehicleGressionVehService.deleteByMainSid(scmVehicleGression.getSid());
-            //存放车架号
+            scmVehicleGressionVehService.saveOrUpdateDto(scmVehicleGressionVehDtos, scmVehicleGression.getSid());
-            for (ScmVehicleGressionVehDto scmVehicleGressionVehDto : scmVehicleGressionVehDtos) {
+
-                ScmVehicleGressionVeh scmVehicleGressionVeh = new ScmVehicleGressionVeh();
-                BeanUtil.copyProperties(scmVehicleGressionVehDto, scmVehicleGressionVeh, "sid");
-                vinNo = scmVehicleGressionVehDto.getVehVin();
-//                BaseVehicleVo baseVehicleVo = baseVehicleFeign.selVehicleByVinNo(vinNo).getData();
-                BaseVehicle baseVehicleVo = baseVehicleFeign.selectByVinNoAndOrgSid(vinNo,useOrgSid).getData();
-                scmVehicleGressionVeh.setVehSid(baseVehicleVo.getSid());
-                scmVehicleGressionVeh.setMainSid(scmVehicleGression.getSid());
-                scmVehicleGressionVehService.save(scmVehicleGressionVeh);
-            }
         }
-        return rb.success().setData(scmVehicleGression.getSid()).setMsg("保存成功");
+        return rb.success().setData(sid);
+
+
     }
 
     /**
@@ -448,8 +427,32 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
      * @param sid
      * @return
      */
-    public AppScmVehicleGressionInfoVo getCarTransferInfo(String sid, String userSid) {
+    public ResultBean<AppScmVehicleGressionInfoVo> getCarTransferInfo(String sid, String userSid) {
-        String type1 = "04"; //保单照片
+        ResultBean<AppScmVehicleGressionInfoVo> rb = ResultBean.fireFail();
+        ScmVehicleGression scmVehicleGression = fetchBySid(sid);
+        if (scmVehicleGression == null) {
+            return rb.setMsg("该申请不存在");
+        }
+        AppScmVehicleGressionInfoVo vo = baseMapper.getCarTransferInfo(sid);
+        List<ScmVehicleGressionVehVo> scmVehicleGressionVehVos = scmVehicleGressionVehService.selectInfoVoByMainSid(sid);
+        vo.setScmVehicleGressionVehs(scmVehicleGressionVehVos);
+        //保单照片查询
+        List<ScmFile> scmFiles1 = scmFileService.selectByLinkSid(sid, DictCommonEnum.ScmFileType.BD_IMAGE.getCode());
+        List<String> policyImage = new ArrayList<>();
+        for (ScmFile scmFile : scmFiles1) {
+            policyImage.add(fileUploadComponent.getUrlPrefix() + scmFile.getFilePath());
+        }
+        vo.setPolicyImage(policyImage);
+        //现场照片查询
+        List<ScmFile> scmFiles2 = scmFileService.selectByLinkSid(sid, DictCommonEnum.ScmFileType.XC_IMAGE.getCode());
+        List<String> image = new ArrayList<>();
+        for (ScmFile scmFile : scmFiles2) {
+            policyImage.add(fileUploadComponent.getUrlPrefix() + scmFile.getFilePath());
+        }
+        vo.setImage(image);
+        return rb.success().setData(vo);
+
+       /* String type1 = "04"; //保单照片
         String type2 = "05"; //现场照片
         List<String> policyImage = new ArrayList<>();
         List<String> image = new ArrayList<>();
@@ -457,8 +460,6 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
         AppUserOrgInfoVo data = sysUserFeign.getUserOrgInfoByUserSid(userSid).getData();
         SysStaffinfoVo data1 = sysUserFeign.getSysUserByMobile(data.getStaffSid()).getData();
         AppScmVehicleGressionInfoVo vo = baseMapper.getCarTransferInfo(sid, useOrgSid);
-//        List<String> vins = scmVehicleGressionVehService.fetchVoByMainSid(sid);
-//        vo.setVins(vins);
         List<ScmVehicleGressionVehVo> scmVehicleGressionVehVos = scmVehicleGressionVehService.selectInfoVoByMainSid(sid);
         vo.setScmVehicleGressionVehs(scmVehicleGressionVehVos);
         vo.setApplicantName(data1.getName());
@@ -476,7 +477,7 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
             policyImage.add(fileUploadComponent.getUrlPrefix() + scmFile.getFilePath());
         }
         vo.setImage(image);
-        return vo;
+        return vo;*/
     }
 
     /**
@@ -485,20 +486,41 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
      * @param sid
      * @return
      */
-    public AppScmVehicleGressionDetailsVo getCarTransfer(String sid) {
+    public ResultBean<AppScmVehicleGressionDetailsVo> getCarTransfer(String sid) {
-        String type1 = "04"; //保单照片
+        ResultBean<AppScmVehicleGressionDetailsVo> rb = ResultBean.fireFail();
-        String type2 = "05"; //现场照片
+        ScmVehicleGression scmVehicleGression = fetchBySid(sid);
-        List<String> policyImage = new ArrayList<>();
+        if (scmVehicleGression == null) {
-        List<String> image = new ArrayList<>();
+            return rb.setMsg("该申请不存在");
+        }
         AppScmVehicleGressionDetailsVo vo = baseMapper.getCarTransfer(sid);
         List<ScmVehicleGressionVehVo> scmVehicleGressionVehVos = scmVehicleGressionVehService.selectInfoVoByMainSid(sid);
         vo.setScmVehicleGressionVehs(scmVehicleGressionVehVos);
-        if ("1".equals(vo.getInsuranceStateKey())) {
+        vo.setInsuranceShow("1".equals(vo.getInsuranceStateKey()));
-            vo.setInsuranceShow(true);
+        vo.setProCardShow("1".equals(vo.getProCardStateKey()));
+        List<ScmFile> scmFiles1 = scmFileService.selectByLinkSid(sid, DictCommonEnum.ScmFileType.BD_IMAGE.getCode());
+        List<String> policyImage = new ArrayList<>();
+        if (scmFiles1.size() > 0) {
+            for (ScmFile scmFile : scmFiles1) {
+                policyImage.add(fileUploadComponent.getUrlPrefix() + scmFile.getFilePath());
+            }
         }
-        if ("1".equals(vo.getProCardStateKey())) {
+        vo.setPolicyImage(policyImage);
-            vo.setProCardShow(true);
+
+        List<ScmFile> scmFiles2 = scmFileService.selectByLinkSid(sid, DictCommonEnum.ScmFileType.XC_IMAGE.getCode());
+        List<String> image = new ArrayList<>();
+        if (scmFiles2.size() > 0) {
+            for (ScmFile scmFile : scmFiles2) {
+                image.add(fileUploadComponent.getUrlPrefix() + scmFile.getFilePath());
+            }
         }
+        vo.setImage(image);
+        return rb.success().setData(vo);
+
+
+       /* String type1 = "04"; //保单照片
+        String type2 = "05"; //现场照片
+        List<String> policyImage = new ArrayList<>();
+        List<String> image = new ArrayList<>();
         List<String> vins = scmVehicleGressionVehService.fetchVoByMainSid(sid);
         String vin = StringUtils.join(vins, StringUtils.LF);
         vo.setVinNo(vin);
@@ -518,7 +540,7 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
             }
         }
         vo.setImage(image);
-        return vo;
+        return vo;*/
     }
 
     /**
@@ -620,48 +642,6 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
         return billNo;
     }
 
-//    /**
-//     * 移位单生成编号
-//     *
-//     * @param userSid 用户sid
-//     * @return
-//     */
-//    public Map<String, String> generateBillNo(String userSid) {
-//        List<DictCommonVo> commonVoList = dictCommonFeign.getTypeValues(DictCommonType.BILLSTYPE, "0").getData();
-//        String billsType = "";
-//        if (commonVoList.size() > 0) {
-//            for (int i = 0; i < commonVoList.size(); i++) {
-//                if (commonVoList.get(i).getDictValue().contains("移位单")) {
-//                    billsType = commonVoList.get(i).getDictKey();
-//                }
-//            }
-//        }
-//        AppUserOrgInfoVo userOrgInfo = null;
-//        String orgCode = "";
-//        String orgSid = "";
-//        String orgName = "";
-//        ResultBean<AppUserOrgInfoVo> resultBean = sysUserFeign.getUserOrgInfoByUserSid(userSid);
-//        if (resultBean.getSuccess() && resultBean.getData() != null) {
-//            userOrgInfo = resultBean.getData();
-//            orgSid = userOrgInfo.getOrgSid();
-//            orgName = userOrgInfo.getOrgName();
-//            orgCode = userOrgInfo.getOrgCode();
-//        }
-//        String date = DateUtils.dateConvertStr(new Date(), "yyyy-MM-dd");
-//        // 流水号
-//        int i = selectCountByOrgSid(billsType, date, orgSid);
-//        String num = String.format("%04d", i + 1); // 不足4位补0
-//        Map<String, String> map = new HashMap<>();
-//        map.put("billNo_Num", billsType + orgCode + date.replaceAll("-", "") + num);
-//        map.put("billNo", billsType + orgCode + date.replaceAll("-", ""));
-//        map.put("staffSid", userOrgInfo.getStaffSid());
-//        map.put("staffName", userOrgInfo.getStaffName());
-//        map.put("orgSid", orgSid);
-//        map.put("orgName", orgName);
-//
-//        return map;
-//    }
-
     public int selectCountByOrgSid(String billsType, String date, String orgSid) {
         return baseMapper.selectCountByOrgSid(billsType, date, orgSid);
     }
@@ -694,20 +674,31 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
         if (r == 0) {
             return rb.setMsg("操作失败!提交的数据不一致");
         }
+        String sid = dto.getSid();
         //存放车架号
-        if (r == 1) {
+        //判断要提交的车辆sid是否存在于临时表中
-            List<ScmVehicleGressionVehDto> scmVehicleGressionVehDtos = dto.getScmVehicleGressionVehs();
+
-            for (ScmVehicleGressionVehDto scmVehicleGressionVehDto : scmVehicleGressionVehDtos) {
+        List<ScmVehicleGressionVehDto> scmVehicleGressionVehDtos = dto.getScmVehicleGressionVehs();
-                List<String> sids = scmVehicleGressionVehService.fetchVoByVins(scmVehicleGressionVehDto.getVehVin());
+        for (ScmVehicleGressionVehDto v : scmVehicleGressionVehDtos) {
-                for (String sid : sids) {
+            List<BaseVehicleTempstateVo> carSidList = baseVehicleTempstateFeign.selectAll("001").getData();
-                    List<ScmVehicleGressionVo> scmVehicleGressionVos = baseMapper.getlastTimeEqual(sid, dto.getTargetLocationSid());
+            for (BaseVehicleTempstateVo vv : carSidList) {
-                    if (scmVehicleGressionVos.size() > 0) {
+                if (r == 1) {
-                        if (StringUtils.isNotBlank(scmVehicleGressionVos.get(0).getNodeState())) {
+                    List<String> carSidListO = baseVehicleTempstateFeign.selectAllOne("001").getData();
-                            if (scmVehicleGressionVos.get(0).getNodeState().contains("已办结") || !(scmVehicleGressionVos.get(0).getNodeState().contains("终止")) || !(scmVehicleGressionVos.get(0).getNodeState().contains("申请"))) {
+                    if (carSidListO.size() > 0) {
-                                return rb.setMsg("该申请中" + scmVehicleGressionVehDto.getVehVin() + "已存在，请勿重复提交！");
+                        if (carSidListO.contains(sid)) {
+                            return rb.setMsg("车架号为" + v.getVehVin() + "的车辆存放地点变更正在审批中,不允许提交");
+                        }
+                    }
+                } else {
+                    if (!vv.getBusSid().equals(scmVehicleGression.getSid())) {
+                        List<String> carSidListO = baseVehicleTempstateFeign.selectAllOne("001").getData();
+                        if (carSidListO.size() > 0) {
+                            if (carSidListO.contains(sid)) {
+                                return rb.setMsg("车架号为" + v.getVehVin() + "的车辆存放地点变更正在审批中,不允许提交");
                             }
                         }
                     }
+
                 }
             }
         }
@@ -721,17 +712,16 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
         String state = "2";
         baseMapper.updateStateBySid(businessSid, state);
         //推送车辆移库状态
-        List<String> vinList = scmVehicleGressionVehService.fetchVoByMainSid(businessSid);
+        List<ScmVehicleGressionVehVo> vinList = scmVehicleGressionVehService.selectInfoVoByMainSid(businessSid);
-        if (vinList.size() > 0) {
+        vinList.removeAll(Collections.singleton(null));
-            for (String s : vinList) {
+        //先删除掉该申请的车
-                BaseVehicle baseVehicleVo = baseVehicleFeign.selectByVinNoAndOrgSid(s,scmVehicleGression.getUseOrgSid()).getData();
+        baseVehicleTempstateFeign.delByBusSid(businessSid);
-//                BaseVehicleVo baseVehicleVo = baseVehicleFeign.selVehicleByVinNo(s).getData();
+        for (ScmVehicleGressionVehVo v : vinList) {
-                BaseVehicleTempstateDto baseVehicleTempstateDto = new BaseVehicleTempstateDto();
+            BaseVehicleTempstateDto baseVehicleTempstateDto = new BaseVehicleTempstateDto();
-                baseVehicleTempstateDto.setVehSid(baseVehicleVo.getSid());
+            BeanUtil.copyProperties(v, baseVehicleTempstateDto, "sid");
-                baseVehicleTempstateDto.setTempStateKey("001");
+            baseVehicleTempstateDto.setTempStateKey("001");
-                baseVehicleTempstateDto.setBusSid(businessSid);
+            baseVehicleTempstateDto.setBusSid(businessSid);
-                baseVehicleTempstateFeign.save(baseVehicleTempstateDto);
+            baseVehicleTempstateFeign.save(baseVehicleTempstateDto);
-            }
         }
         //创建BusinessVariables实体对象
         BusinessVariables bv = new BusinessVariables();
@@ -1015,6 +1005,8 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
                 List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
                 if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(scmVehicleGression.getCreateBySid())) {
                     messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交");
+                    //清除临时车辆表状态
+                    baseVehicleTempstateFeign.delByBusSid(query.getBusinessSid());
                 } else {
                     messageFlowableQuery.setMsgContent(scmVehicleGression.getApplicantName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
                 }
@@ -1172,7 +1164,7 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
         return rb.success().setData(temporaryExitPermitInfo);
     }
 
-    public String createPdf(String sid) {
+    /*public String createPdf(String sid) {
         ScmVehicleGression scmVehicleGression = fetchBySid(sid);
         SysOrganization sysOrganization = sysOrganizationFeign.selectBySid(scmVehicleGression.getUseOrgSid()).getData();
         BaseVehicleSelectVo data = baseVehicleFeign.details(scmVehicleGression.getVehicleSid()).getData();
@@ -1184,7 +1176,8 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
         dataMap.put("name", "—");
         dataMap.put("modelName", exiCarConfigDetailVo.getVehicleAlias() + exiCarConfigDetailVo.getCarColor());
         dataMap.put("number", 1);
-        dataMap.put("vinNo", scmVehicleGression.getVinNo());
+        //ToDo:
+//        dataMap.put("vinNo", scmVehicleGression.getVinNo());
         dataMap.put("reason", "存放地点变更");
         dataMap.put("operator", scmVehicleGression.getOperator());
 //        dataMap.put("finOperator", "-");
@@ -1210,7 +1203,7 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
         return "template" + "/" + dateStr + "/" + pdfName;
 
 
-    }
+    }*/
 
     public ResultBean<String> getToDoNum(String userSid) {
         ResultBean rb = ResultBean.fireFail();

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegressionveh/ScmVehicleGressionVehService.java

@@ -26,17 +26,13 @@
 package com.yxt.anrui.scm.biz.scmvehiclegressionveh;
 
 import cn.hutool.core.bean.BeanUtil;
-import com.baomidou.mybatisplus.core.conditions.SharedString;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.scm.api.scmvehiclegressionveh.*;
-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.vo.PagerVo;
-
-
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
@@ -73,31 +69,6 @@ public class ScmVehicleGressionVehService extends MybatisBaseService<ScmVehicleG
         return p;
     }
 
-    public void saveOrUpdateDto(ScmVehicleGressionVehDto dto) {
-        String dtoSid = dto.getSid();
-        if (StringUtils.isBlank(dtoSid)) {
-            this.insertByDto(dto);
-            return;
-        }
-        this.updateByDto(dto);
-    }
-
-    public void insertByDto(ScmVehicleGressionVehDto dto) {
-        ScmVehicleGressionVeh entity = new ScmVehicleGressionVeh();
-        BeanUtil.copyProperties(dto, entity, "id", "sid");
-        baseMapper.insert(entity);
-    }
-
-    public void updateByDto(ScmVehicleGressionVehDto dto) {
-        String dtoSid = dto.getSid();
-        if (StringUtils.isBlank(dtoSid)) {
-            return;
-        }
-        ScmVehicleGressionVeh entity = fetchBySid(dtoSid);
-        BeanUtil.copyProperties(dto, entity, "id", "sid");
-        baseMapper.updateById(entity);
-    }
-
     public ScmVehicleGressionVehDetailsVo fetchDetailsVoBySid(String sid) {
         ScmVehicleGressionVeh entity = fetchBySid(sid);
         ScmVehicleGressionVehDetailsVo vo = new ScmVehicleGressionVehDetailsVo();
@@ -140,4 +111,19 @@ public class ScmVehicleGressionVehService extends MybatisBaseService<ScmVehicleG
         List<ScmVehicleGressionVehVo> vos = baseMapper.fetchVoByMainSid(sid);
         return vos;
     }
+
+    /**
+     * 新增存放地点变更车辆
+     *
+     * @param scmVehicleGressionVehDtos
+     * @param sid
+     */
+    public void saveOrUpdateDto(List<ScmVehicleGressionVehDto> scmVehicleGressionVehDtos, String sid) {
+        for (ScmVehicleGressionVehDto dto : scmVehicleGressionVehDtos) {
+            ScmVehicleGressionVeh scmVehicleGressionVeh = new ScmVehicleGressionVeh();
+            BeanUtil.copyProperties(dto, scmVehicleGressionVeh, "sid");
+            scmVehicleGressionVeh.setMainSid(sid);
+            baseMapper.insert(scmVehicleGressionVeh);
+        }
+    }
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppGressionDto.java

@@ -14,111 +14,89 @@ public class AppGressionDto implements Dto {
     private static final long serialVersionUID = 6578281182401647801L;
     @ApiModelProperty("sid")
     private String sid;
-
-  /*  @ApiModelProperty("任务id")
-    private String taskId;
-
-    @ApiModelProperty("流程实例id")
-    private String procInsId;*/
-
-    @ApiModelProperty("车架号")
-    private List<VehicleGressionVehDto> scmVehicleGressionVehs;
-
     @ApiModelProperty("用户sid")
     private String userSid;
-
     @ApiModelProperty("申请人编号")
     @JsonProperty("applyId")
     private String applicantNo;
-
-//    @ApiModelProperty("申请人名称")
-//    @JsonProperty("applyNmae")
-//    private String applicantName;
-//
-//    @ApiModelProperty("申请日期")
-//    @JsonProperty("applyDate")
-//    private String applicantDate;
-
     @ApiModelProperty("现存放地点")
     @JsonProperty("nowAddress")
     private String location;
-
-    @ApiModelProperty("现存放地点")
-    @JsonProperty("nowAddressKey")
-    private String locationKey;
-
     @ApiModelProperty("现存放地点sid")
     @JsonProperty("nowAddressSid")
     private String locationSid;
-
-//    @ApiModelProperty("车架号")
-//    @JsonProperty("vin")
-//    private String vinNo;
-//
-//    @ApiModelProperty("车架号")
-//    private List<String> vins;
-
     @ApiModelProperty("目标库")
     @JsonProperty("targetAddress")
     private String targetLocation;
-
-    @ApiModelProperty("目标库")
-    @JsonProperty("targetAddressKey")
-    private String targetLocationKey;
-
     @ApiModelProperty("目标库sid")
     @JsonProperty("targetAddressSid")
     private String targetLocationSid;
-
     @ApiModelProperty("变更原因")
     @JsonProperty("reason")
     private String changeReason;
-
     @ApiModelProperty("申请费用")
     @JsonProperty("price")
     private String applicantFunds;
-
     @ApiModelProperty("经办人")
     @JsonProperty("handler")
     private String operator;
-
     @ApiModelProperty("保险状态")
     @JsonProperty("insuranceState")
     private String InsuranceState;
-
     @ApiModelProperty("保险状态")
     @JsonProperty("insuranceStateKey")
     private String InsuranceStateKey;
-
-//    @ApiModelProperty("保单照片")
-//    @JsonProperty("policyImage")
-//    private List<String> policyImage;
-
     @ApiModelProperty("临牌状态")
     private String proCardState;
-
     @ApiModelProperty("临牌状态")
     private String proCardStateKey;
-
-//    @ApiModelProperty("临牌")
-//    @JsonProperty("proCard")
-//    private String temporaryCard;
-//
-//    @ApiModelProperty("现场照片")
-//    private List<String> image;
-
     @ApiModelProperty("现场地址")
     private String address;
-
     @ApiModelProperty("经纬度")
     @JsonProperty("addressCode")
     private String locationCode;
-
     @ApiModelProperty("调出方负责人名称")
     @JsonProperty("personName")
     private String staffName;
-
     @ApiModelProperty("调出方负责人用户sid")
     @JsonProperty("personSid")
     private String personUserSid;
+    @ApiModelProperty("车架号")
+    private List<VehicleGressionVehDto> scmVehicleGressionVehs;
+/*    @ApiModelProperty("现存放地点")
+    @JsonProperty("nowAddressKey")
+    private String locationKey;*/
+    /*    @ApiModelProperty("目标库")
+    @JsonProperty("targetAddressKey")
+    private String targetLocationKey;*/
+//    @ApiModelProperty("申请人名称")
+//    @JsonProperty("applyNmae")
+//    private String applicantName;
+//
+//    @ApiModelProperty("申请日期")
+//    @JsonProperty("applyDate")
+//    private String applicantDate;
+
+
+//    @ApiModelProperty("车架号")
+//    @JsonProperty("vin")
+//    private String vinNo;
+//
+//    @ApiModelProperty("车架号")
+//    private List<String> vins;
+
+
+//    @ApiModelProperty("保单照片")
+//    @JsonProperty("policyImage")
+//    private List<String> policyImage;
+
+
+//    @ApiModelProperty("临牌")
+//    @JsonProperty("proCard")
+//    private String temporaryCard;
+//
+//    @ApiModelProperty("现场照片")
+//    private List<String> image;
+
+
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/VehicleGressionVehDto.java

@@ -8,19 +8,19 @@ import lombok.Data;
 public class VehicleGressionVehDto implements Dto {
 
     private static final long serialVersionUID = 1981618379783367050L;
-    private String sid; // sid
-
-    @ApiModelProperty("移位申请单sid")
-    private String mainSid; // 移位申请单sid
     @ApiModelProperty("车辆sid")
-    private String vehSid; // 车辆sid
+    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
+    private String settlementStatusValue;
-    @ApiModelProperty("临时牌照号码")
+ /*   @ApiModelProperty("临时牌照号码")
-    private String temporaryCardNo; // 临时牌照号码
+    private String temporaryCardNo;*/
+    /*   private String sid;*/
+
+ /*   @ApiModelProperty("移位申请单sid")
+    private String mainSid;*/
 
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/scmvehiclegression/AppScmVehicleGressionService.java

@@ -27,7 +27,6 @@ package com.yxt.anrui.terminal.biz.supplychain.scmvehiclegression;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
-import com.yxt.anrui.base.api.basevehicle.BaseVehicleVo;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
@@ -43,6 +42,7 @@ import com.yxt.anrui.terminal.config.CoverUtils;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
+import org.apache.axis.i18n.RB;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -84,16 +84,21 @@ public class AppScmVehicleGressionService {
         return rb.success().setData(vo);
     }
 
+    /**
+     * 2022-09-20 存放地点变更保存
+     *
+     * @param dto
+     * @return
+     */
     public ResultBean saveCarTransferInfo(AppGressionDto dto) {
+        ResultBean rb = ResultBean.fireFail();
         AppScmVehicleGressionDto appScmVehicleGressionDto = new AppScmVehicleGressionDto();
         BeanUtil.copyProperties(dto, appScmVehicleGressionDto);
-//        //根据车架号查询车辆sid
-//        ResultBean<BaseVehicleVo> stringResultBean = baseVehicleFeign.selVehicleByVinNo(dto.getVinNo());
-//        if (stringResultBean.getSuccess()) {
-//            appScmVehicleGressionDto.setVehicleSid(stringResultBean.getData().getSid());
-//        }
         ResultBean resultBean = scmVehicleGressionFeign.saveCarTransferInfo(appScmVehicleGressionDto);
-        return resultBean;
+        if (!resultBean.getSuccess()) {
+            return rb.setMsg(resultBean.getMsg());
+        }
+        return rb.success();
     }
 
     public ResultBean<AppGressionInfoVo> getCarTransferInfo(String sid, String userSid) {