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

fix:分切上料排队

Browse Source
This commit is contained in:
zhouz
2025-08-26 16:46:28 +08:00
parent 867d6ddf4c
commit 81deba8512
3 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -371,8 +371,8 @@ public class FaultDeviceServiceImpl implements FaultDeviceService {
JSONObject b1 = b1_data.getJSONObject(j); JSONObject b1 = b1_data.getJSONObject(j);
if (b1.getString("device_code").equals(row.getString("device_code"))) { if (b1.getString("device_code").equals(row.getString("device_code"))) {
b1.put("region_code", row.getString("region_code")); b1.put("region_code", row.getString("region_code"));
data.add(b1);
} }
data.add(b1);
} }
} }
} }
@@ -383,17 +383,16 @@ public class FaultDeviceServiceImpl implements FaultDeviceService {
JSONObject blk = blk_data.getJSONObject(j); JSONObject blk = blk_data.getJSONObject(j);
if (blk.getString("device_code").equals(row.getString("device_code"))) { if (blk.getString("device_code").equals(row.getString("device_code"))) {
blk.put("region_code", row.getString("region_code")); blk.put("region_code", row.getString("region_code"));
data.add(blk);
} }
data.add(blk);
} }
} }
} }
//查询内包间套轴对接位的异常 //查询内包间套轴对接位的异常
if (inArea.contains("NBJ") && (StrUtil.isEmpty(region_code) || region_code.equals("NBJ")) ) { if (inArea.contains("CBJ") && (StrUtil.isEmpty(region_code) || region_code.equals("CBJ")) ) {
IBstIvtCutpointivtService bean2 = SpringContextHolder.getBean(IBstIvtCutpointivtService.class); IBstIvtCutpointivtService bean2 = SpringContextHolder.getBean(IBstIvtCutpointivtService.class);
List<BstIvtCutpointivt> list = bean2.list(new LambdaQueryWrapper<BstIvtCutpointivt>() List<BstIvtCutpointivt> list = bean2.list(new LambdaQueryWrapper<BstIvtCutpointivt>()
.eq(BstIvtCutpointivt::getPoint_type, "1") .eq(BstIvtCutpointivt::getPoint_type, "1")
.eq(BstIvtCutpointivt::getIs_used, "1")
.ne(BstIvtCutpointivt::getRemark, "") .ne(BstIvtCutpointivt::getRemark, "")
.isNotNull(BstIvtCutpointivt::getRemark) .isNotNull(BstIvtCutpointivt::getRemark)
.eq(BstIvtCutpointivt::getPoint_status, "2")); .eq(BstIvtCutpointivt::getPoint_status, "2"));
@@ -401,7 +400,7 @@ public class FaultDeviceServiceImpl implements FaultDeviceService {
JSONObject row = new JSONObject(); JSONObject row = new JSONObject();
row.put("device_code", a.getPoint_code()); row.put("device_code", a.getPoint_code());
row.put("device_name", a.getPoint_code()); row.put("device_name", a.getPoint_code());
row.put("region_code", "NBJ"); row.put("region_code", "CBJ");
row.put("error_code", ""); row.put("error_code", "");
row.put("error_message", a.getRemark()); row.put("error_message", a.getRemark());
data.add(row); data.add(row);

4
lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_OVENINANDOUT_01.wql
View File

@@ -403,7 +403,9 @@
is_used = '1' is_used = '1'
AND IFNULL(po.material_code,'') = '' AND IFNULL(po.material_code,'') = ''
AND po.region_id = 输入.reging_id AND po.region_id = 输入.reging_id
AND po.point_location = 输入.point_location OPTION 输入.point_location <> ""
po.point_location = 输入.point_location
ENDOPTION
AND po.point_type = 输入.point_type AND po.point_type = 输入.point_type
AND NOT EXISTS ( AND NOT EXISTS (
SELECT SELECT

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

@@ -244,6 +244,7 @@ public class OutHotTask extends AbstractAcsTask {
String point_code1 = form.getString("point_code1"); String point_code1 = form.getString("point_code1");
String point_code2 = form.getString("point_code2"); String point_code2 = form.getString("point_code2");
String point_code3 = form.getString("point_code3"); String point_code3 = form.getString("point_code3");
String task_status = form.getString("task_status");
if (cutConveyorTask.isSingleTask(point_code1)) { if (cutConveyorTask.isSingleTask(point_code1)) {
throw new BadRequestException("点位：" + point_code1 + "存在未完成的任务！"); throw new BadRequestException("点位：" + point_code1 + "存在未完成的任务！");
} }
@@ -265,7 +266,11 @@ public class OutHotTask extends AbstractAcsTask {
} else { } else {
json.put("task_type", "010202"); json.put("task_type", "010202");
} }
json.put("task_status", TaskStatusEnum.START_AND_POINT.getCode()); if (StrUtil.isNotEmpty(task_status)) {
json.put("task_status", task_status);
}else {
json.put("task_status", TaskStatusEnum.START_AND_POINT.getCode());
}
json.put("point_code1", form.getString("point_code1")); json.put("point_code1", form.getString("point_code1"));
json.put("point_code2", form.getString("point_code2")); json.put("point_code2", form.getString("point_code2"));
json.put("point_code3", form.getString("point_code3")); json.put("point_code3", form.getString("point_code3"));