diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java index 46d4ab0a36..5d3553763c 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java +++ b/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 { * 手机端查询不本公司的现车,排产车 * * @param modelSid - * @param sid * @return */ List getCompanyModelList(@Param("modelSid") String modelSid, @Param("useOrg") String useOrg, @Param("state") String state); @@ -379,5 +378,5 @@ public interface BaseVehicleMapper extends BaseMapper { List selectInventoryRecords(@Param("userOrgSid") String userOrgSid); - List selExistingCar(String createOrgSid); + List selExistingCar(@Param(Constants.WRAPPER) QueryWrapper qw); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml index a132e34e80..acd08922ce 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml @@ -799,6 +799,6 @@ FROM base_vehicle bv LEFT JOIN base_vehicle_model bvm ON bv.`modelSid` = bvm.`sid` - WHERE bv.createOrg = #{createOrgSid} + ${ew.sqlSegment} \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java index 6cd56c1006..fd745bd8cf 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java @@ -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> selExistingCar(String createOrgSid) { ResultBean rb = ResultBean.fireFail(); - List baseExistingCarListVo = baseMapper.selExistingCar(createOrgSid); + List stringList = baseVehinstallService.selectListVo(createOrgSid); + QueryWrapper qw = new QueryWrapper<>(); + qw.notIn("bv.vinNo",stringList); + qw.eq("bv.createOrg",createOrgSid); + qw.eq("bvm.createOrg",createOrgSid); + List baseExistingCarListVo = baseMapper.selExistingCar(qw); return rb.success().setData(baseExistingCarListVo); } } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallMapper.java index d0d15ec7ef..a0378d97ee 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallMapper.java +++ b/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 { List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); - @Select("select * from base_vehinstall") - List selectListVo(); + @Select("select vinNo from base_vehinstall where createOrg = #{createOrgSid}") + List selectListVo(String createOrgSid); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallService.java index 362cf686fc..9e09235a91 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallService.java +++ b/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 selectListVo(String createOrgSid) { + return baseMapper.selectListVo(createOrgSid); + } } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/ScmVehicleInventoryFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/ScmVehicleInventoryFeign.java index 8bae8d0a1f..6e4b8d8ec3 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/ScmVehicleInventoryFeign.java +++ b/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> listPage(@RequestBody PagerQuery pq); + @ApiOperation("盘库修改状态") + @PostMapping("/updateState") + @ResponseBody + public ResultBean updateState(@RequestParam("sid") String sid,@RequestParam("inventoryStateKey") String inventoryStateKey,@RequestParam("inventoryState") String inventoryState); + @ApiOperation("新增或修改") @PostMapping("/save") @ResponseBody diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/ScmVehicleInventoryFeignFallback.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/ScmVehicleInventoryFeignFallback.java index 353460a2c3..4e3874947c 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/ScmVehicleInventoryFeignFallback.java +++ b/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无法访问"); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryMapper.java index 6619d0aeeb..4f6ad04d3e 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryMapper.java +++ b/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