feat:物料准备检定校准接口

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

@@ -37,9 +37,13 @@ public class MaterialInventoryOutboundRespVO {
     private LocalDateTime applyTime;
 
     @Schema(description = "物料名称", example = "硫酸")
-    @ExcelProperty("试剂名称")
+    @ExcelProperty("物料名称")
     private String productName;
 
+    @Schema(description = "物料编码")
+    @ExcelProperty("物料编码")
+    private String productCode;
+
     @Schema(description = "申请部门")
     @ExcelProperty("消耗部门")
     private String applyDepartment;

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

@@ -2,6 +2,7 @@ package com.zt.plat.module.qms.resource.material.controller.vo;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -121,6 +122,14 @@ public class MaterialLifecycleDetailRespVO {
     @ExcelProperty("已完成数量")
     private Long finishedCount;
 
+    @Schema(description = "合格/通过数量", example = "15772")
+    @ExcelProperty("合格/通过数量")
+    private BigDecimal qualifiedCount;
+
+    @Schema(description = "不合格/拒绝数量", example = "15772")
+    @ExcelProperty("不合格/拒绝数量")
+    private BigDecimal unqualifiedCount;
+
     @Schema(description = "明细操作类型,【字典】【jy_material_lifecycle_detail_bsn_type】", example = "1")
     @ExcelProperty("明细操作类型,【字典】【jy_material_lifecycle_detail_bsn_type】")
     private String businessType;

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

@@ -1,5 +1,6 @@
 package com.zt.plat.module.qms.resource.material.controller.vo;
 
+import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -33,6 +34,12 @@ public class MaterialLifecycleDetailSaveReqVO {
     @Schema(description = "影响数量", example = "15772")
     private BigDecimal influenceCount;
 
+    @Schema(description = "合格/通过数量", example = "15772")
+    private BigDecimal qualifiedCount;
+
+    @Schema(description = "不合格/拒绝数量", example = "15772")
+    private BigDecimal unqualifiedCount;
+
     @Schema(description = "明细操作类型,【字典】【jy_material_lifecycle_detail_bsn_type】", example = "1")
     private String businessType;
 

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

@@ -20,14 +20,18 @@ public class MaterialConsumeStatisticsExportVO {
     @ExcelProperty("日期")
     private LocalDate applyTime;
 
-    @Schema(description = "物料名称", example = "硫酸")
-    @ExcelProperty("试剂名称")
-    private String productName;
-
     @Schema(description = "申请部门")
     @ExcelProperty("消耗部门")
     private String applyDepartment;
 
+    @Schema(description = "物料名称", example = "硫酸")
+    @ExcelProperty("物料试剂名称")
+    private String productName;
+
+    @Schema(description = "物料编码")
+    @ExcelProperty("物料试剂编码")
+    private String productCode;
+
     @Schema(description = "申请部门id", example = "845")
     private Long applyDepartmentId;
 

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

@@ -66,6 +66,16 @@ public class MaterialLifecycleDetailDO extends BusinessBaseDO {
     */
     @TableField("INFL_CNT")
     private BigDecimal influenceCount;
+    /**
+     * 合格/通过数量
+     */
+    @TableField("QLFD_CNT")
+    private BigDecimal qualifiedCount;
+    /**
+     * 不合格/拒绝数量
+     */
+    @TableField("UNQ_CNT")
+    private BigDecimal unqualifiedCount;
     /**
     * 明细操作类型,【字典】【jy_material_lifecycle_detail_bsn_type】
     */

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialInventoryOutboundMapper.java

@@ -17,6 +17,7 @@ import com.zt.plat.module.qms.resource.material.enums.MaterialOutboundType;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
@@ -64,6 +65,8 @@ public interface MaterialInventoryOutboundMapper extends BaseMapperX<MaterialInv
                 .groupBy(MaterialInfomationDO::getProductId)
                 .groupBy(MaterialInventoryOutboundDO::getApplyDepartmentId)
                 ;
+        if (reqVO.getApplyTime() != null && reqVO.getApplyTime().length == 2)
+            wrapper.between(MaterialInventoryOutboundDO::getApplyTime, reqVO.getApplyTime()[0], reqVO.getApplyTime()[1]);
         List<Map<String, Object>> statisticsMaps = selectJoinMaps(wrapper);
         if (CollUtil.isEmpty(statisticsMaps)) return List.of();
 

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/enums/MaterialFlowType.java

@@ -11,7 +11,10 @@ public enum MaterialFlowType {
 
     exchange_material("换货"),
 
-    make_apply("配置申请");
+    make_apply("配置申请"),
+
+    verify_calibrate("检定校准")
+    ;
 
     private final String name;
 

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/job/MaterialJob.java

@@ -1,5 +1,6 @@
 package com.zt.plat.module.qms.resource.material.job;
 
+import com.xxl.job.core.context.XxlJobHelper;
 import com.xxl.job.core.handler.annotation.XxlJob;
 import com.zt.plat.framework.tenant.core.job.TenantJob;
 import com.zt.plat.module.qms.resource.material.service.MaterialInfomationService;
@@ -20,15 +21,16 @@ public class MaterialJob {
     /**
      * 更新物料过期状态定时任务
      * 每天执行一次，检查并更新已过期的物料状态
+     *
      */
     @XxlJob("updateMaterialExpiredStatusJob")
-    @TenantJob
     public void updateMaterialExpiredStatusJob() {
         log.info("[updateMaterialExpiredStatusJob] 开始执行物料过期状态更新任务");
 
         try {
             Integer updateCount = materialInfomationService.updateExpiredMaterialStatus();
             log.info("[updateMaterialExpiredStatusJob] 任务执行成功，共更新 {} 个物料", updateCount);
+            XxlJobHelper.handleSuccess(String.format("任务执行成功，共更新 %d 个物料", updateCount));
         } catch (Exception e) {
             log.error("[updateMaterialExpiredStatusJob] 任务执行失败：{}", e.getMessage(), e);
             throw e;

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialBatchService.java

@@ -166,4 +166,12 @@ public interface MaterialBatchService {
      * @return 分页数据
      */
     PageResult<MaterialBatchRespVO> getBatchGongPageWithPdtInfo(@Valid MaterialBatchPageReqVO pageReqVO);
+
+    /**
+     * 锁定批次校准数量
+     *
+     * @param batches 批次信息
+     * @param lockType 锁定类型
+     */
+    void lockBatchVerifyCalibrateCount(List<MaterialLifecycleDetailDO> batches, LockType lockType);
 }

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialBatchServiceImpl.java

@@ -384,6 +384,27 @@ public class MaterialBatchServiceImpl implements MaterialBatchService {
         return pageResult;
     }
 
+    @Override
+    public void lockBatchVerifyCalibrateCount(List<MaterialLifecycleDetailDO> batches, LockType lockType) {
+        List<Long> batIds = batches.stream().map(MaterialLifecycleDetailDO::getBatchId).toList();
+        List<MaterialBatchDO> batchDOS = getBatchListByBatchIds(batIds);
+        Map<Long, MaterialLifecycleDetailDO> lifecycleDetailDOMapByBatchId = batches.stream().collect(Collectors.toMap(MaterialLifecycleDetailDO::getBatchId, Function.identity()));
+        for (MaterialBatchDO batchDO : batchDOS) {
+            MaterialLifecycleDetailDO detailDO = lifecycleDetailDOMapByBatchId.get(batchDO.getId());
+            BigDecimal influenceCount = detailDO.getInfluenceCount();
+            switch (lockType) {
+                case lock -> {
+                    BigDecimal lockQuantity = batchDO.getLockQuantity().add(influenceCount);
+                    if (lockQuantity.compareTo(batchDO.getInboundQuantity()) > 0)
+                        throw new ServiceException(1_032_160_000, "检定数量大于可用数量");
+                    batchDO.setLockQuantity(lockQuantity);
+                }
+                case unlock -> batchDO.setLockQuantity(batchDO.getLockQuantity().subtract(influenceCount));
+            }
+        }
+        materialBatchMapper.updateBatch(batchDOS);
+    }
+
     private void lockBatchOrGongReturnExchangeCount(LockType lockType, List<MaterialBatchDO> batchOrGongDOS, Map<Long, MaterialLifecycleDetailDO> lifecycleDetailDOMapByBatOrGongId) {
         for (MaterialBatchDO batOrGong : batchOrGongDOS) {
             MaterialLifecycleDetailDO detailDO = lifecycleDetailDOMapByBatOrGongId.get(batOrGong.getId());