zgty/zt-qms
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/test' into test

Browse Source
This commit is contained in:
FCL
2026-04-03 08:53:23 +08:00
parent 7623c96ca9 eac4f99dcf
commit c81bffa767
12 changed files with 298 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/mq/consumer/SampleEntrustRegistrationAssayCompleteConsumer.java
View File

@@ -1,7 +1,9 @@
package com.zt.plat.module.qms.mq.consumer;
import com.zt.plat.module.qms.resource.material.constant.MaterialConstants;
import org.apache.rocketmq.spring.annotation.RocketMQMessageListener;
import org.apache.rocketmq.spring.core.RocketMQListener;
import org.apache.rocketmq.spring.core.RocketMQTemplate;
import org.springframework.stereotype.Component;
import com.zt.plat.module.qms.business.bus.controller.vo.BusinessSampleEntrustRegistrationExtendRespVO;
@@ -23,7 +25,8 @@ import lombok.extern.slf4j.Slf4j;
consumerGroup = SampleEntrustRegistrationAssayCompleteMessage.TOPIC + "_CONSUMER"
)
public class SampleEntrustRegistrationAssayCompleteConsumer implements RocketMQListener<SampleEntrustRegistrationAssayCompleteMessage> {
@Resource
private RocketMQTemplate rocketMQTemplate;
@Resource
private BusinessSampleEntrustRegistrationMapper businessSampleEntrustRegistrationMapper;
@@ -36,7 +39,8 @@ public class SampleEntrustRegistrationAssayCompleteConsumer implements RocketMQL
switch (businessSampleEntrustRegistration.getConfigEntrustSourceKey()) {
case QmsCommonConstant.ENTRUST_SOURCE_JYWT: //检验委托
// 物料验收
rocketMQTemplate.syncSend(MaterialConstants.MQ_TOPIC_MATERIAL_ACCEPT_ASSAY_COMPLETE, message);
break;
case QmsCommonConstant.ENTRUST_SOURCE_XNT_TEMPORARY: //西南铜临时样

30
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/constant/MaterialConstants.java
View File

@@ -4,19 +4,39 @@ package com.zt.plat.module.qms.resource.material.constant;
* 物料常量
*/
public class MaterialConstants {
// 字典
// ======================== 字典
public static final String DICT_MATERIAL_FLOW_TYPE = "jy_material_lifecycle_bsn_type";
public static final String DICT_MATERIAL_INBOUND_QUANTITY_LIMIT = "materialInboundQuantityLimit";
// 序列号
// ======================== 序列号
public static final String SEQUENCE_BATCH_KEY = "QMS_MATERIAL_BATCH_NO";
public static final String SEQUENCE_INF_KEY = "QMS_MATERIAL_INF_NO";
public static final String SEQUENCE_ASSAY_ACCEPT_SAMPLE_KEY = "QMS_MATERIAL_ASSAY_ACCEPT_SAMPLE";
// 外部模块
// ======================== 外部模块
public static final String DEVICE_BURETTE_CATEGORY_NAME = "滴定管";
// 流程
public static final String INIT_ASSAY_FLOW = "initAssayFlow";
// ======================== 流程
public static final String ASSAY_FLAG = "assayFlag";
/**
* 开始检验流程
*/
public static final String INIT_ASSAY_FLOW = "initAssayFlow";
/**
* 等待检验结果
*/
public static final String WAIT_ASSAY_NODE_MARK = "waitAssay";
/**
* 检验结果已全部报出
*/
public static final String ASSAY_RESULT_ALL_OUTPUT = "assayResultAllOutput";
/**
* 检验结果判定节点标记
*/
public static final String ASSAY_RESULT_ASSESSMENT_NODE_MARK = "assayResultAssessment";
// ======================== mq
/**
* 物料验收检验完成
*/
public static final String MQ_TOPIC_MATERIAL_ACCEPT_ASSAY_COMPLETE = "MATERIAL_ACCEPT_ASSAY_COMPLETE";
}

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

@@ -64,9 +64,9 @@ public class MaterialLifecycleController extends AbstractFileUploadController im
@PutMapping("/update")
@Operation(summary = "更新物料流程")
// @PreAuthorize("@ss.hasPermission('qms:material-lifecycle:update')")
public CommonResult<Boolean> updateMaterialLifecycle(@Validated(UpdateGroup.class) @RequestBody MaterialLifecycleSaveReqVO updateReqVO) {
materialLifecycleService.updateMaterialLifecycle(updateReqVO);
return success(true);
public CommonResult<MaterialLifecycleRespVO> updateMaterialLifecycle(@Validated(UpdateGroup.class) @RequestBody MaterialLifecycleSaveReqVO updateReqVO) {
MaterialLifecycleDO lifecycleDO = materialLifecycleService.updateMaterialLifecycle(updateReqVO);
return success(BeanUtils.toBean(lifecycleDO, MaterialLifecycleRespVO.class));
}
@DeleteMapping("/delete")
@@ -126,10 +126,11 @@ public class MaterialLifecycleController extends AbstractFileUploadController im
return success(materialLifecycleService.inventoryCheckInfomation(inventoryReqVO));
}
@GetMapping("/test")
@PutMapping("/manual-execute-flow")
@Operation(summary = "手动执行流程，主要用于测试")
@Parameter(name = "flowId", description = "流程id", required = true)
public void test(@RequestParam("flowId") String flowId) {
materialAssayResultListener.bpmTest(flowId);
materialAssayResultListener.approveTask(flowId);
}
@GetMapping("/export-excel")

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

@@ -7,13 +7,16 @@ import cn.hutool.json.JSONUtil;
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 io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import java.time.LocalDateTime;
import java.util.List;
import java.util.Objects;
@Slf4j
@Schema(description = "管理后台 - 物料检化验关联信息 Response VO")
@Data
@ExcelIgnoreUnannotated
@@ -76,7 +79,7 @@ public class MaterialCorrelationAssayRespVO {
@Schema(description = "结果,检化验结果")
@ExcelProperty("结果,检化验结果")
private String result;
private MaterialAssayResult result;
@Schema(description = "是否合格,字典")
@ExcelProperty("是否合格,字典")

3
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialLifecycleSaveReqVO.java
View File

@@ -80,4 +80,7 @@ public class MaterialLifecycleSaveReqVO {
@Schema(description = "明细列表")
private List<MaterialLifecycleDetailSaveReqVO> detailList;
@Schema(description = "删除的文件id")
private List<Long> deleteFileIdList;
}

16
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/assist/MaterialAssayResult.java Normal file
View File

@@ -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 MaterialAssayResult extends SampleProjectResultRespVO {
/**
* 结果明细
*/
private List<SampleProjectResultDetailRespVO> detailList;
}

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

@@ -1,7 +1,9 @@
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
@@ -86,8 +88,8 @@ public class MaterialCorrelationAssayDO extends BusinessBaseDO {
/**
* 结果,检化验结果
*/
@TableField("RSLT")
private String result;
@TableField(value = "RSLT", typeHandler = JacksonTypeHandler.class)
private MaterialAssayResult result;
/**
* 是否合格,字典
*/

1
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialInfomationMapper.java
View File

@@ -98,6 +98,7 @@ public interface MaterialInfomationMapper extends BaseMapperX<MaterialInfomation
.eqIfExists(MaterialInfomationDO::getPublishStatus, reqVO.getPublishStatus())
.eqIfExists(MaterialInfomationDO::getUsageStatus, reqVO.getUsageStatus())
.eqIfExists(MaterialInfomationDO::getManagerDepartmentId, reqVO.getManagerDepartmentId())
.likeIfExists(MaterialProductDO::getName, reqVO.getName())
.likeIfExists(MaterialInfomationDO::getManagerDepartmentName, reqVO.getManagerDepartmentName())
.eqIfExists(MaterialInfomationDO::getManagerUserId, reqVO.getManagerUserId())
.likeIfExists(MaterialInfomationDO::getManagerUserName, reqVO.getManagerUserName())

120
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/listener/MaterialAssayResultListener.java
View File

File diff suppressed because it is too large Load Diff

2
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialLifecycleService.java
View File

@@ -28,7 +28,7 @@ public interface MaterialLifecycleService {
*
* @param updateReqVO 更新信息
*/
void updateMaterialLifecycle(@Valid MaterialLifecycleSaveReqVO updateReqVO);
MaterialLifecycleDO updateMaterialLifecycle(@Valid MaterialLifecycleSaveReqVO updateReqVO);
/**
* 删除物料通用流程,物料验收、退换货

Some files were not shown because too many files have changed in this diff Show More