From 1b4b84241538334b4475ba25f117decdc15e26ca Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期三, 18 十二月 2024 08:50:20 +0800
Subject: [PATCH] 修正并板入库，批号不使用Mat中的
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocMastController.java | 20 +++++++++++++++++---
1 files changed, 17 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 6b784d5..99fe383 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
@@ -8,6 +8,7 @@
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;
@@ -228,15 +229,28 @@
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);
}
--
Gitblit v1.9.1