fix 下发工单 获取托盘信息 add 大屏生产统计接口
This commit is contained in:
张江玮
@@ -1,12 +1,33 @@
|
||||
package org.nl.acs.device_driver.driver;
|
||||
|
||||
import cn.hutool.core.util.ObjectUtil;
|
||||
import org.nl.acs.ext.wms.data.JsonUtl;
|
||||
import org.nl.acs.log.service.DeviceExecuteLogService;
|
||||
import org.nl.acs.opc.ItemValue;
|
||||
import org.nl.acs.opc.OpcConfig;
|
||||
import org.nl.acs.opc.OpcServerService;
|
||||
import org.nl.acs.opc.OpcServerServiceImpl;
|
||||
import org.nl.acs.udw.UnifiedDataAccessor;
|
||||
import org.nl.acs.udw.UnifiedDataAccessorFactory;
|
||||
import org.nl.modules.lucene.service.LuceneExecuteLogService;
|
||||
import org.nl.modules.lucene.service.dto.LuceneLogDto;
|
||||
import org.nl.modules.wql.exception.WDKException;
|
||||
import org.nl.modules.wql.util.SpringContextHolder;
|
||||
|
||||
import java.util.Date;
|
||||
import java.util.Iterator;
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.Map;
|
||||
|
||||
public class AbstractOpcDeviceDriver extends AbstractDeviceDriver implements OpcDeviceDriver {
|
||||
UnifiedDataAccessor opcUdw;
|
||||
|
||||
private Date sendTime;
|
||||
private String last_items;
|
||||
private int noLog_sendTimeOut;
|
||||
private Date noLog_sendTime;
|
||||
private String noLog_last_items;
|
||||
|
||||
public AbstractOpcDeviceDriver() {
|
||||
this.opcUdw = UnifiedDataAccessorFactory.getAccessor(OpcConfig.udw_opc_value_key);
|
||||
}
|
||||
@@ -15,4 +36,100 @@ public class AbstractOpcDeviceDriver extends AbstractDeviceDriver implements Opc
|
||||
public UnifiedDataAccessor getOpcValueAccessor() {
|
||||
return this.opcUdw;
|
||||
}
|
||||
|
||||
public void writing(Map<String, Object> map) {
|
||||
LuceneExecuteLogService lucene = SpringContextHolder.getBean(LuceneExecuteLogService.class);
|
||||
DeviceExecuteLogService logServer = SpringContextHolder.getBean("deviceExecuteLogServiceImpl");
|
||||
Map<String, Object> itemMap = new LinkedHashMap<>();
|
||||
map.forEach((key, value) -> {
|
||||
if (ObjectUtil.isNotEmpty(value)) {
|
||||
itemMap.put(getToParam() + key, value);
|
||||
}
|
||||
});
|
||||
if (ObjectUtil.isNotEmpty(itemMap)) {
|
||||
this.control(itemMap);
|
||||
logServer.deviceExecuteLog(this.getDevice().getDevice_code(), "", "", "下发多个电气信号:" + itemMap);
|
||||
lucene.deviceExecuteLog(new LuceneLogDto(this.getDeviceCode(), "下发多个电气信号:" + itemMap));
|
||||
}
|
||||
}
|
||||
|
||||
public String getToParam() {
|
||||
return this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() + ".";
|
||||
}
|
||||
|
||||
public boolean control(Map<String, Object> itemValues) {
|
||||
|
||||
Iterator<Map.Entry<String, Object>> it = itemValues.entrySet().iterator();
|
||||
|
||||
ItemValue[] p2;
|
||||
p2 = new ItemValue[itemValues.size()];
|
||||
int i = 0;
|
||||
while (it.hasNext()) {
|
||||
Map.Entry<String, Object> entry = it.next();
|
||||
System.out.println("即将写入值:" + entry.getKey() + ":" + entry.getValue());
|
||||
p2[i] = new ItemValue();
|
||||
p2[i].setItem_code(entry.getKey());
|
||||
p2[i].setItem_value(entry.getValue());
|
||||
i++;
|
||||
}
|
||||
|
||||
return this.control(p2);
|
||||
}
|
||||
|
||||
public boolean control(ItemValue[] itemValues) {
|
||||
if (itemValues != null && itemValues.length != 0) {
|
||||
String this_items = JsonUtl.parseWithoutException(itemValues);
|
||||
boolean need_write = false;
|
||||
StringBuilder sb = new StringBuilder();
|
||||
ItemValue[] var5 = itemValues;
|
||||
int var6 = itemValues.length;
|
||||
|
||||
for (int var7 = 0; var7 < var6; ++var7) {
|
||||
ItemValue itemValue = var5[var7];
|
||||
String code = itemValue.getItem_code();
|
||||
Object udw_value = this.getUdwValue(code);
|
||||
Object write_value = itemValue.getItem_value();
|
||||
sb.append(code);
|
||||
sb.append(":");
|
||||
sb.append(JsonUtl.parseWithoutException(udw_value));
|
||||
sb.append(";");
|
||||
// if (!need_write && !UnifiedDataAppService.isEquals(udw_value, write_value)) {
|
||||
// need_write = true;
|
||||
// }
|
||||
}
|
||||
need_write = true;
|
||||
|
||||
if (need_write) {
|
||||
Date date = new Date();
|
||||
/*if (StringUtl.isEqual(this_items, this.last_items) && date.getTime() - this.sendTime.getTime() < (long) WcsConfig.opc_write_repeat_check) {
|
||||
log.trace("发送时间因为小于{}毫秒，而被无视", WcsConfig.opc_write_repeat_check);
|
||||
return false;
|
||||
}*/
|
||||
|
||||
this.last_items = this_items;
|
||||
this.sendTime = date;
|
||||
/* this.execute_log.setResource(this.getDevice().getCode(), this.getDevice().getName());
|
||||
this.execute_log.log("原始记录{}->变更为{}", new Object[]{sb, this_items});
|
||||
OpcServerService opcServerService = OpcServerFactory.getOpcServerService();*/
|
||||
|
||||
OpcServerService opcServerService = SpringContextHolder.getBean(OpcServerServiceImpl.class);
|
||||
|
||||
opcServerService.writeInteger(this.getOpcServer(), itemValues);
|
||||
UnifiedDataAccessor opcValueAccessor = this.getOpcValueAccessor();
|
||||
ItemValue[] var17 = itemValues;
|
||||
int var18 = itemValues.length;
|
||||
|
||||
for (int var19 = 0; var19 < var18; ++var19) {
|
||||
ItemValue itemValue = var17[var19];
|
||||
String code = itemValue.getItem_code();
|
||||
Object value = itemValue.getItem_value();
|
||||
opcValueAccessor.setValue(code, value);
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
} else {
|
||||
throw new WDKException("下发 无内容");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -77,4 +77,8 @@ public interface OpcDeviceDriver extends DeviceDriver {
|
||||
return this.getOpcServer() + "." + this.getOpcPlc() + "." + this.getDeviceCode() + "." + item;
|
||||
}
|
||||
|
||||
default Object getUdwValue(String protocol) {
|
||||
return this.getOpcValueAccessor().getValue(protocol);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -1284,62 +1284,64 @@ public class LnshPalletizingManipulatorSiteDeviceDriver extends AbstractOpcDevic
|
||||
String Htrapezoidal = content.getString("htrapezoidal");
|
||||
String Wthickness = content.getString("wthickness");
|
||||
|
||||
this.writing("to_product_code", StrUtil.isBlank(product_code) ? "0" : product_code);
|
||||
this.writing("to_AlongSide", StrUtil.isBlank(AlongSide) ? "0" : AlongSide);
|
||||
this.writing("to_BshortSide", StrUtil.isBlank(BshortSide) ? "0" : BshortSide);
|
||||
this.writing("to_Htrapezoidal", StrUtil.isBlank(Htrapezoidal) ? "0" : Htrapezoidal);
|
||||
this.writing("to_Wthickness", StrUtil.isBlank(Wthickness) ? "0" : Wthickness);
|
||||
HashMap<String, Object> map = new HashMap<>();
|
||||
map.put("to_product_code", StrUtil.isBlank(product_code) ? "0" : product_code);
|
||||
map.put("to_AlongSide", StrUtil.isBlank(AlongSide) ? "0" : AlongSide);
|
||||
map.put("to_BshortSide", StrUtil.isBlank(BshortSide) ? "0" : BshortSide);
|
||||
map.put("to_Htrapezoidal", StrUtil.isBlank(Htrapezoidal) ? "0" : Htrapezoidal);
|
||||
map.put("to_Wthickness", StrUtil.isBlank(Wthickness) ? "0" : Wthickness);
|
||||
//当前托盘砖数量
|
||||
this.writing("to_tray_qty", StrUtil.isBlank(qty) ? "0" : qty);
|
||||
this.writing("to_tray_high", StrUtil.isBlank(tray_high) ? "0" : tray_high);
|
||||
this.writing("to_crib_category", StrUtil.isBlank(crib_category) ? "0" : crib_category);
|
||||
this.writing("to_palletX1_line", StrUtil.isBlank(palletX1_line) ? "0" : palletX1_line);
|
||||
this.writing("to_palletY1_row", StrUtil.isBlank(palletY1_row) ? "0" : palletY1_row);
|
||||
this.writing("to_palletA1_angle", StrUtil.isBlank(palletA1_angle) ? "0" : palletA1_angle);
|
||||
this.writing("to_palletX2_line", StrUtil.isBlank(palletX2_line) ? "0" : palletX2_line);
|
||||
this.writing("to_palletY2_row", StrUtil.isBlank(palletY2_row) ? "0" : palletY2_row);
|
||||
this.writing("to_palletA2_angle", StrUtil.isBlank(palletA2_angle) ? "0" : palletA2_angle);
|
||||
this.writing("to_palletX3_line", StrUtil.isBlank(palletX3_line) ? "0" : palletX3_line);
|
||||
this.writing("to_palletY3_row", StrUtil.isBlank(palletY3_row) ? "0" : palletY3_row);
|
||||
this.writing("to_palletA3_angle", StrUtil.isBlank(palletA3_angle) ? "0" : palletA3_angle);
|
||||
this.writing("to_pressCribX1_line", StrUtil.isBlank(pressCribX1_line) ? "0" : pressCribX1_line);
|
||||
this.writing("to_pressCribY1_row", StrUtil.isBlank(pressCribY1_row) ? "0" : pressCribY1_row);
|
||||
this.writing("to_pressCribA1_angle", StrUtil.isBlank(pressCribA1_angle) ? "0" : pressCribA1_angle);
|
||||
this.writing("to_pressCribX2_line", StrUtil.isBlank(pressCribX2_line) ? "0" : pressCribX2_line);
|
||||
this.writing("to_pressCribY2_row", StrUtil.isBlank(pressCribY2_row) ? "0" : pressCribY2_row);
|
||||
this.writing("to_pressCribA2_angle", StrUtil.isBlank(pressCribA2_angle) ? "0" : pressCribA2_angle);
|
||||
this.writing("to_pressCribX3_line", StrUtil.isBlank(pressCribX3_line) ? "0" : pressCribX3_line);
|
||||
this.writing("to_pressCribY3_row", StrUtil.isBlank(pressCribY3_row) ? "0" : pressCribY3_row);
|
||||
this.writing("to_pressCribA3_angle", StrUtil.isBlank(pressCribA3_angle) ? "0" : pressCribA3_angle);
|
||||
this.writing("to_Zoffset", StrUtil.isBlank(Zoffset) ? "0" : Zoffset);
|
||||
this.writing("to_pallet_layerQty", StrUtil.isBlank(pallet_layerQty) ? "0" : pallet_layerQty);
|
||||
this.writing("to_pressCrib_layerQty", StrUtil.isBlank(pressCrib_layerQty) ? "0" : pressCrib_layerQty);
|
||||
this.writing("to_codeLayerX1_interval", StrUtil.isBlank(codeLayerX1_interval) ? "0" : codeLayerX1_interval);
|
||||
this.writing("to_codeLayerY1_interval", StrUtil.isBlank(codeLayerY1_interval) ? "0" : codeLayerY1_interval);
|
||||
this.writing("to_codeLayerX2_interval", StrUtil.isBlank(codeLayerX2_interval) ? "0" : codeLayerX2_interval);
|
||||
this.writing("to_codeLayerY2_interval", StrUtil.isBlank(codeLayerY2_interval) ? "0" : codeLayerY2_interval);
|
||||
this.writing("to_codeLayerX3_interval", StrUtil.isBlank(codeLayerX3_interval) ? "0" : codeLayerX3_interval);
|
||||
this.writing("to_codeLayerY3_interval", StrUtil.isBlank(codeLayerY3_interval) ? "0" : codeLayerY3_interval);
|
||||
this.writing("to_codeLayerX1_offset", StrUtil.isBlank(codeLayerX1_offset) ? "0" : codeLayerX1_offset);
|
||||
this.writing("to_codeLayerY1_offset", StrUtil.isBlank(codeLayerY1_offset) ? "0" : codeLayerY1_offset);
|
||||
this.writing("to_codeLayerX2_offset", StrUtil.isBlank(codeLayerX2_offset) ? "0" : codeLayerX2_offset);
|
||||
this.writing("to_codeLayerY2_offset", StrUtil.isBlank(codeLayerY2_offset) ? "0" : codeLayerY2_offset);
|
||||
this.writing("to_codeLayerX3_offset", StrUtil.isBlank(codeLayerX3_offset) ? "0" : codeLayerX3_offset);
|
||||
this.writing("to_codeLayerY3_offset", StrUtil.isBlank(codeLayerY3_offset) ? "0" : codeLayerY3_offset);
|
||||
this.writing("to_pressLayerX1_interval", StrUtil.isBlank(pressLayerX1_interval) ? "0" : pressLayerX1_interval);
|
||||
this.writing("to_pressLayerY1_interval", StrUtil.isBlank(pressLayerY1_interval) ? "0" : pressLayerY1_interval);
|
||||
this.writing("to_pressLayerX2_interval", StrUtil.isBlank(pressLayerX2_interval) ? "0" : pressLayerX2_interval);
|
||||
this.writing("to_pressLayerY2_interval", StrUtil.isBlank(pressLayerY2_interval) ? "0" : pressLayerY2_interval);
|
||||
this.writing("to_pressLayerX3_interval", StrUtil.isBlank(pressLayerX3_interval) ? "0" : pressLayerX3_interval);
|
||||
this.writing("to_pressLayerY3_interval", StrUtil.isBlank(pressLayerY3_interval) ? "0" : pressLayerY3_interval);
|
||||
this.writing("to_pressLayerX1_offset", StrUtil.isBlank(pressLayerX1_offset) ? "0" : pressLayerX1_offset);
|
||||
this.writing("to_pressLayerY1_offset", StrUtil.isBlank(pressLayerY1_offset) ? "0" : pressLayerY1_offset);
|
||||
this.writing("to_pressLayerX2_offset", StrUtil.isBlank(pressLayerX2_offset) ? "0" : pressLayerX2_offset);
|
||||
this.writing("to_pressLayerY2_offset", StrUtil.isBlank(pressLayerY2_offset) ? "0" : pressLayerY2_offset);
|
||||
this.writing("to_pressLayerX3_offset", StrUtil.isBlank(pressLayerX3_offset) ? "0" : pressLayerX3_offset);
|
||||
this.writing("to_pressLayerY3_offset", StrUtil.isBlank(pressLayerY3_offset) ? "0" : pressLayerY3_offset);
|
||||
this.writing("to_tool_coordinate", StrUtil.isBlank(tool_coordinate) ? "0" : tool_coordinate);
|
||||
this.writing(this.mode);
|
||||
map.put("to_tray_qty", StrUtil.isBlank(qty) ? "0" : qty);
|
||||
map.put("to_tray_high", StrUtil.isBlank(tray_high) ? "0" : tray_high);
|
||||
map.put("to_crib_category", StrUtil.isBlank(crib_category) ? "0" : crib_category);
|
||||
map.put("to_palletX1_line", StrUtil.isBlank(palletX1_line) ? "0" : palletX1_line);
|
||||
map.put("to_palletY1_row", StrUtil.isBlank(palletY1_row) ? "0" : palletY1_row);
|
||||
map.put("to_palletA1_angle", StrUtil.isBlank(palletA1_angle) ? "0" : palletA1_angle);
|
||||
map.put("to_palletX2_line", StrUtil.isBlank(palletX2_line) ? "0" : palletX2_line);
|
||||
map.put("to_palletY2_row", StrUtil.isBlank(palletY2_row) ? "0" : palletY2_row);
|
||||
map.put("to_palletA2_angle", StrUtil.isBlank(palletA2_angle) ? "0" : palletA2_angle);
|
||||
map.put("to_palletX3_line", StrUtil.isBlank(palletX3_line) ? "0" : palletX3_line);
|
||||
map.put("to_palletY3_row", StrUtil.isBlank(palletY3_row) ? "0" : palletY3_row);
|
||||
map.put("to_palletA3_angle", StrUtil.isBlank(palletA3_angle) ? "0" : palletA3_angle);
|
||||
map.put("to_pressCribX1_line", StrUtil.isBlank(pressCribX1_line) ? "0" : pressCribX1_line);
|
||||
map.put("to_pressCribY1_row", StrUtil.isBlank(pressCribY1_row) ? "0" : pressCribY1_row);
|
||||
map.put("to_pressCribA1_angle", StrUtil.isBlank(pressCribA1_angle) ? "0" : pressCribA1_angle);
|
||||
map.put("to_pressCribX2_line", StrUtil.isBlank(pressCribX2_line) ? "0" : pressCribX2_line);
|
||||
map.put("to_pressCribY2_row", StrUtil.isBlank(pressCribY2_row) ? "0" : pressCribY2_row);
|
||||
map.put("to_pressCribA2_angle", StrUtil.isBlank(pressCribA2_angle) ? "0" : pressCribA2_angle);
|
||||
map.put("to_pressCribX3_line", StrUtil.isBlank(pressCribX3_line) ? "0" : pressCribX3_line);
|
||||
map.put("to_pressCribY3_row", StrUtil.isBlank(pressCribY3_row) ? "0" : pressCribY3_row);
|
||||
map.put("to_pressCribA3_angle", StrUtil.isBlank(pressCribA3_angle) ? "0" : pressCribA3_angle);
|
||||
map.put("to_Zoffset", StrUtil.isBlank(Zoffset) ? "0" : Zoffset);
|
||||
map.put("to_pallet_layerQty", StrUtil.isBlank(pallet_layerQty) ? "0" : pallet_layerQty);
|
||||
map.put("to_pressCrib_layerQty", StrUtil.isBlank(pressCrib_layerQty) ? "0" : pressCrib_layerQty);
|
||||
map.put("to_codeLayerX1_interval", StrUtil.isBlank(codeLayerX1_interval) ? "0" : codeLayerX1_interval);
|
||||
map.put("to_codeLayerY1_interval", StrUtil.isBlank(codeLayerY1_interval) ? "0" : codeLayerY1_interval);
|
||||
map.put("to_codeLayerX2_interval", StrUtil.isBlank(codeLayerX2_interval) ? "0" : codeLayerX2_interval);
|
||||
map.put("to_codeLayerY2_interval", StrUtil.isBlank(codeLayerY2_interval) ? "0" : codeLayerY2_interval);
|
||||
map.put("to_codeLayerX3_interval", StrUtil.isBlank(codeLayerX3_interval) ? "0" : codeLayerX3_interval);
|
||||
map.put("to_codeLayerY3_interval", StrUtil.isBlank(codeLayerY3_interval) ? "0" : codeLayerY3_interval);
|
||||
map.put("to_codeLayerX1_offset", StrUtil.isBlank(codeLayerX1_offset) ? "0" : codeLayerX1_offset);
|
||||
map.put("to_codeLayerY1_offset", StrUtil.isBlank(codeLayerY1_offset) ? "0" : codeLayerY1_offset);
|
||||
map.put("to_codeLayerX2_offset", StrUtil.isBlank(codeLayerX2_offset) ? "0" : codeLayerX2_offset);
|
||||
map.put("to_codeLayerY2_offset", StrUtil.isBlank(codeLayerY2_offset) ? "0" : codeLayerY2_offset);
|
||||
map.put("to_codeLayerX3_offset", StrUtil.isBlank(codeLayerX3_offset) ? "0" : codeLayerX3_offset);
|
||||
map.put("to_codeLayerY3_offset", StrUtil.isBlank(codeLayerY3_offset) ? "0" : codeLayerY3_offset);
|
||||
map.put("to_pressLayerX1_interval", StrUtil.isBlank(pressLayerX1_interval) ? "0" : pressLayerX1_interval);
|
||||
map.put("to_pressLayerY1_interval", StrUtil.isBlank(pressLayerY1_interval) ? "0" : pressLayerY1_interval);
|
||||
map.put("to_pressLayerX2_interval", StrUtil.isBlank(pressLayerX2_interval) ? "0" : pressLayerX2_interval);
|
||||
map.put("to_pressLayerY2_interval", StrUtil.isBlank(pressLayerY2_interval) ? "0" : pressLayerY2_interval);
|
||||
map.put("to_pressLayerX3_interval", StrUtil.isBlank(pressLayerX3_interval) ? "0" : pressLayerX3_interval);
|
||||
map.put("to_pressLayerY3_interval", StrUtil.isBlank(pressLayerY3_interval) ? "0" : pressLayerY3_interval);
|
||||
map.put("to_pressLayerX1_offset", StrUtil.isBlank(pressLayerX1_offset) ? "0" : pressLayerX1_offset);
|
||||
map.put("to_pressLayerY1_offset", StrUtil.isBlank(pressLayerY1_offset) ? "0" : pressLayerY1_offset);
|
||||
map.put("to_pressLayerX2_offset", StrUtil.isBlank(pressLayerX2_offset) ? "0" : pressLayerX2_offset);
|
||||
map.put("to_pressLayerY2_offset", StrUtil.isBlank(pressLayerY2_offset) ? "0" : pressLayerY2_offset);
|
||||
map.put("to_pressLayerX3_offset", StrUtil.isBlank(pressLayerX3_offset) ? "0" : pressLayerX3_offset);
|
||||
map.put("to_pressLayerY3_offset", StrUtil.isBlank(pressLayerY3_offset) ? "0" : pressLayerY3_offset);
|
||||
map.put("to_tool_coordinate", StrUtil.isBlank(tool_coordinate) ? "0" : tool_coordinate);
|
||||
map.put("to_command", this.mode);
|
||||
this.writing(map);
|
||||
}
|
||||
this.setRequireSucess(true);
|
||||
}
|
||||
|
||||
@@ -0,0 +1,125 @@
|
||||
package org.nl.acs.ext.wms.data;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonInclude.Include;
|
||||
import com.fasterxml.jackson.core.JsonProcessingException;
|
||||
import com.fasterxml.jackson.databind.DeserializationFeature;
|
||||
import com.fasterxml.jackson.databind.JavaType;
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import com.fasterxml.jackson.databind.module.SimpleModule;
|
||||
import com.fasterxml.jackson.databind.type.TypeFactory;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
public class JsonUtl {
|
||||
private static ObjectMapper objectMapper = null;
|
||||
private static ObjectMapper objectMapperLog = null;
|
||||
|
||||
private JsonUtl() {
|
||||
}
|
||||
|
||||
private static ObjectMapper init() {
|
||||
ObjectMapper objectMapper = new ObjectMapper();
|
||||
SimpleModule simpleModule = new SimpleModule();
|
||||
// simpleModule.addSerializer(Enum.class, new EnumSerializer());
|
||||
// simpleModule.addSerializer(Date.class, new DateSerializer());
|
||||
// simpleModule.addDeserializer(Enum.class, new EnumDeserializer());
|
||||
// simpleModule.addDeserializer(Date.class, new DateDeserializers.DateDeserializer());
|
||||
objectMapper.registerModule(simpleModule);
|
||||
objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
|
||||
return objectMapper;
|
||||
}
|
||||
|
||||
public static ObjectMapper getInstance() {
|
||||
if (objectMapper == null) {
|
||||
Class var0 = JsonUtl.class;
|
||||
synchronized(JsonUtl.class) {
|
||||
if (objectMapper == null) {
|
||||
objectMapper = init();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return objectMapper;
|
||||
}
|
||||
|
||||
public static ObjectMapper getInstanceLog() {
|
||||
if (objectMapperLog == null) {
|
||||
Class var0 = JsonUtl.class;
|
||||
synchronized(JsonUtl.class) {
|
||||
if (objectMapperLog == null) {
|
||||
objectMapperLog = init();
|
||||
objectMapperLog.setSerializationInclusion(Include.NON_NULL);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return objectMapperLog;
|
||||
}
|
||||
|
||||
public static ObjectMapper getObjectMapper() {
|
||||
return getInstance();
|
||||
}
|
||||
|
||||
public static String parse(Object object) throws RuntimeException {
|
||||
try {
|
||||
return getObjectMapper().writeValueAsString(object);
|
||||
} catch (JsonProcessingException var2) {
|
||||
throw new RuntimeException(var2);
|
||||
}
|
||||
}
|
||||
|
||||
public static String parseWithoutException(Object object) {
|
||||
try {
|
||||
return parse(object);
|
||||
} catch (Exception var2) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
public static String parseLog(Object object) {
|
||||
try {
|
||||
return getInstanceLog().writeValueAsString(object);
|
||||
} catch (Exception var2) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
public static <T> T format(String json, Class<T> clazz) throws RuntimeException {
|
||||
try {
|
||||
return getObjectMapper().readValue(json, clazz);
|
||||
} catch (IOException var3) {
|
||||
throw new RuntimeException(var3);
|
||||
}
|
||||
}
|
||||
|
||||
public static <T> List<T> formatList(String json, Class<T> clazz) throws RuntimeException {
|
||||
try {
|
||||
JavaType type = getObjectMapper().getTypeFactory().constructParametricType(List.class, new Class[]{clazz});
|
||||
return (List)getObjectMapper().readValue(json, type);
|
||||
} catch (IOException var3) {
|
||||
throw new RuntimeException(var3);
|
||||
}
|
||||
}
|
||||
|
||||
public static <T, U> Map<T, U> formatMap(String json, Class<T> clazzKey, Class<U> clazzValue) throws RuntimeException {
|
||||
try {
|
||||
JavaType type = getObjectMapper().getTypeFactory().constructParametricType(Map.class, new Class[]{clazzKey, clazzValue});
|
||||
return (Map)getObjectMapper().readValue(json, type);
|
||||
} catch (IOException var4) {
|
||||
throw new RuntimeException(var4);
|
||||
}
|
||||
}
|
||||
|
||||
public static <T> List<List<T>> formatListTwo(String json, Class<T> clazz) throws RuntimeException {
|
||||
try {
|
||||
TypeFactory typeFactory = getObjectMapper().getTypeFactory();
|
||||
JavaType type = typeFactory.constructParametrizedType(List.class, List.class, new Class[]{clazz});
|
||||
type = typeFactory.constructParametrizedType(List.class, List.class, new JavaType[]{type});
|
||||
return (List)getObjectMapper().readValue(json, type);
|
||||
} catch (IOException var4) {
|
||||
throw new RuntimeException(var4);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -48,6 +48,7 @@ import org.slf4j.MDC;
|
||||
import org.springframework.http.HttpStatus;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
@@ -308,14 +309,12 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
|
||||
if (StrUtil.isEmpty(material_code)) {
|
||||
throw new BadRequestException("物料编码不能为空！");
|
||||
}
|
||||
lnshMixingMillDeviceDriver.writing("to_order_No", producetask_code);
|
||||
lnshMixingMillDeviceDriver.writing("to_weight", qty);
|
||||
lnshMixingMillDeviceDriver.writing("to_material_code", material_code);
|
||||
lnshMixingMillDeviceDriver.writing("to_order_No", producetask_code);
|
||||
lnshMixingMillDeviceDriver.writing("to_weight", qty);
|
||||
lnshMixingMillDeviceDriver.writing("to_material_code", material_code);
|
||||
lnshMixingMillDeviceDriver.writing(1);
|
||||
lnshMixingMillDeviceDriver.writing(1);
|
||||
HashMap<String, Object> map = new HashMap<>();
|
||||
map.put("to_order_No", producetask_code);
|
||||
map.put("to_weight", qty);
|
||||
map.put("to_material_code", material_code);
|
||||
map.put("to_command", 1);
|
||||
lnshMixingMillDeviceDriver.writing(map);
|
||||
is_flag = true;
|
||||
}
|
||||
if (device.getDeviceDriver() instanceof LnshPressDeviceDriver) {
|
||||
@@ -329,24 +328,17 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
|
||||
if (StrUtil.isEmpty(material_code)) {
|
||||
throw new BadRequestException("物料编码不能为空！");
|
||||
}
|
||||
lnshPressDeviceDriver.writing("to_order_No", producetask_code);
|
||||
lnshPressDeviceDriver.writing("to_qty", qty);
|
||||
lnshPressDeviceDriver.writing("to_material_code", material_code);
|
||||
lnshPressDeviceDriver.writing("to_product_code", product_code);
|
||||
lnshPressDeviceDriver.writing("to_AlongSide", AlongSide);
|
||||
lnshPressDeviceDriver.writing("to_BshortSide", BshortSide);
|
||||
lnshPressDeviceDriver.writing("to_Htrapezoidal", Htrapezoidal);
|
||||
lnshPressDeviceDriver.writing("to_Wthickness", Wthickness);
|
||||
lnshPressDeviceDriver.writing("to_order_No", producetask_code);
|
||||
lnshPressDeviceDriver.writing("to_qty", qty);
|
||||
lnshPressDeviceDriver.writing("to_material_code", material_code);
|
||||
lnshPressDeviceDriver.writing("to_product_code", product_code);
|
||||
lnshPressDeviceDriver.writing("to_AlongSide", AlongSide);
|
||||
lnshPressDeviceDriver.writing("to_BshortSide", BshortSide);
|
||||
lnshPressDeviceDriver.writing("to_Htrapezoidal", Htrapezoidal);
|
||||
lnshPressDeviceDriver.writing("to_Wthickness", Wthickness);
|
||||
lnshPressDeviceDriver.writing(1);
|
||||
lnshPressDeviceDriver.writing(1);
|
||||
HashMap<String, Object> map = new HashMap<>();
|
||||
map.put("to_order_No", producetask_code);
|
||||
map.put("to_qty", qty);
|
||||
map.put("to_material_code", material_code);
|
||||
map.put("to_product_code", product_code);
|
||||
map.put("to_AlongSide", AlongSide);
|
||||
map.put("to_BshortSide", BshortSide);
|
||||
map.put("to_Htrapezoidal", Htrapezoidal);
|
||||
map.put("to_Wthickness", Wthickness);
|
||||
map.put("to_command", 1);
|
||||
lnshPressDeviceDriver.writing(map);
|
||||
is_flag = true;
|
||||
}
|
||||
if (device.getDeviceDriver() instanceof LnshPackagePalletManipulatorDeviceDriver) {
|
||||
@@ -360,26 +352,18 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
|
||||
if (StrUtil.isEmpty(material_code)) {
|
||||
throw new BadRequestException("物料编号不能为空！");
|
||||
}
|
||||
lnshPackagePalletManipulatorDeviceDriver.writing("to_order_No", producetask_code);
|
||||
lnshPackagePalletManipulatorDeviceDriver.writing("to_order_qty", qty);
|
||||
lnshPackagePalletManipulatorDeviceDriver.writing("to_material", material_code);
|
||||
lnshPackagePalletManipulatorDeviceDriver.writing("to_product_code", product_code);
|
||||
lnshPackagePalletManipulatorDeviceDriver.writing("to_AlongSide", AlongSide);
|
||||
lnshPackagePalletManipulatorDeviceDriver.writing("to_BshortSide", BshortSide);
|
||||
lnshPackagePalletManipulatorDeviceDriver.writing("to_Htrapezoidal", Htrapezoidal);
|
||||
lnshPackagePalletManipulatorDeviceDriver.writing("to_Wthickness", Wthickness);
|
||||
lnshPackagePalletManipulatorDeviceDriver.writing("to_vehicle_type", String.valueOf(json.getIntValue("vehicle_type") - 2));
|
||||
lnshPackagePalletManipulatorDeviceDriver.writing("to_order_No", producetask_code);
|
||||
lnshPackagePalletManipulatorDeviceDriver.writing("to_order_qty", qty);
|
||||
lnshPackagePalletManipulatorDeviceDriver.writing("to_material", material_code);
|
||||
lnshPackagePalletManipulatorDeviceDriver.writing("to_product_code", product_code);
|
||||
lnshPackagePalletManipulatorDeviceDriver.writing("to_AlongSide", AlongSide);
|
||||
lnshPackagePalletManipulatorDeviceDriver.writing("to_BshortSide", BshortSide);
|
||||
lnshPackagePalletManipulatorDeviceDriver.writing("to_Htrapezoidal", Htrapezoidal);
|
||||
lnshPackagePalletManipulatorDeviceDriver.writing("to_Wthickness", Wthickness);
|
||||
lnshPackagePalletManipulatorDeviceDriver.writing("to_vehicle_type", String.valueOf(json.getIntValue("vehicle_type") - 2));
|
||||
lnshPackagePalletManipulatorDeviceDriver.writing(1);
|
||||
lnshPackagePalletManipulatorDeviceDriver.writing(1);
|
||||
HashMap<String, Object> map = new HashMap<>();
|
||||
map.put("to_order_No", producetask_code);
|
||||
map.put("to_order_qty", qty);
|
||||
map.put("to_material", material_code);
|
||||
map.put("to_product_code", product_code);
|
||||
map.put("to_AlongSide", AlongSide);
|
||||
map.put("to_BshortSide", BshortSide);
|
||||
map.put("to_Htrapezoidal", Htrapezoidal);
|
||||
map.put("to_Wthickness", Wthickness);
|
||||
map.put("to_vehicle_type", String.valueOf(json.getIntValue("vehicle_type") - 2));
|
||||
map.put("to_command", 1);
|
||||
lnshPackagePalletManipulatorDeviceDriver.writing(map);
|
||||
is_flag = true;
|
||||
}
|
||||
if (device.getDeviceDriver() instanceof LnshSplitManipulatorDeviceDriver) {
|
||||
@@ -393,24 +377,17 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
|
||||
if (StrUtil.isEmpty(material_code)) {
|
||||
throw new BadRequestException("物料编号不能为空！");
|
||||
}
|
||||
lnshSplitManipulatorDeviceDriver.writing("to_order_No", producetask_code);
|
||||
lnshSplitManipulatorDeviceDriver.writing("to_material_qty", qty);
|
||||
lnshSplitManipulatorDeviceDriver.writing("to_material_code", material_code);
|
||||
lnshSplitManipulatorDeviceDriver.writing("to_product_code", product_code);
|
||||
lnshSplitManipulatorDeviceDriver.writing("to_AlongSide", AlongSide);
|
||||
lnshSplitManipulatorDeviceDriver.writing("to_BshortSide", BshortSide);
|
||||
lnshSplitManipulatorDeviceDriver.writing("to_Htrapezoidal", Htrapezoidal);
|
||||
lnshSplitManipulatorDeviceDriver.writing("to_Wthickness", Wthickness);
|
||||
lnshSplitManipulatorDeviceDriver.writing("to_order_No", producetask_code);
|
||||
lnshSplitManipulatorDeviceDriver.writing("to_material_qty", qty);
|
||||
lnshSplitManipulatorDeviceDriver.writing("to_material_code", material_code);
|
||||
lnshSplitManipulatorDeviceDriver.writing("to_product_code", product_code);
|
||||
lnshSplitManipulatorDeviceDriver.writing("to_AlongSide", AlongSide);
|
||||
lnshSplitManipulatorDeviceDriver.writing("to_BshortSide", BshortSide);
|
||||
lnshSplitManipulatorDeviceDriver.writing("to_Htrapezoidal", Htrapezoidal);
|
||||
lnshSplitManipulatorDeviceDriver.writing("to_Wthickness", Wthickness);
|
||||
lnshSplitManipulatorDeviceDriver.writing(1);
|
||||
lnshSplitManipulatorDeviceDriver.writing(1);
|
||||
HashMap<String, Object> map = new HashMap<>();
|
||||
map.put("to_order_No", producetask_code);
|
||||
map.put("to_material_qty", qty);
|
||||
map.put("to_material_code", material_code);
|
||||
map.put("to_product_code", product_code);
|
||||
map.put("to_AlongSide", AlongSide);
|
||||
map.put("to_BshortSide", BshortSide);
|
||||
map.put("to_Htrapezoidal", Htrapezoidal);
|
||||
map.put("to_Wthickness", Wthickness);
|
||||
map.put("to_command", 1);
|
||||
lnshSplitManipulatorDeviceDriver.writing(map);
|
||||
is_flag = true;
|
||||
}
|
||||
//下发成功后，写入工单信息表记录
|
||||
|
||||
Reference in New Issue
Block a user