diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesBtoJobServiceImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesBtoJobServiceImpl.java index 00f00a1..3345d33 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesBtoJobServiceImpl.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesBtoJobServiceImpl.java @@ -51,8 +51,13 @@ public class MesBtoJobServiceImpl implements IMesBtoJobService { //4. 如果没有订单需要更新窗口时间 TM_BAS_PRODUCT_GROUP_WINDOW_TIME //5. 根据零件生产组中是否有assyCode(总成类型)，去校验 客户排序信息中，是否包含了零件发运组的零件 // custsortinfolist.where(c=> partproductgroupinfo.AssCode.contains(c.AssCode)) == 0 直接返回 - List countInfo = sortInfoList.stream().filter(item -> item.getAssyCode().equals(prodGroup.getPartType())).collect(Collectors.toList()); - if (countInfo.isEmpty()){ + +// List countInfo = sortInfoList.stream().filter(item -> item.getAssyCode().equals(prodGroup.getPartType())).collect(Collectors.toList()); +// if (countInfo.isEmpty()){ +// continue; +// } + + if (sortInfoList.isEmpty()){ continue; } //6. 根据零件生产组的RoundnessType 去做策略，现在只做 窗口时间 策略; 入参 diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/roundness/MesTimeRoundnessService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/roundness/MesTimeRoundnessService.java index d4f292f..1f5e93d 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/roundness/MesTimeRoundnessService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/roundness/MesTimeRoundnessService.java @@ -90,7 +90,7 @@ public class MesTimeRoundnessService implements IRoundnessStrategy { MesWorkOrder mesWorkOrder = new MesWorkOrder(); mesWorkOrder.setWorkOrderType(MesExtEnumUtil.ORDER_TYPE.BTO.getValue()); mesWorkOrder.setWorkOrderSeq(createSeq.toString()); - mesWorkOrder.setProduceSeq(createSeq); + mesWorkOrder.setProduceSeq(createSeq.toString()); mesWorkOrder.setOrganizeCode(detail.getOrganizeCode()); //产线 mesWorkOrder.setWorkCenterCode(detail.getWorkCenterCode()); @@ -120,11 +120,11 @@ public class MesTimeRoundnessService implements IRoundnessStrategy { mesWorkOrder.setQty(realQty); mesWorkOrder.setUnCompleteQty(realQty); mesWorkOrder.setUnit(mesPartSap.getUnit()); - if (partProdGroup.getIsAutoRelease() == CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()) { - mesWorkOrder.setStatus(MesExtEnumUtil.ORDER_STATUS.RELEASE.getValue()); - } else { - mesWorkOrder.setStatus(MesExtEnumUtil.ORDER_STATUS.CREATE.getValue()); - } +// if (partProdGroup.getIsAutoRelease() == CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()) { +// mesWorkOrder.setStatus(MesExtEnumUtil.ORDER_STATUS.RELEASE.getValue()); +// } else { +// mesWorkOrder.setStatus(MesExtEnumUtil.ORDER_STATUS.CREATE.getValue()); +// } mesWorkOrder.setPartProdGroupCode(partProdGroup.getPartProdGroupCode()); //bto diff --git a/modules/i3plus-ext-mes-apiservice/src/main/resources/application-71.properties b/modules/i3plus-ext-mes-apiservice/src/main/resources/application-71.properties index eebcf5a..b6ee3bb 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/resources/application-71.properties +++ b/modules/i3plus-ext-mes-apiservice/src/main/resources/application-71.properties @@ -150,7 +150,7 @@ spring.data.mongodb.port=27017 ################ \u4E3B\u6570\u636E\u6E90 ################ ##############\u5B9A\u65F6\u4EFB\u52A1\u6301\u4E45\u5316############## -impp.schedule.open=false +impp.schedule.open=true impp.schedule.datasource.driver-class-name=com.mysql.jdbc.Driver impp.schedule.datasource.jdbc-url=jdbc:mysql://10.195.88.71:3306/impp_i3_schedule?autoReconnect=true&useSSL=false&characterEncoding=utf-8 impp.schedule.datasource.username=root @@ -228,7 +228,7 @@ spring.shardingsphere.datasource.master.keep-alive-time=3500000 ##?? spring.shardingsphere.datasource.slave.type=com.zaxxer.hikari.HikariDataSource spring.shardingsphere.datasource.slave.driver-class-name= com.mysql.jdbc.Driver -spring.shardingsphere.datasource.slave.JdbcUrl=jdbc:mysql://10.195.88.71:3336/impp_i3_mes?autoReconnect=true&useSSL=false&characterEncoding=utf-8 +spring.shardingsphere.datasource.slave.JdbcUrl=jdbc:mysql://10.195.88.71:3316/impp_i3_mes?autoReconnect=true&useSSL=false&characterEncoding=utf-8 spring.shardingsphere.datasource.slave.username=root spring.shardingsphere.datasource.slave.password=estsh123 @@ -261,3 +261,23 @@ spring.shardingsphere.sharding.master-slave-rules.ds0.slave-data-source-names=sl spring.shardingsphere.props.sql.show = false spring.shardingsphere.props.max.connections.size.per.query = 10 + +impp.schedule.scheduleType=xxljob +xxl.job.admin.addresses=http://10.195.88.71:10010/xxl-job-admin +### xxl-job, access token +xxl.job.accessToken= +### xxl-job executor appname +#xxl.job.executor.appname=${project.name} +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.109 +#xxl.job.executor.ip= +#xxl.job.executor.port=9999 +xxl.job.executor.port=8888 +### xxl-job executor log-path +xxl.job.executor.logpath= +### xxl-job executor log-retention-days +xxl.job.executor.logretentiondays=10 +xxl.job.basePackage=cn.estsh.i3plus.ext.mes.apiservice.schedulejob diff --git a/modules/i3plus-ext-mes-apiservice/src/main/resources/log4j2-spring.xml b/modules/i3plus-ext-mes-apiservice/src/main/resources/log4j2-spring.xml index bff81a4..99eaf25 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/resources/log4j2-spring.xml +++ b/modules/i3plus-ext-mes-apiservice/src/main/resources/log4j2-spring.xml @@ -112,7 +112,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -128,6 +157,7 @@ +