Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppScmWarehouseVinVo.java

@@ -7,6 +7,10 @@ import lombok.Data;
 @Data
 public class AppScmWarehouseVinVo implements Vo {
 
+
+    @ApiModelProperty("车辆sid")
+    private String carSid;
+
     @ApiModelProperty("车架号")
     private String vin;
 
@@ -19,9 +23,6 @@ public class AppScmWarehouseVinVo implements Vo {
     @ApiModelProperty("")
     private String address;
 
-    @ApiModelProperty("")
-    private String carSid;
-
     @ApiModelProperty("")
     private String color;
 

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstateFeign.java

@@ -50,8 +50,8 @@ import java.util.List;
  */
 @Api(tags = "车辆临时状态表")
 @FeignClient(
-        contextId = "comc-BaseVehicleTempstate",
-        name = "comc",
+        contextId = "anrui-base-BaseVehicleTempstate",
+        name = "anrui-base",
         path = "v1/basevehicletempstate",
         fallback = BaseVehicleTempstateFeignFallback.class)
 public interface BaseVehicleTempstateFeign {

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml

@@ -904,6 +904,7 @@
 
     <select id="getVinByWarehouseSid" resultType="com.yxt.anrui.base.api.basevehicle.AppScmWarehouseVinVo">
         select vinNo as vin,
+               sid as carSid,
                settlementStatus,
                settlementStatusValue
         from base_vehicle bv

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java

@@ -17,6 +17,7 @@ import com.yxt.anrui.base.biz.basemodelconfig.BaseModelConfigService;
 import com.yxt.anrui.base.biz.basevehicleappendix.BaseVehicleAppendixService;
 import com.yxt.anrui.base.biz.basevehiclecertificate.BaseVehicleCertificateService;
 import com.yxt.anrui.base.biz.basevehiclemodelappendix.BaseVehicleModelAppendixService;
+import com.yxt.anrui.base.biz.basevehicletempstate.BaseVehicleTempstateService;
 import com.yxt.anrui.base.biz.basevehinstall.BaseVehinstallService;
 import com.yxt.anrui.base.biz.basevehmodelconfig.BaseVehmodelConfigService;
 import com.yxt.anrui.base.biz.commonappendix.CommonAppendixService;
@@ -95,6 +96,8 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
     private CommonAppendixService commonAppendixService;
     @Autowired
     private BaseVehmodelConfigService baseVehmodelConfigService;
+    @Autowired
+    private BaseVehicleTempstateService baseVehicleTempstateService;
 
     /**
      * 车辆信息分页列表
@@ -1661,10 +1664,14 @@ 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();
         ResultBean<String> resultBean = sysStaffOrgFeign.getPathSidByUserSid(userSid);
         if (StringUtils.isNotBlank(resultBean.getData())) {
             qw.eq("bv.createOrgSid", resultBean.getData());
         }
+        if (carSidList.size() > 0) {
+            qw.notIn("bv.sid", carSidList);
+        }
         qw.and(wrapper -> wrapper.eq("bv.vehicleState", VehicleState.StockEnum.RETURNING_STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.DR_STOCK.getCode()));
         List<AppScmWarehouseVinVo> list = baseMapper.getVinByWarehouseSid(warehouseSid, qw);
         if (list.size() <= 0) {

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicletempstate/BaseVehicleTempstateRest.java

@@ -35,7 +35,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 
-
 /**
  * Project: comc(comc) <br/>
  * File: BaseVehicleTempstateFeignFallback.java <br/>
@@ -50,53 +49,53 @@ import org.springframework.web.bind.annotation.*;
  * @since 1.0
  */
 @Api(tags = "车辆临时状态表")
-@RestController("aaaa.biz.basevehicletempstate.BaseVehicleTempstateRest")
+@RestController("com.yxt.anrui.base.biz.basevehicletempstate.BaseVehicleTempstateRest")
 @RequestMapping("v1/basevehicletempstate")
 public class BaseVehicleTempstateRest implements BaseVehicleTempstateFeign {
 
-	@Autowired
-	private BaseVehicleTempstateService baseVehicleTempstateService;
+    @Autowired
+    private BaseVehicleTempstateService baseVehicleTempstateService;
 
-	@Override
-	@ApiOperation("根据条件分页查询数据的列表")
-	@PostMapping("/listPage")
-	public ResultBean<PagerVo<BaseVehicleTempstateVo>> listPage(@RequestBody PagerQuery<BaseVehicleTempstateQuery> pq){
-		ResultBean rb = ResultBean.fireFail();
-		PagerVo<BaseVehicleTempstateVo> pv = baseVehicleTempstateService.listPageVo(pq);
-		return rb.success().setData(pv);
-	}
+    @Override
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<BaseVehicleTempstateVo>> listPage(@RequestBody PagerQuery<BaseVehicleTempstateQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<BaseVehicleTempstateVo> pv = baseVehicleTempstateService.listPageVo(pq);
+        return rb.success().setData(pv);
+    }
 
-	@Override
-	@ApiOperation("新增或修改")
-	@PostMapping("/save")
-	public ResultBean save(@RequestBody BaseVehicleTempstateDto dto){
-		ResultBean rb = ResultBean.fireFail();
-		baseVehicleTempstateService.saveOrUpdateDto(dto);
-		return rb.success();
-	}
+    @Override
+    @ApiOperation("新增或修改")
+    @PostMapping("/save")
+    public ResultBean save(@RequestBody BaseVehicleTempstateDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        baseVehicleTempstateService.saveOrUpdateDto(dto);
+        return rb.success();
+    }
 
-	@Override
-	@ApiOperation("根据sid批量删除")
+    @Override
+    @ApiOperation("根据sid批量删除")
     @PostMapping("/delBySids")
-    public ResultBean delBySids(@RequestBody String[] sids){
-		ResultBean rb = ResultBean.fireFail();
-		baseVehicleTempstateService.delBySids(sids);
-		return rb.success();
-	}
+    public ResultBean delBySids(@RequestBody String[] sids) {
+        ResultBean rb = ResultBean.fireFail();
+        baseVehicleTempstateService.delBySids(sids);
+        return rb.success();
+    }
 
-	@Override
-	@ApiOperation("根据SID获取一条记录")
+    @Override
+    @ApiOperation("根据SID获取一条记录")
     @GetMapping("/fetchDetailsBySid/{sid}")
-    public ResultBean<BaseVehicleTempstateDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
-		ResultBean rb = ResultBean.fireFail();
-		BaseVehicleTempstateDetailsVo vo = baseVehicleTempstateService.fetchDetailsVoBySid(sid);
-		return rb.success().setData(vo);
-	}
+    public ResultBean<BaseVehicleTempstateDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        BaseVehicleTempstateDetailsVo vo = baseVehicleTempstateService.fetchDetailsVoBySid(sid);
+        return rb.success().setData(vo);
+    }
 
-	@Override
-	public ResultBean delByBusSid(String businessSid) {
-		ResultBean rb = ResultBean.fireFail();
-		baseVehicleTempstateService.delByBusSid(businessSid);
-		return rb.success();
-	}
+    @Override
+    public ResultBean delByBusSid(String businessSid) {
+        ResultBean rb = ResultBean.fireFail();
+        baseVehicleTempstateService.delByBusSid(businessSid);
+        return rb.success();
+    }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicletempstate/BaseVehicleTempstateService.java

@@ -39,6 +39,7 @@ import com.yxt.common.core.vo.PagerVo;
 
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -107,4 +108,15 @@ public class BaseVehicleTempstateService extends MybatisBaseService<BaseVehicleT
     public void delByBusSid(String businessSid) {
         deleteBySid(businessSid);
     }
+
+    public List<String> selectAll() {
+        List<String> list = new ArrayList<>();
+        List<BaseVehicleTempstateVo> baseVehicleTempstateVos = baseMapper.selectListVo();
+        if (baseVehicleTempstateVos.size() > 0) {
+            for (BaseVehicleTempstateVo baseVehicleTempstateVo : baseVehicleTempstateVos) {
+                list.add(baseVehicleTempstateVo.getVehSid());
+            }
+        }
+        return list;
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.xml

@@ -37,7 +37,7 @@
 
     <!--虚拟订单列表-->
     <select id="getVirtualOrders" resultType="com.yxt.anrui.buscenter.api.busmaindeposit.AppBusMainDepositVo">
-        SELECT
+        select * from (SELECT
         bmd.sid AS virtualOrderSid,
         bmd.billNo AS virtualOrderId,
         bmd.createDate AS virtualOrderDate,
@@ -56,10 +56,10 @@
                 , #{name}
                 , '%')
             </if>
-        </where>
+        </where> order by bmd.id desc ) a
         <if test="name != '' and name != null">
             UNION ALL
-            SELECT
+           select * from( SELECT
             bmd.sid AS virtualOrderSid,
             bmd.billNo AS virtualOrderId,
             bmd.createDate AS virtualOrderDate,
@@ -78,9 +78,9 @@
                     , #{name}
                     , '%')
                 </if>
-            </where>
+            </where> order by bmd.id desc ) b
             UNION ALL
-            SELECT
+            select * from( SELECT
             bmd.sid AS virtualOrderSid,
             bmd.billNo AS virtualOrderId,
             bmd.createDate AS virtualOrderDate,
@@ -99,9 +99,8 @@
                     , #{name}
                     , '%')
                 </if>
-            </where>
+            </where> order by bmd.id desc ) c
         </if>
-        order by bmd.id desc
     </select>
 
     <delete id="deleteVirtualOrder">

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

@@ -680,13 +680,6 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
         }
         List<String> vins = dto.getVins();
         for (String vin : vins) {
-            //推送车辆移库状态
-            BaseVehicleVo baseVehicleVo = baseVehicleFeign.selVehicleByVinNo(vin).getData();
-            BaseVehicleTempstateDto baseVehicleTempstateDto = new BaseVehicleTempstateDto();
-            baseVehicleTempstateDto.setVehSid(baseVehicleVo.getSid());
-            baseVehicleTempstateDto.setTempStateKey("001");
-            baseVehicleTempstateDto.setBusSid(scmVehicleGression.getSid());
-            baseVehicleTempstateFeign.save(baseVehicleTempstateDto);
             List<String> sids = scmVehicleGressionVehService.fetchVoByVins(vin);
             for (String sid : sids) {
                 List<ScmVehicleGressionVo> scmVehicleGressionVos = baseMapper.getlastTimeEqual(sid, dto.getTargetLocationSid());
@@ -707,6 +700,18 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
         String businessSid = resultBean.getData();
         String state = "2";
         baseMapper.updateStateBySid(businessSid, state);
+        //推送车辆移库状态
+        List<String> vinList = scmVehicleGressionVehService.fetchVoByMainSid(businessSid);
+        if (vinList.size() > 0) {
+            for (String s : vinList) {
+                BaseVehicleVo baseVehicleVo = baseVehicleFeign.selVehicleByVinNo(s).getData();
+                BaseVehicleTempstateDto baseVehicleTempstateDto = new BaseVehicleTempstateDto();
+                baseVehicleTempstateDto.setVehSid(baseVehicleVo.getSid());
+                baseVehicleTempstateDto.setTempStateKey("001");
+                baseVehicleTempstateDto.setBusSid(businessSid);
+                baseVehicleTempstateFeign.save(baseVehicleTempstateDto);
+            }
+        }
         //创建BusinessVariables实体对象
         BusinessVariables bv = new BusinessVariables();
         //流程中的参数赋值、若有网关，则赋值网关中判断的字段。