库位视图权限修改

1.不登陆可以查看视图
2.不登陆不可操作库存状态

(cherry picked from commit 857d87d2665b87e2ae1aa2f76f25650db024c540)

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

@@ -1,27 +1,31 @@
 package com.ruoyi.web.controller.warewms.ams;
 
-import com.ruoyi.ams.inv.mapper.InvLotLocIdMapper;
+import com.ruoyi.ams.config.service.ILotattConfigService;
+import com.ruoyi.ams.inv.domain.vo.InvLotLocIdLotattVO;
 import com.ruoyi.ams.inv.service.IInvLotLocIdService;
 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.constant.Constant;
-import com.ruoyi.base.domain.BaseLocationInfo;
+import com.ruoyi.base.domain.BaseLocationZone;
 import com.ruoyi.base.domain.dto.BasLocationGuiExtDTO;
-import com.ruoyi.base.service.IBaseLocationInfoService;
-import com.ruoyi.common.annotation.Log;
+import com.ruoyi.base.service.IBaseLocationZoneService;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.enums.BusinessType;
 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.
- * User: andy.qu
- * Date: 2022/3/16
+ * User: kaka
+ * Date: 2022/3/22
  */
 @RestController
 @RequestMapping("/ams/locationView")
@@ -30,11 +34,11 @@ public class LocationViewController extends BaseController {
     @Autowired
     private LocationViewService locationViewService;
     @Autowired
-    private IBaseLocationInfoService baseLocationInfoService;
+    private IInvLotLocIdService invLotLocIdService;
     @Autowired
-    private InvLotLocIdMapper invLotLocIdMapper;
+    private ILotattConfigService lotattConfigService;
     @Autowired
-    private IInvLotLocIdService invLotLocIdService;
+    private IBaseLocationZoneService baseLocationZoneService;
 
     @GetMapping(value = "/view")
     public AjaxResult getInfo(LocationViewForm locationViewForm) {
@@ -59,17 +63,28 @@ public class LocationViewController extends BaseController {
         return invLotLocIdService.clear(id.toString(),Constant.WAREHOUSE_ID, logger.getName());
     }
 
-    /**
-     * 库存是否有货状态调整
-     *
-     * @param locationId
-     * @return
-     */
-    @Log(title = "PDA库存状态调整", businessType = BusinessType.UPDATE)
-
     @GetMapping(value = "/setIsEmpty/{id}")
     public AjaxResult adjLocationIsEmpty(@PathVariable("id") Long id) {
 
         return invLotLocIdService.adjLocationIsEmpty(id.toString(), Constant.WAREHOUSE_ID, logger.getName());
     }
+
+    @GetMapping(value = "/locationLotatt/{locationId}")
+    public AjaxResult locationLotatt(@PathVariable("locationId") Long locationId) {
+        List<InvLotLocIdLotattVO> invLotLocIdLotattVOS = invLotLocIdService.selectInvLocIdLotattByLocationId(locationId);
+        return AjaxResult.success(invLotLocIdLotattVOS);
+    }
+
+    @GetMapping("/lotattConfigList")
+    public AjaxResult lotattConfigList() {
+        return AjaxResult.success(lotattConfigService.queryLotattConfigList());
+    }
+
+    @GetMapping("/queryZoneDict")
+    public AjaxResult queryZoneDict()
+    {
+        BaseLocationZone query = new BaseLocationZone();
+        query.setStatus("0");
+        return AjaxResult.success(baseLocationZoneService.selectBaseLocationZoneList(query));
+    }
 }

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

@@ -0,0 +1,92 @@
+package com.ruoyi.web.controller.warewms.ams;
+
+import com.ruoyi.ams.config.service.ILotattConfigService;
+import com.ruoyi.ams.inv.domain.vo.InvLotLocIdLotattVO;
+import com.ruoyi.ams.inv.service.IInvLotLocIdService;
+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.constant.Constant;
+import com.ruoyi.base.domain.BaseLocationZone;
+import com.ruoyi.base.domain.BaseWarehouse;
+import com.ruoyi.base.domain.dto.BasLocationGuiExtDTO;
+import com.ruoyi.base.service.IBaseLocationZoneService;
+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.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.
+ * User: kaka
+ * Date: 2022/3/22
+ */
+@RestController
+@RequestMapping("/ams/safe/locationView/")
+public class LocationViewSafeController extends BaseController {
+
+    @Autowired
+    private LocationViewService locationViewService;
+    @Autowired
+    private IInvLotLocIdService invLotLocIdService;
+    @Autowired
+    private ILotattConfigService lotattConfigService;
+    @Autowired
+    private IBaseLocationZoneService baseLocationZoneService;
+
+    @GetMapping(value = "/view")
+    public AjaxResult getInfo(LocationViewForm locationViewForm) {
+        LocationViewVO locationViewVO = locationViewService.locationView(locationViewForm);
+        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) {
+        return invLotLocIdService.adjLocationStockStatus(id.toString(), Constant.WAREHOUSE_ID
+                , logger.getName());
+    }
+
+    @GetMapping(value = "/clearLoc/{id}")
+    public AjaxResult clearLoc(@PathVariable("id") Long id) {
+        return invLotLocIdService.clear(id.toString(),Constant.WAREHOUSE_ID, logger.getName());
+    }
+
+    @GetMapping(value = "/setIsEmpty/{id}")
+    public AjaxResult adjLocationIsEmpty(@PathVariable("id") Long id) {
+
+        return invLotLocIdService.adjLocationIsEmpty(id.toString(), Constant.WAREHOUSE_ID, logger.getName());
+    }
+
+    @GetMapping(value = "/locationLotatt/{locationId}")
+    public AjaxResult locationLotatt(@PathVariable("locationId") Long locationId) {
+        List<InvLotLocIdLotattVO> invLotLocIdLotattVOS = invLotLocIdService.selectInvLocIdLotattByLocationId(locationId);
+        return AjaxResult.success(invLotLocIdLotattVOS);
+    }
+
+    @GetMapping("/lotattConfigList")
+    public AjaxResult lotattConfigList() {
+        return AjaxResult.success(lotattConfigService.queryLotattConfigList());
+    }
+
+    @GetMapping("/queryZoneDict")
+    public AjaxResult queryZoneDict()
+    {
+        BaseLocationZone query = new BaseLocationZone();
+        query.setStatus("0");
+        return AjaxResult.success(baseLocationZoneService.selectBaseLocationZoneList(query));
+    }
+}

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

@@ -18,21 +18,52 @@ export function locationInvView(query) {
 
 export function lockLocRequest(id) {
   return request({
-    url: '/ams/locationView/lockLoc/'+id,
+    url: '/ams/safe/locationView/lockLoc/'+id,
+    // url: '/ams/locationView/lockLoc/'+id,
     method: 'get'
   })
 }
 
 export function clearLocRequest(id) {
   return request({
-    url: '/ams/locationView/clearLoc/'+id,
+    url: '/ams/safe/locationView/clearLoc/'+id,
+    // url: '/ams/locationView/clearLoc/'+id,
     method: 'get'
   })
 }
 
 export function occupyLocRequest(id) {
   return request({
-    url: '/ams/locationView/setIsEmpty/'+id,
+    url: '/ams/safe/locationView/setIsEmpty/'+id,
+    // url: '/ams/locationView/setIsEmpty/'+id,
     method: 'get'
   })
 }
+
+export function lotattInfo(id) {
+  return request({
+    url: '/ams/locationView/locationLotatt/'+id,
+    method: 'get'
+  })
+}
+
+export function lotattConfigList() {
+  return request({
+    url: '/ams/locationView/lotattConfigList',
+    method: 'get'
+  })
+}
+
+export function queryLocationZoneDict() {
+  return request({
+    url: '/ams/locationView/queryZoneDict',
+    method: 'get',
+  })
+}
+
+export function queryWarehouseDict() {
+  return request({
+    url: '',
+    method: 'get',
+  })
+}

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

@@ -107,11 +107,8 @@
     </el-container>
 </template>
 <script>
-import {clearLocRequest, locationInvView, lockLocRequest, occupyLocRequest} from "@/api/ams/locationView";
-import {lotattInfo} from "@/api/ams/invLotLocId";
-import {lotattConfigList} from "@/api/ams/config";
-import {queryWarehouseDict} from "@/api/base/warehouse";
-import {queryLocationZoneDict} from "@/api/base/locationZone";
+import { clearLocRequest,locationInvView,queryLocationZoneDict,lockLocRequest,lotattConfigList
+  ,lotattInfo,occupyLocRequest,queryWarehouseDict} from "@/api/ams/locationView";
 
   export default {
     data () {
@@ -158,6 +155,8 @@ import {queryLocationZoneDict} from "@/api/base/locationZone";
     activated () {
     },
     created () {
+      // this.getWarehouseList()
+      this.getBasZoneList()
       this.getDataList()
       this.getItemopention()
       this.timer = setInterval(this.getDataList, 5000)
@@ -179,12 +178,6 @@ import {queryLocationZoneDict} from "@/api/base/locationZone";
       },
       getDataList () {
         this.dataListLoading = true
-        queryWarehouseDict().then(response => {
-          this.warehouseCombo = response.data
-        });
-        queryLocationZoneDict().then(response => {
-          this.locationZoneCombo = response.data
-        })
         locationInvView(this.queryParams).then(response => {
           this.locationZoneList = response.data
         })
@@ -252,6 +245,16 @@ import {queryLocationZoneDict} from "@/api/base/locationZone";
           });
         });
       },
+      getBasZoneList() {
+        queryLocationZoneDict().then(response => {
+          this.locationZoneCombo = response.data
+        })
+      },
+      getWarehouseList() {
+        queryWarehouseDict().then(response => {
+          this.warehouseCombo = response.data
+        });
+      },
     }
   }
 </script>