Merge branch 'test' of https://git.will-way.cn/zgty/zt-qms into test

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/common/data/controller/admin/DataTemplateController.java

@@ -134,7 +134,7 @@ public class DataTemplateController implements BusinessControllerMarker {
 
     @GetMapping("/page")
     @Operation(summary = "获得表单设计器模板分页")
-    @PreAuthorize("@ss.hasPermission('qms:data-template:query')")
+//    @PreAuthorize("@ss.hasPermission('qms:data-template:query')")
     public CommonResult<PageResult<DataTemplateRespVO>> getDataTemplatePage(@Valid DataTemplatePageReqVO pageReqVO) {
         PageResult<DataTemplateDO> pageResult = dataTemplateService.getDataTemplatePage(pageReqVO);
         return success(BeanUtils.toBean(pageResult, DataTemplateRespVO.class));

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceApplyDetailRespVO.java

@@ -92,4 +92,10 @@ public class DeviceApplyDetailRespVO {
     @Schema(description = "购入价格", example = "25826")
     @ExcelProperty("购入价格")
     private BigDecimal purchasePrice;
+
+    @Schema(description = "所属部门ID")
+    private Long deviceDeptId;
+
+    @Schema(description = "所属部门名称")
+    private String deviceDeptName;
 }

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceInfomationSaveReqVO.java

@@ -111,6 +111,12 @@ public class DeviceInfomationSaveReqVO {
     @Schema(description = "数据采集设备类型")
     private String collectDeviceType;
 
+    @Schema(description = "所属部门ID")
+    private Long deptId;
+
+    @Schema(description = "所属部门名称")
+    private String deptName;
+
     //=================扩展字段==================>
     @Schema(description = "删除的文件id")
     private List<Long> deleteFileIdList;

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/dal/mapper/DeviceApplyDetailMapper.java

@@ -49,6 +49,8 @@ public interface DeviceApplyDetailMapper extends BaseMapperX<DeviceApplyDetailDO
                 .selectAs(DeviceInfomationDO::getPosition, DeviceApplyDetailRespVO::getPosition)
                 .selectAs(DeviceInfomationDO::getPurchaseDate, DeviceApplyDetailRespVO::getPurchaseDate)
                 .selectAs(DeviceInfomationDO::getPurchasePrice, DeviceApplyDetailRespVO::getPurchasePrice)
+                .selectAs(DeviceInfomationDO::getDeptId, DeviceApplyDetailRespVO::getDeviceDeptId)
+                .selectAs(DeviceInfomationDO::getDeviceName, DeviceApplyDetailRespVO::getDeviceDeptName)
                 .eqIfPresent(DeviceApplyDetailDO::getApplyId, reqVO.getApplyId())
                 .eqIfPresent(DeviceApplyDetailDO::getDeviceInfomationId, reqVO.getDeviceInfomationId())
                 .inIfPresent(DeviceApplyDetailDO::getDeviceInfomationId, reqVO.getDeviceInfoIdList())

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/admin/MaterialLifecycleController.java

@@ -107,9 +107,9 @@ public class MaterialLifecycleController extends AbstractFileUploadController im
     @PutMapping("/submit")
     @Operation(summary = "提交（验收等流程）")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    public CommonResult<Boolean> submitLifecycle(@RequestParam("id") Long id) {
+    public CommonResult<MaterialLifecycleRespVO> submitLifecycle(@RequestParam("id") Long id) {
-
+        materialLifecycleService.submitLifecycle(id);
-        return success(materialLifecycleService.submitLifecycle(id));
+        return success(materialLifecycleService.getMaterialLifecycleWithDetailList(id));
     }
 
     @PutMapping("/operator-submit")
@@ -133,6 +133,11 @@ public class MaterialLifecycleController extends AbstractFileUploadController im
         materialAssayResultListener.approveTask(flowId);
     }
 
+    @PutMapping("/mq-test")
+    public void testMq() {
+        materialAssayResultListener.mqTest();
+    }
+
     @GetMapping("/export-excel")
     @Operation(summary = "导出物料通用流程,物料验收、退换货 Excel")
     @PreAuthorize("@ss.hasPermission('qms:material-lifecycle:export')")

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialCorrelationAssayRespVO.java

@@ -1,6 +1,5 @@
 package com.zt.plat.module.qms.resource.material.controller.vo;
 
-import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONArray;
 import cn.hutool.json.JSONUtil;
@@ -8,6 +7,7 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.zt.plat.module.qms.core.aspect.annotation.Dict;
 import com.zt.plat.module.qms.resource.material.controller.vo.assist.MaterialAssayResult;
+import com.zt.plat.module.qms.resource.material.controller.vo.assist.MaterialSampleItemAssayResult;
 import com.zt.plat.module.qms.resource.material.enums.MaterialAssayStatus;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -15,7 +15,6 @@ import lombok.extern.slf4j.Slf4j;
 
 import java.time.LocalDateTime;
 import java.util.List;
-import java.util.Objects;
 
 @Slf4j
 @Schema(description = "管理后台 - 物料检化验关联信息 Response VO")
@@ -50,6 +49,9 @@ public class MaterialCorrelationAssayRespVO {
     @Schema(description = "样品编号")
     private String sampleCode;
 
+    @Schema(description = "样品名称")
+    private String sampleName;
+
     @Schema(description = "样品标签模板")
     private String sampleLabelTemplate;
 
@@ -111,6 +113,10 @@ public class MaterialCorrelationAssayRespVO {
         return array.toList(Long.class);
     }
 
+    public String getAssayProject() {
+        return this.itemsShowName;
+    }
+
     public String getAssayStatus_dictText() {
         if (StrUtil.isBlank(this.assayStatus)) {
             return MaterialAssayStatus.not_start.getName();

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialLifecycleRespVO.java

@@ -1,11 +1,13 @@
 package com.zt.plat.module.qms.resource.material.controller.vo;
 
+import cn.hutool.core.collection.CollUtil;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.zt.plat.framework.common.pojo.CommonResult;
 import com.zt.plat.module.infra.api.businessfile.dto.BusinessFileWithUrlRespDTO;
 import com.zt.plat.module.qms.core.aspect.annotation.Dict;
+import com.zt.plat.module.qms.resource.material.enums.MaterialFlowType;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -118,4 +120,16 @@ public class MaterialLifecycleRespVO {
     @Schema(description = "附件对象")
     private CommonResult<List<BusinessFileWithUrlRespDTO>> businessFileRet;
 
+    // 是否走流程审批
+    public Boolean getNeedFlowApproval() {
+        MaterialFlowType flowType = MaterialFlowType.fromName(this.businessType);
+        return switch (flowType) {
+            case acceptance ->
+                    CollUtil.isNotEmpty(detailList)
+                            && detailList.stream().anyMatch(d -> d.getAssayFlag() == 1);
+            case verify_calibrate, inventory_check -> true;
+            case return_material, replace_material, make_apply -> false;
+        };
+    }
+
 }

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/assist/MaterialAssayResult.java

@@ -1,16 +1,25 @@
 package com.zt.plat.module.qms.resource.material.controller.vo.assist;
 
-import com.zt.plat.module.qms.business.bus.controller.vo.SampleProjectResultDetailRespVO;
-import com.zt.plat.module.qms.business.bus.controller.vo.SampleProjectResultRespVO;
 import lombok.Data;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
 @Data
-public class MaterialAssayResult extends SampleProjectResultRespVO {
+public class MaterialAssayResult {
+
+    /**
+     * 报出结果
+     */
+    private String assessmentValue;
+
+    /**
+     * 报出时间
+     */
+    private LocalDateTime reportTime;
 
     /**
      * 结果明细
      */
-    private List<SampleProjectResultDetailRespVO> detailList;
+    private List<MaterialSampleItemAssayResult> detailList;
 }

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/assist/MaterialSampleItemAssayResult.java

@@ -0,0 +1,16 @@
+package com.zt.plat.module.qms.resource.material.controller.vo.assist;
+
+import com.zt.plat.module.qms.business.bus.controller.vo.SampleProjectResultDetailRespVO;
+import com.zt.plat.module.qms.business.bus.controller.vo.SampleProjectResultRespVO;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class MaterialSampleItemAssayResult extends SampleProjectResultRespVO {
+
+    /**
+     * 结果明细
+     */
+    private List<SampleProjectResultDetailRespVO> detailList;
+}

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/dataobject/MaterialCorrelationAssayDO.java

@@ -1,9 +1,7 @@
 package com.zt.plat.module.qms.resource.material.dal.dataobject;
 
 import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
 import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO;
-import com.zt.plat.module.qms.resource.material.controller.vo.assist.MaterialAssayResult;
 import lombok.*;
 /**
 * 物料检化验关联信息 DO