Merge branch 'test-temp-wj-interface-mapper' into dev

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));
+    }
+}

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));
+    }
+}

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));
+    }
+}

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);
 
 

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<MesWorkOrder> implements
                     if (!StringUtils.isEmpty(pullOrderCloseState)){
                         List<String> 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});
                         }
                     }
                 }
@@ -797,6 +797,10 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
     }
 
     private void doCreateKitting(List<MesWorkOrder> 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);
@@ -969,6 +973,7 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> 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());
             }
 
 //            /**
@@ -1007,12 +1012,12 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
 
     private void insertPullOrderInfo(MesWorkOrder mesWorkOrder,List<MesBom> bomPullList,MesPartPull mesPartPull,List<MesPartPullDetail> 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<String, List<MesPartPullDetail>> pullDetailMap = mesPartPullDetailList.stream().filter(item->!StringUtils.isEmpty(item.getPullPartNo())).collect(Collectors.groupingBy(MesPartPullDetail::getPullPartNo));
         List<String> pullDetailPartList = mesPartPullDetailList.stream().map(MesPartPullDetail::getPullPartNo).collect(Collectors.toList());

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;

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
+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

modules/i3plus-ext-mes-apiservice/src/main/resources/application-cus-88.properties

@@ -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

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