Merge remote-tracking branch 'origin/master'

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/TwoNDCSocketConnectionAutoRun.java

@@ -256,7 +256,8 @@ public class TwoNDCSocketConnectionAutoRun extends AbstractAutoRunnable {
                             if (device.getDeviceDriver() instanceof StandardAutodoorDeviceDriver) {
                                 standardAutodoorDeviceDriver = (StandardAutodoorDeviceDriver) device.getDeviceDriver();
                                 try {
-                                    standardAutodoorDeviceDriver.writing("to_command", 2);
+                                    standardAutodoorDeviceDriver.writing("to_close", "1");
+                                    standardAutodoorDeviceDriver.writing("to_open", "0");
                                 } catch (Exception e) {
                                     log.info("下发电气信号失败:" + e.getMessage());
                                     e.printStackTrace();

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceOpcProtocolRunable.java

@@ -100,8 +100,6 @@ public class DeviceOpcProtocolRunable implements Runnable, DataCallback, ServerC
                     server.disconnect();
                     log.trace("清理server...");
                 }
-
-//                group =opcServerService.getServer(this.getOpcServer().getOpc_code());
                 this.server = OpcServerUtl.getServerWithOutException(this.OpcServer.getOpc_host(), this.OpcServer.getCls_id(), this.OpcServer.getUser(), this.OpcServer.getPassword(), this.OpcServer.getDomain());
                 this.server.addStateListener(this);
                 group = this.server.addGroup();
@@ -391,20 +389,8 @@ public class DeviceOpcProtocolRunable implements Runnable, DataCallback, ServerC
             Object value = OpcUtl.getValue(item, itemState);
             UnifiedDataAccessor accessor_value = UnifiedDataAccessorFactory.getAccessor(OpcConfig.udw_opc_value_key);
             accessor_value.setValue(itemId, value);
-
-//            if (value != null) {
-//                if (log.isTraceEnabled()) {
-//                    log.trace("Item {} new value: {}, Timestamp: {}", new Object[]{itemId, itemState.getValue(), itemState.getTimestamp().getTime()});
-//                }
-//            } else if (log.isInfoEnabled()) {
-//                log.info("Item {} new value: {}, Timestamp: {}, Quality: {}", new Object[]{itemId, itemState.getValue(), itemState.getTimestamp().getTime(), itemState.getQuality()});
-//            }
             log.trace("Item {} new value: {}, Timestamp: {}", new Object[]{itemId, itemState.getValue(), itemState.getTimestamp().getTime()});
-
             OpcItemDto itemDto = this.getItem(itemId);
-//            if (Boolean.TRUE.equals(itemDto.getNeed_log())) {
-//                this.logItemChanged(itemId, accessor_value, value, itemDto);
-//            }
             this.logItemChanged(itemId, accessor_value, value, itemDto);
 
         } catch (Exception var7) {
@@ -425,15 +411,13 @@ public class DeviceOpcProtocolRunable implements Runnable, DataCallback, ServerC
                 Object obj = accessor_value.getValue(relate);
                 sb.append("key:" + relate + "value:" + obj + ";");
             }
-//            log.warn("设备：{}信号{}变更从{}->{};信号快照：{}", new Object[]{itemDto.getDevice_code(), itemId, his, value, sb});
             if (!itemDto.getItem_code().endsWith("heartbeat") && !itemDto.getItem_code().endsWith("time")) {
                 // 存在上次点位值为null情况 则不记录日志
                 LuceneLogDto luceneLogDto = new LuceneLogDto(itemDto.getOpc_server_code(), itemDto.getOpc_plc_code(), itemDto.getDevice_code(), itemDto.getItem_code().substring(itemDto.getItem_code().lastIndexOf(".") + 1),
-                        String.valueOf(itemDto.getHis_item_value()), String.valueOf(itemDto.getItem_value()));
+                        String.valueOf(his), String.valueOf(value));
                 luceneLogDto.setLogType(LogTypeEnum.DEVICE_LOG.getDesc());
                 log.info("{}", JSON.toJSONString(luceneLogDto));
             }
-//            this.businessLogger.setResource(itemDto.getDevice_code(), itemDto.getDevice_name()).log("信号{}变更从{}->{};信号快照：{}", new Object[]{itemId, his, value, sb});
         } else {
 //            if(his instanceof int[]){
 //                if(!Arrays.equals((long[]) his, (long[]) value)){
@@ -450,11 +434,10 @@ public class DeviceOpcProtocolRunable implements Runnable, DataCallback, ServerC
 //            log.warn("设备：{}信号{}变更从{}->{};信号快照：{}", new Object[]{itemDto.getDevice_code(), itemId, his, value});
             if (!itemDto.getItem_code().endsWith("heartbeat") && !itemDto.getItem_code().endsWith("time")) {
                 LuceneLogDto luceneLogDto = new LuceneLogDto(itemDto.getOpc_server_code(), itemDto.getOpc_plc_code(), itemDto.getDevice_code(), itemDto.getItem_code().substring(itemDto.getItem_code().lastIndexOf(".") + 1),
-                        String.valueOf(itemDto.getHis_item_value()), String.valueOf(itemDto.getItem_value()));
+                        String.valueOf(his), String.valueOf(value));
                 luceneLogDto.setLogType(LogTypeEnum.DEVICE_LOG.getDesc());
                 log.info("{}", JSON.toJSONString(luceneLogDto));
             }
-//            this.businessLogger.setResource(itemDto.getDevice_code(), itemDto.getDevice_name()).log("信号{}变更从{}->{}", new Object[]{itemId, his, value});
         }
     }
 

acs2/nladmin-system/nlsso-server/src/main/resources/log/OneNDCSocketConnectionAutoRun.xml

@@ -3,7 +3,7 @@
     <springProperty scope="context" name="logPath" source="logging.file.path" defaultValue="logs"/>
     <property name="LOG_HOME" value="${logPath}"/>
     <!-- 按照每天生成日志文件 -->
-    <appender name="FILE10" class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <appender name="FILE11" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
             <!--日志文件输出的文件名-->
             <FileNamePattern>${LOG_HOME}/一楼NDC系统/%d{yyyy-MM-dd}.%i.log</FileNamePattern>
@@ -28,6 +28,6 @@
 
     <!-- 打印sql -->
     <logger name="org.nl.acs.auto.run.OneNDCSocketConnectionAutoRun" level="info" additivity="true">
-        <appender-ref ref="FILE10"/>
+        <appender-ref ref="FILE11"/>
     </logger>
 </included>

acs2/nladmin-system/nlsso-server/src/main/resources/log/TwoNDCSocketConnectionAutoRun.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<included>
+    <springProperty scope="context" name="logPath" source="logging.file.path" defaultValue="logs"/>
+    <property name="LOG_HOME" value="${logPath}"/>
+    <!-- 按照每天生成日志文件 -->
+    <appender name="FILE10" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <!--日志文件输出的文件名-->
+            <FileNamePattern>${LOG_HOME}/二楼NDC系统/%d{yyyy-MM-dd}.%i.log</FileNamePattern>
+            <!--日志文件保留天数-->
+            <maxHistory>15</maxHistory>
+            <!--单个日志最大容量 至少10MB才能看得出来-->
+            <maxFileSize>200MB</maxFileSize>
+            <!--所有日志最多占多大容量-->
+            <totalSizeCap>2GB</totalSizeCap>
+        </rollingPolicy>
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <charset>${log.charset}</charset>
+        </encoder>
+
+    </appender>
+
+    <!--  <logger name="org.nl.start.Init" level="info" additivity="true">
+          <appender-ref ref="FILE3"/>
+      </logger>-->
+
+    <!-- 打印sql -->
+    <logger name="org.nl.acs.auto.run.TwoNDCSocketConnectionAutoRun" level="info" additivity="true">
+        <appender-ref ref="FILE10"/>
+    </logger>
+</included>

acs2/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml

@@ -20,6 +20,7 @@ https://juejin.cn/post/6844903775631572999
     <!--引入默认的一些设置-->
     <include resource="log/ACSToLMS.xml"/>
     <include resource="log/LMSToACS.xml"/>
+    <include resource="log/TwoNDCSocketConnectionAutoRun.xml"/>
 
     <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
         <!--withJansi 参数改为true-->

lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/ProductScrapServiceImpl.java

@@ -530,7 +530,6 @@ public class ProductScrapServiceImpl implements ProductScrapService {
                 if (ObjectUtil.isNotEmpty(label)) {
                     value = label.get(0).getString("value");
                 }
-
                 // 插入不合格品来源、不合格品描述
                 String finalValue = value;
                 boxList.forEach(row -> {

lms/nladmin-ui/src/views/wms/st/outbill/DivDialog.vue

@@ -179,7 +179,7 @@
           <el-form-item prop="checked">
             <el-checkbox v-model="checked">是否异常出库</el-checkbox>
           </el-form-item>
-          <el-form-item label="超期发货:" prop="is_overdue">
+          <el-form-item label="超期发货('否'为正常出库发货):" prop="is_overdue">
             <el-radio v-model="rowmst.is_overdue" label="1" :disabled="rowmst.bill_status === '40'" @change="updataIsOverdue">是</el-radio>
             <el-radio v-model="rowmst.is_overdue" label="0" :disabled="rowmst.bill_status === '40'" @change="updataIsOverdue">否</el-radio>
           </el-form-item>