From 37aa0bc72714c9ec98b50bd3fa9504cd92e67114 Mon Sep 17 00:00:00 2001
From: zhouz <>
Date: Fri, 30 May 2025 15:31:43 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BC=98=E5=8C=96B1=E5=88=86?=
 =?UTF-8?q?=E5=88=87=E4=B8=8A=E6=96=99=EF=BC=8C=E6=8F=90=E9=86=92=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E5=8F=AF=E7=94=A8=E7=9A=84=E5=86=B7=E5=8D=B4=E5=8C=BA?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pda/mps/service/impl/FeedingServiceImpl.java | 16 ++++++++++++++++
 .../src/views/wms/agvrush/charge/index.vue       | 12 ++++++------
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/FeedingServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/FeedingServiceImpl.java
index 26e118d65..5be27bdd2 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/FeedingServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/FeedingServiceImpl.java
@@ -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"));
diff --git a/lms/nladmin-ui/src/views/wms/agvrush/charge/index.vue b/lms/nladmin-ui/src/views/wms/agvrush/charge/index.vue
index bb2d0ffd6..5b8f17409 100644
--- a/lms/nladmin-ui/src/views/wms/agvrush/charge/index.vue
+++ b/lms/nladmin-ui/src/views/wms/agvrush/charge/index.vue
@@ -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>