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

rev:优化根据木箱号查询方法

Browse Source
This commit is contained in:
tuqiang
2024-09-04 15:38:13 +08:00
parent 6afccdc7a6
commit c21cc00085
6 changed files with 106 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
acs/nladmin-system/src/main/java/org/nl/acs/auto/run/TwoNDCSocketConnectionAutoRun.java
View File

@@ -305,12 +305,22 @@ public class TwoNDCSocketConnectionAutoRun extends AbstractAutoRunnable {
System.out.println(e.getMessage());
} finally {
closeResources();
}
}
private void closeResources() {
try {
if (dis != null) dis.close();
if (dos != null) dos.close();
if (s != null && !s.isClosed()) s.close();
} catch (IOException e) {
log.error("关闭资源时发生错误: {}", e.getMessage(), e);
}
}
@Override
public void stop() {

114
acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java
View File

@@ -361,7 +361,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
jo.put("error", rgvDeviceDriver.getError());
}else if (device.getDeviceDriver() instanceof DeviceStatusDeviceDriver) {
} else if (device.getDeviceDriver() instanceof DeviceStatusDeviceDriver) {
deviceStatusDeviceDriver = (DeviceStatusDeviceDriver) device.getDeviceDriver();
jo.put("device_code", deviceStatusDeviceDriver.getDevice().getDevice_code());
jo.put("device_name", deviceStatusDeviceDriver.getDevice().getDevice_name());
@@ -417,41 +417,41 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
jo.put("y", driver.getY_position());
jo.put("error", driver.getError());
jo.put("error_msg", driver.getError() == 0 ? "" : ErrorUtil.getDictDetail("fqhj_error_type", String.valueOf(driver.getError())));
}else if (device.getDeviceDriver() instanceof PaperTubeConveyor2DeviceDriver) {
} else if (device.getDeviceDriver() instanceof PaperTubeConveyor2DeviceDriver) {
paperTubeConveyor2DeviceDriver = (PaperTubeConveyor2DeviceDriver) device.getDeviceDriver();
jo.put("device_code", parent_device_code);
jo.put("heartbeat",paperTubeConveyor2DeviceDriver.getHeartbeat());
jo.put("mode",paperTubeConveyor2DeviceDriver.getMode());
jo.put("move",paperTubeConveyor2DeviceDriver.getMove());
jo.put("carrier_direction",paperTubeConveyor2DeviceDriver.getCarrier_direction());
jo.put("error",paperTubeConveyor2DeviceDriver.getError());
jo.put("task",paperTubeConveyor2DeviceDriver.getTask());
jo.put("out_seq_arr",paperTubeConveyor2DeviceDriver.getItem_out_seq_arr());
jo.put("out_qty_arr",paperTubeConveyor2DeviceDriver.getItem_out_qty_arr());
jo.put("material1",paperTubeConveyor2DeviceDriver.getItem_material1());
jo.put("qty1",paperTubeConveyor2DeviceDriver.getItem_qty1());
jo.put("material2",paperTubeConveyor2DeviceDriver.getItem_material2());
jo.put("qty2",paperTubeConveyor2DeviceDriver.getItem_qty2());
jo.put("material3",paperTubeConveyor2DeviceDriver.getItem_material3());
jo.put("qty3",paperTubeConveyor2DeviceDriver.getItem_qty3());
jo.put("material4",paperTubeConveyor2DeviceDriver.getItem_material4());
jo.put("qty4",paperTubeConveyor2DeviceDriver.getItem_qty4());
jo.put("material5",paperTubeConveyor2DeviceDriver.getItem_material5());
jo.put("qty5",paperTubeConveyor2DeviceDriver.getItem_qty5());
jo.put("material6",paperTubeConveyor2DeviceDriver.getItem_material6());
jo.put("qty6",paperTubeConveyor2DeviceDriver.getItem_qty6());
jo.put("material7",paperTubeConveyor2DeviceDriver.getItem_material7());
jo.put("qty7",paperTubeConveyor2DeviceDriver.getItem_qty7());
jo.put("material8",paperTubeConveyor2DeviceDriver.getItem_material8());
jo.put("qty8",paperTubeConveyor2DeviceDriver.getItem_qty8());
jo.put("material9",paperTubeConveyor2DeviceDriver.getItem_material9());
jo.put("qty9",paperTubeConveyor2DeviceDriver.getItem_qty9());
jo.put("material10",paperTubeConveyor2DeviceDriver.getItem_material10());
jo.put("qty10",paperTubeConveyor2DeviceDriver.getItem_qty10());
jo.put("material11",paperTubeConveyor2DeviceDriver.getItem_material11());
jo.put("qty11",paperTubeConveyor2DeviceDriver.getItem_qty11());
jo.put("material12",paperTubeConveyor2DeviceDriver.getItem_material12());
jo.put("qty12",paperTubeConveyor2DeviceDriver.getItem_qty12());
jo.put("heartbeat", paperTubeConveyor2DeviceDriver.getHeartbeat());
jo.put("mode", paperTubeConveyor2DeviceDriver.getMode());
jo.put("move", paperTubeConveyor2DeviceDriver.getMove());
jo.put("carrier_direction", paperTubeConveyor2DeviceDriver.getCarrier_direction());
jo.put("error", paperTubeConveyor2DeviceDriver.getError());
jo.put("task", paperTubeConveyor2DeviceDriver.getTask());
jo.put("out_seq_arr", paperTubeConveyor2DeviceDriver.getItem_out_seq_arr());
jo.put("out_qty_arr", paperTubeConveyor2DeviceDriver.getItem_out_qty_arr());
jo.put("material1", paperTubeConveyor2DeviceDriver.getItem_material1());
jo.put("qty1", paperTubeConveyor2DeviceDriver.getItem_qty1());
jo.put("material2", paperTubeConveyor2DeviceDriver.getItem_material2());
jo.put("qty2", paperTubeConveyor2DeviceDriver.getItem_qty2());
jo.put("material3", paperTubeConveyor2DeviceDriver.getItem_material3());
jo.put("qty3", paperTubeConveyor2DeviceDriver.getItem_qty3());
jo.put("material4", paperTubeConveyor2DeviceDriver.getItem_material4());
jo.put("qty4", paperTubeConveyor2DeviceDriver.getItem_qty4());
jo.put("material5", paperTubeConveyor2DeviceDriver.getItem_material5());
jo.put("qty5", paperTubeConveyor2DeviceDriver.getItem_qty5());
jo.put("material6", paperTubeConveyor2DeviceDriver.getItem_material6());
jo.put("qty6", paperTubeConveyor2DeviceDriver.getItem_qty6());
jo.put("material7", paperTubeConveyor2DeviceDriver.getItem_material7());
jo.put("qty7", paperTubeConveyor2DeviceDriver.getItem_qty7());
jo.put("material8", paperTubeConveyor2DeviceDriver.getItem_material8());
jo.put("qty8", paperTubeConveyor2DeviceDriver.getItem_qty8());
jo.put("material9", paperTubeConveyor2DeviceDriver.getItem_material9());
jo.put("qty9", paperTubeConveyor2DeviceDriver.getItem_qty9());
jo.put("material10", paperTubeConveyor2DeviceDriver.getItem_material10());
jo.put("qty10", paperTubeConveyor2DeviceDriver.getItem_qty10());
jo.put("material11", paperTubeConveyor2DeviceDriver.getItem_material11());
jo.put("qty11", paperTubeConveyor2DeviceDriver.getItem_qty11());
jo.put("material12", paperTubeConveyor2DeviceDriver.getItem_material12());
jo.put("qty12", paperTubeConveyor2DeviceDriver.getItem_qty12());
} else if (device.getDeviceDriver() instanceof SiemensConveyorDeviceDriver) {
SiemensConveyorDeviceDriver driver = (SiemensConveyorDeviceDriver) device.getDeviceDriver();
@@ -495,7 +495,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
jo.put("y_position", driver.getY_position());
jo.put("inflatable_shaft_size", driver.getInflatable_shaft_size());
jo.put("error_msg", driver.getError() == 0 ? "" : ErrorUtil.getDictDetail("ssx_error_type", String.valueOf(driver.getError())));
}else if (device.getDeviceDriver() instanceof PluggingUnpluggingMachineDeviceDriver) {
} else if (device.getDeviceDriver() instanceof PluggingUnpluggingMachineDeviceDriver) {
PluggingUnpluggingMachineDeviceDriver driver = (PluggingUnpluggingMachineDeviceDriver) device.getDeviceDriver();
jo.put("device_code", driver.getDevice().getDevice_code());
jo.put("device_name", driver.getDevice().getDevice_name());
@@ -506,14 +506,28 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
// jo.put("task2", driver.getTask2());
jo.put("error", driver.getError());
jo.put("error_msg", driver.getError() == 0 ? "" : ErrorUtil.getDictDetail("ssx_error_type", String.valueOf(driver.getError())));
}else if (device.getDeviceDriver() instanceof SiemensWeightConveyorDeviceDriver) {
} else if (device.getDeviceDriver() instanceof SiemensWeightConveyorDeviceDriver) {
siemensWeightConveyorDeviceDriver = (SiemensWeightConveyorDeviceDriver) device.getDeviceDriver();
jo.put("device_code", siemensWeightConveyorDeviceDriver.getDevice().getDevice_code());
jo.put("device_name", siemensWeightConveyorDeviceDriver.getDevice().getDevice_name());
jo.put("mode", siemensWeightConveyorDeviceDriver.getMode());
jo.put("move", siemensWeightConveyorDeviceDriver.getMove());
jo.put("error", siemensWeightConveyorDeviceDriver.getError());
jo.put("weight", siemensWeightConveyorDeviceDriver.getWeight());
if (siemensWeightConveyorDeviceDriver.getWeight() == 0) {
Thread.sleep(1000);
if (siemensWeightConveyorDeviceDriver.getWeight() == 0 && siemensWeightConveyorDeviceDriver.getMode() == 0 && siemensWeightConveyorDeviceDriver.getMove() == 0) {
jo.put("message", "数据异常");
} else {
jo.put("device_code", siemensWeightConveyorDeviceDriver.getDevice().getDevice_code());
jo.put("device_name", siemensWeightConveyorDeviceDriver.getDevice().getDevice_name());
jo.put("mode", siemensWeightConveyorDeviceDriver.getMode());
jo.put("move", siemensWeightConveyorDeviceDriver.getMove());
jo.put("error", siemensWeightConveyorDeviceDriver.getError());
jo.put("weight", siemensWeightConveyorDeviceDriver.getWeight());
}
} else {
jo.put("device_code", siemensWeightConveyorDeviceDriver.getDevice().getDevice_code());
jo.put("device_name", siemensWeightConveyorDeviceDriver.getDevice().getDevice_name());
jo.put("mode", siemensWeightConveyorDeviceDriver.getMode());
jo.put("move", siemensWeightConveyorDeviceDriver.getMove());
jo.put("error", siemensWeightConveyorDeviceDriver.getError());
jo.put("weight", siemensWeightConveyorDeviceDriver.getWeight());
}
} else {
jo.put("device_code", parent_device_code);
}
@@ -984,8 +998,8 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
JSONObject json = new JSONObject();
json.put("task_code", task_code);
json.put("ext_task_id", ext_task_id);
json.put("message", "起始点:"+ task_dto.getStart_point_code() + ",终点:"+
task_dto.getNext_point_code()+",条码:" + task_dto.getVehicle_code() +
json.put("message", "起始点:" + task_dto.getStart_point_code() + ",终点:" +
task_dto.getNext_point_code() + ",条码:" + task_dto.getVehicle_code() +
"," + e.getMessage());
errArr.add(json);
continue;
@@ -1341,15 +1355,15 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
log.info("paperTubeAction--------------:输出参数" + resp.toString());
return resp;
}
try{
List list = new ArrayList();
try {
List list = new ArrayList();
Map map = new HashMap();
map.put("code", "to_material");
map.put("value", material_code);
list.add(map);
paperTubeConveyorDeviceDriver.writing(list);
} catch (Exception e){
} catch (Exception e) {
e.printStackTrace();
}
} else if (StrUtil.equals(type, "2")) {
@@ -1391,16 +1405,16 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
map3.put("code", "to_command");
map3.put("value", 2);
list.add(map3);
try{
try {
// paperTubeConveyorDeviceDriver.writing("to_out_qty", qty);
// paperTubeConveyorDeviceDriver.writing("to_target", device.getAddress());
// paperTubeConveyorDeviceDriver.writing("to_command", "2");
paperTubeConveyorDeviceDriver.writing(list);
} catch (Exception e){
} catch (Exception e) {
e.printStackTrace();
}
} else if(StrUtil.equals(type, "3")){
} else if (StrUtil.equals(type, "3")) {
List list = new ArrayList();
Map map = new HashMap();
map.put("code", "to_command");

5
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/ItemProtocol.java
View File

@@ -273,18 +273,19 @@ public class ItemProtocol {
setIsonline(true);
return value;
}
return value;
return 0;
}
public String getOpcStringValue(String protocol) {
String value = this.driver.getStringValue(protocol);
if (value == null) {
setIsonline(false);
return "";
// return "";
} else {
setIsonline(true);
return value;
}
return "";
}
public int[] getOpcIntegerArrayValue(String protocol) {

20
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java
View File

@@ -23,6 +23,7 @@ import org.nl.acs.device_driver.conveyor.standard_ordinary_site.StandardOrdinary
import org.nl.acs.device_driver.one_conveyor.fold_disc_site.FoldDiscSiteDeviceDriver;
import org.nl.acs.device_driver.one_manipulator.box_package_manipulator.BoxPackageManipulatorDeviceDriver;
import org.nl.acs.device_driver.conveyor.box_palletizing_manipulator.BoxPalletizingManipulatorDeviceDriver;
import org.nl.acs.device_driver.one_manipulator.trapped_manipulator.TrappedManipulatorManipulatorDeviceDriver;
import org.nl.acs.device_driver.paper_tube_device2.PaperTubeConveyor2DeviceDriver;
import org.nl.acs.device_driver.paper_tube_pick_site.PaperTubePickSiteDeviceDriver;
import org.nl.acs.device_driver.two_conveyor.blank_manipulator.BlankManipulatorDeviceDriver;
@@ -558,6 +559,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
BeltConveyorDeviceDriver beltConveyorDeviceDriver ;
WasteFoilWeighingStationDriver wasteFoilWeighingStationDriver;
FoldDiscSiteDeviceDriver foldDiscSiteDeviceDriver;
TrappedManipulatorManipulatorDeviceDriver trappedManipulatorManipulatorDeviceDriver;
if (device.getDeviceDriver() instanceof HongXiangStationDeviceDriver) {
hongXiangStationDeviceDriver = (HongXiangStationDeviceDriver) device.getDeviceDriver();
hongXiangStationDeviceDriver.writing(code, value);
@@ -569,6 +571,24 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
if (device.getDeviceDriver() instanceof BeltConveyorDeviceDriver) {
beltConveyorDeviceDriver=(BeltConveyorDeviceDriver) device.getDeviceDriver();
beltConveyorDeviceDriver.writing(code, value);
Device mxddhj1 = deviceAppService.findDeviceByCode("MXDDHJ1");
trappedManipulatorManipulatorDeviceDriver= (TrappedManipulatorManipulatorDeviceDriver) mxddhj1.getDeviceDriver();
if (StrUtil.equals(device_code,"CK2020")){
Map<String, Object> map1 = new HashMap<>();
List list = new ArrayList();
map1.put("code", "to_command");
map1.put("value", 2020);
list.add(map1);
trappedManipulatorManipulatorDeviceDriver.writing(list);
}
if (StrUtil.equals(device_code,"CK2022")){
Map<String, Object> map2 = new HashMap<>();
List list = new ArrayList();
map2.put("code", "to_command");
map2.put("value", 2022);
list.add(map2);
trappedManipulatorManipulatorDeviceDriver.writing(list);
}
}
if (device.getDeviceDriver() instanceof InflatableShaftLibraryDeviceDriver) {
inflatableShaftLibraryDeviceDriver = (InflatableShaftLibraryDeviceDriver) device.getDeviceDriver();

4
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java
View File

@@ -242,6 +242,7 @@ public class InstructionServiceImpl extends CommonServiceImpl<InstructionMapper,
public Map<String, Object> getAll(Map whereJson, Pageable page) {
String code = (String) whereJson.get("code");
String vehicle_code = (String) whereJson.get("vehicle_code");
String vehicle_code2 = (String) whereJson.get("vehicle_code2");
String material_type = (String) whereJson.get("material_type");
String status = (String) whereJson.get("status");
String point_code = (String) whereJson.get("point_code");
@@ -258,6 +259,9 @@ public class InstructionServiceImpl extends CommonServiceImpl<InstructionMapper,
if (!StrUtil.isEmpty(vehicle_code)) {
wrapper.like(InstructionMybatis::getVehicle_code, vehicle_code);
}
if (!StrUtil.isEmpty(vehicle_code2)) {
wrapper.like(InstructionMybatis::getVehicle_code2, vehicle_code2);
}
if (!StrUtil.isEmpty(material_type)) {
wrapper.eq(InstructionMybatis::getMaterial, material_type);
}

4
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java
View File

@@ -355,6 +355,7 @@ public class TaskServiceImpl extends CommonServiceImpl<TaskMapper, Task> impleme
public Map<String, Object> getAll(Map whereJson, Pageable page) {
String task_code = (String) whereJson.get("task_code");
String vehicle_code = (String) whereJson.get("vehicle_code");
String vehicle_code2 = (String) whereJson.get("vehicle_code2");
String material_type = (String) whereJson.get("material_type");
String status = (String) whereJson.get("status");
String taskType = (String) whereJson.get("task_type");
@@ -373,6 +374,9 @@ public class TaskServiceImpl extends CommonServiceImpl<TaskMapper, Task> impleme
if (!StrUtil.isEmpty(vehicle_code)) {
wrapper.like(Task::getVehicle_code, vehicle_code);
}
if (!StrUtil.isEmpty(vehicle_code2)) {
wrapper.like(Task::getVehicle_code2, vehicle_code2);
}
if (!StrUtil.isEmpty(material_type)) {
wrapper.eq(Task::getMaterial, material_type);
}