二进制文件禁止对比

.gitattributes

@@ -0,0 +1,22 @@
+# 图片
+*.jpg binary
+*.jpeg binary
+*.png binary
+*.gif binary
+*.bmp binary
+*.webp binary
+
+# 文档/压缩包
+*.pdf binary
+*.doc binary
+*.docx binary
+*.zip binary
+*.rar binary
+*.7z binary
+
+# 其他二进制格式
+*.exe binary
+*.dll binary
+*.so binary
+*.jar binary
+*.class binary

zt-module-qms/zt-module-qms-api/src/main/java/com/zt/plat/module/qms/enums/ErrorCodeConstants.java

@@ -142,6 +142,13 @@ public interface ErrorCodeConstants {
 	
 	ErrorCode BUSINESS_XRF_DATA_NOT_EXISTS = new ErrorCode(1_032_100_000, "荧光采集记录不存在");
 
+	//第三方对接
+	ErrorCode OTHER_SYSTEM_CONFIG_NOT_EXISTS = new ErrorCode(1_032_100_000, "第三方系统配置不存在");
+	ErrorCode OTHER_BASE_SAMPLE_NOT_EXISTS = new ErrorCode(1_032_100_000, "第三方系统样品大类对应不存在");
+	ErrorCode OTHER_DICTIONARY_PROJECT_NOT_EXISTS = new ErrorCode(1_032_100_000, "第三方系统检测项目字典对应不存在");
+	ErrorCode OTHER_SYSTEM_USER_NOT_EXISTS = new ErrorCode(1_032_100_000, "第三方系统用户信息对应不存在");
+	ErrorCode OTHER_DICTIONARY_BUSINESS_NOT_EXISTS = new ErrorCode(1_032_100_000, "第三方系统与业务字典对应不存在");
+	
 
 	//检测报告
 	ErrorCode REPORT_DOCUMENT_MAIN_NOT_EXISTS = new ErrorCode(1_032_100_000, "检测报告业务不存在");
@@ -186,6 +193,7 @@ public interface ErrorCodeConstants {
 	ErrorCode MATERIAL_PRODUCTS_EXISTS_CATEGORY = new ErrorCode(1_032_160_000, "物料大类列表中存在分类数据");
 	ErrorCode MATERIAL_LIFECYCLE_DETAIL_NOT_EXISTS = new ErrorCode(1_032_160_000, "物料通用流程明细不存在");
 	ErrorCode MATERIAL_LIFECYCLE_NOT_EXISTS = new ErrorCode(1_032_160_000, "物料通用流程不存在");
+	ErrorCode MATERIAL_CORRELATION_ASSAY_NOT_EXISTS = new ErrorCode(1_032_160_000, "物料检化验关联信息不存在");
 
 	ErrorCode MATERIAL_BATCH_NOT_EXISTS = new ErrorCode(1_032_160_000, "物料批次不存在");
 	ErrorCode MATERIAL_BATCH_GONG_NOT_EXISTS = new ErrorCode(1_032_160_000, "物料批次工段不存在");
@@ -198,8 +206,7 @@ public interface ErrorCodeConstants {
 
 	ErrorCode SYSTEM_VERSION_MANAGEMENT_NOT_EXISTS = new ErrorCode(1_032_160_000, "客户端版本管理不存在");
 
-	ErrorCode MATERIAL_INVENTORY_CHECK_NOT_EXISTS = new ErrorCode(1_032_160_000, "库存盘点不存在");
-	ErrorCode MATERIAL_INVENTORY_CHECK_BATCH_NOT_EXISTS = new ErrorCode(1_032_160_000, "库存盘点项不存在");
+	ErrorCode MATERIAL_INVENTORY_CHECK_ITEM_NOT_EXISTS = new ErrorCode(1_032_160_000, "库存盘点项不存在");
 	ErrorCode MATERIAL_INVENTORY_CHECK_DETAIL_NOT_EXISTS = new ErrorCode(1_032_160_000, "库存盘点明细不存在");
 	ErrorCode MATERIAL_INVENTORY_OUTBOUND_NOT_EXISTS = new ErrorCode(1_032_160_000, "出库不存在");
 	ErrorCode MATERIAL_INVENTORY_OUTBOUND_DETAIL_NOT_EXISTS = new ErrorCode(1_032_160_000, "出库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等不存在");
@@ -249,6 +256,7 @@ public interface ErrorCodeConstants {
 	/*=================================  部门信息、用户信息 ==================================*/
 	ErrorCode CURRENT_USER_COMPANY_NOT_EXISTS = new ErrorCode(1_032_350_000, "当前用户公司不存在");
 	ErrorCode CURRENT_USER_DEPT_NOT_EXISTS = new ErrorCode(1_032_350_000, "当前用户部门不存在");
+	ErrorCode CURRENT_USER_NOT_EXISTS = new ErrorCode(1_032_350_000, "当前用户部门不存在");
 
 	// ========== 文件记录分发号,记录文件分发与线下对应的分发号对应，且标记到目标人物 TODO 补充编号 ==========
 	ErrorCode RECORD_ASSIGN_NOT_EXISTS = new ErrorCode(1_032_450_000, "文件记录分发号,记录文件分发与线下对应的分发号对应，且标记到目标人物不存在");

zt-module-qms/zt-module-qms-api/src/main/java/com/zt/plat/module/qms/enums/QmsCommonConstant.java

@@ -215,11 +215,47 @@ public interface QmsCommonConstant {
     /** 委检登记附件类型：商检部门分析报告 **/
     String ENTRUST_ATTACHMENT_CATEGORY_DEPT_DOC = "entrust_dept_doc_upload";
     
+    /** 委托来源 检验委托 **/
+    String  ENTRUST_SOURCE_JYWT = "jywt";
+    
+    /** 委托来源西南铜 原料 **/
+    String ENTRUST_SOURCE_XNT_RAW_MATERIAL = "xntyl";
+    
+    /** 委托来源西南铜 供方 **/
+    String ENTRUST_SOURCE_XNT_SUPPLIER = "";
+    
+    /** 委托来源西南铜 产品 **/
+    String ENTRUST_SOURCE_XNT_PRODUCT = "xntwt";
+    
+    /** 委托来源西南铜 中控 **/
+    String ENTRUST_SOURCE_XNT_IN_PROCESS_CONTROL = "xntzjwl";
+    
+    /** 委托来源西南铜 原料复测 **/
+    String ENTRUST_SOURCE_XNT_RETEST = "";
+    
+    /** 委托来源西南铜 产品复测 **/
+    String ENTRUST_SOURCE_XNT_PRODUCT_RETEST = "";
+    
+    /** 委托来源西南铜 中心留样复测 **/
+    String ENTRUST_SOURCE_XNT_CENTRAL_RETENTIN_RETEST = "";
+    
+    /** 委托来源西南铜 临时样 **/
+    String ENTRUST_SOURCE_XNT_TEMPORARY = "xntlsy";
+    
+    /** 第三方系统 西南铜实验室 **/
+    String OTHER_SYSTEM_XNT_LIMS = "XNT-LIMS";
+    
     /** 自动 **/
     String AUTOMATIC = "automatic";
     
     /** 手动 **/
     String MANUAL = "manual";
+    
+    /** 接口 **/
+    String INTERFACE = "interface";
+    
+    /** 内部接口 **/
+    String INTERFACE_INTERNAL = "interface_internal";
 
 
     /** 样品库操作类型： 归库、调拨、下架 **/

zt-module-qms/zt-module-qms-api/src/main/java/com/zt/plat/module/qms/enums/QmsPermissionConstant.java

@@ -24,4 +24,6 @@ public interface QmsPermissionConstant {
     String SAMPLE_WAREHOUSE_ADMIN = "sample_warehouse_admin";                   //样品库管理员
 
     String DEVICE_MANAGER = "qms_device_manager";                               //设备管理员
+
+    String ADMIN_ROLE = "ytjyAdmin"; // 超级管理员 标识
 }

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSampleEntrustFileMapper.java

@@ -36,6 +36,7 @@ public interface BusinessSampleEntrustFileMapper extends BaseMapperX<BusinessSam
                 .eqIfPresent(BusinessSampleEntrustFileDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode())
                 .betweenIfPresent(BusinessSampleEntrustFileDO::getCreateTime, reqVO.getCreateTime())
                 .eqIfPresent(BusinessSampleEntrustFileDO::getRemark, reqVO.getRemark())
+                .orderByDesc(BusinessSampleEntrustFileDO::getFileCategory)
                 .orderByDesc(BusinessSampleEntrustFileDO::getId));
     }
 
@@ -55,6 +56,7 @@ public interface BusinessSampleEntrustFileMapper extends BaseMapperX<BusinessSam
                 .eqIfPresent(BusinessSampleEntrustFileDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode())
                 .betweenIfPresent(BusinessSampleEntrustFileDO::getCreateTime, reqVO.getCreateTime())
                 .eqIfPresent(BusinessSampleEntrustFileDO::getRemark, reqVO.getRemark())
+                .orderByDesc(BusinessSampleEntrustFileDO::getFileCategory)
                 .orderByDesc(BusinessSampleEntrustFileDO::getId));
 	}
 

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleResultReportingServiceImpl.java

@@ -824,9 +824,9 @@ public class SampleResultReportingServiceImpl implements SampleResultReportingSe
 		
 		for (BusinessSampleEntrustRegistrationDO businessSampleEntrustRegistrationDO : businessSampleEntrustRegistrationDOList) {
 			ConfigEntrustSourceDO configEntrustSourceDO = configEntrustSourceMapper.selectById(businessSampleEntrustRegistrationDO.getConfigEntrustSourceId());
-			if (QmsCommonConstant.YES.equals(configEntrustSourceDO.getIsGenerateDocument())) {//需要生成部门编制报告
-				//过滤当前委托下的分析部门
-				List<BusinessSampleEntrustDepartmentDO> currBusinessSampleEntrustDepartmentDOList = allBusinessSampleEntrustDepartmentDOList.stream().filter(f -> f.getBusinessSampleEntrustRegistrationId().equals(businessSampleEntrustRegistrationDO.getId()) && !QmsCommonConstant.CHECKED.equals(f.getAssayStatus())).collect(Collectors.toList());
+			//过滤当前委托下的分析部门
+			List<BusinessSampleEntrustDepartmentDO> currBusinessSampleEntrustDepartmentDOList = allBusinessSampleEntrustDepartmentDOList.stream().filter(f -> f.getBusinessSampleEntrustRegistrationId().equals(businessSampleEntrustRegistrationDO.getId()) && !QmsCommonConstant.CHECKED.equals(f.getAssayStatus())).collect(Collectors.toList());
+			if (QmsCommonConstant.YES.equals(configEntrustSourceDO.getIsGenerateDocument()) && CollUtil.isNotEmpty(currBusinessSampleEntrustDepartmentDOList)) {//需要生成部门编制报告,并且当前委托部门不为空
 				for (BusinessSampleEntrustDepartmentDO businessSampleEntrustDepartmentDO : currBusinessSampleEntrustDepartmentDOList) {
 					//过滤当前分析部门下的样品
 					List<BusinessSampleEntrustDepartmentDetailDO> currBusinessSampleEntrustDepartmentDetailDOList = allBusinessSampleEntrustDepartmentDetailDOList.stream().filter(f -> f.getBusinessSampleEntrustDepartmentId().equals(businessSampleEntrustDepartmentDO.getId()) && !QmsCommonConstant.CHECKED.equals(f.getAssayStatus())).collect(Collectors.toList());

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigWarehouseLocationPageReqVO.java

@@ -6,6 +6,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import com.zt.plat.framework.common.pojo.PageParam;
 import org.springframework.format.annotation.DateTimeFormat;
 import java.time.LocalDateTime;
+import java.util.List;
 import java.util.Set;
 
 import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@@ -61,6 +62,12 @@ public class ConfigWarehouseLocationPageReqVO extends PageParam {
     @Schema(description = "查询时进行权限过滤")
     private String permissionFilterFlag;
 
+    @Schema(description = "是否为管理员-可查看全部数据")
+    private Boolean adminFlag;
+
+    @Schema(description = "有权限的仓库")
+    private List<Long> authorizedWarehouseIds;
+
     @Schema(description = "查询用-权限角色")
     private Set<Long> roleIds;
 

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/dal/mapper/ConfigWarehouseLocationMapper.java

@@ -1,18 +1,22 @@
 package com.zt.plat.module.qms.business.config.dal.mapper;
 
+import cn.hutool.core.collection.CollUtil;
 import com.zt.plat.framework.common.pojo.PageResult;
 import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX;
 import com.zt.plat.framework.mybatis.core.query.MPJLambdaWrapperX;
+import com.zt.plat.framework.security.core.util.SecurityFrameworkUtils;
 import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSampleDispatchDetailDO;
 import com.zt.plat.module.qms.business.config.controller.vo.ConfigWarehouseLocationPageReqVO;
 import com.zt.plat.module.qms.business.config.controller.vo.ConfigWarehouseLocationRespVO;
+import com.zt.plat.module.qms.business.config.dal.dataobject.ConfigPermissionDO;
 import com.zt.plat.module.qms.business.config.dal.dataobject.ConfigWarehouseLocationDO;
 import com.zt.plat.module.qms.business.config.dal.dataobject.ConfigWarehouseLocationParDO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 存放位置 Mapper
@@ -25,6 +29,7 @@ public interface ConfigWarehouseLocationMapper extends BaseMapperX<ConfigWarehou
     default PageResult<ConfigWarehouseLocationRespVO> selectPage(ConfigWarehouseLocationPageReqVO reqVO) {
 
         MPJLambdaWrapperX<ConfigWarehouseLocationDO> wrapper = new MPJLambdaWrapperX<>();
+        Boolean adminFlag = reqVO.getAdminFlag();
         //仓库
         wrapper.leftJoin(ConfigWarehouseLocationParDO.class, ConfigWarehouseLocationParDO::getId, ConfigWarehouseLocationDO::getParentId);
         wrapper.selectAll(ConfigWarehouseLocationDO.class)
@@ -43,6 +48,11 @@ public interface ConfigWarehouseLocationMapper extends BaseMapperX<ConfigWarehou
                 .eqIfPresent(ConfigWarehouseLocationDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode())
                 .betweenIfPresent(ConfigWarehouseLocationDO::getCreateTime, reqVO.getCreateTime())
                 .eqIfPresent(ConfigWarehouseLocationDO::getRemark, reqVO.getRemark())
+                .and(adminFlag == null || !adminFlag && CollUtil.isNotEmpty(reqVO.getAuthorizedWarehouseIds()),
+                        wrapper1 ->
+                                wrapper1.in(ConfigWarehouseLocationDO::getId, reqVO.getAuthorizedWarehouseIds())
+                                        .or()
+                                        .in(ConfigWarehouseLocationParDO::getId, reqVO.getAuthorizedWarehouseIds()))
                 .orderByDesc(ConfigWarehouseLocationDO::getSortNo);
 
         return selectJoinPage(reqVO, ConfigWarehouseLocationRespVO.class, wrapper);

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/service/ConfigPermissionService.java

@@ -74,4 +74,11 @@ public interface ConfigPermissionService {
      */
     PageResult<ConfigPermissionDO> getConfigPermissionPage(ConfigPermissionPageReqVO pageReqVO);
 
+    /**
+     * 根据目标id获取权限列表
+     *
+     * @param targetIds 目标id
+     * @return 权限列表
+     */
+    List<ConfigPermissionDO> getPermissionListByTargetIds(List<Long> targetIds);
 }

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/service/ConfigPermissionServiceImpl.java

@@ -2,6 +2,7 @@ package com.zt.plat.module.qms.business.config.service;
 
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.zt.plat.module.qms.business.config.controller.vo.ConfigPermissionPageReqVO;
 import com.zt.plat.module.qms.business.config.controller.vo.ConfigPermissionRespVO;
 import com.zt.plat.module.qms.business.config.controller.vo.ConfigPermissionSaveReqVO;
@@ -210,4 +211,11 @@ public class ConfigPermissionServiceImpl implements ConfigPermissionService {
         return configPermissionMapper.selectPage(pageReqVO);
     }
 
+    @Override
+    public List<ConfigPermissionDO> getPermissionListByTargetIds(List<Long> targetIds) {
+
+        return configPermissionMapper.selectList(Wrappers.lambdaQuery(ConfigPermissionDO.class)
+                .in(ConfigPermissionDO::getTargetId, targetIds));
+    }
+
 }