From 73c1bc9d0156d5398aa8d7f75f17ab856b14a929 Mon Sep 17 00:00:00 2001
From: liuzhu <liuzhu@123.com>
Date: Fri, 6 Mar 2026 17:58:55 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=B0=E9=87=8D=E6=8A=93=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 wms-common/pom.xml                                       | 2 +-
 .../wms/admin/material/service/MaterialInfoService.java  | 6 ++++++
 .../material/service/impl/MaterialInfoServiceImpl.java   | 9 +++++++++
 .../controller/meterial/MaterialInfoController.java      | 6 ++++++
 4 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/wms-common/pom.xml b/wms-common/pom.xml
index ad10aa6..6eca3fb 100644
--- a/wms-common/pom.xml
+++ b/wms-common/pom.xml
@@ -156,4 +156,4 @@
         </dependency>
 
     </dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/wms-module-system/src/main/java/top/wms/admin/material/service/MaterialInfoService.java b/wms-module-system/src/main/java/top/wms/admin/material/service/MaterialInfoService.java
index 6644972..916d2c4 100644
--- a/wms-module-system/src/main/java/top/wms/admin/material/service/MaterialInfoService.java
+++ b/wms-module-system/src/main/java/top/wms/admin/material/service/MaterialInfoService.java
@@ -55,4 +55,10 @@ public interface MaterialInfoService extends BaseService<MaterialInfoResp, Mater
     * 照片批量上传处理
     * */
     void uploadMaterialPhotos(MultipartFile file);
+
+
+    /*
+    * 称重时照片抓取
+    * */
+    String catchPhoto(MultipartFile file);
 }
diff --git a/wms-module-system/src/main/java/top/wms/admin/material/service/impl/MaterialInfoServiceImpl.java b/wms-module-system/src/main/java/top/wms/admin/material/service/impl/MaterialInfoServiceImpl.java
index cfdccdd..1060e39 100644
--- a/wms-module-system/src/main/java/top/wms/admin/material/service/impl/MaterialInfoServiceImpl.java
+++ b/wms-module-system/src/main/java/top/wms/admin/material/service/impl/MaterialInfoServiceImpl.java
@@ -413,4 +413,13 @@ public class MaterialInfoServiceImpl extends BaseServiceImpl<MaterialInfoMapper,
             .forEach(code -> log.warn("物料编码 [{}] 不存在，照片更新失败", code));
     }
 
+
+    @Override
+    public String catchPhoto(MultipartFile file){
+        String photoStoragePath = "catch" + DateUtil.today() + "/";
+        FileInfo fileInfo = fileService.upload(file, photoStoragePath, null, true, true);
+        CheckUtils.throwIfEmpty(fileInfo.getUrl(),"上传失败,请重新上传");
+        return fileInfo.getUrl();
+    }
+
 }
diff --git a/wms-webapi/src/main/java/top/wms/admin/controller/meterial/MaterialInfoController.java b/wms-webapi/src/main/java/top/wms/admin/controller/meterial/MaterialInfoController.java
index a917572..b661f77 100644
--- a/wms-webapi/src/main/java/top/wms/admin/controller/meterial/MaterialInfoController.java
+++ b/wms-webapi/src/main/java/top/wms/admin/controller/meterial/MaterialInfoController.java
@@ -82,4 +82,10 @@ public class MaterialInfoController extends BaseController<MaterialInfoService,
         baseService.uploadMaterialPhotos(zipFile);
         return R.ok();
     }
+    @Operation(summary = "照片抓取", description = "照片抓取")
+    @PostMapping("/import/catch")
+    public String catchPhoto(@RequestParam("file")MultipartFile file) {
+        CheckUtils.throwIfEmpty(file,"照片抓取失败,请重新抓取");
+        return baseService.catchPhoto(file);
+    }
 }