盘库、待盘库接口开发

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

@@ -238,7 +238,6 @@ public interface BaseVehicleMapper extends BaseMapper<BaseVehicle> {
      * 手机端查询不本公司的现车，排产车
      *
      * @param modelSid
-     * @param sid
      * @return
      */
     List<MoreConfigVo> getCompanyModelList(@Param("modelSid") String modelSid, @Param("useOrg") String useOrg, @Param("state") String state);
@@ -379,5 +378,5 @@ public interface BaseVehicleMapper extends BaseMapper<BaseVehicle> {
 
     List<AppScmInventoryRecordsVo> selectInventoryRecords(@Param("userOrgSid") String userOrgSid);
 
-    List<BaseExistingCarListVo> selExistingCar(String createOrgSid);
+    List<BaseExistingCarListVo> selExistingCar(@Param(Constants.WRAPPER) QueryWrapper<BaseVehicle> qw);
 }

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

@@ -799,6 +799,6 @@
         FROM base_vehicle bv
                      LEFT JOIN base_vehicle_model bvm
                 ON bv.`modelSid` = bvm.`sid`
-        WHERE bv.createOrg = #{createOrgSid}
+        <where> ${ew.sqlSegment} </where>
     </select>
 </mapper>

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

@@ -8,12 +8,14 @@ import com.yxt.anrui.base.api.basemodelconfig.AppModelConfigListVo;
 import com.yxt.anrui.base.api.basevehicle.*;
 import com.yxt.anrui.base.api.basevehicle.app.AppBaseVehicleOrderVo;
 import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificate;
+import com.yxt.anrui.base.api.basevehinstall.BaseVehinstall;
 import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo;
 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.basevehiclemodel.BaseVehicleModelService;
 import com.yxt.anrui.base.biz.basevehiclemodelappendix.BaseVehicleModelAppendixService;
+import com.yxt.anrui.base.biz.basevehinstall.BaseVehinstallService;
 import com.yxt.anrui.base.biz.commonappendix.CommonAppendixService;
 import com.yxt.anrui.base.common.enums.VehicleState;
 import com.yxt.anrui.buscenter.api.busmaindeposit.pc.PcBusMainDepositFeign;
@@ -73,6 +75,8 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
     private BaseVehicleCertificateService baseVehicleCertificateService;
     @Autowired
     private BaseVehicleModelAppendixService baseVehicleModelAppendixService;
+    @Autowired
+    private BaseVehinstallService baseVehinstallService;
 
     /**
      * 车辆信息分页列表
@@ -1400,7 +1404,12 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
 
     public ResultBean<List<BaseExistingCarListVo>> selExistingCar(String createOrgSid) {
         ResultBean rb = ResultBean.fireFail();
-        List<BaseExistingCarListVo> baseExistingCarListVo = baseMapper.selExistingCar(createOrgSid);
+        List<String> stringList = baseVehinstallService.selectListVo(createOrgSid);
+        QueryWrapper<BaseVehicle> qw = new QueryWrapper<>();
+        qw.notIn("bv.vinNo",stringList);
+        qw.eq("bv.createOrg",createOrgSid);
+        qw.eq("bvm.createOrg",createOrgSid);
+        List<BaseExistingCarListVo> baseExistingCarListVo = baseMapper.selExistingCar(qw);
         return rb.success().setData(baseExistingCarListVo);
     }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallMapper.java

@@ -60,6 +60,6 @@ public interface BaseVehinstallMapper extends BaseMapper<BaseVehinstall> {
 	
 	List<BaseVehinstallVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BaseVehinstall> qw);
 	
-	@Select("select * from base_vehinstall")
+	@Select("select vinNo from base_vehinstall where createOrg = #{createOrgSid}")
-	List<BaseVehinstallVo> selectListVo();
+	List<String> selectListVo(String createOrgSid);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallService.java

@@ -145,4 +145,8 @@ public class BaseVehinstallService extends MybatisBaseService<BaseVehinstallMapp
 		vo.setBaseVehinstallmodel(baseVehinstallmodel);
 		return vo;
 	}
+
+	public List<String> selectListVo(String createOrgSid) {
+		return baseMapper.selectListVo(createOrgSid);
+	}
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/ScmVehicleInventoryFeign.java

@@ -59,6 +59,11 @@ public interface ScmVehicleInventoryFeign {
     @ResponseBody
     public ResultBean<PagerVo<ScmVehicleInventoryVo>> listPage(@RequestBody PagerQuery<ScmVehicleInventoryQuery> pq);
 
+    @ApiOperation("盘库修改状态")
+    @PostMapping("/updateState")
+    @ResponseBody
+    public ResultBean updateState(@RequestParam("sid") String sid,@RequestParam("inventoryStateKey") String inventoryStateKey,@RequestParam("inventoryState") String inventoryState);
+
     @ApiOperation("新增或修改")
     @PostMapping("/save")
     @ResponseBody

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/ScmVehicleInventoryFeignFallback.java

@@ -52,6 +52,11 @@ public class ScmVehicleInventoryFeignFallback implements ScmVehicleInventoryFeig
 		return rb.setMsg("接口anrui_scm/scmvehicleinventory/listPage无法访问");
 	}
 
+	@Override
+	public ResultBean updateState(String sid, String inventoryStateKey, String inventoryState) {
+		return null;
+	}
+
 	@Override
 	public ResultBean save(ScmVehicleInventoryDto dto){
 		return ResultBean.fireFail().setMsg("接口anrui_scm/scmvehicleinventory/save无法访问");

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryMapper.java

@@ -34,6 +34,7 @@ import com.yxt.anrui.scm.api.scmvehicleinventory.*;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Update;
 
 
 import java.util.List;
@@ -90,4 +91,6 @@ public interface ScmVehicleInventoryMapper extends BaseMapper<ScmVehicleInventor
 	 */
 	AppScmVehicleStayInventoryDetailedsVo getInventoryInfo(@Param("recordSid") String recordSid);
 
+	@Update("update scm_vehicle_inventory set InventoryStateKey = #{inventoryStateKey},InventoryState = #{inventoryState} where sid = #{sid}")
+    void updateState(@Param("sid") String sid,@Param("inventoryStateKey") String inventoryStateKey,@Param("inventoryState") String inventoryState);
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryRest.java

@@ -69,6 +69,11 @@ public class ScmVehicleInventoryRest implements ScmVehicleInventoryFeign {
 		return rb.success().setData(pv);
 	}
 
+	@Override
+	public ResultBean updateState(String sid,String inventoryStateKey,String inventoryState) {
+		return scmVehicleInventoryService.updateState(sid,inventoryStateKey,inventoryState);
+	}
+
 	@Override
 	@ApiOperation("新增或修改")
 	@PostMapping("/save")

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryService.java

@@ -214,4 +214,10 @@ public class ScmVehicleInventoryService extends MybatisBaseService<ScmVehicleInv
 		AppScmVehicleStayInventoryDetailedsVo vo = baseMapper.getInventoryInfo(recordSid);
 		return vo;
 	}
+
+	public ResultBean updateState(String sid,String inventoryStateKey,String inventoryState) {
+		ResultBean rb = ResultBean.fireFail();
+		baseMapper.updateState(sid,inventoryStateKey,inventoryState);
+		return rb.success().setMsg("修改保存成功");
+	}
 }