功能修改

src/main/java/com/nov/KgLowDurable/config/FileUploadConfig.java

@@ -9,11 +9,11 @@ import org.springframework.stereotype.Component;
 public class FileUploadConfig {
 
     // 本地服务器地址
-    @Value("${file.upload.server:http://localhost:8083}")
+    @Value(value = "${file.upload.server}")
     private String serverUrl;
 
     // 基础存储路径
-    @Value("${file.upload.base-path:/opt/SmartParkFilesTest}")
+    @Value(value = "${file.upload.base-path}")
     private String basePath;
 
     // 允许的文件类型

src/main/java/com/nov/KgLowDurable/config/WebMvcConfiguration.java

@@ -8,7 +8,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 @Configuration
 public class WebMvcConfiguration implements WebMvcConfigurer {
 
-	@Value(value = "${path.upload}")
+	@Value(value = "${file.upload.base-path}")
 	private String uploadpath;
 	
 //	@Value("${app.video-folder}")

src/main/java/com/nov/KgLowDurable/pojo/entity/LdOnePutStorageDetail.java

@@ -1,6 +1,7 @@
 package com.nov.KgLowDurable.pojo.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
@@ -119,4 +120,10 @@ public class LdOnePutStorageDetail implements Serializable {
 	 */
 	private String remark;
 
+	/**
+	 * 已入库数量
+	 */
+	@TableField(exist = false)
+	private BigDecimal yetInboundQuantity;
+
 }

src/main/java/com/nov/KgLowDurable/service/Impl/LdOnePutStorageServiceImpl.java

@@ -57,6 +57,7 @@ public class LdOnePutStorageServiceImpl extends ServiceImpl<LdOnePutStorageMappe
     @Autowired
     ILdApproveService ldApproveService;
 
+
     @Override
     public PageInfo<LdOnePutStorage> getOnePutStorageList(Date startTime, Date endTime, String inOperator, Integer pageNum, Integer pageSize) {
 
@@ -111,6 +112,35 @@ public class LdOnePutStorageServiceImpl extends ServiceImpl<LdOnePutStorageMappe
             throw new CustomerException("入库ID有误");
         }
         List<LdOnePutStorageDetail> ldOnePutStorageDetailList = onePutStorageDetailService.getByOnePutStorageId(ldOnePutStorage.getId());
+        ldOnePutStorageDetailList.forEach(item ->item.setYetInboundQuantity(new BigDecimal(0)));
+        List<Long> idList = ldOnePutStorageDetailList.stream().map(LdOnePutStorageDetail::getLdPurchaseEndId).collect(Collectors.toList());
+
+        //查询一级入库是否有该采购单
+        List<LdOnePutStoragePurchaseEnd> onePutStoragePurchaseEndList = onePutStoragePurchaseEndService.selectByPurchaseEndId(idList);
+        if(!CollectionUtils.isEmpty(onePutStoragePurchaseEndList)){
+            //获取一级库ID
+            List<Long> onePutStorageIds = onePutStoragePurchaseEndList.stream()
+                    .map(LdOnePutStoragePurchaseEnd::getOnePutStorageId)
+                    .distinct()
+                    .collect(Collectors.toList());
+            //查询是否审核通过
+            List<LdOnePutStorage> ldOnePutStorageList = this.getApprove(onePutStorageIds);
+            if(!CollectionUtils.isEmpty(ldOnePutStorageList)){
+                //通过的话需要汇总入库数量
+                List<Long> collect = ldOnePutStorageList.stream()
+                        .map(LdOnePutStorage::getId)
+                        .collect(Collectors.toList());
+
+                List<LdOnePutStorageDetail> ldOnePutStorageDetailOldList = onePutStorageDetailService.getSummaryData(collect);
+                for(LdOnePutStorageDetail detail : ldOnePutStorageDetailList){
+                    for(LdOnePutStorageDetail oldDtail : ldOnePutStorageDetailOldList){
+                        if(detail.getMaterialId() == oldDtail.getMaterialId() && detail.getMaterialCode().equals(oldDtail.getMaterialCode())){
+                            detail.setYetInboundQuantity(oldDtail.getInboundQuantity());
+                        }
+                    }
+                }
+            }
+        }
 
         List<LdApprove> approveList = ldApproveService.getByFromId(onePutStorageId,BatchConstant.PUT_STORAGE_TYPE);
 
@@ -220,7 +250,7 @@ public class LdOnePutStorageServiceImpl extends ServiceImpl<LdOnePutStorageMappe
             throw new CustomerException("获取入库单ID失败");
         }
         // 设置审批人
-        setApproverInfo(dto, dto.getUserInfoVO());
+       // setApproverInfo(dto, dto.getUserInfoVO());
     }
 
     /**
@@ -441,7 +471,9 @@ public class LdOnePutStorageServiceImpl extends ServiceImpl<LdOnePutStorageMappe
     private void updateDetails(LdOnePutStorageDto dto) {
         for (LdOnePutStorageDetailVO detailVO : dto.getLdOnePutStorageDetailVOList()) {
             if (detailVO.getId() != null) {
-                updateExistingDetail(detailVO);
+                detailVO.setInboundQuantity(detailVO.getTheInboundQuantity());
+                onePutStorageDetailService.updateById(detailVO);
+                //updateExistingDetail(detailVO);
             } else {
                 addNewDetail(detailVO, dto);
             }

src/main/java/com/nov/KgLowDurable/service/Impl/LdTwoOutStorageServiceImpl.java

@@ -116,10 +116,10 @@ public class LdTwoOutStorageServiceImpl extends ServiceImpl<LdTwoOutStorageMappe
             //处理剩余库存
             BigDecimal num = null;
             if (BatchConstant.CONSUMER.equals(ldTwoOutStorageDetail.getType())) {
-                LdConsumerForm consumerForm = consumerFormService.getById(ldTwoOutStorageDetail.getTwoInventoryId());
+                LdConsumerForm consumerForm = consumerFormService.getById(ldTwoOutStorageDetail.getId());
                 num = consumerForm.getNum();
             } else {
-                LdDurableForm durableForm = durableFormService.getById(ldTwoOutStorageDetail.getTwoInventoryId());
+                LdDurableForm durableForm = durableFormService.getById(ldTwoOutStorageDetail.getId());
                 num = durableForm.getNum();
             }
 
@@ -153,10 +153,10 @@ public class LdTwoOutStorageServiceImpl extends ServiceImpl<LdTwoOutStorageMappe
         for (LdTwoOutStorageDetail twoOutStorageDetail : dto.getLdTwoOutStorageDetailList()) {
             BigDecimal num = null;
             if(BatchConstant.CONSUMER.equals(twoOutStorageDetail.getType())){
-                LdConsumerForm consumerForm = consumerFormService.getById(twoOutStorageDetail.getTwoInventoryId());
+                LdConsumerForm consumerForm = consumerFormService.getById(twoOutStorageDetail.getId());
                 num = consumerForm.getNum();
             }else {
-                LdDurableForm durableForm = durableFormService.getById(twoOutStorageDetail.getTwoInventoryId());
+                LdDurableForm durableForm = durableFormService.getById(twoOutStorageDetail.getId());
                 num = durableForm.getNum();
             }
             // 1. 创建表格行

src/main/java/com/nov/KgLowDurable/util/ImageUploadUtil.java

@@ -145,13 +145,13 @@ public class ImageUploadUtil {
 
     private String generateStoragePath(String module) {
         // 按天创建文件夹：yyyy-MM-dd
-        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+//        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
-        String dateFolder = dateFormat.format(new Date());
+//        String dateFolder = dateFormat.format(new Date());
+        String path = config.getBasePath() + File.separator;
+        logger.info("物品上传目录: {}", path);
 
         // 生成完整路径：/opt/SmartParkFilesTest/模块名/yyyy-MM-dd/
-        return config.getBasePath() + File.separator +
+        return path;
-                module + File.separator +
-                dateFolder + File.separator;
     }
 
     private String generateFileName(String originalFilename) {
@@ -192,12 +192,11 @@ public class ImageUploadUtil {
         String dateFolder = dateFormat.format(new Date());
 
         // 生成访问URL：http://10.90.100.231:8132/opt/SmartParkFilesTest/模块名/yyyy-MM-dd/文件名
-        return String.format("%s/%s/%s/%s",
+        return String.format("%s/%s/%s",
                 config.getServerUrl().endsWith("/") ?
                         config.getServerUrl().substring(0, config.getServerUrl().length() - 1) :
                         config.getServerUrl(),
-                module,
+                "file",
-                dateFolder,
                 fileName);
     }
 

src/main/resources/application-dev.properties

@@ -62,3 +62,10 @@ spring.redis.database=0
 spring.redis.timeout=3000ms
 spring.redis.connect-timeout=2000ms
 
+#file.upload.server=http://192.168.1.5:8333
+#file.upload.base-path=opt/SmartParkFilesTest
+
+
+file.upload.server=http://atcflight.com:10094/6583e0b6-a422-4c74-aa40-df48e059b4de/lowDurableTestBack
+file.upload.base-path=/opt/SmartParkFilesTest
+

src/main/resources/application-prop.properties

@@ -1,45 +1,45 @@
-#运行端口
+#\u8FD0\u884C\u7AEF\u53E3
 server.port=8334
 
 server.tomcat.max-http-form-post-size=50MB
 
-#日志输出
+#\u65E5\u5FD7\u8F93\u51FA
 logging.config=classpath:logback-spring.xml
 logging.level.com.kg.wisdompark_api.mapper=debug
 
-#配置定时任务线程池
+#\u914D\u7F6E\u5B9A\u65F6\u4EFB\u52A1\u7EBF\u7A0B\u6C60
 spring.task.scheduling.pool.size=100
 spring.task.scheduling.thread-name-prefix=KgLowDurable
 
-#JDBC连接
+#JDBC\u8FDE\u63A5
-#Mysql6以上com.mysql.cj.jdbc.Driver
+#Mysql6\u4EE5\u4E0Acom.mysql.cj.jdbc.Driver
 spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver
-#Mysql6以上需加serverTimezone=GMT%2B8 否则会与系统时区有差异造成异常
+#Mysql6\u4EE5\u4E0A\u9700\u52A0serverTimezone=GMT%2B8 \u5426\u5219\u4F1A\u4E0E\u7CFB\u7EDF\u65F6\u533A\u6709\u5DEE\u5F02\u9020\u6210\u5F02\u5E38
 spring.datasource.url=jdbc:mysql://10.90.100.201:3889/smartpark?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true
 spring.datasource.username=root
 spring.datasource.password=1qaz@WSX
-#MYSQL 8小时连接超时配置
+#MYSQL 8\u5C0F\u65F6\u8FDE\u63A5\u8D85\u65F6\u914D\u7F6E
-#验证连接的有效性
+#\u9A8C\u8BC1\u8FDE\u63A5\u7684\u6709\u6548\u6027
 spring.datasource.test-while-idle=true
-#获取连接时候验证，会影响性能
+#\u83B7\u53D6\u8FDE\u63A5\u65F6\u5019\u9A8C\u8BC1\uFF0C\u4F1A\u5F71\u54CD\u6027\u80FD
 spring.datasource.test-on-borrow=true
 spring.datasource.validation-query=SELECT 1 
-#空闲连接回收的时间间隔，与test-while-idle一起使用，设置5分钟
+#\u7A7A\u95F2\u8FDE\u63A5\u56DE\u6536\u7684\u65F6\u95F4\u95F4\u9694\uFF0C\u4E0Etest-while-idle\u4E00\u8D77\u4F7F\u7528\uFF0C\u8BBE\u7F6E5\u5206\u949F
 spring.datasource.time-between-eviction-runs-millis=300000
-#连接池空闲连接的有效时间 ，设置30分钟
+#\u8FDE\u63A5\u6C60\u7A7A\u95F2\u8FDE\u63A5\u7684\u6709\u6548\u65F6\u95F4 \uFF0C\u8BBE\u7F6E30\u5206\u949F
 spring.datasource.min-evictable-idle-time-millis=1800000
 
 #mybatis
 mybatis.typeAliasesPackage=com.nov.KgLowDurable.domain
 mybatis.mapperLocations=classpath:mapper/*.xml
 
-##pageHelper分页插件
+##pageHelper\u5206\u9875\u63D2\u4EF6
 pagehelper.helper-dialect=MYSQL
 pagehelper.reasonable=false
 pagehelper.support-methods-arguments=true
 pagehelper.params=count=countSql
 
-#swagger配置开启关闭
+#swagger\u914D\u7F6E\u5F00\u542F\u5173\u95ED
 mconfig.swagger-ui-open=true
 
 #mybatis-plus
@@ -75,3 +75,7 @@ spring.redis.database=1
 spring.redis.timeout=3000ms
 spring.redis.connect-timeout=2000ms
 
+
+file.upload.server=http://atcflight.com:10094
+file.upload.base-path=6583e0b6-a422-4c74-aa40-df48e059b4de/lowDurableBack/file
+

src/main/resources/application-test.properties

@@ -80,3 +80,6 @@ spring.redis.database=1
 spring.redis.timeout=3000ms
 spring.redis.connect-timeout=2000ms
 
+file.upload.server=http://atcflight.com:10094/6583e0b6-a422-4c74-aa40-df48e059b4de/lowDurableTestBack
+file.upload.base-path=/opt/SmartParkFilesTest
+

src/main/resources/application.properties

@@ -1,3 +1,3 @@
 #spring.profiles.active=prop
-#spring.profiles.active=test
+spring.profiles.active=test
-spring.profiles.active=dev
+#spring.profiles.active=dev