Merge remote-tracking branch 'origin/dev' into dev

modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesPartGroupRelationService.java

@@ -0,0 +1,13 @@
+package cn.estsh.i3plus.ext.mes.api.base;
+
+import cn.estsh.i3plus.pojo.mes.bean.edi.base.MesPartGroupRelation;
+
+/**
+ * @Description :发运基础数据维护
+ * @Reference :
+ * @Author : Castle
+ * @CreateDate : 2024/7/1 13:46
+ * @Modify:
+ **/
+public interface IMesPartGroupRelationService extends IBaseMesService<MesPartGroupRelation>{
+}

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesPartGroupRelationController.java

@@ -0,0 +1,20 @@
+package cn.estsh.i3plus.ext.mes.apiservice.controller.base;
+
+import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant;
+import cn.estsh.i3plus.pojo.mes.bean.edi.base.MesPartGroupRelation;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : Castle
+ * @CreateDate : 2024/7/1 10:57
+ * @Modify:
+ **/
+@Api("零件组关系")
+@RestController
+@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesPartGroupRelation")
+public class MesPartGroupRelationController extends BaseMesController<MesPartGroupRelation>{
+}

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesBtoJobServiceImpl.java

@@ -42,6 +42,7 @@ public class MesBtoJobServiceImpl implements IMesBtoJobService {
             MesCustomerMessagePoint messagePoint = mesCustomerMessagePointService.getPointByCode(prodGroup.getCustInfoPoint(),organizeCode);
             if (messagePoint == null){
                 log.info("客户的信息点{}不存在",prodGroup.getCustInfoPoint());
+                continue;
             }
             //3. 根据零件生产组中reuseSoftInfo 获取排序信息
             //  Integer isReuseSortInfo = prodGroup.getIsReuseSortInfo();

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPartGroupRelationServiceImpl.java

@@ -0,0 +1,18 @@
+package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
+
+import cn.estsh.i3plus.ext.mes.api.base.IMesPartGroupRelationService;
+import cn.estsh.i3plus.pojo.mes.bean.edi.base.MesPartGroupRelation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : Castle
+ * @CreateDate : 2024/7/1 13:47
+ * @Modify:
+ **/
+@Slf4j
+@Service
+public class MesPartGroupRelationServiceImpl extends BaseMesService<MesPartGroupRelation> implements IMesPartGroupRelationService {
+}

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

@@ -1,7 +1,7 @@
 #\u9879\u76EE\u7AEF\u53E3
 server.port=8300
 #\u672C\u673Aip
-impp.server.ip=192.168.4.109
+impp.server.ip=172.24.96.1
 #\u94FE\u8DEF\u8FFD\u8E2Azipkin\u63A7\u5236\u53F0ip\u5730\u5740
 impp.console.ip=http://10.195.88.71:8010
 ################ \u529F\u80FD\u914D\u7F6E1 ################
@@ -90,7 +90,7 @@ filter.shiro.admin.filteruri=/mes/adoperate/*
 filter.shiro.saadmin.filteruri=/mes/saoperate/*
 ################ \u4E91\u914D\u7F6E \uFF08\u4EE5projectName\u4F5C\u4E3A\u5E94\u7528\u540D\uFF09 ################
 #\u662F\u5426\u5F00\u542F\u5FAE\u670D
-eureka.client.enabled=true
+eureka.client.enabled=false
 #\uFF08\u53C2\u6570\u914D\u7F6E\uFF09\u6CE8\u518C\u4E2D\u5FC3\u5730\u5740 -\u300B i3plus-ics\uFF0C\u591A\u4E2A\u7528\u9017\u53F7\u5206\u9694
 eureka.client.service-url.defaultZone=${impp.cluster.regist.center}
 #\u533A\u57DF\uFF08\u6E90\u7801\u4E2D\u5305\u542BdefaultZone\uFF0C\u6240\u4EE5\u9ED8\u8BA4\u4F7F\u7528defaultZone\uFF09
@@ -240,15 +240,15 @@ spring.shardingsphere.datasource.slave.max-lifetime=7000000
 spring.shardingsphere.datasource.slave.connection-test-query=select 1
 spring.shardingsphere.datasource.slave.keep-alive-time=3500000
 
-impp.write.datasource.driver-class-name=com.mysql.jdbc.Driver
-impp.write.datasource.jdbc-url=jdbc:mysql://10.195.88.71:3316/impp_i3_mes?autoReconnect=true&useSSL=false&characterEncoding=utf-8&allowPublicKeyRetrieval=true
-impp.write.datasource.username=root
-impp.write.datasource.password=estsh123
-impp.read.datasource.type=com.zaxxer.hikari.HikariDataSource
-impp.read.datasource.driver-class-name=com.mysql.jdbc.Driver
-impp.read.datasource.jdbc-url=jdbc:mysql://10.195.88.71:3336/impp_i3_mes?autoReconnect=true&useSSL=false&characterEncoding=utf-8&allowPublicKeyRetrieval=true
-impp.read.datasource.username=root
-impp.read.datasource.password=estsh123
+#impp.write.datasource.driver-class-name=com.mysql.jdbc.Driver
+#impp.write.datasource.jdbc-url=jdbc:mysql://10.195.88.71:3316/impp_i3_mes?autoReconnect=true&useSSL=false&characterEncoding=utf-8&allowPublicKeyRetrieval=true
+#impp.write.datasource.username=root
+#impp.write.datasource.password=estsh123
+#impp.read.datasource.type=com.zaxxer.hikari.HikariDataSource
+#impp.read.datasource.driver-class-name=com.mysql.jdbc.Driver
+#impp.read.datasource.jdbc-url=jdbc:mysql://10.195.88.71:3336/impp_i3_mes?autoReconnect=true&useSSL=false&characterEncoding=utf-8&allowPublicKeyRetrieval=true
+#impp.read.datasource.username=root
+#impp.read.datasource.password=estsh123
 
 
 ##??????
@@ -272,7 +272,7 @@ xxl.job.executor.appname=i3mes-castle
 ### xxl-job executor registry-address: default use address to registry , otherwise use ip:port if address is null
 xxl.job.executor.address=
 ### xxl-job executor server-info
-xxl.job.executor.ip=10.196.75.151
+xxl.job.executor.ip=172.24.96.1
 #xxl.job.executor.ip=
 #xxl.job.executor.port=9999
 xxl.job.executor.port=8888