From e13ec1cbda17e61730d4c47736987798e7d66317 Mon Sep 17 00:00:00 2001 From: 10001392 <1055202292@qq.com> Date: Wed, 25 Dec 2024 11:45:10 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=B7=A5=E4=BD=9C=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=E3=80=91=E8=99=9A=E6=8B=9F=E5=B7=A5=E4=BD=9C=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=E5=AF=B9=E5=BA=94=E5=85=B3=E7=B3=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/master/ProcessWorkCenterMapper.java | 3 +++ .../technology/pojo/vo/ProcessWorkCenterVO.java | 8 ++++---- .../technology/service/ProcessWorkCenterService.java | 11 ++++++++++- .../resources/mapper/master/ProcessWorkCenterDao.xml | 6 +++++- 4 files changed, 22 insertions(+), 6 deletions(-) diff --git a/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/mapper/master/ProcessWorkCenterMapper.java b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/mapper/master/ProcessWorkCenterMapper.java index 524cbd59..3a50154c 100644 --- a/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/mapper/master/ProcessWorkCenterMapper.java +++ b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/mapper/master/ProcessWorkCenterMapper.java @@ -9,6 +9,7 @@ import com.nflg.product.technology.pojo.vo.ProcessWorkCenterVO; import org.apache.ibatis.annotations.Param; import java.util.List; +import java.util.Map; /** * 工艺管理-工作中心表数据库访问层 @@ -35,5 +36,7 @@ public interface ProcessWorkCenterMapper extends BaseMapper entities); IPage selectPageByCondition(Page page, @Param("query") ProcessWorkCenterQuery query); + + List> selectProcessWorkcenterMappingList(); } diff --git a/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/vo/ProcessWorkCenterVO.java b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/vo/ProcessWorkCenterVO.java index 27f0b941..747a24de 100644 --- a/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/vo/ProcessWorkCenterVO.java +++ b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/vo/ProcessWorkCenterVO.java @@ -84,18 +84,18 @@ public class ProcessWorkCenterVO implements Serializable { private Date endTime; //创建人 - private String createBy; + private String createdBy; //创建时间 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT-8") - private Date createTime; + private Date createdTime; //更新人 - private String updateBy; + private String updatedBy; //更新时间 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT-8") - private Date updateTime; + private Date updatedTime; // 虚拟工作中心 private String workingType; diff --git a/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/service/ProcessWorkCenterService.java b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/service/ProcessWorkCenterService.java index e3cff356..93709ecf 100644 --- a/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/service/ProcessWorkCenterService.java +++ b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/service/ProcessWorkCenterService.java @@ -117,12 +117,21 @@ public class ProcessWorkCenterService extends ServiceImpl newList = new ArrayList<>(); // 数据库已有的SAP数据 List existsList = new ArrayList<>(); + // 对应关系 + List> mappingList = processWorkCenterMapper.selectProcessWorkcenterMappingList(); for (ProcessWorkCenterEntity sap : sapList) { if (!workCenterSet.contains(sap.getFactory() + "_" + sap.getWorkCenter())) { sap.setRowId(IdWorker.getId()); sap.setCreatedBy(SessionUtil.getUserName()); sap.setCreatedTime(new Date()); - // TODO 自动关联虚拟工作中心 + // 自动关联虚拟工作中心 + if (CollUtil.isNotEmpty(mappingList)) { + List> collect = mappingList.stream().filter(mapping -> mapping.get("factory").toString().equals(sap.getFactory()) + && mapping.get("work_center").toString().equals(sap.getWorkCenter())).collect(Collectors.toList()); + if (CollUtil.isNotEmpty(collect)) { + sap.setWorkingType(collect.get(0).get("working_type_code").toString()); + } + } newList.add(sap); } else { existsList.add(sap); diff --git a/nflg_project_dev/nflg-technology/src/main/resources/mapper/master/ProcessWorkCenterDao.xml b/nflg_project_dev/nflg-technology/src/main/resources/mapper/master/ProcessWorkCenterDao.xml index 8c029b1d..15e2802f 100644 --- a/nflg_project_dev/nflg-technology/src/main/resources/mapper/master/ProcessWorkCenterDao.xml +++ b/nflg_project_dev/nflg-technology/src/main/resources/mapper/master/ProcessWorkCenterDao.xml @@ -82,7 +82,7 @@ row_id, factory,work_center, `name`, type, `description`, header, header_description, usefulness, usefulness_description, recoil, standard_code, standard_code_description, standard_text_code, standard_text_code_description, processing_formula, processing_formula_description, - cost_controlling_area, cost_center, cost_center_description, start_time, end_time + cost_controlling_area, cost_center, cost_center_description, start_time, end_time, created_by, created_time, updated_by, updated_time, working_type @@ -111,5 +111,9 @@ from t_process_workcenter + +