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

fix：优化B1分切上料，提醒没有可用的冷却区提示逻辑

Browse Source
This commit is contained in:
zhouz
2025-05-30 15:31:43 +08:00
parent 1756706642
commit 37aa0bc727
2 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/FeedingServiceImpl.java
View File

@@ -427,6 +427,22 @@ public class FeedingServiceImpl implements FeedingService {
task_jo.put("point_code2", pointArr.getString("point_code"));
// 2.找冷却区空货位
JSONObject cool_map = new JSONObject();
cool_map.put("flag", "2");
cool_map.put("product_area", cool_jo.getString("product_area"));
cool_map.put("point_location", "0");
JSONObject jsonCooIvt = WQL.getWO("PDA_OVENINANDOUT_01").addParamMap(cool_map).process().uniqueResult(0);
// 如果为空
if (ObjectUtil.isEmpty(jsonCooIvt)) {
cool_map.put("point_location", "1");
jsonCooIvt = WQL.getWO("PDA_OVENINANDOUT_01").addParamMap(cool_map).process().uniqueResult(0);
}
if (ObjectUtil.isEmpty(jsonCooIvt)) {
throw new BadRequestException("冷却区空位不足");
}
//将分切机的点位作为目的点，桁架任务完成时，自动创建AGV任务
task_jo.put("point_code3", next_point_code);
task_jo.put("material_code", cool_jo.getString("container_name"));

12
lms/nladmin-ui/src/views/wms/agvrush/charge/index.vue
View File

@@ -33,7 +33,7 @@
<!-- <div v-if="agvObj.car_no === '' || agvObj.car_no == null" class="grid-content bg-purple" style="height: 250px;background-color: white;border-bottom:3px solid rgb(240, 242, 245)">-->
<!-- 请添加更多AGV设备-->
<!-- </div>-->
<div v-if="agvObj.car_no !== '' && agvObj.car_no != null" class="grid-content bg-purple" style="height: 400px;background-color: white;border-bottom:0px solid rgb(240, 242, 245)">
<div v-if="agvObj.car_no !== '' && agvObj.car_no != null" class="grid-content bg-purple" style="height: 500px;background-color: white;border-bottom:0px solid rgb(240, 242, 245)">
<el-row>
<el-col :span="8">
<img
@@ -55,9 +55,9 @@
电量：
</el-col>
<el-col :span="16">
<el-progress v-if="agvObj.electricity<=30" :text-inside="true" :stroke-width="25" :percentage="agvObj.electricity" status="exception" style="margin-top: 7px; margin-right: 5px;"/>
<el-progress v-if="agvObj.electricity>30 && agvObj.electricity<100" :text-inside="true" :stroke-width="25" :percentage="agvObj.electricity" status="warning" style="margin-top: 7px; margin-right: 5px;"/>
<el-progress v-if="agvObj.electricity == 100" :text-inside="true" :stroke-width="25" :percentage="agvObj.electricity" status="success" style="margin-top: 7px; margin-right: 5px;"/>
<el-progress v-if="agvObj.electricity<=30" :text-inside="true" :stroke-width="25" :percentage="agvObj.electricity" status="exception" style="margin-top: 7px; margin-right: 5px;" />
<el-progress v-if="agvObj.electricity>30 && agvObj.electricity<100" :text-inside="true" :stroke-width="25" :percentage="agvObj.electricity" status="warning" style="margin-top: 7px; margin-right: 5px;" />
<el-progress v-if="agvObj.electricity == 100" :text-inside="true" :stroke-width="25" :percentage="agvObj.electricity" status="success" style="margin-top: 7px; margin-right: 5px;" />
</el-col>
</div>
</el-row>
@@ -83,10 +83,10 @@
</el-row>
<el-row>
<div class="grid-content bg-purple" style="height: 50px;">
<el-col :span="8" style="line-height: 40px; text-align: center">
<el-col :span="8" style="line-height: 50px; text-align: center">
报警：
</el-col>
<el-col :span="16" style="line-height: 40px; text-align: center">
<el-col :span="16" style="line-height: 50px; text-align: center">
{{ agvObj.fault }}
</el-col>
</div>