库位视图显示-优化

(cherry picked from commit a74e483b9b7cf8ddc10319ef6d3104b553de6741)

ruoyi-ui/src/permission.js

@@ -7,7 +7,7 @@ import { getToken } from '@/utils/auth'
 
 NProgress.configure({ showSpinner: false })
 
-const whiteList = ['/login', '/locationView','/auth-redirect', '/bind', '/register']
+const whiteList = ['/login', '/inv/locationView','/auth-redirect', '/bind', '/register']
 
 router.beforeEach((to, from, next) => {
   NProgress.start()

ruoyi-ui/src/router/index.js

@@ -47,8 +47,8 @@ export const constantRoutes = [
     hidden: true
   },
   {
-    path: '/locationView',
-    component: () => import('@/views/ams/inv/locationView/index'),
+    path: '/inv/locationView',
+    component: () => import('@/views/ams/inv/locationView'),
     hidden: true
   },
   {

ruoyi-ui/src/views/ams/inv/locationView/index.vue

@@ -14,9 +14,9 @@
 <!--          <div class="divLeft">-->
 <!--            库存<icon-svg name="steel" class="site-sidebar__menu-icon"></icon-svg>-->
 <!--          </div>-->
-<!--          <div class="divLeft">-->
-<!--            空托盘<icon-svg name="pallet" class="site-sidebar__menu-icon"></icon-svg>-->
-<!--          </div>-->
+          <div class="divLeft">
+            空托盘<svg-icon class-name="pallet-icon" icon-class="pallet" @click.stop="click" />
+          </div>
         </div>
       </el-header>
       <el-main>
@@ -26,7 +26,7 @@
           </div>
           <div class="divBoxCol" v-for="col in zone.basLocationGuiColDTOS">
             <div v-for="o in col.baseLocationGuiDTOList" v-bind:key="o.id" class="text item divBox" @click="changeLocation(o)">
-              <div class="divMinBox">
+              <div class="divMinBox" v-show="o.locationNo!=null">
                 {{o.locationNo}}<!--(<font class="pointcss">{{o.agvStation}}</font>)-->
               </div>
               <div>
@@ -34,14 +34,15 @@
                 </div>
                 <div v-show="o.isEmpty=='N'" :class="{'locDiv': true,'colorRed': o.isEmptyPlate != 'Y', 'colorYellow': o.stockStatus!='00'}">
                   <div class="divMinFontBox" v-show="o.isEmpty=='N' && o.isEmptyPlate != 'Y' ">
-                    <div style="color: #FFFFFF">{{o.lotatt01}}&nbsp;&nbsp; </div>
-                    <div v-show="o.lotatt01!=null" style="color: #FFFFFF">{{o.lotatt01}}</div>
-                    <div v-show="o.lotatt05!=null" style="color: #FFFFFF">{{o.lotatt05}}</div>
-                    <div v-show="o.lotatt08!=null" style="color: #FFFFFF">{{o.lotatt08}}</div>
+<!--                    <div style="color: #FFFFFF;font-size:10px;">{{o.lotatt01}}&nbsp;&nbsp; </div>-->
+                    <div v-show="o.skuName!=null" style="color: #FFFFFF;font-size:10px;">{{o.skuName}}</div>
+<!--                    <div v-show="o.lotatt01!=null" style="color: #FFFFFF">{{o.lotatt01}}</div>-->
+<!--                    <div v-show="o.lotatt05!=null" style="color: #FFFFFF">{{o.lotatt05}}</div>-->
+<!--                    <div v-show="o.lotatt08!=null" style="color: #FFFFFF">{{o.lotatt08}}</div>-->
                   </div>
                   <div class="divMinFontBoxEmptyPlate" v-show="o.isEmptyPlate == 'Y'">
-<!--                    <icon-svg  name="pallet" class="site-sidebar__menu-icon" style="width: 60px;height: 35px">{{o.id}}</icon-svg>-->
-<!--                    <div style="color: #191970">{{o.skuName}}&nbsp;&nbsp;</div>-->
+                    <svg-icon class-name="pallet-icon" icon-class="pallet" @click.stop="click" style="width: 60px;height: 35px;">{{o.id}}</svg-icon>
+                    <div style="color: #191970;font-size:12px;">{{o.skuName}}&nbsp;&nbsp;</div>
                   </div>
                 </div>
               </div>
@@ -87,6 +88,9 @@ import { locationInvView } from "@/api/ams/locationView";
           this.locationZoneList = response.data
         })
         this.dataListLoading = false
+      },
+      changeLocation(o){
+        // alert(o.locationNo);
       }
     }
   }
@@ -99,7 +103,7 @@ import { locationInvView } from "@/api/ams/locationView";
 }
 
 .divBoxCol {
-  width: 170px;
+  width: 150px;
   display: block;
   float: left;
 }
@@ -115,7 +119,7 @@ import { locationInvView } from "@/api/ams/locationView";
 .divMinBox {
   margin-top: 0px;
   height: 15px;
-  width: 115%;
+  width: 100%;
   text-align: center;
   font-weight: bold;
 }
@@ -131,7 +135,7 @@ import { locationInvView } from "@/api/ams/locationView";
 .locDiv {
   float: left;
   display: inline-block;
-  width: 150px;
+  width: 130px;
   height: 70px;
   margin-top: 1px;
   text-align: center;

warewms-base/src/main/resources/mapper/base/BaseLocationInfoMapper.xml

@@ -581,7 +581,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <!-- 库位视图-->
     <select id="queryByListAllInvLotAttView" resultType="com.ruoyi.base.domain.dto.BaseLocationGuiDTO" parameterType="Object">
-        select t1.zone_id zoneId,t1.id,t1.location_no locationNo
+        select t1.zone_id zoneId,t1.id,t1.location_no locationNo,t1.agv_station agvStation
              ,CONCAT(t1.row_no,t1.shift_no) rowNoShiftNo,t1.shift_no shiftNo,t1.shift_index shiftIndex,t1.col_no colNo,t1.col_index colIndex
              ,t1.stock_status stockStatus,t1.is_empty isEmpty
              ,t4.lotatt01,t4.lotatt02,t4.lotatt03,t4.lotatt04,t4.lotatt05,t4.lotatt06
@@ -591,7 +591,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM
             base_location_info t1
                 LEFT JOIN base_location_zone t2 on t2.zone_id = t1.zone_id
-                LEFT JOIN inv_lot_loc_id t3 on t3.location_id = t1.id
+                LEFT JOIN (SELECT * from inv_lot_loc_id GROUP BY location_id) t3 on t3.location_id = t1.id
                 LEFT JOIN inv_lot_att t4 on t4.lotnum = t3.lotnum
                 LEFT JOIN base_sku t5 on t5.customer_id=t3.customer_id and t5.sku = t3.sku
         where t1.zone_id = #{zoneId} and t1.id not in (99997, 99998, 99999)