入库附件问题修复、入库通过时清除修改原因

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/materialManagement/wareHouse/mapper/WareHouseBasicMapper.java

@@ -59,4 +59,7 @@ public interface WareHouseBasicMapper extends BaseMapper<WareHouseBasic> {
     void updateWarnNumByTradeNameAndType(@Param("warnNum")String warnNum,
                                          @Param("tradeName")String tradeName,
                                          @Param("typeId")String typeId);
+
+    // 根据id清除修改原因
+    void clearUpdateCause(String id);
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/materialManagement/wareHouse/mapper/xml/WareHouseBasicMapper.xml

@@ -205,4 +205,7 @@
 		set warn_num = #{warnNum}
 		where trade_name = #{tradeName} and ware_house_type = #{typeId}
 	</update>
+	<update id="clearUpdateCause">
+		update material_management_warehouse_basics set update_cause = null where id = #{id}
+	</update>
 </mapper>

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/materialManagement/wareHouse/service/WareHouseBasicService.java

@@ -36,6 +36,7 @@ import com.jeeplus.test.materialManagement.wareHouse.service.dto.WareHouseDto;
 import com.jeeplus.test.mould.service.SerialnumTplService;
 import com.jeeplus.test.oss.domain.WorkAttachment;
 import com.jeeplus.test.oss.mapper.OssServiceMapper;
+import com.jeeplus.test.oss.service.OssService;
 import com.jeeplus.test.workContract.service.dto.WorkAttachmentDto;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
@@ -89,6 +90,9 @@ public class WareHouseBasicService {
     @Resource
     private WareHouseBasicMapper wareHouseBasicMapper;
 
+    @Resource
+    private OssService ossService;
+
     /**
      * 列表查询
      */
@@ -335,6 +339,8 @@ public class WareHouseBasicService {
                 BeanUtils.copyProperties(dto, info);
                 info.setHandledBy(dto.getHandledById());
                 basicMapper.updateById(info);
+                // 把修改原因清空
+                basicMapper.clearUpdateCause(dto.getId());
                 // 入库详情修改
                 List<WareHouseDetailed> wareHouseDetaileds = detailedMapper.selectList(new LambdaQueryWrapper<WareHouseDetailed>()
                         .eq(WareHouseDetailed::getBasicId,info.getId()));
@@ -357,9 +363,7 @@ public class WareHouseBasicService {
                 basicMapper.updateById(info);
                 basicMapper.deleteUpdateUser(dto.getId()); // 删除数据修改申请人
                 // 修改附件信息列表
-                if (CollectionUtils.isNotEmpty(dto.getFiles())) {
-                    infoService.updateFiles(dto.getFiles(), userDTO, dto.getId());
-                }
+                ossService.saveOrUpdateFileList(dto.getFiles(), dto.getId(),"ware_house_basic");
                 // 入库详情修改
                 // 物理删除此入库的全部入库关联的附件表数据，然后再新增附件。因为如果不物理删除，新增时会有主键冲突
                 List<WareHouseDetailed> wareHouseDetaileds = detailedMapper.selectList(new QueryWrapper<WareHouseDetailed>().lambda().eq(WareHouseDetailed::getBasicId, dto.getId()));
@@ -373,9 +377,7 @@ public class WareHouseBasicService {
                         item.setWareHouseType(item.getWareHouseTypeId());
                         detailedMapper.insert(item);
                         // 保存附件信息列表
-                        if (CollectionUtils.isNotEmpty(item.getFileInfoLost())) {
-                            infoService.updateFiles(item.getFileInfoLost(), userDTO, item.getId());
-                        }
+                        ossService.saveOrUpdateFileList(item.getFileInfoLost(), item.getId(),"ware_house_detail");
                     });
                 }
                 // 删除送审时在历史修改表添加的数据
@@ -452,15 +454,13 @@ public class WareHouseBasicService {
                     }
                 }
                 // 修改附件信息列表
-                if (CollectionUtils.isNotEmpty(detailInfo.getFileInfoLost())) {
-                    infoService.updateFiles(detailInfo.getFileInfoLost(), userDTO, detailInfo.getId());
-                }
+                ossService.saveOrUpdateFileList(detailInfo.getFileInfoLost(), detailInfo.getId(),"ware_house_detail");
+
             });
         }
         // 修改附件信息列表
-        if (CollectionUtils.isNotEmpty(dto.getFiles())) {
-            infoService.updateFiles(dto.getFiles(), userDTO, dto.getId());
-        }
+        ossService.saveOrUpdateFileList(dto.getFiles(), dto.getId(),"ware_house_basic");
+
         return dto.getId();
     }