From 754f5cf033ff80d2a8fc4e7e87b97cb57f29f19b Mon Sep 17 00:00:00 2001 From: "castle.zang" Date: Fri, 14 Feb 2025 17:26:01 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug=2045097=20=E5=B7=A5?= =?UTF-8?q?=E5=8D=95=E8=A3=85=E9=85=8D=E4=BB=B6=E6=A0=87=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=A8=A1=E6=9D=BF=E5=92=8C=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E6=9C=BA=E5=90=8D=E7=A7=B0=E8=B5=8B=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ext/mes/apiservice/serviceimpl/busi/MesCreateWorkOrderImpl.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesCreateWorkOrderImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesCreateWorkOrderImpl.java index 88fa57e..aad9a03 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesCreateWorkOrderImpl.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesCreateWorkOrderImpl.java @@ -717,6 +717,8 @@ public class MesCreateWorkOrderImpl implements IMesCreateWorkOrder { orderAssembly.setProductPartNo(sortCfg.getProductPartNo()); orderAssembly.setPid(sortCfg.getId()); orderAssembly.setWorkCenterCode(workCenterCode); + orderAssembly.setPrintTemplate(sortCfg.getPrintTemplate()); + orderAssembly.setPrinter(sortCfg.getPrinter()); workOrderAssemblyList.add(orderAssembly); } @@ -759,6 +761,8 @@ public class MesCreateWorkOrderImpl implements IMesCreateWorkOrder { orderAssembly.setMaxValue(ruleSortCfg.getMaxValue()); orderAssembly.setMinValue(ruleSortCfg.getMinValue()); orderAssembly.setProductPartNo(ruleSortCfg.getProductPartNo()); + orderAssembly.setPrintTemplate(ruleSortCfg.getPrintTemplate()); + orderAssembly.setPrinter(ruleSortCfg.getPrinter()); workOrderAssemblyList.add(orderAssembly); } //查询所有共用的零件 且没有零件号，多用于螺钉---查询排序加工规则 @@ -797,6 +801,8 @@ public class MesCreateWorkOrderImpl implements IMesCreateWorkOrder { orderAssembly.setMaxValue(ruleSortCfg.getMaxValue()); orderAssembly.setMinValue(ruleSortCfg.getMinValue()); orderAssembly.setProductPartNo(ruleSortCfg.getProductPartNo()); + orderAssembly.setPrintTemplate(ruleSortCfg.getPrintTemplate()); + orderAssembly.setPrinter(ruleSortCfg.getPrinter()); workOrderAssemblyList.add(orderAssembly); } return workOrderAssemblyList; From 8c98d36b161bc048a66423d4387aa189bda9ac5e Mon Sep 17 00:00:00 2001 From: "castle.zang" Date: Fri, 21 Feb 2025 09:39:10 +0800 Subject: [PATCH 2/5] =?UTF-8?q?kitting=20=E4=BF=AE=E5=A4=8D=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serviceimpl/base/MesWorkOrderService.java | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java index 34011a5..8de2b19 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java @@ -335,7 +335,7 @@ public class MesWorkOrderService extends BaseMesService implements if (!StringUtils.isEmpty(pullOrderCloseState)){ List closeState = Arrays.asList(pullOrderCloseState.split(",")); if (closeState.contains(mesWorkOrder.getWorkOrderStatus().toString())){ - mesPullingOrderInfoRao.updateByProperties(new String[]{"workOrderNo"}, new Object[]{mesWorkOrder.getWorkOrderNo()}, new String[]{"pullOrderStatus","modifyUser"}, new Object[]{ MesExtEnumUtil.PULL_ORDER_STATUS.PULL_ORDER_STATUS_50,userName}); + mesPullingOrderInfoRao.updateByProperties(new String[]{"workOrderNo"}, new Object[]{mesWorkOrder.getWorkOrderNo()}, new String[]{"pullOrderStatus","modifyUser"}, new Object[]{ MesExtEnumUtil.PULL_ORDER_STATUS.PULL_ORDER_STATUS_50.getValue(),userName}); } } } @@ -785,6 +785,10 @@ public class MesWorkOrderService extends BaseMesService implements } private void doCreateKitting(List mesWorkOrderList,String organizeCode) { + mesWorkOrderList = mesWorkOrderList.stream().filter(item ->item.getPullingStatus()!=MesExtEnumUtil.WORK_ORDER_PULLING_STATUS.SUBMIT.getValue()).collect(Collectors.toList()); + if (mesWorkOrderList.isEmpty()){ + return; + } //1.拉动组获取 -- 根据拉动组类型获取kitting,需要判断是否生成是否生成拉动单开关 DdlPackBean partPullPackBean = DdlPackBean.getDdlPackBean(organizeCode); DdlPreparedPack.getNumEqualPack(MesExtEnumUtil.PART_PULL_ORDER_TYPE.KITTING_PULL.getValue(),"pullOrderType", partPullPackBean); @@ -957,6 +961,7 @@ public class MesWorkOrderService extends BaseMesService implements for (int i = 1; i <= multiple; i++) { insertPullOrderInfo( mesWorkOrder, bomPullList, mesPartPull, mesPartPullDetailList, organizeCode, i, packRoundQty); } + workOrderRepository.updateByProperties("workOrderNo",mesWorkOrder.getWorkOrderNo(),"pullingStatus",MesExtEnumUtil.WORK_ORDER_PULLING_STATUS.SUBMIT.getValue()); } // /** @@ -995,12 +1000,12 @@ public class MesWorkOrderService extends BaseMesService implements private void insertPullOrderInfo(MesWorkOrder mesWorkOrder,List bomPullList,MesPartPull mesPartPull,List mesPartPullDetailList,String organizeCode,int i, int roundPackQty){ //校验当前工单是否已经生成过拉动单，如果已经生成过则不在生成 - DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(organizeCode); - DdlPreparedPack.getStringEqualPack(mesWorkOrder.getWorkOrderNo(),"workOrderNo", ddlPackBean); - int count = mesPullingOrderInfoRao.findByHqlWhereCount(ddlPackBean); - if (count >0){ - return; - } +// DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(organizeCode); +// DdlPreparedPack.getStringEqualPack(mesWorkOrder.getWorkOrderNo(),"workOrderNo", ddlPackBean); +// int count = mesPullingOrderInfoRao.findByHqlWhereCount(ddlPackBean); +// if (count >0){ +// return; +// } // 计算所有拉动单的数量，生成拉动单 Map> pullDetailMap = mesPartPullDetailList.stream().filter(item->!StringUtils.isEmpty(item.getPullPartNo())).collect(Collectors.groupingBy(MesPartPullDetail::getPullPartNo)); List pullDetailPartList = mesPartPullDetailList.stream().map(MesPartPullDetail::getPullPartNo).collect(Collectors.toList()); From e1bccabd274503be8d84bb5a292da168cfb1145c Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 26 Feb 2025 13:43:23 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9pom=E7=89=88=E6=9C=AC=20m?= =?UTF-8?q?es?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 24fd5ff..71c8f37 100644 --- a/pom.xml +++ b/pom.xml @@ -34,7 +34,7 @@ 1.0.0-yfai 1.0.0.1-patch 1.0.0.1-patch - 1.0.1-yfai + 1.0.2-yfai 2.17.1 From 67fd0b8a1417a611c122b795e7ff34e563862312 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 26 Feb 2025 14:36:26 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=96=87=E4=BB=B6=20=E6=94=B9=E6=88=90=20docker?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus-ext-mes-apiservice/src/main/resources/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/resources/application.properties b/modules/i3plus-ext-mes-apiservice/src/main/resources/application.properties index 43a2258..d72832f 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/resources/application.properties +++ b/modules/i3plus-ext-mes-apiservice/src/main/resources/application.properties @@ -1,7 +1,7 @@ #\u9879\u76EE\u540D\u79F0 spring.application.name=i3mes #\u4F7F\u7528\u914D\u7F6E -spring.profiles.active=6,cus-71 +spring.profiles.active=docker,cus-docker ######### \u81EA\u5B9A\u4E49\u53C2\u6570 ######### #\u9879\u76EE\u63CF\u8FF0\u4FE1\u606F\uFF08swagger\u4E2D\u663E\u5F0F\uFF09\uFF0C\u4E2D\u6587\u4F7F\u7528uncode\u8F6C desc.application.name=\u751F\u4EA7\u6267\u884C\u7CFB\u7EDF From c55224a658c94ec750a07fe95527610968d947b8 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 26 Feb 2025 18:16:00 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=98=A0=E5=B0=84=20?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=204,5,6=20=E6=95=B0=E6=8D=AE=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes/apiservice/cus_suit/Pisces4Properties.java | 67 ++++++++++++++++++ .../mes/apiservice/cus_suit/Pisces5Properties.java | 67 ++++++++++++++++++ .../mes/apiservice/cus_suit/Pisces6Properties.java | 67 ++++++++++++++++++ .../apiservice/dbinterface/MesSAPDbAdapter.java | 82 ++++++++++++++++++++-- .../main/resources/application-cus-71.properties | 26 ++++++- .../main/resources/application-cus-88.properties | 64 ----------------- 6 files changed, 302 insertions(+), 71 deletions(-) create mode 100644 modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/cus_suit/Pisces4Properties.java create mode 100644 modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/cus_suit/Pisces5Properties.java create mode 100644 modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/cus_suit/Pisces6Properties.java delete mode 100644 modules/i3plus-ext-mes-apiservice/src/main/resources/application-cus-88.properties diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/cus_suit/Pisces4Properties.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/cus_suit/Pisces4Properties.java new file mode 100644 index 0000000..ec794f9 --- /dev/null +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/cus_suit/Pisces4Properties.java @@ -0,0 +1,67 @@ +package cn.estsh.i3plus.ext.mes.apiservice.cus_suit; + +import cn.estsh.i3plus.platform.common.util.CommonConstWords; +import cn.estsh.i3plus.platform.plugin.datasource.DynamicDataSourceProxy; +import lombok.Getter; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +import java.util.concurrent.TimeUnit; + +/** + * @Description : pisces4数据源配置 + * @Reference : + * @Author : junsheng.li + * @CreateDate 2024/11/5 11:29 + * @Modify: + **/ +@Configuration +public class Pisces4Properties { + + public static final Logger LOGGER = LoggerFactory.getLogger(CommonConstWords.SYSTEM_LOG); + + /*********************** + * pisces4数据源配置 + */ + @Value("${impp.pisces4.datasource.isopen}") + @Getter + private boolean piscesIsOpen; + + @Value("${impp.pisces4.datasource.driver-class-name}") + @Getter + private String piscesDriverClassName; + + @Value("${impp.pisces4.datasource.alias}") + @Getter + private String piscesDsAlias; + + @Value("${impp.pisces4.datasource.jdbc-url}") + @Getter + private String piscesDsJdbcUrl; + + @Value("${impp.pisces4.datasource.username}") + @Getter + private String piscesDsUsername; + + @Value("${impp.pisces4.datasource.password}") + @Getter + private String piscesDsPassword; + + @Bean(name = "pisces4DataSource") + @ConditionalOnExpression("'${impp.pisces4.datasource.isopen:false}' == 'true'") + public DynamicDataSourceProxy initPiscesCustomerSet(){ + LOGGER.info("【初始化客户定制化...】"); + + /** + * 注册客户定制数据源 + */ + LOGGER.info("【客户定制化：pisces4数据源加载...】"); + + return DynamicDataSourceProxy.initDataSourceFactory(this.getPiscesDriverClassName(), + this.getPiscesDsJdbcUrl(), this.getPiscesDsUsername(), this.getPiscesDsPassword(),TimeUnit.MINUTES.toMillis(30)); + } +} diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/cus_suit/Pisces5Properties.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/cus_suit/Pisces5Properties.java new file mode 100644 index 0000000..df26970 --- /dev/null +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/cus_suit/Pisces5Properties.java @@ -0,0 +1,67 @@ +package cn.estsh.i3plus.ext.mes.apiservice.cus_suit; + +import cn.estsh.i3plus.platform.common.util.CommonConstWords; +import cn.estsh.i3plus.platform.plugin.datasource.DynamicDataSourceProxy; +import lombok.Getter; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +import java.util.concurrent.TimeUnit; + +/** + * @Description : pisces5数据源配置 + * @Reference : + * @Author : junsheng.li + * @CreateDate 2024/11/5 11:29 + * @Modify: + **/ +@Configuration +public class Pisces5Properties { + + public static final Logger LOGGER = LoggerFactory.getLogger(CommonConstWords.SYSTEM_LOG); + + /*********************** + * pisces5数据源配置 + */ + @Value("${impp.pisces5.datasource.isopen}") + @Getter + private boolean piscesIsOpen; + + @Value("${impp.pisces5.datasource.driver-class-name}") + @Getter + private String piscesDriverClassName; + + @Value("${impp.pisces5.datasource.alias}") + @Getter + private String piscesDsAlias; + + @Value("${impp.pisces5.datasource.jdbc-url}") + @Getter + private String piscesDsJdbcUrl; + + @Value("${impp.pisces5.datasource.username}") + @Getter + private String piscesDsUsername; + + @Value("${impp.pisces5.datasource.password}") + @Getter + private String piscesDsPassword; + + @Bean(name = "pisces5DataSource") + @ConditionalOnExpression("'${impp.pisces5.datasource.isopen:false}' == 'true'") + public DynamicDataSourceProxy initPiscesCustomerSet(){ + LOGGER.info("【初始化客户定制化...】"); + + /** + * 注册客户定制数据源 + */ + LOGGER.info("【客户定制化：pisces5数据源加载...】"); + + return DynamicDataSourceProxy.initDataSourceFactory(this.getPiscesDriverClassName(), + this.getPiscesDsJdbcUrl(), this.getPiscesDsUsername(), this.getPiscesDsPassword(),TimeUnit.MINUTES.toMillis(30)); + } +} diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/cus_suit/Pisces6Properties.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/cus_suit/Pisces6Properties.java new file mode 100644 index 0000000..a323cc6 --- /dev/null +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/cus_suit/Pisces6Properties.java @@ -0,0 +1,67 @@ +package cn.estsh.i3plus.ext.mes.apiservice.cus_suit; + +import cn.estsh.i3plus.platform.common.util.CommonConstWords; +import cn.estsh.i3plus.platform.plugin.datasource.DynamicDataSourceProxy; +import lombok.Getter; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +import java.util.concurrent.TimeUnit; + +/** + * @Description : pisces6数据源配置 + * @Reference : + * @Author : junsheng.li + * @CreateDate 2024/11/5 11:29 + * @Modify: + **/ +@Configuration +public class Pisces6Properties { + + public static final Logger LOGGER = LoggerFactory.getLogger(CommonConstWords.SYSTEM_LOG); + + /*********************** + * pisces6数据源配置 + */ + @Value("${impp.pisces6.datasource.isopen}") + @Getter + private boolean piscesIsOpen; + + @Value("${impp.pisces6.datasource.driver-class-name}") + @Getter + private String piscesDriverClassName; + + @Value("${impp.pisces6.datasource.alias}") + @Getter + private String piscesDsAlias; + + @Value("${impp.pisces6.datasource.jdbc-url}") + @Getter + private String piscesDsJdbcUrl; + + @Value("${impp.pisces6.datasource.username}") + @Getter + private String piscesDsUsername; + + @Value("${impp.pisces6.datasource.password}") + @Getter + private String piscesDsPassword; + + @Bean(name = "pisces6DataSource") + @ConditionalOnExpression("'${impp.pisces6.datasource.isopen:false}' == 'true'") + public DynamicDataSourceProxy initPiscesCustomerSet(){ + LOGGER.info("【初始化客户定制化...】"); + + /** + * 注册客户定制数据源 + */ + LOGGER.info("【客户定制化：pisces6数据源加载...】"); + + return DynamicDataSourceProxy.initDataSourceFactory(this.getPiscesDriverClassName(), + this.getPiscesDsJdbcUrl(), this.getPiscesDsUsername(), this.getPiscesDsPassword(),TimeUnit.MINUTES.toMillis(30)); + } +} diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/dbinterface/MesSAPDbAdapter.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/dbinterface/MesSAPDbAdapter.java index ae9843c..fb4eec3 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/dbinterface/MesSAPDbAdapter.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/dbinterface/MesSAPDbAdapter.java @@ -59,6 +59,15 @@ public class MesSAPDbAdapter { @Resource(name = "pisces3DataSource") private DynamicDataSourceProxy pisces3DataSourceProxy; + @Resource(name = "pisces4DataSource") + private DynamicDataSourceProxy pisces4DataSourceProxy; + + @Resource(name = "pisces5DataSource") + private DynamicDataSourceProxy pisces5DataSourceProxy; + + @Resource(name = "pisces6DataSource") + private DynamicDataSourceProxy pisces6DataSourceProxy; + @Value("${sync.redis.time:1800}") private Integer redisTime; @@ -89,7 +98,10 @@ public class MesSAPDbAdapter { DynamicDataSourceProxy piscesDataSourceProxy, DynamicDataSourceProxy pisces1DataSourceProxy, DynamicDataSourceProxy pisces2DataSourceProxy, - DynamicDataSourceProxy pisces3DataSourceProxy) throws Exception { + DynamicDataSourceProxy pisces3DataSourceProxy, + DynamicDataSourceProxy pisces4DataSourceProxy, + DynamicDataSourceProxy pisces5DataSourceProxy, + DynamicDataSourceProxy pisces6DataSourceProxy) throws Exception { WmsSAPDbWriter wmsSAPDbWriter = null; @@ -133,6 +145,29 @@ public class MesSAPDbAdapter { wmsSAPDbWriter = new WmsSAPDbWriter(mesDataSourceProxy, pisces3DataSourceProxy); } + if (groupName.equals(MesInterfaceEnumUtil.DIRECTION_TYPE.PISCES42MES.getCode())) { + wmsSAPDbWriter = new WmsSAPDbWriter(pisces4DataSourceProxy, mesDataSourceProxy); + } + + if (groupName.equals(MesInterfaceEnumUtil.DIRECTION_TYPE.MES2PISCES4.getCode())) { + wmsSAPDbWriter = new WmsSAPDbWriter(mesDataSourceProxy, pisces4DataSourceProxy); + } + + if (groupName.equals(MesInterfaceEnumUtil.DIRECTION_TYPE.PISCES52MES.getCode())) { + wmsSAPDbWriter = new WmsSAPDbWriter(pisces5DataSourceProxy, mesDataSourceProxy); + } + + if (groupName.equals(MesInterfaceEnumUtil.DIRECTION_TYPE.MES2PISCES5.getCode())) { + wmsSAPDbWriter = new WmsSAPDbWriter(mesDataSourceProxy, pisces5DataSourceProxy); + } + + if (groupName.equals(MesInterfaceEnumUtil.DIRECTION_TYPE.PISCES62MES.getCode())) { + wmsSAPDbWriter = new WmsSAPDbWriter(pisces6DataSourceProxy, mesDataSourceProxy); + } + + if (groupName.equals(MesInterfaceEnumUtil.DIRECTION_TYPE.MES2PISCES6.getCode())) { + wmsSAPDbWriter = new WmsSAPDbWriter(mesDataSourceProxy, pisces6DataSourceProxy); + } // new 的对象需要手工注入 bean if (SpringContextsUtil.getApplicationContext() != null) { @@ -165,7 +200,10 @@ public class MesSAPDbAdapter { DynamicDataSourceProxy piscesDataSourceProxy, DynamicDataSourceProxy pisces1DataSourceProxy, DynamicDataSourceProxy pisces2DataSourceProxy, - DynamicDataSourceProxy pisces3DataSourceProxy) { + DynamicDataSourceProxy pisces3DataSourceProxy, + DynamicDataSourceProxy pisces4DataSourceProxy, + DynamicDataSourceProxy pisces5DataSourceProxy, + DynamicDataSourceProxy pisces6DataSourceProxy) { WmsSAPDbReader wmsSAPDbReader = null; @@ -209,6 +247,30 @@ public class MesSAPDbAdapter { wmsSAPDbReader = new WmsSAPDbReader(mesDataSourceProxy); } + if (groupName.equals(MesInterfaceEnumUtil.DIRECTION_TYPE.PISCES42MES.getCode())) { + wmsSAPDbReader = new WmsSAPDbReader(pisces4DataSourceProxy); + } + + if (groupName.equals(MesInterfaceEnumUtil.DIRECTION_TYPE.MES2PISCES4.getCode())) { + wmsSAPDbReader = new WmsSAPDbReader(mesDataSourceProxy); + } + + if (groupName.equals(MesInterfaceEnumUtil.DIRECTION_TYPE.PISCES52MES.getCode())) { + wmsSAPDbReader = new WmsSAPDbReader(pisces5DataSourceProxy); + } + + if (groupName.equals(MesInterfaceEnumUtil.DIRECTION_TYPE.MES2PISCES5.getCode())) { + wmsSAPDbReader = new WmsSAPDbReader(mesDataSourceProxy); + } + + if (groupName.equals(MesInterfaceEnumUtil.DIRECTION_TYPE.PISCES62MES.getCode())) { + wmsSAPDbReader = new WmsSAPDbReader(pisces6DataSourceProxy); + } + + if (groupName.equals(MesInterfaceEnumUtil.DIRECTION_TYPE.MES2PISCES6.getCode())) { + wmsSAPDbReader = new WmsSAPDbReader(mesDataSourceProxy); + } + // if (groupName.equals(MesInterfaceEnumUtil.DIRECTION_TYPE.WMS2MES.getName())) { // wmsSAPDbReader = new WmsSAPDbReader(mesDataSourceProxy); // } @@ -261,11 +323,15 @@ public class MesSAPDbAdapter { // 不需要在这里处理 //initConnection(); - writer = buildWriter(groupName, sapDataSourceProxy, mesDataSourceProxy,piscesDataSourceProxy,pisces1DataSourceProxy,pisces2DataSourceProxy,pisces3DataSourceProxy); + writer = buildWriter(groupName, sapDataSourceProxy, mesDataSourceProxy, + piscesDataSourceProxy, pisces1DataSourceProxy, pisces2DataSourceProxy, pisces3DataSourceProxy, pisces4DataSourceProxy, pisces5DataSourceProxy, pisces6DataSourceProxy); + writer.setSrcConn(this.srcConn); writer.setDestConn(this.destConn); - reader = buildReader(groupName, sapDataSourceProxy, mesDataSourceProxy,piscesDataSourceProxy,pisces1DataSourceProxy,pisces2DataSourceProxy,pisces3DataSourceProxy); + reader = buildReader(groupName, sapDataSourceProxy, mesDataSourceProxy, + piscesDataSourceProxy, pisces1DataSourceProxy, pisces2DataSourceProxy, pisces3DataSourceProxy, pisces4DataSourceProxy, pisces5DataSourceProxy, pisces6DataSourceProxy); + reader.setSrcConn(this.srcConn); @@ -422,11 +488,15 @@ public class MesSAPDbAdapter { // 不需要在这里处理 //initConnection(); - writer = buildWriter(groupName, sapDataSourceProxy, mesDataSourceProxy,piscesDataSourceProxy,pisces1DataSourceProxy,pisces2DataSourceProxy,pisces3DataSourceProxy); + writer = buildWriter(groupName, sapDataSourceProxy, mesDataSourceProxy, + piscesDataSourceProxy, pisces1DataSourceProxy, pisces2DataSourceProxy, pisces3DataSourceProxy, pisces4DataSourceProxy, pisces5DataSourceProxy, pisces6DataSourceProxy); + writer.setSrcConn(this.srcConn); writer.setDestConn(this.destConn); - reader = buildReader(groupName, sapDataSourceProxy, mesDataSourceProxy,piscesDataSourceProxy,pisces1DataSourceProxy,pisces2DataSourceProxy,pisces3DataSourceProxy); + reader = buildReader(groupName, sapDataSourceProxy, mesDataSourceProxy, + piscesDataSourceProxy, pisces1DataSourceProxy, pisces2DataSourceProxy, pisces3DataSourceProxy, pisces4DataSourceProxy, pisces5DataSourceProxy, pisces6DataSourceProxy); + reader.setSrcConn(this.srcConn); diff --git a/modules/i3plus-ext-mes-apiservice/src/main/resources/application-cus-71.properties b/modules/i3plus-ext-mes-apiservice/src/main/resources/application-cus-71.properties index 2f1483e..343d028 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/resources/application-cus-71.properties +++ b/modules/i3plus-ext-mes-apiservice/src/main/resources/application-cus-71.properties @@ -69,4 +69,28 @@ impp.pisces3.datasource.alias=pisces3DataSource impp.pisces3.datasource.driver-class-name=com.microsoft.sqlserver.jdbc.SQLServerDriver impp.pisces3.datasource.jdbc-url=jdbc:sqlserver://172.28.239.113:1433;SelectMethod=cursor;DatabaseName=PiscesTest;applicationIntent=schemaOnly;selectedSchema=MES impp.pisces3.datasource.username=sa -impp.pisces3.datasource.password=sahasnopassword \ No newline at end of file +impp.pisces3.datasource.password=sahasnopassword + +#Pisces4\u6570\u636E\u6E90 +impp.pisces4.datasource.isopen=true +impp.pisces4.datasource.alias=pisces4DataSource +impp.pisces4.datasource.driver-class-name=com.microsoft.sqlserver.jdbc.SQLServerDriver +impp.pisces4.datasource.jdbc-url=jdbc:sqlserver://172.28.239.113:1433;SelectMethod=cursor;DatabaseName=PiscesTest;applicationIntent=schemaOnly;selectedSchema=MES +impp.pisces4.datasource.username=sa +impp.pisces4.datasource.password=sahasnopassword + +#Pisces5\u6570\u636E\u6E90 +impp.pisces5.datasource.isopen=true +impp.pisces5.datasource.alias=pisces5DataSource +impp.pisces5.datasource.driver-class-name=com.microsoft.sqlserver.jdbc.SQLServerDriver +impp.pisces5.datasource.jdbc-url=jdbc:sqlserver://172.28.239.113:1433;SelectMethod=cursor;DatabaseName=PiscesTest;applicationIntent=schemaOnly;selectedSchema=MES +impp.pisces5.datasource.username=sa +impp.pisces5.datasource.password=sahasnopassword + +#Pisces6\u6570\u636E\u6E90 +impp.pisces6.datasource.isopen=true +impp.pisces6.datasource.alias=pisces6DataSource +impp.pisces6.datasource.driver-class-name=com.microsoft.sqlserver.jdbc.SQLServerDriver +impp.pisces6.datasource.jdbc-url=jdbc:sqlserver://172.28.239.113:1433;SelectMethod=cursor;DatabaseName=PiscesTest;applicationIntent=schemaOnly;selectedSchema=MES +impp.pisces6.datasource.username=sa +impp.pisces6.datasource.password=sahasnopassword \ No newline at end of file diff --git a/modules/i3plus-ext-mes-apiservice/src/main/resources/application-cus-88.properties b/modules/i3plus-ext-mes-apiservice/src/main/resources/application-cus-88.properties deleted file mode 100644 index 9e9f96e..0000000 --- a/modules/i3plus-ext-mes-apiservice/src/main/resources/application-cus-88.properties +++ /dev/null @@ -1,64 +0,0 @@ -#\u5B89\u9053\u62D3\u6570\u636E\u6E90 -impp.yfas.datasource.isopen=true -#WMS\u6570\u636E\u6E90 -impp.mes.datasource.isopen=true -#\u6570\u636E\u6E90\u7684\u522B\u540D -impp.mes.datasource.alias=mesDataSource -impp.mes.datasource.driver-class-name=com.mysql.jdbc.Driver -impp.mes.datasource.jdbc-url=jdbc:mysql://10.195.88.71:3306/impp_i3_mes?autoReconnect=true&useSSL=false&characterEncoding=utf-8&allowPublicKeyRetrieval=true -#impp.mes.datasource.jdbc-url=jdbc:sqlserver://139.224.200.147:20037;DatabaseName=impp_i3_mes; -impp.mes.datasource.username=root -#impp.mes.datasource.password=Test123! -impp.mes.datasource.password=estsh123 -#Admin123! - - -#\u6570\u636E\u6E90\u7684\u522B\u540D -impp.yfas.datasource.alias=yfasDataSource -impp.yfas.datasource.driver-class-name=com.mysql.jdbc.Driver -impp.yfas.datasource.jdbc-url=jdbc:mysql://10.195.88.71:3316/impp_i3_wms_sap_if?autoReconnect=true&useSSL=false&characterEncoding=utf-8&allowPublicKeyRetrieval=true -#impp.yfas.datasource.jdbc-url=jdbc:sqlserver://139.224.200.147:20037;DatabaseName=impp_i3_mes; -impp.yfas.datasource.username=root -impp.yfas.datasource.password=estsh123 - - - -#\u6570\u636E\u6E90\u7684\u522B\u540D -#impp.wms.datasource.isopen=true -#impp.wms.datasource.alias=wmsDataSource -#impp.wms.datasource.driver-class-name=com.mysql.jdbc.Driver -#impp.wms.datasource.jdbc-url=jdbc:mysql://dbmaster:3306/impp_i3_wms?autoReconnect=true&useSSL=false&characterEncoding=utf-8 -#impp.wms.datasource.username=root -#impp.wms.datasource.password=estsh123 -# -##SWEB?????????? -#impp.sweb.datasource.isopen=true -#impp.sweb.datasource.alias=swebDataSource -#impp.sweb.datasource.driver-class-name=com.mysql.jdbc.Driver -#impp.sweb.datasource.jdbc-url=jdbc:mysql://dbmaster:3306/impp_i3_wms?autoReconnect=true&useSSL=false&characterEncoding=utf-8 -#impp.sweb.datasource.username=root -#impp.sweb.datasource.password=estsh123 - -#PiscesԴ -impp.pisces.datasource.isopen=true -impp.pisces.datasource.alias=piscesDataSource -impp.pisces.datasource.driver-class-name=com.microsoft.sqlserver.jdbc.SQLServerDriver -impp.pisces.datasource.jdbc-url=jdbc:sqlserver://172.28.239.113:1433;SelectMethod=cursor;DatabaseName=PiscesTest;applicationIntent=schemaOnly;selectedSchema=MES -impp.pisces.datasource.username=sa -impp.pisces.datasource.password=sahasnopassword - -#PiscesԴ -impp.pisces1.datasource.isopen=true -impp.pisces1.datasource.alias=piscesDataSource -impp.pisces1.datasource.driver-class-name=com.microsoft.sqlserver.jdbc.SQLServerDriver -impp.pisces1.datasource.jdbc-url=jdbc:sqlserver://172.28.239.113:1433;SelectMethod=cursor;DatabaseName=PiscesTest;applicationIntent=schemaOnly;selectedSchema=MES -impp.pisces1.datasource.username=sa -impp.pisces1.datasource.password=sahasnopassword - -#PiscesмԴ -impp.pisces1.datasource.isopen=true -impp.pisces1.datasource.alias=pisces1DataSource -impp.pisces1.datasource.driver-class-name=com.microsoft.sqlserver.jdbc.SQLServerDriver -impp.pisces1.datasource.jdbc-url=jdbc:sqlserver://172.28.16.73:1433;SelectMethod=cursor;DatabaseName=YFMES_DATACENTER;applicationIntent=schemaOnly;selectedSchema=MES -impp.pisces1.datasource.username=sa -impp.pisces1.datasource.password=sahasnopassword \ No newline at end of file