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

木箱堆叠代码更新

Browse Source
This commit is contained in:
liuxy
2023-04-23 17:24:28 +08:00
parent 821741ba84
commit b3d34ed529
6 changed files with 84 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/FaultDeviceServiceImpl.java
View File

@@ -67,14 +67,21 @@ public class FaultDeviceServiceImpl implements FaultDeviceService {
JSONObject param = new JSONObject();
if (ObjectUtil.isNotEmpty(device_code)) {
param.put("device_code",device_code);
} else {
// 不为空则只需要查询专机设备
JSONObject jsonStr = WQL.getWO("QMD_BI_FAULT").addParam("flag", "3").process().uniqueResult(0);
String str = jsonStr.getString("str");
param.put("device_code",str);
}
// 调用acs接口获取设备
JSONObject result = SpringContextHolder.getBean(WmsToAcsServiceImpl.class).realTimefaultInfo(param);
JSONArray data = result.getJSONArray("data");
JSONObject test1 = new JSONObject();
// 根据入参处理对应数据
ArrayList<Object> objects = new ArrayList<>();
JSONArray objects = new JSONArray();
for (int i = 0; i < data.size(); i++) {
JSONObject json = data.getJSONObject(i);
@@ -89,6 +96,35 @@ public class FaultDeviceServiceImpl implements FaultDeviceService {
if (ObjectUtil.isEmpty(jsonDevice)) continue;
// 单独处理agv报警
if (StrUtil.equals(json.getString("fault_type"), "agv_error_type")) {
String[] fault_codes = json.getString("fault_code").split(",");
if (fault_codes.length > 1) {
// 根据每个报警码找找对应解决信息
StringBuilder stringBuilder = new StringBuilder();
for (int j = 0; j < fault_codes.length; j++) {
JSONObject jsonFault = faultTab.query("fault_type = '" + json.getString("fault_type") + "' and fault_code = '" + fault_codes[j] + "'").uniqueResult(0);
stringBuilder.append(jsonFault.getString("solve_mode"));
if (fault_codes.length-1 > j) {
stringBuilder.append(",");
}
}
jsonDevice.put("fault_code", "1");
jsonDevice.put("fault_info", json.getString("fault_info"));
jsonDevice.put("fault_type", json.getString("fault_type"));
jsonDevice.put("solve_mode", stringBuilder);
}
}
// 获取报警码
JSONObject jsonFault = faultTab.query("fault_type = '" + json.getString("fault_type") + "' and fault_code = '" + json.getString("fault_code") + "'").uniqueResult(0);
@@ -121,11 +157,13 @@ public class FaultDeviceServiceImpl implements FaultDeviceService {
}
// 组织分页查询并返回
Map<String, Object> json = PageUtil.toPage(
PageUtil.toPage(page.getPageNumber(), page.getPageSize(), objects),
objects.size()
);
// Map<String, Object> json = PageUtil.toPage(
// PageUtil.toPage(page.getPageNumber(), page.getPageSize(), objects),
// objects.size()
// );
JSONObject json = new JSONObject();
json.put("content", objects);
return json;
}

13
lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_BI_FAULT.wql
View File

@@ -88,5 +88,18 @@
ENDQUERY
ENDIF
IF 输入.flag = "3"
QUERY
SELECT
GROUP_CONCAT(device_code) AS str
FROM
EM_BI_MonitorDevice
WHERE
is_crux = '1'
ENDSELECT
ENDQUERY
ENDIF

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

@@ -474,7 +474,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
JSONObject point_jo = rowArr.getJSONObject(i);
JSONArray pointArr = WQLObject.getWQLObject("sch_base_point").query("row_num = '" + point_jo.getString("row_num") + "' AND point_type ='9' AND is_delete = '0' and lock_type = '1' and IFNULL(vehicle_code,'') = '' order by out_order_seq ASC").getResultJSONArray(0);
if (pointArr.size() == 8) {
// TODO pointArr.size() == 8
if (pointArr.size() == 4) {
JSONObject jsonNewRow = WQLObject.getWQLObject("sch_base_point").query("row_num = '" + point_jo.getString("row_num") + "' AND point_type ='9' AND is_delete = '0' and lock_type = '1' order by out_order_seq,layer_num").uniqueResult(0);
point_code = jsonNewRow.getString("point_code");
break;
@@ -514,7 +515,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
JSONObject point_jo = rowArr.getJSONObject(i);
JSONArray pointArr = WQLObject.getWQLObject("sch_base_point").query("row_num = '" + point_jo.getString("row_num") + "' AND point_type ='9' AND is_delete = '0' and lock_type = '1' and IFNULL(vehicle_code,'') = '' order by out_order_seq ASC").getResultJSONArray(0);
if (pointArr.size() == 8) {
// TODO pointArr.size() == 8
if (pointArr.size() == 4) {
JSONObject jsonNewRow = WQLObject.getWQLObject("sch_base_point").query("row_num = '" + point_jo.getString("row_num") + "' AND point_type ='9' AND is_delete = '0' and lock_type = '1' order by out_order_seq,layer_num").uniqueResult(0);
point_code = jsonNewRow.getString("point_code");
break;
@@ -598,8 +600,12 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
throw new BadRequestException("客户不存在请检查!");
}
JSONObject data = new JSONObject();
data.put("is_auto_table",jsonCust.getString("is_auto_table"));
// 判断是否贴标
if (!StrUtil.equals(jsonCust.getString("is_auto_table"), "1")) {
result.put("data", data);
return result;
}
@@ -644,7 +650,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
if (Integer.valueOf(label_num_down) >= Integer.valueOf(now_num)) {
result.put("message", "标签纸数量过低，请更换!");
}
result.put("data", data);
} else if (type.equals("2")) {
//捆扎申请
@@ -676,7 +682,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
}
// 判断是否需要捆扎
String is_lash = whereJson.getString("is_lash"); // TODO 此字段未跟acs确认，需要确认
String is_lash = whereJson.getString("is_bind");
if (StrUtil.equals(is_lash, "1")) {
// 获取系统参数:捆扎米数

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

@@ -61,13 +61,16 @@ public class SendOutTask extends AbstractAcsTask {
.task_code(json.getString("task_code"))
.task_type(json.getString("acs_task_type"))
.start_device_code(json.getString("point_code1"))
.next_device_code(jsonPoint.getString("device_code"))
// TODO .next_device_code(jsonPoint.getString("device_code"))
.next_device_code(json.getString("point_code2"))
.agv_system_type("1")
.vehicle_code(json.getString("vehicle_code"))
.priority(json.getString("priority"))
.remark(json.getString("remark"))
.start_height(start_high)
.next_height(next_high)
// TODO 暂时不上线
// .start_height(start_high)
// .next_height(next_high)
.build();
resultList.add(dto);
System.out.println(resultList.toString());