Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-07-19 4fae0a3d70ce519502c8ef17f327daffbe9a44aa

 standard-server/src/main/java/com/yuanchu/limslaboratory/service/SpecificationsService.java

@@ -5,7 +5,7 @@
import com.yuanchu.limslaboratory.mapper.SpecificationsMapper;
import com.yuanchu.limslaboratory.pojo.Specifications;
import com.baomidou.mybatisplus.extension.service.IService;
import com.yuanchu.limslaboratory.vo.ListSpecificationsInformation;
import org.springframework.transaction.annotation.Transactional;

import javax.annotation.Resource;
import java.util.Map;
@@ -23,7 +23,17 @@

    Integer addSpecificationsInformation(Specifications specifications);

    IPage<ListSpecificationsInformation> listSpecificationsInformation(String specificationsName, String serialNumberId, Page<Objects> page);

    Map<String,Object> selectSNameSNName(int materialId);

    IPage<Map<String, Objects>> listSpecificationsInformation(String specificationsName, String serialNumberId, Page<Objects> page);

    Integer updateSpecificationsInformation(Specifications specifications);

    /**
     * 多表删除，表格分别有：Specification --> Material --> Product
     * @param specificationsId
     * @return
     */
    @Transactional(rollbackFor = Exception.class)
    Integer deleteSpecifications(String specificationsId);
}