From 09284f08c7a901f684cf26ccb0e51a9204d9cd64 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 30 五月 2024 09:30:27 +0800
Subject: [PATCH] #订单组托

---
 zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocMastController.java |   13 ++++++++++---
 1 files changed, 10 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 c20a0d4..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,5 +1,6 @@
 package com.zy.asrs.wms.controller;
 
+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;
@@ -193,10 +194,16 @@
             return R.error();
         }
 
-        String pic = locMast.getPic();
         ArrayList<String> list = new ArrayList<>();
-        list.add("http://" + WCS_URL + "/image/" + pic + "-1.jpg");
-        list.add("http://" + WCS_URL + "/image/" + pic + "-2.jpg");
+        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