From 8dc2f096a2b8e9094eb6532ecceab2d975bd5d20 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Thu, 24 Aug 2023 10:51:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/op/mes/domain/MesPrepare.java | 9 +++++++++ .../src/main/resources/mapper/MesPrepareMapper.xml | 5 +++-- .../java/com/op/plan/domain/ProOrderWorkorder.java | 10 ++++++++++ .../op/sap/service/impl/SapProRouteServiceImpl.java | 3 ++- .../technology/service/impl/ProProcessServiceImpl.java | 4 ++-- .../technology/service/impl/ProRecipeServiceImpl.java | 4 ++-- .../technology/service/impl/ProRouteServiceImpl.java | 3 ++- 7 files changed, 30 insertions(+), 8 deletions(-) diff --git a/op-modules/op-mes/src/main/java/com/op/mes/domain/MesPrepare.java b/op-modules/op-mes/src/main/java/com/op/mes/domain/MesPrepare.java index e000f3c4..81d9e056 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/domain/MesPrepare.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/domain/MesPrepare.java @@ -22,6 +22,7 @@ public class MesPrepare extends BaseEntity { /** 工单编码 */ @Excel(name = "工单编码") private String workorderCode; + private String workorderCodeSap; /** 工单名称 */ @Excel(name = "工单名称") @@ -122,6 +123,14 @@ public class MesPrepare extends BaseEntity { private String dayStr; + public String getWorkorderCodeSap() { + return workorderCodeSap; + } + + public void setWorkorderCodeSap(String workorderCodeSap) { + this.workorderCodeSap = workorderCodeSap; + } + public String getDayStr() { return dayStr; } diff --git a/op-modules/op-mes/src/main/resources/mapper/MesPrepareMapper.xml b/op-modules/op-mes/src/main/resources/mapper/MesPrepareMapper.xml index 022986d1..d103763c 100644 --- a/op-modules/op-mes/src/main/resources/mapper/MesPrepareMapper.xml +++ b/op-modules/op-mes/src/main/resources/mapper/MesPrepareMapper.xml @@ -103,9 +103,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" diff --git a/op-modules/op-plan/src/main/java/com/op/plan/domain/ProOrderWorkorder.java b/op-modules/op-plan/src/main/java/com/op/plan/domain/ProOrderWorkorder.java index def65600..431bc7fd 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/domain/ProOrderWorkorder.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/domain/ProOrderWorkorder.java @@ -147,6 +147,16 @@ public class ProOrderWorkorder extends TreeEntity { private String prepareId; + private String workorderCodeSap; + + public String getWorkorderCodeSap() { + return workorderCodeSap; + } + + public void setWorkorderCodeSap(String workorderCodeSap) { + this.workorderCodeSap = workorderCodeSap; + } + public String getPrepareId() { return prepareId; } diff --git a/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapProRouteServiceImpl.java b/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapProRouteServiceImpl.java index 53e2e191..514afb99 100644 --- a/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapProRouteServiceImpl.java +++ b/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapProRouteServiceImpl.java @@ -123,9 +123,10 @@ public class SapProRouteServiceImpl implements SapProRouteService { @DS("#header.poolName") public int updateProRoute(SapProRoute proRoute) { proRoute.setUpdateTime(DateUtils.getNowDate()); + baseFileMapper.deleteBaseFileBySourceId(proRoute.getRouteId()); //上传附件 if (StringUtils.isNotEmpty(proRoute.getFileList())) { - baseFileMapper.deleteBaseFileBySourceId(proRoute.getRouteId()); + String[] ids = proRoute.getFileList().split(","); List files = new ArrayList<>(); BaseFileData file = null; diff --git a/op-modules/op-technology/src/main/java/com/op/technology/service/impl/ProProcessServiceImpl.java b/op-modules/op-technology/src/main/java/com/op/technology/service/impl/ProProcessServiceImpl.java index aac4e16f..69b62355 100644 --- a/op-modules/op-technology/src/main/java/com/op/technology/service/impl/ProProcessServiceImpl.java +++ b/op-modules/op-technology/src/main/java/com/op/technology/service/impl/ProProcessServiceImpl.java @@ -141,10 +141,10 @@ public class ProProcessServiceImpl implements IProProcessService { @Override @DS("#header.poolName") public int updateProProcess(ProProcess proProcess) { - + baseFileMapper.deleteBaseFileBySourceId(proProcess.getProcessId()); //上传附件 if (StringUtils.isNotEmpty(proProcess.getFileList())) { - baseFileMapper.deleteBaseFileBySourceId(proProcess.getProcessId()); + String[] ids = proProcess.getFileList().split(","); List files = new ArrayList<>(); BaseFileData file = null; diff --git a/op-modules/op-technology/src/main/java/com/op/technology/service/impl/ProRecipeServiceImpl.java b/op-modules/op-technology/src/main/java/com/op/technology/service/impl/ProRecipeServiceImpl.java index de64d742..5e58d43b 100644 --- a/op-modules/op-technology/src/main/java/com/op/technology/service/impl/ProRecipeServiceImpl.java +++ b/op-modules/op-technology/src/main/java/com/op/technology/service/impl/ProRecipeServiceImpl.java @@ -139,10 +139,10 @@ public class ProRecipeServiceImpl implements IProRecipeService { @Override @DS("#header.poolName") public int updateProRecipe(ProRecipe proRecipe) { - + baseFileMapper.deleteBaseFileBySourceId(proRecipe.getRecipeId()); //上传附件 if (StringUtils.isNotEmpty(proRecipe.getFileList())) { - baseFileMapper.deleteBaseFileBySourceId(proRecipe.getRecipeId()); + String[] ids = proRecipe.getFileList().split(","); List files = new ArrayList<>(); BaseFileData file = null; diff --git a/op-modules/op-technology/src/main/java/com/op/technology/service/impl/ProRouteServiceImpl.java b/op-modules/op-technology/src/main/java/com/op/technology/service/impl/ProRouteServiceImpl.java index 7be52556..9e6221cd 100644 --- a/op-modules/op-technology/src/main/java/com/op/technology/service/impl/ProRouteServiceImpl.java +++ b/op-modules/op-technology/src/main/java/com/op/technology/service/impl/ProRouteServiceImpl.java @@ -123,9 +123,10 @@ public class ProRouteServiceImpl implements IProRouteService { @DS("#header.poolName") public int updateProRoute(ProRoute proRoute) { proRoute.setUpdateTime(DateUtils.getNowDate()); + baseFileMapper.deleteBaseFileBySourceId(proRoute.getRouteId()); //上传附件 if (StringUtils.isNotEmpty(proRoute.getFileList())) { - baseFileMapper.deleteBaseFileBySourceId(proRoute.getRouteId()); + String[] ids = proRoute.getFileList().split(","); List files = new ArrayList<>(); BaseFileData file = null;