From cf9a5039e6db9d1d5963e3fe1a37d00169ec2ef7 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期三, 25 六月 2025 11:18:22 +0800
Subject: [PATCH] 验收报告修改
---
src/main/java/com/whyc/service/ProductService.java | 25 ++++++++++++++++++-------
1 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/whyc/service/ProductService.java b/src/main/java/com/whyc/service/ProductService.java
index f58297b..bdc8e43 100644
--- a/src/main/java/com/whyc/service/ProductService.java
+++ b/src/main/java/com/whyc/service/ProductService.java
@@ -149,8 +149,11 @@
File parentFile = new File(filePath);
String originalFilename = file.getOriginalFilename();
File zipFile = new File(filePath + File.separator + originalFilename);
- if (!zipFile.exists()) {
+ /*if (!zipFile.exists()) {
zipFile.mkdirs();
+ }*/
+ if (!parentFile.exists()) {
+ parentFile.mkdirs();
}
file.transferTo(zipFile);
//瑙ｅ帇鏂囦欢澶�
@@ -368,6 +371,14 @@
if (!pictureRowSet.isEmpty() && pictureRowSet.contains(k)) {
PictureData pictureData = pictureDataMap.get(k);
+ //鍒ゆ柇鐗╂枡鍨嬪彿鏄惁鍖呭惈闈炴硶瀛楃(鍥剧墖浼氳浆鍖栦负璺緞)
+ if(bom.getSubModel()!=null) {
+ String regexStr = "[\\/*?\"|:<>\t]";
+ boolean matches = Pattern.compile(regexStr).matcher(bom.getSubModel()).find();
+ if (matches) {
+ return response.set(1, false, "鍨嬪彿涓�"+bom.getSubModel()+"鐨勭墿鏂欏寘鍚潪娉曞瓧绗�:\\/*?\"|:<>鎴栧墠缃┖鏍�");
+ }
+ }
//鍥剧墖瀛樺偍 product_submit/username/2022-07/
String approvingPath = rootFile + File.separator + "product_submit" + File.separator + user.getName() + File.separator + dateFormat + File.separator + timeStamp;
File provingFile = new File(approvingPath);
@@ -895,7 +906,7 @@
List<MaterialHistory> materialHistoryList = new LinkedList<>();
//鏂扮墿鏂�
List<Material> newMaterialList = new LinkedList<>();
- //宸茬粡瀛樺湪鐨勭墿鏂�
+ //鍒ゆ柇鐗╂枡鏄惁宸茬粡瀛樺湪浜庣墿鏂欒〃涓�
List<Material> materialUpdateList = new LinkedList<>();
for (ProductBom bom : bomList) {
if (!subCodeList.contains(bom.getSubCode() + "/" + bom.getSubModel())) {
@@ -1134,12 +1145,12 @@
return new Response().setIII(1,listMaterial.size()>0||listProduct.size()>0,listMaterial,listProduct,"");
}
- //鍙嶉绠＄悊-鏌ヨ褰撳墠浣跨敤鐨勬墍鏈夌殑浜у搧
+ //鍙嶉绠＄悊-鏌ヨ鎵�鏈夌殑浜у搧
public Response getFkProduct() {
- QueryWrapper wrapper=new QueryWrapper();
- wrapper.ne("version",-1);
- List list=mapper.selectList(wrapper);
- return new Response().setII(1,list.size()>0,list,"鍙嶉绠＄悊-鏌ヨ褰撳墠浣跨敤鐨勬墍鏈夌殑浜у搧");
+ //QueryWrapper wrapper=new QueryWrapper();
+ //wrapper.ne("version",-1);
+ List list=mapper.selectList(null);
+ return new Response().setII(1,list.size()>0,list,"鍙嶉绠＄悊-鏌ヨ鎵�鏈夌殑浜у搧");
}
//浜у搧瀵规瘮涓嬫媺閫変腑
--
Gitblit v1.9.1