Browse Source

2025-07-29

master
fengyuan_yang 6 months ago
parent
commit
ee9765e2bf
  1. 2
      src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java
  2. 2
      src/main/java/com/spring/modules/proofing/entity/ProofingInformationEntity.java
  3. 3
      src/main/resources/mapper/proofing/ProofingInformationMapper.xml

2
src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java

@ -1427,7 +1427,7 @@ public class ChangeManagementServiceImpl extends ServiceImpl<ChangeManagementMap
List<Map<String, Object>> 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();

2
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<ProofingDelegateAccess> delegateAccessList;
}

3
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

Loading…
Cancel
Save