From 2444ba874b5dc2167f7cc465254b32355ea1d054 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Tue, 25 Jul 2023 00:21:28 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=95=86=E5=93=81=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87=E7=9A=84=E5=8E=9F=E5=9B=BE=E8=B7=AF=E5=BE=84=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../erp/controller/DepotItemController.java   |  6 ++++--
 .../erp/controller/MaterialController.java    |  6 ++++--
 .../datasource/entities/MaterialVo4Unit.java  | 20 ++++++++++++++-----
 .../erp/service/material/MaterialService.java |  3 ++-
 4 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java
index 50b3931f..ad7a8c77 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java
@@ -260,9 +260,11 @@ public class DepotItemController {
                     item.put("remark", diEx.getRemark());
                     item.put("imgName", diEx.getImgName());
                     if(fileUploadType == 2) {
-                        item.put("imgType", "small");
+                        item.put("imgSmall", "small");
+                        item.put("imgLarge", "large");
                     } else {
-                        item.put("imgType", "");
+                        item.put("imgSmall", "");
+                        item.put("imgLarge", "");
                     }
                     item.put("linkId", diEx.getLinkId());
                     item.put("depotId", diEx.getDepotId() == null ? "" : diEx.getDepotId());
diff --git a/jshERP-boot/src/main/java/com/jsh/erp/controller/MaterialController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/MaterialController.java
index 4dfbd624..26c00389 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/controller/MaterialController.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/controller/MaterialController.java
@@ -268,9 +268,11 @@ public class MaterialController {
                     item.put("expand", materialService.getMaterialOtherByParam(mpArr, material));
                     item.put("imgName", material.getImgName());
                     if(fileUploadType == 2) {
-                        item.put("imgType", "small");
+                        item.put("imgSmall", "small");
+                        item.put("imgLarge", "large");
                     } else {
-                        item.put("imgType", "");
+                        item.put("imgSmall", "");
+                        item.put("imgLarge", "");
                     }
                     dataArray.add(item);
                 }
diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/MaterialVo4Unit.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/MaterialVo4Unit.java
index f79ae494..9a70863f 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/MaterialVo4Unit.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/MaterialVo4Unit.java
@@ -47,7 +47,9 @@ public class MaterialVo4Unit extends Material{
      */
     private String bigUnitStock;
 
-    private String imgType;
+    private String imgSmall;
+
+    private String imgLarge;
 
     public String getUnitName() {
         return unitName;
@@ -209,11 +211,19 @@ public class MaterialVo4Unit extends Material{
         this.bigUnitStock = bigUnitStock;
     }
 
-    public String getImgType() {
-        return imgType;
+    public String getImgSmall() {
+        return imgSmall;
     }
 
-    public void setImgType(String imgType) {
-        this.imgType = imgType;
+    public void setImgSmall(String imgSmall) {
+        this.imgSmall = imgSmall;
+    }
+
+    public String getImgLarge() {
+        return imgLarge;
+    }
+
+    public void setImgLarge(String imgLarge) {
+        this.imgLarge = imgLarge;
     }
 }
\ No newline at end of file
diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/material/MaterialService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/material/MaterialService.java
index fb363560..cef0659b 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/service/material/MaterialService.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/service/material/MaterialService.java
@@ -136,7 +136,8 @@ public class MaterialService {
                 Map<Long,BigDecimal> currentStockMap = getCurrentStockMapByMaterialList(list);
                 for (MaterialVo4Unit m : list) {
                     if(fileUploadType == 2) {
-                        m.setImgType("small");
+                        m.setImgSmall("small");
+                        m.setImgLarge("large");
                     }
                     m.setMaterialOther(getMaterialOtherByParam(mpArr, m));
                     m.setStock(currentStockMap.get(m.getId())!=null? currentStockMap.get(m.getId()): BigDecimal.ZERO);