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

嘉耐项目更新

Browse Source
This commit is contained in:
ludj
2023-04-10 15:53:25 +08:00
parent dc24b8a8ce
commit 120f124a79
2 changed files with 44 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
wms/hd/nladmin-system/src/main/java/org/nl/wms/common/PointUpdateUtil.java
View File

@@ -13,45 +13,52 @@ import org.springframework.http.HttpStatus;
public class PointUpdateUtil { public class PointUpdateUtil {
public static void updatePoint(JSONArray arr) { public static void updatePoint(JSONArray arr) {
WmsToAcsServiceImpl wmsToAcsServiceImpl = new WmsToAcsServiceImpl();
String isConnect = SpringContextHolder.getBean(ParamServiceImpl.class).findByCode("IS_CONNECT_ACS").getValue(); String isConnect = SpringContextHolder.getBean(ParamServiceImpl.class).findByCode("IS_CONNECT_ACS").getValue();
if (StrUtil.equals("0", isConnect)) { if (StrUtil.equals("0", isConnect)) {
return; return;
} }
JSONObject joo = wmsToAcsServiceImpl.queryPointStatus(arr); new Thread(() -> {
JSONArray pointarr = joo.getJSONArray("data"); try {
//JSONArray pointarr =new JSONArray(); WmsToAcsServiceImpl wmsToAcsServiceImpl = new WmsToAcsServiceImpl();
WQLObject pointTable = WQLObject.getWQLObject("sch_base_point"); JSONObject joo = wmsToAcsServiceImpl.queryPointStatus(arr);
for (int i = 0; i < pointarr.size(); i++) { JSONArray pointarr = joo.getJSONArray("data");
JSONObject pointjo = pointarr.getJSONObject(i); //JSONArray pointarr =new JSONArray();
//String point_status = "00"; WQLObject pointTable = WQLObject.getWQLObject("sch_base_point");
String mode = pointjo.getString("mode"); for (int i = 0; i < pointarr.size(); i++) {
String point_status = "0" + pointjo.getString("move"); JSONObject pointjo = pointarr.getJSONObject(i);
//String vehicle_code = pointjo.getString("vehicle_code"); //String point_status = "00";
String vehicle_code = pointjo.getString("barcode"); String mode = pointjo.getString("mode");
String device_code = pointjo.getString("device_code"); String point_status = "0" + pointjo.getString("move");
//物料类型 //String vehicle_code = pointjo.getString("vehicle_code");
String weight = pointjo.getString("weight"); String vehicle_code = pointjo.getString("barcode");
//物料 String device_code = pointjo.getString("device_code");
String material_code = pointjo.getString("material"); //物料类型
//将托盘类型123，改为 03，04，05,默认给01 String weight = pointjo.getString("weight");
String pallet_type = "01"; //物料
if (!StrUtil.equals("0", pointjo.getString("pallet_type"))) { String material_code = pointjo.getString("material");
pallet_type = "0" + (pointjo.getIntValue("pallet_type") + 2); //将托盘类型123，改为 03，04，05,默认给01
String pallet_type = "01";
if (!StrUtil.equals("0", pointjo.getString("pallet_type"))) {
pallet_type = "0" + (pointjo.getIntValue("pallet_type") + 2);
}
pointjo.put("point_status", point_status);
if (StrUtil.equals(vehicle_code, "0")) {
vehicle_code = "";
}
JSONObject pointObj = pointTable.query("point_code ='" + device_code + "'").uniqueResult(0);
pointObj.put("vehicle_code", vehicle_code);
pointObj.put("point_status", point_status);
pointObj.put("vehicle_type", pallet_type);
pointObj.put("material_type", weight);
pointObj.put("material_code", material_code);
pointObj.put("mode", mode);
pointTable.update(pointObj);
}
} catch (Exception e) {
e.printStackTrace();
} }
pointjo.put("point_status", point_status); }).start();
if (StrUtil.equals(vehicle_code, "0")) {
vehicle_code = "";
}
JSONObject pointObj = pointTable.query("point_code ='" + device_code + "'").uniqueResult(0);
pointObj.put("vehicle_code", vehicle_code);
pointObj.put("point_status", point_status);
pointObj.put("vehicle_type", pallet_type);
pointObj.put("material_type", weight);
pointObj.put("material_code", material_code);
pointObj.put("mode", mode);
pointTable.update(pointObj);
}
} }

6
wms/hd/nladmin-system/src/main/resources/logback-spring.xml
View File

@@ -25,9 +25,8 @@ https://juejin.cn/post/6844903775631572999
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender"> <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
<encoder> <encoder>
<pattern>${log.pattern}</pattern> <pattern>${log.pattern}</pattern>
<charset>${log.charset}</charset> <!-- <charset>${log.charset}</charset>-->
</encoder> </encoder>
</appender> </appender>
<!--定义日志文件的存储地址 勿在 LogBack 的配置中使用相对路径--> <!--定义日志文件的存储地址 勿在 LogBack 的配置中使用相对路径-->
@@ -47,6 +46,7 @@ https://juejin.cn/post/6844903775631572999
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder"> <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
<!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符--> <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern> <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
<charset>${log.charset}</charset>
</encoder> </encoder>
</appender> </appender>
@@ -110,7 +110,7 @@ https://juejin.cn/post/6844903775631572999
<!--生产环境:打印控制台和输出到文件--> <!--生产环境:打印控制台和输出到文件-->
<springProfile name="prod"> <springProfile name="prod">
<root level="ERROR"> <root level="debug">
<appender-ref ref="asyncFileAppender"/> <appender-ref ref="asyncFileAppender"/>
</root> </root>
<logger name="org.springframework" level="ERROR" additivity="false"> <logger name="org.springframework" level="ERROR" additivity="false">