From 2de392bac25c2c448c50357d86345ebf79c71085 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=AE=E7=AC=91=E7=9D=80=E9=9D=A2=E5=AF=B9=E6=98=8E?= =?UTF-8?q?=E5=A4=A9?= <752558143@qq.com> Date: Thu, 25 Jul 2024 20:06:37 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=8A=A5=E5=B7=A5=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/ext/mes/pcn/apiservice/mqtt/PcnMqttCallback.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/mqtt/PcnMqttCallback.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/mqtt/PcnMqttCallback.java index 4ea85d2..72ca8da 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/mqtt/PcnMqttCallback.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/mqtt/PcnMqttCallback.java @@ -25,7 +25,7 @@ import java.util.concurrent.TimeUnit; @Slf4j public class PcnMqttCallback implements MqttCallbackExtended { - private static ExecutorService executorService = new ThreadPoolExecutor(1000, 1000, + private static ExecutorService executorService = new ThreadPoolExecutor(200, 200, 0L, TimeUnit.MILLISECONDS, new LinkedBlockingQueue<>(10000), r -> { Thread thread = new Thread(r); @@ -33,7 +33,7 @@ public class PcnMqttCallback implements MqttCallbackExtended { return thread; },new ThreadPoolExecutor.DiscardPolicy()); - private static ExecutorService executorServiceTwo = new ThreadPoolExecutor(1000,1000, + private static ExecutorService executorServiceTwo = new ThreadPoolExecutor(200,200, 0L, TimeUnit.MILLISECONDS, new LinkedBlockingQueue<>(10000), r -> { Thread thread = new Thread(r); From 0f428020c42ea6518686b131931bbf3da4bf0398 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=AE=E7=AC=91=E7=9D=80=E9=9D=A2=E5=AF=B9=E6=98=8E?= =?UTF-8?q?=E5=A4=A9?= <752558143@qq.com> Date: Thu, 25 Jul 2024 22:22:06 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=8A=A5=E5=B7=A5=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes/pcn/apiservice/mqtt/PcnMqttCallback.java | 4 +-- .../serviceimpl/base/MesEquipmentLogService.java | 2 +- .../src/main/resources/application-72.properties | 33 +++++++++++++++++----- 3 files changed, 29 insertions(+), 10 deletions(-) diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/mqtt/PcnMqttCallback.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/mqtt/PcnMqttCallback.java index 72ca8da..a3807b2 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/mqtt/PcnMqttCallback.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/mqtt/PcnMqttCallback.java @@ -25,7 +25,7 @@ import java.util.concurrent.TimeUnit; @Slf4j public class PcnMqttCallback implements MqttCallbackExtended { - private static ExecutorService executorService = new ThreadPoolExecutor(200, 200, + private static ExecutorService executorService = new ThreadPoolExecutor(100, 100, 0L, TimeUnit.MILLISECONDS, new LinkedBlockingQueue<>(10000), r -> { Thread thread = new Thread(r); @@ -33,7 +33,7 @@ public class PcnMqttCallback implements MqttCallbackExtended { return thread; },new ThreadPoolExecutor.DiscardPolicy()); - private static ExecutorService executorServiceTwo = new ThreadPoolExecutor(200,200, + private static ExecutorService executorServiceTwo = new ThreadPoolExecutor(100,100, 0L, TimeUnit.MILLISECONDS, new LinkedBlockingQueue<>(10000), r -> { Thread thread = new Thread(r); diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesEquipmentLogService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesEquipmentLogService.java index 8f8c94e..298a72e 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesEquipmentLogService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesEquipmentLogService.java @@ -152,7 +152,7 @@ public class MesEquipmentLogService implements IMesEquipmentLogService { mesEquipmentLogDetail.setId(null); mesEquipmentLogDetail.setCreateDatetime(null); mesEquipmentLogDetail.setCreateUser(null); - + mesEquipmentLogDetail.setOrgEquipId(mesEquipmentLogDetail.getOrganizeCode()+"_"+mesEquipmentLogDetail.getEquipId()); String jsonStr = mesEquipmentRecord.getProduceSnJson(); if (!StringUtils.isEmpty(jsonStr)) { diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/resources/application-72.properties b/modules/i3plus-ext-mes-pcn-apiservice/src/main/resources/application-72.properties index dff0204..279701f 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/resources/application-72.properties +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/resources/application-72.properties @@ -1,7 +1,7 @@ #\u9879\u76EE\u7AEF\u53E3 server.port=8350 #\u672C\u673Aip -impp.server.ip=10.196.77.248 +impp.server.ip=localhost #impp.server.ip=192.168.0.105 #andon ip impp.andon.url=http://10.195.88.71:8750 @@ -24,7 +24,7 @@ impp.cluster.regist.center=http://10.195.88.71:8000/eureka/ logging.config=classpath:log4j2-spring.xml mes.ws=ws://10.197.190.121:8300/ws/pcn-regist/ #mes-pcn.ws.path=ws://10.197.176.77:8350 -mes-pcn.ws.path=ws://10.196.77.248:8350 +mes-pcn.ws.path=ws://localhost:8350 pcn.code=PCN-U7 ########\u5E73\u53F0\u76F8\u5173\u53C2\u6570########## #\u662F\u5426\u5F00\u5x42Fredis\u7F13\u5B58 @@ -186,12 +186,19 @@ spring.shardingsphere.sharding.master-slave-rules.ds0.slave-data-source-names=sl #\u7CFB\u7EDF\u5C5E\u6027\uFF0C\u663E\u793A\u6B63\u5E38\u7684sql\u8BED\u53E5 spring.shardingsphere.props.sql.show=false -spring.shardingsphere.sharding.tables.mes_equipment_log.actual-data-nodes=ds0.mes_equipment_log_$->{1..100} -spring.shardingsphere.sharding.tables.mes_equipment_log.table-strategy.inline.sharding-column=equip_id -spring.shardingsphere.sharding.tables.mes_equipment_log.table-strategy.inline.algorithm-expression=mes_equipment_log_$->{equip_id} +#spring.shardingsphere.sharding.tables.mes_equipment_log.actual-data-nodes=ds0.mes_equipment_log_$->{[152,156,300]} +spring.shardingsphere.sharding.tables.mes_equipment_log.actual-data-nodes=ds0.mes_equipment_log_$->{[CK01_5,CK01_6,CK01_7,CK01_8,CK01_9,CK01_10,CK01_11,CK01_12,CK01_13,CK01_14,CK01_15,CK01_16,CK01_17,CK01_21,CK01_22,CK01_23,CK01_24,CK01_28,CK01_29,CK01_31,CK01_56,CK01_62,CK01_143,CK01_151,CK01_152,CK01_153,CK01_154,CK01_155,CK01_156,CK01_157,CK01_158,CK01_161,CK01_164,CK01_179,CK01_180,CK01_181,CK01_182,CK01_184,CK01_186,CK01_191,CK01_210]} + +spring.shardingsphere.sharding.tables.mes_equipment_log.table-strategy.inline.sharding-column=org_equip_id +spring.shardingsphere.sharding.tables.mes_equipment_log.table-strategy.inline.algorithm-expression=mes_equipment_log_$->{org_equip_id} + +#spring.shardingsphere.sharding.tables.mes_equipment_log_detail.actual-data-nodes=ds0.mes_equipment_log_detail_$->{[152,156,300]} +spring.shardingsphere.sharding.tables.mes_equipment_log_detail.actual-data-nodes=ds0.mes_equipment_log_detail_$->{[CK01_5,CK01_6,CK01_7,CK01_8,CK01_9,CK01_10,CK01_11,CK01_12,CK01_13,CK01_14,CK01_15,CK01_16,CK01_17,CK01_21,CK01_22,CK01_23,CK01_24,CK01_28,CK01_29,CK01_31,CK01_56,CK01_62,CK01_143,CK01_151,CK01_152,CK01_153,CK01_154,CK01_155,CK01_156,CK01_157,CK01_158,CK01_161,CK01_164,CK01_179,CK01_180,CK01_181,CK01_182,CK01_184,CK01_186,CK01_191,CK01_210]} +spring.shardingsphere.sharding.tables.mes_equipment_log_detail.table-strategy.inline.sharding-column=org_equip_id +spring.shardingsphere.sharding.tables.mes_equipment_log_detail.table-strategy.inline.algorithm-expression=mes_equipment_log_detail_$->{org_equip_id} #\u7ED1\u5B9A\u8868 -spring.shardingsphere.sharding.binding-tables[0]=mes_equipment_log +spring.shardingsphere.sharding.binding-tables[0]=mes_equipment_log,mes_equipment_log_detail #\u4E2D\u822A\u6570\u636E\u6E90 ##############\u5B9A\u65F6\u4EFB\u52A1\u6301\u4E45\u5316############## @@ -270,4 +277,16 @@ xxl.job.executor.port=9999 xxl.job.executor.logpath= ### xxl-job executor log-retention-days xxl.job.executor.logretentiondays=10 -xxl.job.basePackage=cn.estsh.i3plus.lac.scheduler.schedulejob \ No newline at end of file +xxl.job.basePackage=cn.estsh.i3plus.lac.scheduler.schedulejob + + +mqtt.host=tcp://10.195.88.71:1883 +mqtt.userName=estsh +mqtt.passWord=estsh123 +mqtt.qos=1 +mqtt.clientId=pcn +mqtt.timeout=10 +mqtt.keepalive=30 +mqtt.clearSession=true +pcn.mqtt.flag = true +mqtt.topic.list=ABC,ABD,ADE From 2c57875b0c15e2948ada2e07c525cee43021ab7c Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Fri, 26 Jul 2024 01:38:24 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=B7=A5=E6=AD=A5=E6=89=93=E5=8D=B0=20?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ext/mes/pcn/apiservice/aspect/PcnRepositoryAspect.java | 2 ++ .../serviceimpl/equiplog/MesEquipmentLogExtService.java | 3 +-- .../equiplog/MesWorkCellScanMonitorLogExtService.java | 3 +++ .../serviceimpl/step/MesProductSnPrintStepService.java | 11 +++++++---- .../src/main/resources/application-72.properties | 14 +++++++------- .../i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java | 8 +++++++- 6 files changed, 27 insertions(+), 14 deletions(-) diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/aspect/PcnRepositoryAspect.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/aspect/PcnRepositoryAspect.java index 32fca7f..5c8979b 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/aspect/PcnRepositoryAspect.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/aspect/PcnRepositoryAspect.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.ext.mes.pcn.apiservice.aspect; import cn.estsh.i3plus.platform.common.tool.TimeTool; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.annotation.After; import org.aspectj.lang.annotation.Aspect; @@ -27,6 +28,7 @@ import java.util.List; @ConditionalOnExpression("'${pcn.aspect.repository:true}' == 'true'") @Aspect @Configuration +@Slf4j public class PcnRepositoryAspect { @Before("controllerPointcut()") diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/equiplog/MesEquipmentLogExtService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/equiplog/MesEquipmentLogExtService.java index 59828e8..79e889b 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/equiplog/MesEquipmentLogExtService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/equiplog/MesEquipmentLogExtService.java @@ -66,8 +66,7 @@ public class MesEquipmentLogExtService implements IMesEquipmentLogExtService { DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode); DdlPreparedPack.getNumEqualPack(equipId, MesPcnExtConstWords.EQUIP_ID, packBean); DdlPreparedPack.getNumEqualPack(equipVariableId, MesPcnExtConstWords.EQUIP_VARIABLE_ID, packBean); - - equipmentLogRepository.updateByProperties(new String[]{"equipVariableValue",MesPcnExtConstWords.EQUIP_VARIABLE_STATUS}, new Object[]{value, MesExtEnumUtil.EQUIP_VARIABLE_NEED_NEW_VALUE.TRUE.getEquipVariableStatus()}, packBean); + equipmentLogRepository.updateByProperties(new String[]{MesPcnExtConstWords.EQUIP_VARIABLE_STATUS, MesPcnExtConstWords.EQUIP_VARIABLE_STATUS}, new Object[]{value, MesExtEnumUtil.EQUIP_VARIABLE_NEED_NEW_VALUE.TRUE.getEquipVariableStatus()}, packBean); } @Override public Boolean checkEquipQuality(Integer quality) { diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/equiplog/MesWorkCellScanMonitorLogExtService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/equiplog/MesWorkCellScanMonitorLogExtService.java index 90f9c7f..19a53dd 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/equiplog/MesWorkCellScanMonitorLogExtService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/equiplog/MesWorkCellScanMonitorLogExtService.java @@ -23,6 +23,7 @@ import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; import java.util.List; +import java.util.StringJoiner; import java.util.stream.Collectors; @Slf4j @@ -65,6 +66,8 @@ public class MesWorkCellScanMonitorLogExtService implements ISwsWriteDbLogServic workCellScanMonitorLog.setDealStatus(MesExtEnumUtil.MES_LOG_DEAL_STATUS.UNDEAL.getValue()); + workCellScanMonitorLog.setOrgWorkCode(new StringJoiner(MesPcnExtConstWords.E_UNDERLINE).add(workCellScanMonitorLog.getOrganizeCode()).add(workCellScanMonitorLog.getWorkCenterCode()).toString()); + ConvertBean.serviceModelInitialize(workCellScanMonitorLog, resultBean.getUserInfo()); workCellScanMonitorLogRepository.insert(workCellScanMonitorLog); diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductSnPrintStepService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductSnPrintStepService.java index 199f9fe..986a610 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductSnPrintStepService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductSnPrintStepService.java @@ -6,7 +6,9 @@ import cn.estsh.i3plus.ext.mes.pcn.pojo.context.MesProdRuleContext; import cn.estsh.i3plus.ext.mes.pcn.pojo.context.MesProductionPsOutContext; import cn.estsh.i3plus.ext.mes.pcn.pojo.model.MesProduceSnPrintDataModel; import cn.estsh.i3plus.ext.mes.pcn.pojo.model.MesProduceSnPrintModel; +import cn.estsh.i3plus.ext.mes.pcn.pojo.util.MesPcnExtConstWords; import cn.estsh.i3plus.mes.pcn.serviceimpl.fsm.BaseStepService; +import cn.estsh.i3plus.platform.common.tool.TimeTool; import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.MesPcnEnumUtil; @@ -138,10 +140,11 @@ public class MesProductSnPrintStepService extends BaseStepService { List snLogList = printModelList.stream().map(MesProduceSnPrintModel::getMesPrintedSnLogList).flatMap(List::stream).collect(Collectors.toList()); //更新打印状态 for (MesProductionPsOutContext outSn : productionPsOutContextList) { - Long id = outSn.getId(); - DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(outSn.getOrganizeCode()); - DdlPreparedPack.getNumberSmallerEqualPack(id,"id",ddlPackBean); - mesProduceSnRao.updateByProperties("printStatus",MesExtEnumUtil.PRINT_STATUS.PRINTED.getValue(),ddlPackBean); + DdlPackBean packBean = DdlPackBean.getDdlPackBean(outSn.getOrganizeCode()); + DdlPreparedPack.getNumEqualPack(outSn.getId(), MesPcnExtConstWords.ID, packBean); + mesProduceSnRao.updateByProperties( + new String[]{MesPcnExtConstWords.PRINT_STATUS, MesPcnExtConstWords.MODIFY_USER, MesPcnExtConstWords.MODIFY_DATE_TIME}, + new Object[]{MesExtEnumUtil.PRINT_STATUS.PRINTED.getValue(), reqBean.getUserInfo(), TimeTool.getNowTime(true)}, packBean); } //保存打印条码记录 snLogRao.saveAll(snLogList); diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/resources/application-72.properties b/modules/i3plus-ext-mes-pcn-apiservice/src/main/resources/application-72.properties index 279701f..0305678 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/resources/application-72.properties +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/resources/application-72.properties @@ -252,27 +252,26 @@ slm.api.password=4C9479EBEFA6FA6E232EF25EFA49C4D2 slm.app.id=20190513 # \u811A\u672C\u5728\u7EBF\u8C03\u8BD5\u751F\u6210\u7684\u65E5\u5FD7\u6587\u4EF6\u76F8\u5BF9\u8DEF\u5F84\uFF0Cclasspath:xx pcn.script.logger.path=pluginlogs -pcn.schedule.job=true +pcn.schedule.job=false server.tomcat.max-threads=300 server.tomcat.max-connections=300 plugin.mainPackage=cn.estsh.i3plus -#####\u5B9A\u65F6\u4EFB\u52A1 +impp.xxlJob.admin.enable=true impp.schedule.scheduleType=xxljob -xxl.job.admin.addresses=http://172.28.14.48:10010/xxl-job-admin +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=pcn +xxl.job.executor.appname=i3mes-pcn ### 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=192.168.6.70 +xxl.job.executor.ip=10.195.88.71 #xxl.job.executor.ip= -#xxl.job.executor.port=9999 -xxl.job.executor.port=9999 +xxl.job.executor.port=12345 ### xxl-job executor log-path xxl.job.executor.logpath= ### xxl-job executor log-retention-days @@ -290,3 +289,4 @@ mqtt.keepalive=30 mqtt.clearSession=true pcn.mqtt.flag = true mqtt.topic.list=ABC,ABD,ADE +xxl.job.execute.methodName=executeImppJob,execute diff --git a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java b/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java index c95ef52..a9fba24 100644 --- a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java +++ b/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java @@ -79,6 +79,8 @@ public class MesPcnExtConstWords { public static final String VARIABLE_CFG_TYPE = "variableCfgType"; // 变量状态 public static final String EQUIP_VARIABLE_STATUS = "equipVariableStatus"; + // 变量值 + public static final String EQUIP_VARIABLE_VALUE = "equipVariableValue"; // 模具号 public static final String MOULD_NO = "mouldNo"; // 工单完成数 @@ -159,6 +161,8 @@ public class MesPcnExtConstWords { public static final String ERP_PART_NO = "erpPartNo"; // 编码规则代码 public static final String RULE_CODE = "ruleCode"; + // 打印状态 + public static final String PRINT_STATUS = "printStatus"; // 时间格式 public static final String DATE_FORMAT = "yyyy-MM-dd HH:mm:ss"; @@ -269,8 +273,10 @@ public class MesPcnExtConstWords { public static final String SQUARE_BRACKETS_R = "]"; // * public static final String ASTERISK = "*"; - + //- public static final String SEPARATOR = "-"; + //_ + public static final String E_UNDERLINE = "_";