From f53706e7e8a7b4e0278917e9d3cdfbc877de177d Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 30 五月 2024 16:59:47 +0800
Subject: [PATCH] #平库下架完成
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocMastController.java | 34 +++++++++++++++++++++++++++++++---
1 files changed, 31 insertions(+), 3 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 194311c..f0f05a5 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,7 +1,6 @@
package com.zy.asrs.wms.controller;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zy.asrs.common.domain.entity.Parameter;
@@ -18,9 +17,9 @@
import com.zy.asrs.framework.common.DateUtils;
import com.zy.asrs.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
-
import java.util.*;
@RestController
@@ -30,6 +29,9 @@
private LocMastService locMastService;
@Autowired
private LocDetlService locDetlService;
+
+ @Value("${wcs.url}")
+ private String WCS_URL;
@RequestMapping(value = "/locMast/{id}/auth")
@ManagerAuth
@@ -56,6 +58,9 @@
}
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));
}
@@ -179,4 +184,27 @@
return R.ok("鍒濆鍖栨垚鍔�");
}
+ @GetMapping("/locMast/picUrl")
+ @ManagerAuth
+ public R getPicUrl(@RequestParam String locNo) {
+ LocMast locMast = locMastService.getOne(new LambdaQueryWrapper<LocMast>()
+ .eq(LocMast::getLocNo, locNo)
+ .eq(LocMast::getHostId, getHostId()));
+ if (locMast == null) {
+ return R.error();
+ }
+
+ ArrayList<String> 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");
+ }
+ return R.ok().add(list);
+ }
+
}
--
Gitblit v1.9.1