root/longdianningxing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one

Browse Source
This commit is contained in:
ZHOUZ\Noble'lift
2023-02-20 13:41:01 +08:00
parent 2abf86ef7a 8290ed2810
commit 56ee27acf7
12 changed files with 42 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lms/nladmin-system/pom.xml
View File

@@ -57,6 +57,14 @@
<version>0.9.10</version>
</dependency>
<!-- https://onew.me/logback/2018/09/17/logback_win.html-->
<dependency>
<groupId>org.fusesource.jansi</groupId>
<artifactId>jansi</artifactId>
<version>1.9</version>
</dependency>
<!--工具包-->
<dependency>
<groupId>cn.hutool</groupId>

6
lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
View File

@@ -135,6 +135,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
result.put("message", "任务状态反馈成功!");
result.put("data", new JSONObject());
result.put("errArr", errArr);
log.info("receiveTaskStatusAcs返回参数：--------------------------------------" + result.toString());
return result;
}
@@ -493,6 +494,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
}
result.put("status", HttpStatus.OK.value());
result.put("message", "下发成功!");
log.info("apply返回参数：---------------------------------------------" + result.toString());
return result;
}
} finally {
@@ -502,6 +504,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
}
result.put("status", HttpStatus.BAD_REQUEST.value());
result.put("message", "申请任务超时！" + type);
log.info("apply返回参数：---------------------------------------------" + result.toString());
return result;
}
@@ -602,7 +606,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
lock.unlock();
}
}
log.info("deviceApply返回参数：---------------------------------------------" + result.toString());
return result;
}

1
lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/OutController.java
View File

@@ -6,7 +6,6 @@ import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.nl.modules.logging.annotation.Log;
import org.nl.wms.pda.mps.service.CasingService;
import org.nl.wms.pda.mps.service.OutService;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;

2
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/SendOutTask.java
View File

@@ -73,6 +73,8 @@ public class SendOutTask extends AbstractAcsTask {
JSONObject jsonPoint2 = pointTab.query("point_code = '" + jsonTask.getString("point_code2") + "'").uniqueResult(0);
jsonPoint2.put("lock_type", "1");
jsonPoint2.put("vehicle_code", "");
jsonPoint2.put("point_status", "1");
pointTab.update(jsonPoint2);
}

3
lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/HandMoveStorServiceImpl.java
View File

@@ -292,7 +292,7 @@ public class HandMoveStorServiceImpl implements HandMoveStorService {
storPublicService.IOStor(jo, "31");
//锁定起点点位、仓位
JSONObject from_start = new JSONObject();
from_start.put("lock_type", "03");
from_start.put("lock_type", "6");
from_start.put("struct_id", jo.getString("turnout_struct_id"));
from_start.put("inv_type", jo_mst.getString("bill_type"));
from_start.put("inv_id", jo_mst.getString("moveinv_id"));
@@ -303,6 +303,7 @@ public class HandMoveStorServiceImpl implements HandMoveStorService {
storPublicService.updateStructAndPoint(from_start);
//锁定终点点位、仓位
from_start.put("struct_id", turnin_struct_id);
from_start.put("lock_type", "7");
storPublicService.updateStructAndPoint(from_start);
}
ret.put("total_qty", total_qty);

2
lms/nladmin-system/src/main/java/org/nl/wms/st/instor/task/HandMoveStorAcsTask.java
View File

@@ -89,7 +89,7 @@ public class HandMoveStorAcsTask extends AbstractAcsTask {
if(TaskStatusEnum.EXECUTING.getCode().equals(status)){
map.put("work_status","02");
wo_dtl.update(map,"task_id='"+task_id+"'");
map.put("task_status","03");
map.put("task_status",TaskStatusEnum.EXECUTING.getCode());
map.put("update_optid",currentUserId+"");
map.put("update_optname",nickName);
map.put("update_time",now);

2
lms/nladmin-system/src/main/resources/log/ACSToMes.xml → lms/nladmin-system/src/main/resources/log/AcsToLms.xml
View File

@@ -6,7 +6,7 @@
<appender name="FILE5" class="ch.qos.logback.core.rolling.RollingFileAppender">
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<!--日志文件输出的文件名-->
<FileNamePattern>${LOG_HOME}/ACSToMes/%d{yyyy-MM-dd}.%i.log</FileNamePattern>
<FileNamePattern>${LOG_HOME}/AcsToLms/%d{yyyy-MM-dd}.%i.log</FileNamePattern>
<!--日志文件保留天数-->
<maxHistory>15</maxHistory>
<!--单个日志最大容量 至少10MB才能看得出来-->

2
lms/nladmin-system/src/main/resources/log/MesToACS.xml → lms/nladmin-system/src/main/resources/log/LmsToAcs.xml
View File

@@ -6,7 +6,7 @@
<appender name="FILE6" class="ch.qos.logback.core.rolling.RollingFileAppender">
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<!--日志文件输出的文件名-->
<FileNamePattern>${LOG_HOME}/MesToACS/%d{yyyy-MM-dd}.%i.log</FileNamePattern>
<FileNamePattern>${LOG_HOME}/LmsToAcs/%d{yyyy-MM-dd}.%i.log</FileNamePattern>
<!--日志文件保留天数-->
<maxHistory>15</maxHistory>
<!--单个日志最大容量 至少10MB才能看得出来-->

30
lms/nladmin-system/src/main/resources/logback-spring.xml
View File

@@ -14,24 +14,22 @@ https://juejin.cn/post/6844903775631572999
<property name="log.pattern"
value="%black(%contextName-) %X{traceId} %red(%d{yyyy-MM-dd HH:mm:ss.SSS}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}) - %gray(%msg%n)"/>
<springProperty scope="context" name="logPath" source="logging.file.path" defaultValue="logs"/>
<springProperty scope="context" name="lokiUrl" source="loki.url"/>
<springProperty scope="context" name="esIndex" source="es.index"/>
<springProperty scope="context" name="systemName" source="loki.systemName"/>
<property name="LOKI_URL" value="${lokiUrl}"/>
<property name="SYSTEM_NAME" value="${systemName}"/>
<property name="LOG_HOME" value="${logPath}"/>
<!--引入默认的一些设置-->
<include resource="log/LmsToMes.xml"/>
<include resource="log/LmsToSap.xml"/>
<include resource="log/MesToLms.xml"/>
<include resource="log/SapToLms.xml"/>
<include resource="log/ACSToMes.xml"/>
<include resource="log/MesToACS.xml"/>
<include resource="log/AcsToLMS.xml"/>
<include resource="log/LmsToAcs.xml"/>
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
<!-- 控制台高亮-->
<withJansi>true</withJansi>
<encoder>
<pattern>${log.pattern}</pattern>
<charset>${log.charset}</charset>
<!-- <charset>${log.charset}</charset>-->
</encoder>
</appender>
@@ -54,7 +52,6 @@ https://juejin.cn/post/6844903775631572999
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
<charset>${log.charset}</charset>
</encoder>
</appender>
@@ -149,14 +146,14 @@ https://juejin.cn/post/6844903775631572999
<springProfile name="dev">
<root level="info">
<appender-ref ref="CONSOLE"/>
<appender-ref ref="asyncFileAppender"/>
<appender-ref ref="esLogAppender" />
<!-- <appender-ref ref="asyncFileAppender"/>-->
<appender-ref ref="esLogAppender"/>
</root>
<logger name="org.springframework" level="ERROR" additivity="false">
<appender-ref ref="CONSOLE"/>
</logger>
<logger name="es-logger" level="warn" additivity="false">
<appender-ref ref="esLogAppender" />
<appender-ref ref="esLogAppender"/>
<appender-ref ref="CONSOLE"/>
</logger>
<logger name="org.apache" level="ERROR" additivity="false">
@@ -199,14 +196,14 @@ https://juejin.cn/post/6844903775631572999
<springProfile name="prod">
<root level="info">
<appender-ref ref="asyncFileAppender"/>
<appender-ref ref="ERROR" />
<appender-ref ref="esLogAppender" />
<appender-ref ref="ERROR"/>
<appender-ref ref="esLogAppender"/>
</root>
<logger name="org.springframework" level="ERROR" additivity="false">
<appender-ref ref="asyncFileAppender"/>
</logger>
<logger name="es-logger" level="warn" additivity="false">
<appender-ref ref="esLogAppender" />
<appender-ref ref="esLogAppender"/>
<appender-ref ref="CONSOLE"/>
</logger>
<logger name="org.apache" level="ERROR" additivity="false">
@@ -229,23 +226,18 @@ https://juejin.cn/post/6844903775631572999
</logger>
<logger name="org.quartz" level="ERROR" additivity="false">
<appender-ref ref="asyncFileAppender"/>
</logger>
<logger name="com.google" level="ERROR" additivity="false">
<appender-ref ref="asyncFileAppender"/>
</logger>
<logger name="springfox" level="ERROR" additivity="false">
<appender-ref ref="asyncFileAppender"/>
</logger>
<logger name="log4jdbc" level="ERROR" additivity="false">
<appender-ref ref="asyncFileAppender"/>
</logger>
<logger name="nl.basjes" level="ERROR" additivity="false">
<appender-ref ref="asyncFileAppender"/>
</logger>
</springProfile>