wms / wms4 · Commits

Commit 933d8f735abaccfc26a20438e8ab2ec2592f5fa9

Authored by 谭毅彬
1 parent d2b8e91a

库位比较库区只显示立库 

Signed-off-by: TanYibin <5491541@qq.com>
Inline Side-by-side
Showing 2 changed files with 5 additions and 6 deletions
ant-design-vue-jeecg/src/views/system/compare/CompareWcsLocation.vue
  View file @933d8f7
... ... @@ -306,9 +306,7 @@ export default {
306 306 },
307 307 initDictConfig() {},
308 308 loadFrom() {
309   - let param = Object.assign(
310   - { type: 'L' }
311   - )
  309 + let param = { zoneTypeList: ["L"] }
312 310 getZoneList(param).then(res => {
313 311 if (res.success) {
314 312 this.zoneList = res.result
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/zone/controller/ZoneController.java
  View file @933d8f7
... ... @@ -19,6 +19,7 @@ import org.jeecg.modules.wms.config.zone.service.IZoneService;
19 19 import org.jeecg.utils.HuahengJwtUtil;
20 20 import org.jeecg.utils.StringUtils;
21 21 import org.springframework.beans.factory.annotation.Autowired;
  22 +import org.springframework.util.CollectionUtils;
22 23 import org.springframework.web.bind.annotation.*;
23 24 import org.springframework.web.servlet.ModelAndView;
24 25  
... ... @@ -171,7 +172,7 @@ public class ZoneController extends JeecgController&lt;Zone, IZoneService&gt; {
171 172 * @param req
172 173 */
173 174 @RequestMapping(value = "/getZoneList")
174   - public Result<?> getZoneList(@RequestParam(name = "type", required = true) String type, HttpServletRequest req) {
  175 + public Result<?> getZoneList(@RequestParam(name = "zoneTypeList[]", required = false) List<String> zoneTypeList, HttpServletRequest req) {
175 176 LambdaQueryWrapper<Zone> zoneLambdaQueryWrapper = Wrappers.lambdaQuery();
176 177 HuahengJwtUtil.setWarehouseCode(zoneLambdaQueryWrapper, Zone.class, req);
177 178 String username = HuahengJwtUtil.getCurrentUsername();
... ... @@ -181,8 +182,8 @@ public class ZoneController extends JeecgController&lt;Zone, IZoneService&gt; {
181 182 zoneLambdaQueryWrapper.in(Zone::getCode, Arrays.asList(sysUser.getZoneCode().split(StrUtil.COMMA)));
182 183 }
183 184 }
184   - if (!StringUtils.isEmpty(type)) {
185   - zoneLambdaQueryWrapper.eq(Zone::getType, type);
  185 + if (!CollectionUtils.isEmpty(zoneTypeList)) {
  186 + zoneLambdaQueryWrapper.in(Zone::getType, zoneTypeList);
186 187 }
187 188 List<Zone> zoneList = zoneService.list(zoneLambdaQueryWrapper);
188 189 return Result.OK(zoneList);
... ...