工步打印 逻辑修改

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()")

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[]{MesPcnExtConstWords.EQUIP_VARIABLE_STATUS, MesPcnExtConstWords.EQUIP_VARIABLE_STATUS}, new Object[]{value, MesExtEnumUtil.EQUIP_VARIABLE_NEED_NEW_VALUE.TRUE.getEquipVariableStatus()}, packBean);
-        equipmentLogRepository.updateByProperties(new String[]{"equipVariableValue",MesPcnExtConstWords.EQUIP_VARIABLE_STATUS}, new Object[]{value, MesExtEnumUtil.EQUIP_VARIABLE_NEED_NEW_VALUE.TRUE.getEquipVariableStatus()}, packBean);
     }
     @Override
     public Boolean checkEquipQuality(Integer quality) {

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

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<MesPrintedSnLog> snLogList = printModelList.stream().map(MesProduceSnPrintModel::getMesPrintedSnLogList).flatMap(List::stream).collect(Collectors.toList());
         //更新打印状态
         for (MesProductionPsOutContext outSn : productionPsOutContextList) {
-            Long id = outSn.getId();
+            DdlPackBean packBean = DdlPackBean.getDdlPackBean(outSn.getOrganizeCode());
-            DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(outSn.getOrganizeCode());
+            DdlPreparedPack.getNumEqualPack(outSn.getId(), MesPcnExtConstWords.ID, packBean);
-            DdlPreparedPack.getNumberSmallerEqualPack(id,"id",ddlPackBean);
+            mesProduceSnRao.updateByProperties(
-            mesProduceSnRao.updateByProperties("printStatus",MesExtEnumUtil.PRINT_STATUS.PRINTED.getValue(),ddlPackBean);
+                    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);

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=12345
-xxl.job.executor.port=9999
 ### 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

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 = "_";