From ebf0db91e09be33fcbfe97ed5b91965dc2e61dfd Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期四, 01 八月 2024 10:54:26 +0800
Subject: [PATCH] 1. 托盘管理 2. 入库通知档导入功能 3. 工作档明细 新增来源单据类型及单据编号 4. 库存明细统计表 增加一栏ERP数量（需跟ERP确认接口实现方式）。 5. 存货档案、单据管理、库存管理可以支持模糊搜索（各个单据界面）。
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocMastController.java | 52 ++++++++++++++++++++++++++++++++++++----------------
1 files changed, 36 insertions(+), 16 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocMastController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocMastController.java
index 0b03522..c355fac 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocMastController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocMastController.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zy.asrs.common.domain.entity.Parameter;
import com.zy.asrs.common.domain.entity.Shelves;
@@ -21,6 +22,8 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import java.util.*;
+
+import static jdk.nashorn.api.scripting.ScriptUtils.convert;
@RestController
public class LocMastController extends BaseController {
@@ -46,23 +49,39 @@
@RequestParam(required = false) String condition,
@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);
- }
- if (!Cools.isEmpty(timeRange)) {
- String[] range = timeRange.split(RANGE_TIME_LINK);
- 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"));
- }
- if (!Cools.isEmpty(param.get("loc_sts"))) {
- wrapper.eq(LocMast::getLocSts, param.get("loc_sts"));
- }
+ excludeTrash(param);
+ QueryWrapper<LocMast> wrapper = new QueryWrapper<>();
+ wrapper.eq("host_id",getHostId());
+ //wrapper.eq(LocMast::getHostId, getHostId());
+ convert(param, wrapper);
+ //if (!Cools.isEmpty(condition)) {
+ // wrapper.like(LocMast::getLocNo, condition);
+ //}
+ //if (!Cools.isEmpty(timeRange)) {
+ // String[] range = timeRange.split(RANGE_TIME_LINK);
+ // 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"));
+ //}
+ //if (!Cools.isEmpty(param.get("loc_sts"))) {
+ // wrapper.eq(LocMast::getLocSts, param.get("loc_sts"));
+ //}
return R.ok(locMastService.page(new Page<>(curr, limit), wrapper));
+ }
+
+ private <T> void convert(Map<String, Object> map,QueryWrapper<T> wrapper){
+ for (Map.Entry<String, Object> entry : map.entrySet()){
+ String val = String.valueOf(entry.getValue());
+ if (val.contains(RANGE_TIME_LINK)){
+ String[] dates = val.split(RANGE_TIME_LINK);
+ wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
+ wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
+ } else {
+ wrapper.like(entry.getKey(), val);
+ }
+ }
}
@PostMapping(value = "/group/empty/stock")
@@ -184,6 +203,7 @@
locMast.setModiUser(getUserId());
locMast.setModiTime(new Date());
locMast.setHostId(hostId);
+ locMast.setWhsType(0L);
list.add(locMast);
}
}
--
Gitblit v1.9.1