From 1fc726f8452cee556be5e765cce002d8fb3be15c Mon Sep 17 00:00:00 2001 From: 15066119699 Date: Wed, 5 Mar 2025 15:25:21 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E4=BD=8D=20=E7=AB=99=E5=8F=B0=20?= =?UTF-8?q?=E8=BD=BD=E5=85=B7=E5=8A=9F=E8=83=BD=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/app/AppLocationController.java | 35 ++++++++++--------- .../web/controller/app/AppPmsController.java | 3 ++ .../controller/app/AppStandController.java | 21 ++++------- .../controller/app/AppVehicleController.java | 1 - .../ruoyi/common/constant/AppConstants.java | 19 ++++++++++ .../com/ruoyi/app/domain/AppLocation.java | 15 +++++++- .../java/com/ruoyi/app/domain/AppStand.java | 27 ++++++++++++-- .../java/com/ruoyi/app/domain/AppVehicle.java | 32 +++++++++++------ .../ruoyi/app/mapper/AppLocationMapper.java | 7 ++++ .../app/service/IAppLocationService.java | 13 +++++-- .../service/impl/AppLocationServiceImpl.java | 34 +++++++++++++----- .../mapper/app/AppLocationMapper.xml | 18 +++++++++- .../resources/mapper/app/AppStandMapper.xml | 7 +++- .../resources/mapper/app/AppVehicleMapper.xml | 10 ++++-- 14 files changed, 182 insertions(+), 60 deletions(-) create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/constant/AppConstants.java diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppLocationController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppLocationController.java index 73bc7862..d3a95579 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppLocationController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppLocationController.java @@ -38,8 +38,7 @@ import com.ruoyi.common.core.page.TableDataInfo; @Api("库位管理") @RestController @RequestMapping("/app/location") -public class AppLocationController extends BaseController -{ +public class AppLocationController extends BaseController { @Autowired private IAppLocationService appLocationService; @@ -49,8 +48,7 @@ public class AppLocationController extends BaseController @PreAuthorize("@ss.hasPermi('system:location:list')") @GetMapping("/list") @EnhanceDataList(entityType = AppLocation.class) - public TableDataInfo list(AppLocation appLocation) - { + public TableDataInfo list(AppLocation appLocation) { startPage(); List list = appLocationService.selectAppLocationList(appLocation); return getDataTable(list); @@ -62,8 +60,7 @@ public class AppLocationController extends BaseController @PreAuthorize("@ss.hasPermi('system:location:export')") @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT) @PostMapping("/export") - public void export(HttpServletResponse response, AppLocation appLocation) - { + public void export(HttpServletResponse response, AppLocation appLocation) { List list = appLocationService.selectAppLocationList(appLocation); ExcelUtil util = new ExcelUtil(AppLocation.class); util.exportExcel(response, list, "【请填写功能名称】数据"); @@ -74,8 +71,7 @@ public class AppLocationController extends BaseController */ @PreAuthorize("@ss.hasPermi('system:location:query')") @GetMapping(value = "/{locationId}") - public AjaxResult getInfo(@PathVariable("locationId") String locationId) - { + public AjaxResult getInfo(@PathVariable("locationId") String locationId) { return success(appLocationService.selectAppLocationByLocationId(locationId)); } @@ -85,8 +81,7 @@ public class AppLocationController extends BaseController @PreAuthorize("@ss.hasPermi('system:location:add')") @Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT) @PostMapping - public AjaxResult add(@RequestBody AppLocation appLocation) - { + public AjaxResult add(@RequestBody AppLocation appLocation) { return toAjax(appLocationService.insertAppLocation(appLocation)); } @@ -96,8 +91,7 @@ public class AppLocationController extends BaseController @PreAuthorize("@ss.hasPermi('system:location:edit')") @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE) @PutMapping - public AjaxResult edit(@RequestBody AppLocation appLocation) - { + public AjaxResult edit(@RequestBody AppLocation appLocation) { return toAjax(appLocationService.updateAppLocation(appLocation)); } @@ -107,8 +101,7 @@ public class AppLocationController extends BaseController @PreAuthorize("@ss.hasPermi('system:location:remove')") @Log(title = "【请填写功能名称】", businessType = BusinessType.DELETE) @DeleteMapping("/{locationIds}") - public AjaxResult remove(@PathVariable String[] locationIds) - { + public AjaxResult remove(@PathVariable String[] locationIds) { return toAjax(appLocationService.deleteAppLocationByLocationIds(locationIds)); } @@ -119,8 +112,7 @@ public class AppLocationController extends BaseController // @PreAuthorize("@ss.hasPermi('system:location:query')") @GetMapping(value = "/genLocations/{areaId}") @Anonymous - public AjaxResult genLocations(@PathVariable("areaId") Integer areaId) - { + public AjaxResult genLocations(@PathVariable("areaId") Integer areaId) { if (areaId == null) { return error("库区必填。"); } @@ -214,4 +206,15 @@ public class AppLocationController extends BaseController public AjaxResult count() { return success(appLocationService.countAvailable()); } + + /** + * 禁用启用状态 + */ + @PreAuthorize("@ss.hasPermi('system:location:edit')") + @Log(title = "禁用启用状态", businessType = BusinessType.UPDATE) + @PostMapping("/changeIsEnableStatus/{locationIds}") + public AjaxResult changeIsEnableStatus(@PathVariable String[] locationIds) { + appLocationService.changeIsEnableStatus(locationIds); + return success("修改状态成功"); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppPmsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppPmsController.java index 339c0c74..5cec9af8 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppPmsController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppPmsController.java @@ -99,6 +99,7 @@ public class AppPmsController extends BaseController { if(orderOutRequests == null || orderOutRequests.isEmpty()) { return error("请求数据为空。"); } + logger.info("Pms出库单请求：{}", orderOutRequests); int insertRow = 0; // 判断请求数据完整性 for(PmsOrderOutRequest orderOutRequest : orderOutRequests) { @@ -125,8 +126,10 @@ public class AppPmsController extends BaseController { appPmsOrderOut.setOrderStatus(0); appPmsOrderOut.setCreateTime(new Date()); appPmsOrderOut.setUpdateTime(new Date()); + appPmsOrderOut.setCreateBy("PMS出库接口"); insertRow += appPmsOrderOutService.insertAppPmsOrderOut(appPmsOrderOut); } + return insertRow == orderOutRequests.size() ? success("success") : error("出库单保存失败"); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppStandController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppStandController.java index 8689d944..be656d6f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppStandController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppStandController.java @@ -32,8 +32,7 @@ import com.ruoyi.common.core.page.TableDataInfo; */ @RestController @RequestMapping("/app/stand") -public class AppStandController extends BaseController -{ +public class AppStandController extends BaseController { @Autowired private IAppStandService appStandService; @@ -43,8 +42,7 @@ public class AppStandController extends BaseController @PreAuthorize("@ss.hasPermi('system:stand:list')") @GetMapping("/list") @EnhanceDataList(entityType = AppStand.class) - public TableDataInfo list(AppStand appStand) - { + public TableDataInfo list(AppStand appStand) { startPage(); List list = appStandService.selectAppStandList(appStand); return getDataTable(list); @@ -56,8 +54,7 @@ public class AppStandController extends BaseController @PreAuthorize("@ss.hasPermi('system:stand:export')") @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT) @PostMapping("/export") - public void export(HttpServletResponse response, AppStand appStand) - { + public void export(HttpServletResponse response, AppStand appStand) { List list = appStandService.selectAppStandList(appStand); ExcelUtil util = new ExcelUtil(AppStand.class); util.exportExcel(response, list, "【请填写功能名称】数据"); @@ -68,8 +65,7 @@ public class AppStandController extends BaseController */ @PreAuthorize("@ss.hasPermi('system:stand:query')") @GetMapping(value = "/{standId}") - public AjaxResult getInfo(@PathVariable("standId") String standId) - { + public AjaxResult getInfo(@PathVariable("standId") String standId) { return success(appStandService.selectAppStandByStandId(standId)); } @@ -79,8 +75,7 @@ public class AppStandController extends BaseController @PreAuthorize("@ss.hasPermi('system:stand:add')") @Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT) @PostMapping - public AjaxResult add(@RequestBody AppStand appStand) - { + public AjaxResult add(@RequestBody AppStand appStand) { return toAjax(appStandService.insertAppStand(appStand)); } @@ -90,8 +85,7 @@ public class AppStandController extends BaseController @PreAuthorize("@ss.hasPermi('system:stand:edit')") @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE) @PutMapping - public AjaxResult edit(@RequestBody AppStand appStand) - { + public AjaxResult edit(@RequestBody AppStand appStand) { return toAjax(appStandService.updateAppStand(appStand)); } @@ -101,8 +95,7 @@ public class AppStandController extends BaseController @PreAuthorize("@ss.hasPermi('system:stand:remove')") @Log(title = "【请填写功能名称】", businessType = BusinessType.DELETE) @DeleteMapping("/{standIds}") - public AjaxResult remove(@PathVariable String[] standIds) - { + public AjaxResult remove(@PathVariable String[] standIds) { return toAjax(appStandService.deleteAppStandByStandIds(standIds)); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppVehicleController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppVehicleController.java index f894a548..1b4d253f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppVehicleController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppVehicleController.java @@ -3,7 +3,6 @@ package com.ruoyi.web.controller.app; import java.util.List; import javax.servlet.http.HttpServletResponse; -import com.ruoyi.app.domain.AppTask; import com.ruoyi.app.domain.AppVehicle; import com.ruoyi.app.domain.DTO.AppAvailVehicle; import com.ruoyi.app.service.IAppVehicleService; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/AppConstants.java b/ruoyi-common/src/main/java/com/ruoyi/common/constant/AppConstants.java new file mode 100644 index 00000000..4713d527 --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/constant/AppConstants.java @@ -0,0 +1,19 @@ +package com.ruoyi.common.constant; + + +/** + * 通用常量信息 + * + * @author ruoyi + */ +public class AppConstants { + + /** + * 货位状态 0 启用 1 禁用 + */ + public static final Integer APP_LOCATION_STATUS_ENABLE = 0; + /** + * 货位状态 0 启用 1 禁用 + */ + public static final Integer APP_LOCATION_STATUS_DISABLE = 1; +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/app/domain/AppLocation.java b/ruoyi-system/src/main/java/com/ruoyi/app/domain/AppLocation.java index 744beefb..24910755 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/app/domain/AppLocation.java +++ b/ruoyi-system/src/main/java/com/ruoyi/app/domain/AppLocation.java @@ -35,10 +35,14 @@ public class AppLocation extends BaseEntity @Excel(name = "备注") private String remark; - /** 库位状态 1 空闲 2 有货 3 锁定 4 禁用*/ + /** 库位状态 0 空闲 1 占用*/ @Excel(name = "库位状态") private Integer locationStatus; + /** 库位状态 0 启用 1 禁用*/ + @Excel(name = "启用状态", readConverterExp = "0=启用,1=禁用") + private Integer isEnable; + /** 库位类型 */ private Integer locationType; @@ -202,6 +206,14 @@ public class AppLocation extends BaseEntity this.isWorking = isWorking; } + public Integer getIsEnable() { + return isEnable; + } + + public void setIsEnable(Integer isEnable) { + this.isEnable = isEnable; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) @@ -220,6 +232,7 @@ public class AppLocation extends BaseEntity .append("vehicleId", getVehicleId()) .append("remark", getRemark()) .append("isWorking", getIsWorking()) + .append("isEnable", getIsEnable()) .toString(); } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/app/domain/AppStand.java b/ruoyi-system/src/main/java/com/ruoyi/app/domain/AppStand.java index e0942ca3..8b1b779e 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/app/domain/AppStand.java +++ b/ruoyi-system/src/main/java/com/ruoyi/app/domain/AppStand.java @@ -15,9 +15,12 @@ public class AppStand extends BaseEntity { private static final long serialVersionUID = 1L; + /** 站点编码 */ + private Long standId; + /** 站点编码 */ @Excel(name = "站点编码") - private String standId; + private String standCode; /** 站点名称 */ @Excel(name = "站点名称") @@ -46,12 +49,12 @@ public class AppStand extends BaseEntity /** 是否锁定 */ private Long isLock; - public void setStandId(String standId) + public void setStandId(Long standId) { this.standId = standId; } - public String getStandId() + public Long getStandId() { return standId; } @@ -60,6 +63,14 @@ public class AppStand extends BaseEntity this.standName = standName; } + public String getStandCode() { + return standCode; + } + + public void setStandCode(String standCode) { + this.standCode = standCode; + } + public String getStandName() { return standName; @@ -110,6 +121,16 @@ public class AppStand extends BaseEntity return isLock; } + @Override + public String getRemark() { + return remark; + } + + @Override + public void setRemark(String remark) { + this.remark = remark; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/ruoyi-system/src/main/java/com/ruoyi/app/domain/AppVehicle.java b/ruoyi-system/src/main/java/com/ruoyi/app/domain/AppVehicle.java index 879dc904..4e1abb0e 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/app/domain/AppVehicle.java +++ b/ruoyi-system/src/main/java/com/ruoyi/app/domain/AppVehicle.java @@ -18,16 +18,19 @@ public class AppVehicle extends BaseEntity { private static final long serialVersionUID = 1L; - /** 载具编码 */ - @Excel(name = "载具编码") - private String vehicleId; + /** 容器id */ + private Long vehicleId; - /** 载具类型 */ - @Excel(name = "载具类型") + /** 容器编码 */ + @Excel(name = "容器编码") + private String vehicleCode; + + /** 容器类型 */ + @Excel(name = "容器类型") private String vehicleType; - /** 载具状态 */ - @Excel(name = "载具状态") + /** 容器状态 0 空闲 1 占用 */ + @Excel(name = "容器状态") private Long vehicleStatus; /** 备注 */ @@ -37,7 +40,7 @@ public class AppVehicle extends BaseEntity /** 库位号 */ private String locationId; - /** 是否空载具 */ + /** 是否空容器 */ private Long isEmpty; /** 是否锁定 */ @@ -50,15 +53,24 @@ public class AppVehicle extends BaseEntity /** 上次入库用户 */ private String lastInUser; - public void setVehicleId(String vehicleId) + public void setVehicleId(Long vehicleId) { this.vehicleId = vehicleId; } - public String getVehicleId() + public Long getVehicleId() { return vehicleId; } + + public String getVehicleCode() { + return vehicleCode; + } + + public void setVehicleCode(String vehicleCode) { + this.vehicleCode = vehicleCode; + } + public void setVehicleType(String vehicleType) { this.vehicleType = vehicleType; diff --git a/ruoyi-system/src/main/java/com/ruoyi/app/mapper/AppLocationMapper.java b/ruoyi-system/src/main/java/com/ruoyi/app/mapper/AppLocationMapper.java index 24b96dd4..afac1576 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/app/mapper/AppLocationMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/app/mapper/AppLocationMapper.java @@ -69,4 +69,11 @@ public interface AppLocationMapper int deleteAppLocationByLocationIds(String[] locationIds); Map countAvailableStock(); + + /** + * 根据id查询货位 + * @param locationIds + * @return + */ + List selectAppLocationListByLocationIds(String[] locationIds); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/app/service/IAppLocationService.java b/ruoyi-system/src/main/java/com/ruoyi/app/service/IAppLocationService.java index 14a16588..1f624f55 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/app/service/IAppLocationService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/app/service/IAppLocationService.java @@ -11,8 +11,7 @@ import java.util.Map; * @author ruoyi * @date 2025-01-14 */ -public interface IAppLocationService -{ +public interface IAppLocationService { /** * 查询【请填写功能名称】 * @@ -39,6 +38,7 @@ public interface IAppLocationService /** * 批量保存数据 + * * @param appLocationList 数据列表 * @return 结果 */ @@ -70,6 +70,7 @@ public interface IAppLocationService /** * 请求库位 + * * @param equipmentId 设备号 * @return 库位 */ @@ -78,4 +79,12 @@ public interface IAppLocationService String sendLocation(); Map countAvailable(); + + /** + * 修改禁用启用状态 + * + * @param locationIds + * @return + */ + void changeIsEnableStatus(String[] locationIds); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/app/service/impl/AppLocationServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/app/service/impl/AppLocationServiceImpl.java index 4193810b..5ccdce1f 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/app/service/impl/AppLocationServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/app/service/impl/AppLocationServiceImpl.java @@ -6,10 +6,12 @@ import java.util.Map; import java.util.Objects; import java.util.stream.Collectors; +import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; import com.ruoyi.app.domain.AppLocation; import com.ruoyi.app.mapper.AppLocationMapper; import com.ruoyi.app.service.IAppLocationService; +import com.ruoyi.common.constant.AppConstants; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -124,10 +126,8 @@ public class AppLocationServiceImpl implements IAppLocationService { AppLocation resultLocation = null; // 可用库位列表 List availableLocationList = appLocationList.stream().filter(item -> - item.getIsWorking() == 0 && item.getIsLock() == 0 && item.getLocationStatus() == 0) - .sorted(Comparator.comparingInt(AppLocation::getwDepth).reversed()) - .sorted(Comparator.comparingInt(location -> location.getwCol() + location.getwLayer())) - .collect(Collectors.toList()); + item.getIsWorking() == 0 && item.getIsLock() == 0 && item.getLocationStatus() == 0).sorted(Comparator + .comparingInt(AppLocation::getwCol).thenComparingInt(AppLocation::getwLayer).thenComparingInt(AppLocation::getwDepth)).collect(Collectors.toList()); // 排序 for (AppLocation appLocation : availableLocationList) { if (appLocation.getIsWorking() == 1 || appLocation.getIsLock() == 1 || appLocation.getLocationStatus() == 1) { @@ -157,17 +157,17 @@ public class AppLocationServiceImpl implements IAppLocationService { List collect1 = appLocations.stream().filter(l -> l.getwDepth().equals(1)).collect(Collectors.toList()); //定义库位 String locationId = null; - if(ObjectUtil.isNotEmpty(collect)){ - locationId = collect.get(0).getLocationId(); - }else{ - locationId =collect1.get(0).getLocationId(); + if (ObjectUtil.isNotEmpty(collect)) { + locationId = collect.get(0).getLocationId(); + } else { + locationId = collect1.get(0).getLocationId(); } AppLocation location = new AppLocation(); location.setLocationId(locationId); location.setLocationStatus(1); //更新库位为任务中 int i = appLocationMapper.updateAppLocation(location); - if(i == 0 ){ + if (i == 0) { throw new RuntimeException("库位更新失败"); } return locationId; @@ -224,4 +224,20 @@ public class AppLocationServiceImpl implements IAppLocationService { public Map countAvailable() { return appLocationMapper.countAvailableStock(); } + + @Override + public void changeIsEnableStatus(String[] locationIds) { + List appLocationList = appLocationMapper.selectAppLocationListByLocationIds(locationIds); + if (CollectionUtil.isNotEmpty(appLocationList)) { + appLocationList.forEach(appLocation -> { + Integer oldIsEnabled = appLocation.getIsEnable(); + if (AppConstants.APP_LOCATION_STATUS_ENABLE.equals(oldIsEnabled)) { + appLocation.setIsEnable(AppConstants.APP_LOCATION_STATUS_DISABLE); + }else if (AppConstants.APP_LOCATION_STATUS_DISABLE.equals(oldIsEnabled)) { + appLocation.setIsEnable(AppConstants.APP_LOCATION_STATUS_ENABLE); + } + appLocationMapper.updateAppLocation(appLocation); + }); + } + } } diff --git a/ruoyi-system/src/main/resources/mapper/app/AppLocationMapper.xml b/ruoyi-system/src/main/resources/mapper/app/AppLocationMapper.xml index 89ad3c2b..7643889b 100644 --- a/ruoyi-system/src/main/resources/mapper/app/AppLocationMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/app/AppLocationMapper.xml @@ -20,6 +20,7 @@ + @@ -37,7 +38,8 @@ is_lock, vehicle_id, remark, - is_working + is_working, + is_enable from app_location @@ -57,6 +59,7 @@ and is_lock = #{isLock} and vehicle_id = #{vehicleId} and is_working = #{isWorking} + and is_enable = #{isEnable} @@ -90,6 +93,7 @@ vehicle_id, remark, is_working, + is_enable, #{locationId}, @@ -107,6 +111,7 @@ #{vehicleId}, #{remark}, #{isWorking}, + #{isEnable}, @@ -130,6 +135,7 @@ vehicle_id, remark, is_working, + is_enable, ) values @@ -150,6 +156,7 @@ #{location.vehicleId}, #{location.remark}, #{location.isWorking}, + #{location.isEnable}, ) @@ -172,6 +179,7 @@ vehicle_id = #{vehicleId}, remark = #{remark}, is_working = #{isWorking}, + is_enable = #{isEnable}, where location_id = #{locationId} @@ -188,4 +196,12 @@ #{locationId} + + \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/app/AppStandMapper.xml b/ruoyi-system/src/main/resources/mapper/app/AppStandMapper.xml index 9d1c88bb..d89b6d4a 100644 --- a/ruoyi-system/src/main/resources/mapper/app/AppStandMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/app/AppStandMapper.xml @@ -6,6 +6,7 @@ + @@ -16,12 +17,13 @@ - select stand_id, stand_name, stand_type, stand_area, stand_property, stand_status, is_lock, remark from app_stand + select stand_id,stand_code, stand_name, stand_type, stand_area, stand_property, stand_status, is_lock, remark from app_stand and vehicle_type = #{vehicleType} + and vehicle_code = #{vehicleCode} and vehicle_status = #{vehicleStatus} and location_id = #{locationId} and is_empty = #{isEmpty} @@ -50,6 +53,7 @@ insert into app_vehicle vehicle_id, + vehicle_code, vehicle_type, vehicle_status, location_id, @@ -61,6 +65,7 @@ #{vehicleId}, + #{vehicleCode}, #{vehicleType}, #{vehicleStatus}, #{locationId}, @@ -75,6 +80,7 @@ update app_vehicle + vehicle_code = #{vehicleCode}, vehicle_type = #{vehicleType}, vehicle_status = #{vehicleStatus}, location_id = #{locationId}, @@ -99,6 +105,6 @@ \ No newline at end of file