From ee9765e2bf07de7a4bcc46b1ac6bd097f8fc6f6d Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Tue, 29 Jul 2025 13:44:01 +0800 Subject: [PATCH] 2025-07-29 --- .../change/service/impl/ChangeManagementServiceImpl.java | 2 +- .../modules/proofing/entity/ProofingInformationEntity.java | 2 ++ .../resources/mapper/proofing/ProofingInformationMapper.xml | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java b/src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java index 7109c754..1d5531dc 100644 --- a/src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java +++ b/src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java @@ -1427,7 +1427,7 @@ public class ChangeManagementServiceImpl extends ServiceImpl> irs = res.stream().filter(a -> convertToInt(a.get("isremark")) == 6).collect(Collectors.toList()); if (!irs.isEmpty()) { try { - // 等待2秒（2000毫秒） + // 等待2秒 Thread.sleep(2000); } catch (InterruptedException e) { e.printStackTrace(); diff --git a/src/main/java/com/spring/modules/proofing/entity/ProofingInformationEntity.java b/src/main/java/com/spring/modules/proofing/entity/ProofingInformationEntity.java index c717aeb4..c59c69d5 100644 --- a/src/main/java/com/spring/modules/proofing/entity/ProofingInformationEntity.java +++ b/src/main/java/com/spring/modules/proofing/entity/ProofingInformationEntity.java @@ -180,6 +180,8 @@ public class ProofingInformationEntity extends QueryPage implements Serializable private BigDecimal proofingAmount; + private String sendSamplesUsage; + @TableField(exist = false) private List delegateAccessList; } diff --git a/src/main/resources/mapper/proofing/ProofingInformationMapper.xml b/src/main/resources/mapper/proofing/ProofingInformationMapper.xml index 8db46615..f535fc3f 100644 --- a/src/main/resources/mapper/proofing/ProofingInformationMapper.xml +++ b/src/main/resources/mapper/proofing/ProofingInformationMapper.xml @@ -60,7 +60,8 @@ vpp.plm_part_no, a.proofing_amount, dbo.GET_BM_Oricodeno(a.site,a.test_part_no) as ori_code_no, - dbo.GET_BM_stage(a.site,a.test_part_no) as stage + dbo.GET_BM_stage(a.site,a.test_part_no) as stage, + send_samples_usage FROM plm_proofing_information as a left join plm_request_header as prh on a.site = prh.site and prh.menu_id = #{query.menuId} left join plm_request_node as d on a.site = d.site and prh.classification_no = d.classification_no and prh.workflow_id = d.workflow_id and a.step_id = d.step_id