Merge branch 'refs/heads/master' into master_lz

wms-common/pom.xml

@@ -156,4 +156,4 @@
         </dependency>
 
     </dependencies>
-</project>
+</project>

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);
 }

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();
+    }
+
 }

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);
+    }
 }