From 469d41fe09ceec3dc5259d01a4060aac1448e09f Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 03 九月 2025 09:59:34 +0800
Subject: [PATCH] 完善订单组托可用数据显示功能
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocMastController.java | 101 +++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 82 insertions(+), 19 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..3d45a21 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
@@ -1,13 +1,18 @@
package com.zy.asrs.wms.controller;
import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zy.asrs.common.domain.entity.Parameter;
import com.zy.asrs.common.domain.entity.Shelves;
import com.zy.asrs.common.domain.param.LocMastInitParam;
+import com.zy.asrs.common.wms.dto.LocPicDto;
import com.zy.asrs.common.wms.entity.LocDetl;
import com.zy.asrs.common.wms.entity.LocMast;
+import com.zy.asrs.common.wms.entity.Mat;
import com.zy.asrs.common.wms.service.LocDetlService;
import com.zy.asrs.common.wms.service.LocMastService;
import com.zy.asrs.framework.annotations.ManagerAuth;
@@ -21,6 +26,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 +53,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 +207,7 @@
locMast.setModiUser(getUserId());
locMast.setModiTime(new Date());
locMast.setHostId(hostId);
+ locMast.setWhsType(0L);
list.add(locMast);
}
}
@@ -206,17 +230,56 @@
return R.error();
}
- ArrayList<String> list = new ArrayList<>();
+ List<LocPicDto> list = new ArrayList<>();
String picStr = locMast.getPic();
if (Cools.isEmpty(picStr)) {
return R.ok().add(list);
}
List<String> pics = JSON.parseArray(picStr, String.class);
for (String pic : pics) {
- list.add("http://" + WCS_URL + "/image/" + pic + "-1.jpg");
- list.add("http://" + WCS_URL + "/image/" + pic + "-2.jpg");
+ List<String> picList = new ArrayList<>();
+ String[] split = pic.split("_");
+ String picPath = split[0];
+ String locNoStr = "";
+ if (split.length > 1) {
+ locNoStr = split[1];
+ picPath += "_" + locNoStr;
+ }
+ picList.add("http://" + WCS_URL + "/image/" + picPath + "-1.jpg");
+ picList.add("http://" + WCS_URL + "/image/" + picPath + "-2.jpg");
+
+ LocPicDto locPicDto = new LocPicDto();
+ locPicDto.setLocNo(locNoStr);
+ locPicDto.setPics(picList);
+ list.add(locPicDto);
}
return R.ok().add(list);
}
+ @RequestMapping(value = "/wrkLastno/export/auth")
+ @ManagerAuth(memo = "搴撲綅鏄庣粏瀵煎嚭")
+ public synchronized R export(@RequestBody JSONObject param){
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ QueryWrapper<LocMast> wrapper = new QueryWrapper<>();
+ Map<String, Object> map = excludeTrash(param.getJSONObject("locMast"));
+ String row = "";
+ if (map.get("row") != null) {
+ String chooseRow = (String) map.get("row");
+ if (chooseRow.length() == 1) {
+ row = "0" + chooseRow;
+ map.remove("row");
+ }else {
+ row = chooseRow;
+ map.remove("row");
+ }
+ }
+ convert(map, wrapper);
+// if (!row.equals("")){
+// wrapper.and()
+// .where("loc_no like '" +row +"%'");
+// }
+ List<LocMast> list = locMastService.list(wrapper);
+ return R.ok(exportSupport(list, fields));
+ }
+
}
--
Gitblit v1.9.1