From 180e44f303dcaf2a9102fa91ac7669dbfc191980 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期二, 26 十二月 2023 08:38:08 +0800
Subject: [PATCH] #
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocMastController.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/controller/LocMastController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocMastController.java
similarity index 90%
rename from zy-asrs-common/src/main/java/com/zy/asrs/common/wms/controller/LocMastController.java
rename to zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocMastController.java
index 706e8c8..d34037c 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/controller/LocMastController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocMastController.java
@@ -1,9 +1,10 @@
-package com.zy.asrs.common.wms.controller;
+package com.zy.asrs.wms.controller;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zy.asrs.common.wms.entity.LocDetl;
import com.zy.asrs.common.wms.entity.LocMast;
import com.zy.asrs.common.wms.service.LocMastService;
import com.zy.asrs.framework.annotations.ManagerAuth;
@@ -37,6 +38,7 @@
@RequestParam(required = false) String timeRange,
@RequestParam Map<String, Object> param) {
LambdaQueryWrapper<LocMast> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(LocMast::getHostId, getHostId());
if (!Cools.isEmpty(condition)) {
wrapper.like(LocMast::getLocNo, condition);
}
@@ -45,6 +47,9 @@
wrapper.ge(LocMast::getAppeTime, DateUtils.convert(range[0]));
wrapper.le(LocMast::getAppeTime, DateUtils.convert(range[1]));
}
+ if (!Cools.isEmpty(param.get("loc_no"))) {
+ wrapper.eq(LocMast::getLocNo, param.get("loc_no"));
+ }
return R.ok(locMastService.page(new Page<>(curr, limit), wrapper));
}
@@ -52,6 +57,7 @@
@RequestMapping(value = "/locMast/add/auth")
@ManagerAuth
public R add(LocMast locMast) {
+ locMast.setHostId(getHostId());
locMastService.save(locMast);
return R.ok();
}
@@ -79,6 +85,7 @@
@ManagerAuth
public R query(String condition) {
LambdaQueryWrapper<LocMast> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(LocMast::getHostId, getHostId());
wrapper.like(LocMast::getLocNo, condition);
Page<LocMast> page = locMastService.page(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
@@ -96,6 +103,7 @@
public R getDataKV(@RequestParam(required = false) String condition) {
List<KeyValueVo> vos = new ArrayList<>();
LambdaQueryWrapper<LocMast> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(LocMast::getHostId, getHostId());
if (!Cools.isEmpty(condition)) {
wrapper.like(LocMast::getLocNo, condition);
}
--
Gitblit v1.9.1