库位视图 --end

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warewms/ams/LocationViewController.java

@@ -5,11 +5,17 @@ import com.ruoyi.ams.locationView.domain.form.LocationViewForm;
 import com.ruoyi.ams.locationView.domain.vo.LocationViewVO;
 import com.ruoyi.ams.locationView.service.LocationViewService;
 import com.ruoyi.base.domain.BaseLocationInfo;
+import com.ruoyi.base.domain.dto.BasLocationGuiExtDTO;
 import com.ruoyi.base.service.IBaseLocationInfoService;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
 
 /**
  * Created by IntelliJ IDEA.
@@ -33,6 +39,12 @@ public class LocationViewController extends BaseController {
         return AjaxResult.success(locationViewVO);
     }
 
+    @GetMapping(value = "/invView")
+    public AjaxResult getInvView(LocationViewForm locationViewForm) {
+        List<BasLocationGuiExtDTO> basLocationGuiDTOS = locationViewService.queryLocationGuiExt(locationViewForm);
+        return AjaxResult.success(basLocationGuiDTOS);
+    }
+
     @GetMapping(value = "/lockLoc/{id}")
     public AjaxResult lockLoc(@PathVariable("id") Long id) {
         BaseLocationInfo baseLocationInfo = baseLocationInfoService.selectBaseLocationInfoById(id);
@@ -65,4 +77,4 @@ public class LocationViewController extends BaseController {
             return AjaxResult.error("查询不到对应的库位");
         }
     }
-}
+}

ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java

@@ -111,9 +111,12 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                 .antMatchers("/swagger-resources/**").anonymous()
                 .antMatchers("/webjars/**").anonymous()
                 .antMatchers("/*/api-docs").anonymous()
-//                .antMatchers("/api/**").anonymous()
                 .antMatchers("/druid/**").anonymous()
-                .antMatchers("/hualan/**").permitAll()
+                .antMatchers("/wcs/**").anonymous()
+                .antMatchers("/api/wcstask/**").permitAll()
+                .antMatchers("/test/**").permitAll()
+                // 库位视图
+                .antMatchers("/ams/locationView/**").permitAll()
                 // 除上面外的所有请求全部需要鉴权认证
                 .anyRequest().authenticated()
                 .and()

ruoyi-ui/src/api/ams/locationView.js

@@ -8,6 +8,14 @@ export function locationView(query) {
   })
 }
 
+export function locationInvView(query) {
+  return request({
+    url: '/ams/locationView/invView',
+    method: 'get',
+    params: query
+  })
+}
+
 export function lockLocRequest(id) {
   return request({
     url: '/ams/locationView/lockLoc/'+id,

ruoyi-ui/src/permission.js

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

ruoyi-ui/src/router/index.js

@@ -46,6 +46,11 @@ export const constantRoutes = [
     component: () => import('@/views/login'),
     hidden: true
   },
+  {
+    path: '/locationView',
+    component: () => import('@/views/ams/inv/locationView/index'),
+    hidden: true
+  },
   {
     path: '/register',
     component: () => import('@/views/register'),

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

@@ -1,272 +1,173 @@
 <template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="仓库" prop="warehouseId">
-        <el-select v-model="queryParams.warehouseId" placeholder="请选择所属仓库" clearable size="small" style="width: 100%">
-          <el-option
-            v-for="dict in this.warehouseCombo"
-            :key="dict.warehouseId"
-            :label="dict.warehouseName"
-            :value="dict.warehouseId"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="区域" prop="zoneId">
-        <el-select v-model="queryParams.zoneId" placeholder="请选择库区" clearable size="small" style="width: 100%">
-          <el-option
-            v-for="dict in this.locationZoneCombo"
-            :key="dict.zoneId"
-            :label="dict.zoneName"
-            :value="dict.zoneId"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-    <el-row>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="search"></right-toolbar>
-    </el-row>
-    <div style="overflow-scrolling: auto">
-      <ul class="wall-row"
-          :style="{'width':(this.tableAttr.cols * 145)+'px', 'height':(this.tableAttr.rows * 95) + 'px'}">
-        <li
-          v-for="(item, index) in divList"
-          :key="index"
-          @click="selected(item)">
-          <div v-if="!item.locationNo" style="background-color: #fff;"><!--空格没有的库位--></div>
-          <div class="div" v-else-if="item.stockStatus === '10'" style="background-color: yellow">
-            <div style="text-align: center;font-weight: bold;">{{item.locationNo}}</div>
-            <div v-for="(lot, index) in item.lotattVOList" style="font-size: 8px;">
-              <div v-if="lot.sku">物料:{{lot.sku}}</div>
-              <div v-if="lot.sku">数量:{{lot.qty}}</div>
-            </div>
+    <el-container>
+      <el-header style="height: 40px">
+        <div>
+          <div class="divLeft colorYellow">
+            任务中
+          </div>
+          <div class="divLeft colorGreen">
+            空
+          </div>
+          <div class="divLeft colorRed">
+            占用
+          </div>
+<!--          <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>
+      </el-header>
+      <el-main>
+        <el-card v-for="zone in locationZoneList" v-bind:key="zone.zoneName" class="box-card">
+          <div slot="header" class="clearfix">
+            <span style="font-weight: bold">{{zone.zoneName}}</span>
           </div>
-          <div class="div" v-else style="background-color: #ebf0f4">
-            <div style="text-align: center;font-weight: bold;">{{item.locationNo}}</div>
-            <div v-for="(lot, index) in item.lotattVOList" style="font-size: 8px;">
-              <div v-if="lot.sku">物料:{{lot.sku}}</div>
-              <div v-if="lot.sku">数量:{{lot.qty}}</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">
+                {{o.locationNo}}<!--(<font class="pointcss">{{o.agvStation}}</font>)-->
+              </div>
+              <div>
+                <div v-show="o.isEmpty=='Y'" :class="{'locDiv': true,'colorGreen': true, 'colorYellow': o.stockStatus!='00'}">
+                </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>
+                  <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>-->
+                  </div>
+                </div>
+              </div>
             </div>
           </div>
-        </li>
-      </ul>
-    </div>
-    <el-dialog title="操作" :visible.sync="open" width="1000px" append-to-body>
-      <el-form>
-        <el-form-item>
-          <el-button type="primary" @click="lockLoc()">锁定/解锁</el-button>
-          <!--<el-button type="primary" @click="occupyLoc()">占用</el-button>-->
-          <el-button type="primary" @click="clearLoc()">清空</el-button>
-          <!--<el-button type="primary" @click="submitForm">初始化一个空托盘</el-button>-->
-        </el-form-item>
-      </el-form>
-      <el-divider content-position="center">批次属性信息</el-divider>
-      <el-table v-loading="loading" :data="form.lotattList">
-        <el-table-column label="物料" align="center" prop="sku" width="200"/>
-        <el-table-column label="物料名称" align="center" prop="skuName" width="200"/>
-        <el-table-column label="库位" align="center" prop="locationNo" width="200"/>
-        <el-table-column label="库存数量" align="center" prop="qty"/>
-        <el-table-column label="已分配数量" align="center" prop="qtyallocated" width="200"/>
-        <el-table-column
-          v-for="(item, index) in itemOption"
-          :key="index"
-          :label="item.label"
-          align="center" :prop="item.prop" width="200">
-        </el-table-column>
-      </el-table>
-      <!--<el-descriptions title="批次属性" :column="2" border>
-        <el-descriptions-item v-for="(item, index) in itemOption" :label="item.label">{{form[`${item.prop}`]}}</el-descriptions-item>
-      </el-descriptions>-->
-    </el-dialog>
-  </div>
+        </el-card>
+      </el-main>
+    </el-container>
 </template>
-
 <script>
-  import { locationView, lockLocRequest, occupyLocRequest, clearLocRequest } from "@/api/ams/locationView";
-  import { queryLocationZoneDict } from "@/api/base/locationZone";
-  import { queryWarehouseDict } from "@/api/base/warehouse";
-  import { lotattConfigList } from "@/api/ams/config";
-  import { lotattInfo } from "@/api/ams/invLotLocId";
+import { locationInvView } from "@/api/ams/locationView";
 
   export default {
-    name: "LocationView",
-    data() {
+    data () {
       return {
-        divList: [],
-        // 遮罩层
-        loading: true,
-        showSearch: true,
-        open: false,
-        // 查询参数
-        queryParams: {
-          zoneId: 2,
-          warehouseId: 1
-        },
-        // 表单参数
-        form: {
-          lotatt01: '',
-          lotatt02: '',
-          lotatt03: '',
-          lotatt04: '',
-          lotatt05: '',
-          lotatt06: '',
-          lotatt07: '',
-          lotatt08: '',
-          lotatt09: '',
-          lotatt10: '',
-          lotatt11: '',
-          lotatt12: '',
-          lotatt13: '',
-          lotatt14: '',
-          lotatt15: '',
-          lotatt16: '',
-          lotatt17: '',
-          lotatt18: '',
-          lotattList: null
+        dataForm: {
+          zoneId: ''
         },
-        // 表单校验
-        rules: {},
-        tableAttr: {
-          rows: 3,
-          cols: 3
+        queryParams: {
+          zoneId: '',
+          warehouseId: ''
         },
-        currentSelect: null,
-        locationZoneCombo: [],
-        warehouseCombo: [],
-        itemOption: [],
-        timer: null  // 定时器
-      };
+        locationZoneList: [],
+        locationList: {'a': [1, 2, 3]},
+        locationClearVisible: false
+      }
+    },
+    mounted () {
     },
-    created() {
-      this.init();
-      this.search();
-      this.timer = setInterval(() =>{
-        this.search();
-      },1000 * 5)
+    activated () {
+    },
+    created () {
+      this.getDataList()
+      this.timer = setInterval(this.getDataList, 5000)
+    },
+    beforeDestroy () {
+      clearInterval(this.timer)
     },
     methods: {
-      init() {
-        queryWarehouseDict().then(response => {
-          this.warehouseCombo = response.data
-        });
-        queryLocationZoneDict().then(response => {
-          this.locationZoneCombo = response.data
-        });
-        lotattConfigList().then(response => {
-          let data = response.data
-          for(let i=0;i<data.length;i++) {
-            let obj = new Object();
-            obj.label = data[i].lotattName
-            obj.prop = data[i].lotattId
-            this.itemOption.push(obj)
-          }
-        })
-      },
-      search() {
-        locationView(this.queryParams).then(response => {
-          let data = response.data
-          this.tableAttr.rows = data.rows
-          this.tableAttr.cols = data.cols
-          this.divList = data.locationViewInfoVOList
+      getDataList () {
+        this.dataListLoading = true
+        locationInvView(this.queryParams).then(response => {
+          this.locationZoneList = response.data
         })
-      },
-      selected(item) {
-        if (item.locationNo) {
-          this.currentSelect = parseInt(item.id)
-          this.open = true;
-          lotattInfo(this.currentSelect).then(response => {
-            this.form.lotattList = response.data
-            this.loading = false;
-          })
-        }
-      },
-      handleQuery() {
-        this.search()
-      },
-      resetQuery() {
-        this.resetForm("queryForm");
-        this.handleQuery();
-      },
-      lockLoc() {
-        let that = this
-        this.$modal.confirm('是否确认要锁定').then(function() {
-          lockLocRequest(that.currentSelect).then(response => {
-            if (response.code === 200) {
-              that.$modal.msgSuccess(response.msg);
-              that.search();
-              that.open = false
-            } else {
-              that.$modal.msgError(response.msg);
-            }
-          });
-        });
-      },
-      occupyLoc() {
-        occupyLocRequest(this.currentSelect).then(response => {
-          if (response.code === 200) {
-            this.$modal.msgSuccess(response.msg);
-            this.search();
-            this.open = false
-          } else {
-            this.$modal.msgError(response.msg);
-          }
-        });
-      },
-      clearLoc() {
-        let that = this
-        this.$modal.confirm('是否确认要清空').then(function() {
-          clearLocRequest(that.currentSelect).then(response => {
-            if (response.code === 200) {
-              that.$modal.msgSuccess(response.msg);
-              that.search();
-              that.open = false
-            } else {
-              that.$modal.msgError(response.msg);
-            }
-          });
-        });
-      },
-      destroyed () {
-        clearInterval(this.timer)
+        this.dataListLoading = false
       }
     }
-  };
+  }
 </script>
 
-<style scoped lang="css">
+<style>
 
-  .word span {
-    line-height: 20px;
-    text-align: center;
-  }
+.pointcss{
+  color: hotpink;
+}
 
-  .wall-row {
-    padding: 0;
-    margin: 0;
-    display: block;
-    position: relative;
-  }
+.divBoxCol {
+  width: 170px;
+  display: block;
+  float: left;
+}
 
-  .wall-row li {
-    list-style: none;
-    width: 130px;
-    height: 90px;
-    border: 0.5px solid #fff;
-    float: left;
-    margin-top: 5px;
-    margin-bottom: 5px;
-    margin-right: 5px;
-    margin-left: 5px;
-    overflow: hidden;
-  }
+.divBox {
+  width: 130px;
+  height: 90px;
+  display: block;
+  float: left;
+  margin-left: 2px;
+}
 
-  .div {
-    width:130px;
-    height:90px;
-    font-weight: bold;
-  }
+.divMinBox {
+  margin-top: 0px;
+  height: 15px;
+  width: 115%;
+  text-align: center;
+  font-weight: bold;
+}
+
+.divMinFontBox {
+  margin-top: 2px;
+  height: 10px;
+  width: 100%;
+  text-align: center;
+  /*font-size: 1px;*/
+}
+
+.locDiv {
+  float: left;
+  display: inline-block;
+  width: 150px;
+  height: 70px;
+  margin-top: 1px;
+  text-align: center;
+  margin-left: 1px;
+  border: solid 1px;
+}
 
+.colorGreen {
+  background-color: #19a708;
+}
+
+.colorRed {
+  background-color: #c73c2d;
+}
+
+.colorYellow {
+  background-color: #e2cd0f;
+}
+
+.divLeft {
+  border-top: 1px;
+  border-color: #2b373d;
+  text-align: left;
+  display: inline-block;
+  height: 30px;
+  width: 80px;
+  text-align: center;
+  margin-top: 10px;
+  padding-top: 5px;
+}
+
+.box-card{
+  width: 100%;
+  display:inline-block;
+  overflow: hidden;
+}
 </style>
+
+

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

@@ -0,0 +1,272 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="仓库" prop="warehouseId">
+        <el-select v-model="queryParams.warehouseId" placeholder="请选择所属仓库" clearable size="small" style="width: 100%">
+          <el-option
+            v-for="dict in this.warehouseCombo"
+            :key="dict.warehouseId"
+            :label="dict.warehouseName"
+            :value="dict.warehouseId"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="区域" prop="zoneId">
+        <el-select v-model="queryParams.zoneId" placeholder="请选择库区" clearable size="small" style="width: 100%">
+          <el-option
+            v-for="dict in this.locationZoneCombo"
+            :key="dict.zoneId"
+            :label="dict.zoneName"
+            :value="dict.zoneId"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+    <el-row>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="search"></right-toolbar>
+    </el-row>
+    <div style="overflow-scrolling: auto">
+      <ul class="wall-row"
+          :style="{'width':(this.tableAttr.cols * 145)+'px', 'height':(this.tableAttr.rows * 95) + 'px'}">
+        <li
+          v-for="(item, index) in divList"
+          :key="index_back"
+          @click="selected(item)">
+          <div v-if="!item.locationNo" style="background-color: #fff;"><!--空格没有的库位--></div>
+          <div class="div" v-else-if="item.stockStatus === '10'" style="background-color: yellow">
+            <div style="text-align: center;font-weight: bold;">{{item.locationNo}}</div>
+            <div v-for="(lot, index) in item.lotattVOList" style="font-size: 8px;">
+              <div v-if="lot.sku">物料:{{lot.sku}}</div>
+              <div v-if="lot.sku">数量:{{lot.qty}}</div>
+            </div>
+          </div>
+          <div class="div" v-else style="background-color: #ebf0f4">
+            <div style="text-align: center;font-weight: bold;">{{item.locationNo}}</div>
+            <div v-for="(lot, index) in item.lotattVOList" style="font-size: 8px;">
+              <div v-if="lot.sku">物料:{{lot.sku}}</div>
+              <div v-if="lot.sku">数量:{{lot.qty}}</div>
+            </div>
+          </div>
+        </li>
+      </ul>
+    </div>
+    <el-dialog title="操作" :visible.sync="open" width="1000px" append-to-body>
+      <el-form>
+        <el-form-item>
+          <el-button type="primary" @click="lockLoc()">锁定/解锁</el-button>
+          <!--<el-button type="primary" @click="occupyLoc()">占用</el-button>-->
+          <el-button type="primary" @click="clearLoc()">清空</el-button>
+          <!--<el-button type="primary" @click="submitForm">初始化一个空托盘</el-button>-->
+        </el-form-item>
+      </el-form>
+      <el-divider content-position="center">批次属性信息</el-divider>
+      <el-table v-loading="loading" :data="form.lotattList">
+        <el-table-column label="物料" align="center" prop="sku" width="200"/>
+        <el-table-column label="物料名称" align="center" prop="skuName" width="200"/>
+        <el-table-column label="库位" align="center" prop="locationNo" width="200"/>
+        <el-table-column label="库存数量" align="center" prop="qty"/>
+        <el-table-column label="已分配数量" align="center" prop="qtyallocated" width="200"/>
+        <el-table-column
+          v-for="(item, index) in itemOption"
+          :key="index_back"
+          :label="item.label"
+          align="center" :prop="item.prop" width="200">
+        </el-table-column>
+      </el-table>
+      <!--<el-descriptions title="批次属性" :column="2" border>
+        <el-descriptions-item v-for="(item, index) in itemOption" :label="item.label">{{form[`${item.prop}`]}}</el-descriptions-item>
+      </el-descriptions>-->
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+  import { locationView, lockLocRequest, occupyLocRequest, clearLocRequest } from "@/api/ams/locationView";
+  import { queryLocationZoneDict } from "@/api/base/locationZone";
+  import { queryWarehouseDict } from "@/api/base/warehouse";
+  import { lotattConfigList } from "@/api/ams/config";
+  import { lotattInfo } from "@/api/ams/invLotLocId";
+
+  export default {
+    name: "LocationView",
+    data() {
+      return {
+        divList: [],
+        // 遮罩层
+        loading: true,
+        showSearch: true,
+        open: false,
+        // 查询参数
+        queryParams: {
+          zoneId: 2,
+          warehouseId: 1
+        },
+        // 表单参数
+        form: {
+          lotatt01: '',
+          lotatt02: '',
+          lotatt03: '',
+          lotatt04: '',
+          lotatt05: '',
+          lotatt06: '',
+          lotatt07: '',
+          lotatt08: '',
+          lotatt09: '',
+          lotatt10: '',
+          lotatt11: '',
+          lotatt12: '',
+          lotatt13: '',
+          lotatt14: '',
+          lotatt15: '',
+          lotatt16: '',
+          lotatt17: '',
+          lotatt18: '',
+          lotattList: null
+        },
+        // 表单校验
+        rules: {},
+        tableAttr: {
+          rows: 3,
+          cols: 3
+        },
+        currentSelect: null,
+        locationZoneCombo: [],
+        warehouseCombo: [],
+        itemOption: [],
+        timer: null  // 定时器
+      };
+    },
+    created() {
+      this.init();
+      this.search();
+      this.timer = setInterval(() =>{
+        this.search();
+      },1000 * 5)
+    },
+    methods: {
+      init() {
+        queryWarehouseDict().then(response => {
+          this.warehouseCombo = response.data
+        });
+        queryLocationZoneDict().then(response => {
+          this.locationZoneCombo = response.data
+        });
+        lotattConfigList().then(response => {
+          let data = response.data
+          for(let i=0;i<data.length;i++) {
+            let obj = new Object();
+            obj.label = data[i].lotattName
+            obj.prop = data[i].lotattId
+            this.itemOption.push(obj)
+          }
+        })
+      },
+      search() {
+        locationView(this.queryParams).then(response => {
+          let data = response.data
+          this.tableAttr.rows = data.rows
+          this.tableAttr.cols = data.cols
+          this.divList = data.locationViewInfoVOList
+        })
+      },
+      selected(item) {
+        if (item.locationNo) {
+          this.currentSelect = parseInt(item.id)
+          this.open = true;
+          lotattInfo(this.currentSelect).then(response => {
+            this.form.lotattList = response.data
+            this.loading = false;
+          })
+        }
+      },
+      handleQuery() {
+        this.search()
+      },
+      resetQuery() {
+        this.resetForm("queryForm");
+        this.handleQuery();
+      },
+      lockLoc() {
+        let that = this
+        this.$modal.confirm('是否确认要锁定').then(function() {
+          lockLocRequest(that.currentSelect).then(response => {
+            if (response.code === 200) {
+              that.$modal.msgSuccess(response.msg);
+              that.search();
+              that.open = false
+            } else {
+              that.$modal.msgError(response.msg);
+            }
+          });
+        });
+      },
+      occupyLoc() {
+        occupyLocRequest(this.currentSelect).then(response => {
+          if (response.code === 200) {
+            this.$modal.msgSuccess(response.msg);
+            this.search();
+            this.open = false
+          } else {
+            this.$modal.msgError(response.msg);
+          }
+        });
+      },
+      clearLoc() {
+        let that = this
+        this.$modal.confirm('是否确认要清空').then(function() {
+          clearLocRequest(that.currentSelect).then(response => {
+            if (response.code === 200) {
+              that.$modal.msgSuccess(response.msg);
+              that.search();
+              that.open = false
+            } else {
+              that.$modal.msgError(response.msg);
+            }
+          });
+        });
+      },
+      destroyed () {
+        clearInterval(this.timer)
+      }
+    }
+  };
+</script>
+
+<style scoped lang="css">
+
+  .word span {
+    line-height: 20px;
+    text-align: center;
+  }
+
+  .wall-row {
+    padding: 0;
+    margin: 0;
+    display: block;
+    position: relative;
+  }
+
+  .wall-row li {
+    list-style: none;
+    width: 130px;
+    height: 90px;
+    border: 0.5px solid #fff;
+    float: left;
+    margin-top: 5px;
+    margin-bottom: 5px;
+    margin-right: 5px;
+    margin-left: 5px;
+    overflow: hidden;
+  }
+
+  .div {
+    width:130px;
+    height:90px;
+    font-weight: bold;
+  }
+
+</style>

warewms-ams/src/main/java/com/ruoyi/ams/locationView/domain/form/LocationViewForm.java

@@ -8,6 +8,10 @@ package com.ruoyi.ams.locationView.domain.form;
 public class LocationViewForm {
     private Long zoneId;
     private Long warehouseId;
+    /**
+     * 排序 1根据列号 2根据层号
+     */
+    private Integer orderBy;
 
     public Long getZoneId() {
         return zoneId;
@@ -24,4 +28,4 @@ public class LocationViewForm {
     public void setWarehouseId(Long warehouseId) {
         this.warehouseId = warehouseId;
     }
-}
+}

warewms-ams/src/main/java/com/ruoyi/ams/locationView/service/LocationViewService.java

@@ -1,6 +1,5 @@
 package com.ruoyi.ams.locationView.service;
 
-import com.ruoyi.ams.inv.domain.InvLotLocId;
 import com.ruoyi.ams.inv.domain.vo.InvLotLocIdLotattVO;
 import com.ruoyi.ams.inv.mapper.InvLotLocIdMapper;
 import com.ruoyi.ams.locationView.domain.form.LocationViewForm;
@@ -8,12 +7,20 @@ import com.ruoyi.ams.locationView.domain.vo.LocationViewInfoVO;
 import com.ruoyi.ams.locationView.domain.vo.LocationViewLotattVO;
 import com.ruoyi.ams.locationView.domain.vo.LocationViewVO;
 import com.ruoyi.base.domain.BaseLocationInfo;
-import com.ruoyi.base.domain.vo.BaseLocationLotattVO;
+import com.ruoyi.base.domain.BaseLocationZone;
+import com.ruoyi.base.domain.dto.BasLocationGuiColDTO;
+import com.ruoyi.base.domain.dto.BasLocationGuiExtDTO;
+import com.ruoyi.base.domain.dto.BaseLocationGuiDTO;
 import com.ruoyi.base.mapper.BaseLocationInfoMapper;
+import com.ruoyi.base.mapper.BaseLocationZoneMapper;
+import com.ruoyi.common.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * Created by IntelliJ IDEA.
@@ -27,6 +34,8 @@ public class LocationViewService {
     private BaseLocationInfoMapper baseLocationInfoMapper;
     @Autowired
     private InvLotLocIdMapper invLotLocIdMapper;
+    @Autowired
+    private BaseLocationZoneMapper baseLocationZoneMapper;
 
     public LocationViewVO locationView(LocationViewForm locationViewForm) {
         LocationViewVO locationViewVO = new LocationViewVO();
@@ -91,4 +100,91 @@ public class LocationViewService {
         locationViewVO.setLocationViewInfoVOList(list);
         return locationViewVO;
     }
-}
+
+    /**
+     * 库位视图
+     *
+     * @param locationViewForm
+     * @return
+     */
+    public List<BasLocationGuiExtDTO> queryLocationGuiExt(LocationViewForm locationViewForm) {
+        Long zoneId = locationViewForm.getZoneId();
+        List<BasLocationGuiExtDTO> guiDTOS = new ArrayList<>();
+
+        //查询出线边库区列表
+        BaseLocationZone locationZoneQuery = new BaseLocationZone();
+        locationZoneQuery.setZoneId(zoneId);
+        List<BaseLocationZone> baseLocationZoneList = baseLocationZoneMapper.selectBaseLocationZoneList(locationZoneQuery);
+
+        for (BaseLocationZone basZone : baseLocationZoneList) {
+            BasLocationGuiExtDTO basLocationGuiExtDTO = new BasLocationGuiExtDTO();
+            basLocationGuiExtDTO.setZoneName(basZone.getZoneName());
+            //根据库区查询出库存信息
+            String sort = StringUtils.isEmpty(basZone.getUserdefine3()) ? "2" : basZone.getUserdefine3();
+            List<BaseLocationGuiDTO> locList = baseLocationInfoMapper
+                    .queryByListAllInvLotAttView(basZone.getZoneId().toString(), sort);
+
+            if (locList != null) {
+                List<String> exitsColNo = new ArrayList<>();
+                List<String> exitsShiftNo = new ArrayList<>();
+                List<BasLocationGuiColDTO> guiCols = new ArrayList<>();
+                BasLocationGuiColDTO bCol = null;
+                int index = 0;
+                for (BaseLocationGuiDTO b : locList) {
+                    // 层号
+                    String shiftNo = b.getShiftNo();
+                    // 列号
+                    String locNo = b.getColNo();
+                    index++;
+                    if (sort.equals("1")) {
+                        if (bCol == null) {
+                            exitsShiftNo.add(shiftNo);
+                            bCol = new BasLocationGuiColDTO();
+                            bCol.setColNo(shiftNo);
+                            bCol.addBaslocation(b);
+                        } else if (!exitsShiftNo.contains(shiftNo)) {
+                            exitsShiftNo.add(shiftNo);
+                            guiCols.add(bCol);
+                            bCol = new BasLocationGuiColDTO();
+                            bCol.setColNo(shiftNo);
+                            bCol.addBaslocation(b);
+                        } else {
+                            bCol.addBaslocation(b);
+                        }
+                        if (index == locList.size()) {
+                            guiCols.add(bCol);
+                        }
+                    } else if (sort.equals("2")) {
+                        if (bCol == null) {
+                            exitsColNo.add(locNo);
+                            bCol = new BasLocationGuiColDTO();
+                            bCol.setColNo(locNo);
+                            bCol.addBaslocation(b);
+                        } else if (!exitsColNo.contains(locNo)) {
+                            exitsColNo.add(locNo);
+                            guiCols.add(bCol);
+                            bCol = new BasLocationGuiColDTO();
+                            bCol.setColNo(locNo);
+                            bCol.addBaslocation(b);
+                        } else {
+                            bCol.addBaslocation(b);
+                        }
+                        if (index == locList.size()) {
+                            guiCols.add(bCol);
+                        }
+                    } else {
+                        bCol = new BasLocationGuiColDTO();
+                        bCol.setColNo(index + "");
+                        bCol.addBaslocation(b);
+                        guiCols.add(bCol);
+                    }
+                }
+                basLocationGuiExtDTO.setBasLocationGuiColDTOS(guiCols);
+            } else {
+                basLocationGuiExtDTO.setBasLocationGuiColDTOS(new ArrayList<BasLocationGuiColDTO>());
+            }
+            guiDTOS.add(basLocationGuiExtDTO);
+        }
+        return guiDTOS;
+    }
+}

warewms-ams/src/main/resources/mapper/docOrder/ActAllocationDetailsMapper.xml

@@ -45,6 +45,47 @@
         <result property="lotatt18"    column="lotatt18"/>
     </resultMap>
 
+    <resultMap type="com.ruoyi.ams.order.form.ActAllocationDetailsFrom" id="ActAllocationDetailsInvLotAttResult">
+    <result property="allocationId" column="allocation_id"/>
+    <result property="orderNo" column="order_no"/>
+    <result property="lineNo" column="line_no"/>
+    <result property="material" column="material"/>
+    <result property="locationId" column="location_id"/>
+    <result property="callTransactionId" column="call_transaction_id"/>
+    <result property="status" column="status"/>
+    <result property="lotnum" column="lotnum"/>
+    <result property="qty" column="qty"/>
+    <result property="pickTransactionId" column="pick_transaction_id"/>
+    <result property="pickToLocation" column="pick_to_location"/>
+    <result property="pickQty" column="pick_qty"/>
+    <result property="createBy" column="create_by"/>
+    <result property="createTime" column="create_time"/>
+    <result property="updateBy" column="update_by"/>
+    <result property="updateTime" column="update_time"/>
+    <result property="userdefine1" column="userdefine1"/>
+    <result property="userdefine2" column="userdefine2"/>
+    <result property="userdefine3" column="userdefine3"/>
+    <result property="userdefine4" column="userdefine4"/>
+    <result property="lotatt01" column="lotatt01"/>
+    <result property="lotatt02" column="lotatt02"/>
+    <result property="lotatt03" column="lotatt04"/>
+    <result property="lotatt04" column="lotatt04"/>
+    <result property="lotatt05" column="lotatt05"/>
+    <result property="lotatt06" column="lotatt06"/>
+    <result property="lotatt07" column="lotatt07"/>
+    <result property="lotatt08" column="lotatt08"/>
+    <result property="lotatt09" column="lotatt09"/>
+    <result property="lotatt10" column="lotatt10"/>
+    <result property="lotatt11" column="lotatt11"/>
+    <result property="lotatt12" column="lotatt12"/>
+    <result property="lotatt13" column="lotatt13"/>
+    <result property="lotatt14" column="lotatt14"/>
+    <result property="lotatt15" column="lotatt15"/>
+    <result property="lotatt16" column="lotatt16"/>
+    <result property="lotatt17" column="lotatt17"/>
+    <result property="lotatt18" column="lotatt18"/>
+    </resultMap>
+
     <sql id="selectActAllocationDetailsVo">
         select allocation_id,
                order_no,

warewms-base/pom.xml

@@ -22,4 +22,4 @@
         </dependency>
 
     </dependencies>
-</project>
+</project>

warewms-base/src/main/java/com/ruoyi/base/domain/dto/BasLocationGuiColDTO.java

@@ -0,0 +1,27 @@
+package com.ruoyi.base.domain.dto;
+
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Created by IntelliJ IDEA.
+ * User: kaka
+ * Date: 2023/03/22
+ */
+@Data
+public class BasLocationGuiColDTO {
+    /**
+     * 列号
+     */
+    private String colNo;
+    /**
+     * 列号对应的库存信息
+     */
+    private List<BaseLocationGuiDTO> baseLocationGuiDTOList = new ArrayList<>();
+
+    public void addBaslocation(BaseLocationGuiDTO baseLocationGuiDTO) {
+        baseLocationGuiDTOList.add(baseLocationGuiDTO);
+    }
+}

warewms-base/src/main/java/com/ruoyi/base/domain/dto/BasLocationGuiExtDTO.java

@@ -0,0 +1,22 @@
+package com.ruoyi.base.domain.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Created by IntelliJ IDEA.
+ * User: andy.qu
+ * Date: 2020/2/8
+ */
+@Data
+public class BasLocationGuiExtDTO {
+    /**
+     * 库区名称
+     */
+    private String zoneName;
+    /**
+     * 库存信息
+     */
+    private List<BasLocationGuiColDTO> basLocationGuiColDTOS;
+}

warewms-base/src/main/java/com/ruoyi/base/domain/dto/BaseLocationGuiDTO.java

@@ -0,0 +1,201 @@
+package com.ruoyi.base.domain.dto;
+
+import com.ruoyi.base.domain.BaseLocationInfo;
+
+/**
+ * @author JWK
+ * @version 1.0
+ * @date 2023/3/23 19:49
+ */
+public class BaseLocationGuiDTO extends BaseLocationInfo {
+
+    private String lotatt01;
+    private String lotatt02;
+    private String lotatt03;
+    private String lotatt04;
+    private String lotatt05;
+    private String lotatt06;
+    private String lotatt07;
+    private String lotatt08;
+    private String lotatt09;
+    private String lotatt10;
+    private String lotatt11;
+    private String lotatt12;
+    private String lotatt13;
+    private String lotatt14;
+    private String lotatt15;
+    private String lotatt16;
+    private String lotatt17;
+    private String lotatt18;
+    private String sku;
+    private String skuName;
+    private String isEmptyPlate;
+
+    public String getLotatt01() {
+        return lotatt01;
+    }
+
+    public void setLotatt01(String lotatt01) {
+        this.lotatt01 = lotatt01;
+    }
+
+    public String getLotatt02() {
+        return lotatt02;
+    }
+
+    public void setLotatt02(String lotatt02) {
+        this.lotatt02 = lotatt02;
+    }
+
+    public String getLotatt03() {
+        return lotatt03;
+    }
+
+    public void setLotatt03(String lotatt03) {
+        this.lotatt03 = lotatt03;
+    }
+
+    public String getLotatt04() {
+        return lotatt04;
+    }
+
+    public void setLotatt04(String lotatt04) {
+        this.lotatt04 = lotatt04;
+    }
+
+    public String getLotatt05() {
+        return lotatt05;
+    }
+
+    public void setLotatt05(String lotatt05) {
+        this.lotatt05 = lotatt05;
+    }
+
+    public String getLotatt06() {
+        return lotatt06;
+    }
+
+    public void setLotatt06(String lotatt06) {
+        this.lotatt06 = lotatt06;
+    }
+
+    public String getLotatt07() {
+        return lotatt07;
+    }
+
+    public void setLotatt07(String lotatt07) {
+        this.lotatt07 = lotatt07;
+    }
+
+    public String getLotatt08() {
+        return lotatt08;
+    }
+
+    public void setLotatt08(String lotatt08) {
+        this.lotatt08 = lotatt08;
+    }
+
+    public String getLotatt09() {
+        return lotatt09;
+    }
+
+    public void setLotatt09(String lotatt09) {
+        this.lotatt09 = lotatt09;
+    }
+
+    public String getLotatt10() {
+        return lotatt10;
+    }
+
+    public void setLotatt10(String lotatt10) {
+        this.lotatt10 = lotatt10;
+    }
+
+    public String getLotatt11() {
+        return lotatt11;
+    }
+
+    public void setLotatt11(String lotatt11) {
+        this.lotatt11 = lotatt11;
+    }
+
+    public String getLotatt12() {
+        return lotatt12;
+    }
+
+    public void setLotatt12(String lotatt12) {
+        this.lotatt12 = lotatt12;
+    }
+
+    public String getLotatt13() {
+        return lotatt13;
+    }
+
+    public void setLotatt13(String lotatt13) {
+        this.lotatt13 = lotatt13;
+    }
+
+    public String getLotatt14() {
+        return lotatt14;
+    }
+
+    public void setLotatt14(String lotatt14) {
+        this.lotatt14 = lotatt14;
+    }
+
+    public String getLotatt15() {
+        return lotatt15;
+    }
+
+    public void setLotatt15(String lotatt15) {
+        this.lotatt15 = lotatt15;
+    }
+
+    public String getLotatt16() {
+        return lotatt16;
+    }
+
+    public void setLotatt16(String lotatt16) {
+        this.lotatt16 = lotatt16;
+    }
+
+    public String getLotatt17() {
+        return lotatt17;
+    }
+
+    public void setLotatt17(String lotatt17) {
+        this.lotatt17 = lotatt17;
+    }
+
+    public String getLotatt18() {
+        return lotatt18;
+    }
+
+    public void setLotatt18(String lotatt18) {
+        this.lotatt18 = lotatt18;
+    }
+
+    public String getSku() {
+        return sku;
+    }
+
+    public void setSku(String sku) {
+        this.sku = sku;
+    }
+
+    public String getSkuName() {
+        return skuName;
+    }
+
+    public void setSkuName(String skuName) {
+        this.skuName = skuName;
+    }
+
+    public String getIsEmptyPlate() {
+        return isEmptyPlate;
+    }
+
+    public void setIsEmptyPlate(String isEmptyPlate) {
+        this.isEmptyPlate = isEmptyPlate;
+    }
+}

warewms-base/src/main/java/com/ruoyi/base/mapper/BaseLocationInfoMapper.java

@@ -1,14 +1,15 @@
 package com.ruoyi.base.mapper;
 
-import java.util.List;
-import java.util.Map;
-
 import com.ruoyi.base.domain.BaseLocationInfo;
+import com.ruoyi.base.domain.dto.BaseLocationGuiDTO;
 import com.ruoyi.base.domain.dto.BaseLocationInfoSameColDTO;
-import com.ruoyi.base.domain.vo.LotattVO;
 import com.ruoyi.base.domain.vo.BaseLocationLotattVO;
+import com.ruoyi.base.domain.vo.LotattVO;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * 库位信息Mapper接口
  *
@@ -213,4 +214,12 @@ public interface BaseLocationInfoMapper {
      * @return
      */
     List<BaseLocationInfo> laneCheck(@Param("colNo") String colNo, @Param("laneType") String laneType, @Param("warehouseId")Long warehouseId);
+
+    /**
+     * 视图显示
+     *
+     * @param zoneId
+     * @return
+     */
+    List<BaseLocationGuiDTO> queryByListAllInvLotAttView(@Param("zoneId") String zoneId, @Param("sort") String sort);
 }

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

@@ -578,4 +578,33 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
           and b.col_no = #{colNo}
           and b.warehouse_id = #{warehouseId}
     </select>
+
+    <!-- 库位视图-->
+    <select id="queryByListAllInvLotAttView" resultType="com.ruoyi.base.domain.dto.BaseLocationGuiDTO" parameterType="Object">
+        select t1.zone_id zoneId,t1.id,t1.location_no locationNo
+             ,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
+             ,t4.lotatt07,t4.lotatt08,t4.lotatt09,t4.lotatt10,t4.lotatt11,t4.lotatt12
+             ,t4.lotatt13,t4.lotatt14,t4.lotatt15,t4.lotatt16,t4.lotatt17,t4.lotatt18
+             ,t5.sku,t5.desc1 skuName,t5.hazard_flag isEmptyPlate
+        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 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)
+        <choose>
+            <when test=" sort == '1'.toString() ">
+                ORDER BY t1.shift_no + 0,t1.location_no
+            </when >
+            <when test=" sort == '2'.toString() ">
+                ORDER BY t1.col_no + 0,t1.location_no
+            </when >
+            <otherwise>
+                ORDER BY ${sort}
+            </otherwise>
+        </choose>
+    </select>
 </mapper>

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

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.base.mapper.BaseLocationZoneMapper">
-    
+
     <resultMap type="BaseLocationZone" id="BaseLocationZoneResult">
         <result property="zoneId"    column="zone_id"    />
         <result property="zoneName"    column="zone_name"    />
@@ -30,18 +30,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select z.zone_id, z.zone_name,w.warehouse_name, z.warehouse_id, z.status, z.userdefine1, z.userdefine2, z.userdefine3, z.userdefine4, z.userdefine5, z.create_by, z.create_time, z.update_by, z.update_time, z.remark
         from base_location_zone z
         left join base_warehouse w on z.warehouse_id = w.warehouse_id
-        <where>  
+        <where>
+            <if test="zoneId != null  and zoneId != ''"> and z.zone_id = #{zoneId}</if>
             <if test="zoneName != null  and zoneName != ''"> and z.zone_name like concat('%', #{zoneName}, '%')</if>
             <if test="warehouseId != null "> and z.warehouse_id = #{warehouseId}</if>
             <if test="status != null  and status != ''"> and z.status = #{status}</if>
         </where>
+        order by z.userdefine2
     </select>
-    
+
     <select id="selectBaseLocationZoneByZoneId" parameterType="Long" resultMap="BaseLocationZoneResult">
         <include refid="selectBaseLocationZoneVo"/>
         where zone_id = #{zoneId}
     </select>
-        
+
     <insert id="insertBaseLocationZone" parameterType="BaseLocationZone" useGeneratedKeys="true" keyProperty="zoneId">
         insert into base_location_zone
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -101,9 +103,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteBaseLocationZoneByZoneIds" parameterType="String">
-        delete from base_location_zone where zone_id in 
+        delete from base_location_zone where zone_id in
         <foreach item="zoneId" collection="array" open="(" separator="," close=")">
             #{zoneId}
         </foreach>
     </delete>
-</mapper>
+</mapper>