wms / wms4_zhongputaicang · Commits

Commit d2b8e91a4850842f5000a226290340ff9099a403

Authored by 谭毅彬
1 parent e4aeb1c0

库位比较库区只显示立库 

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