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

opt:优化首页接口查询方式；

Browse Source 
add:增加搬运管理接口
This commit is contained in:
gongbaoxiong
2024-09-24 15:02:46 +08:00
parent 5631aaa361
commit 8faa7335a2
18 changed files with 237 additions and 713 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/OneNDCSocketConnectionAutoRun.java
View File

@@ -235,7 +235,7 @@ public class OneNDCSocketConnectionAutoRun extends AbstractAutoRunnable {
} else {
//上报异常信息
//（不需要WCS反馈）
if (phase == 0x70 || phase == 0x71 || phase == 0x72 || phase == 0x73 || phase == 0x74) {
if (phase == 0x67 ||phase == 0x70 || phase == 0x71 || phase == 0x72 || phase == 0x73 || phase == 0x74) {
device = deviceAppService.findDeviceByCode("AGV0" +agvaddr);
} else {
device = deviceAppService.findDeviceByCode("AGV0" + Integer.toString(arr[20]));
@@ -246,7 +246,6 @@ public class OneNDCSocketConnectionAutoRun extends AbstractAutoRunnable {
agvNdcOneDeviceDriver.processSocket(arr);
}
}
}
if (!ObjectUtil.isEmpty(data)) {
write(data);

26
acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java
View File

@@ -115,18 +115,18 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
String old_device_code = null;
String emptyNum = null;
String device_code = null;
// if (phase == 0x67) {
// //故障信息
// if (arr[18] * 256 + arr[19] == 0) {
//
// }
// FeedBackTaskStatusRequest request = new FeedBackTaskStatusRequest();
// request.setDevice_code(this.device_code);
// request.setType("3");
// request.setState("故障");
// acsToWmsService.notify(request);
// data = NDCAgvService.sendAgvOneModeInst(phase, index, 0, 0, 0, 0, 0);
// }
if (phase == 0x67) {
//故障信息
if (arr[18] * 256 + arr[19] == 0) {
}
FeedBackTaskStatusRequest request = new FeedBackTaskStatusRequest();
request.setDevice_code(this.device_code);
request.setType("3");
request.setState("AGV故障");
acsToWmsService.notify(request);
// data = NDCAgvService.sendAgvOneModeInst(phase, index, 0, 0, 0, 0, 0);
}
TaskDto task = new TaskDto();
if(ObjectUtil.isNotEmpty(inst)){
task = taskService.findById(inst.getTask_id());
@@ -210,7 +210,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
device = deviceAppService.findDeviceByCode(device_code);
if (device.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver) {
log.info("起点设备名称是{}",device_code);
// acsToWmsService.ghsmlqhfinish(task);
// acsToWmsService.ghsmlqhfinish(task);
}
if (ObjectUtil.isEmpty(device_code)) {
log.info(agvaddr + "对应设备号为空!");

2
acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/tianneng/baoshijian/BaoshijianSiteDeviceDriver.java
View File

@@ -198,7 +198,7 @@ public class BaoshijianSiteDeviceDriver extends AbstractOpcDeviceDriver implemen
jsonObject.put("device_code", device_code);
jsonObject.put("requestDate", new Date());
jsonObject.put("requestNo", IdUtil.simpleUUID());
jsonObject.put("request_method_code", "TBXMLTask");
jsonObject.put("request_method_code", "TB XMLTask");
String result=acsToWmsService.applyTaskToWms(jsonObject);
JSONObject res_jo = JSONObject.parseObject(result);
if (res_jo.getString("status").equals("200")){

2
acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/tianneng/baoshijian/ItemProtocol.java
View File

@@ -132,12 +132,14 @@ public class ItemProtocol {
//保湿间
public static List<ItemDto> getReadableItemDtos() {
ArrayList list = new ArrayList();
//0和1 1自动正常 0异常，其他状态 错误代码，动作模式没有,需要增加
list.add(new ItemDto(item_x0, "系统状态", "400001"));
list.add(new ItemDto(item_x1, "收片完成", "400002"));
list.add(new ItemDto(item_x2, "需上空架", "400003"));
list.add(new ItemDto(item_x3, "门开到位", "400004"));
list.add(new ItemDto(item_x4, "门关到位", "400005"));
list.add(new ItemDto(item_x10, "备用字", "400011"));
//list.add(new ItemDto(item_x10, "备用字", "400012"));
list.add(new ItemDto(item_x35, "架数", "400036"));
list.add(new ItemDto(item_x36, "备用字", "400037"));
list.add(new ItemDto(item_x37, "机号", "400038"));

4
acs/nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml
View File

@@ -7,10 +7,10 @@ spring:
db-type: com.alibaba.druid.pool.DruidDataSource
driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
# url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.81.252}:${DB_PORT:3306}/${DB_NAME:stand_acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:xftn_acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
username: ${DB_USER:root}
# password: ${DB_PWD:Root.123456}
password: ${DB_PWD:123456}
password: ${DB_PWD:123456789}
# 初始连接数
initial-size: 5
# 最小连接数