库位监控修改

周峰
1 parent 6caef407
Showing 6 changed files with 29 additions and 3 deletions
src/main/java/com/huaheng/pc/config/location/domain/LocationInfo.java
src/main/java/com/huaheng/pc/config/location/mapper/LocationMapper.java
src/main/java/com/huaheng/pc/config/location/service/LocationService.java
src/main/java/com/huaheng/pc/config/location/service/LocationServiceImpl.java
src/main/resources/mybatis/config/LocationMapper.xml
src/main/resources/templates/monitor/locationstatus/locationstatus.html
@@ -8,6 +8,7 @@ import lombok.Data;
 @Data
 public class LocationInfo {
     private long maxRow;
+    private long minRow = 1;
     private long maxLine;
     private long maxLayer;
     private long maxGrid;
@@ -28,5 +28,7 @@ public interface LocationMapper extends BaseMapper&lt;Location&gt; {
  
     List<Location> selectContainerEmpty(@Param("warehouseCode") String warehouseCode );
  
+    int getFirstRowOfZone(@Param("warehouseCode") String warehouseCode, @Param("locationType") String locationType);
  
+    int getLastRowOfZone(@Param("warehouseCode") String warehouseCode, @Param("locationType") String locationType);
 }
 \ No newline at end of file
@@ -101,4 +101,8 @@ public interface LocationService extends IService&lt;Location&gt;{
     Location getEmptyOutSideLocation(Location location);
  
     Location getEmptyLocation(Location location);
+
+    int getFirstRowOfZone(String warehouseCode, String zoneCode);
+
+    int getLastRowOfZone(String warehouseCode, String zoneCode);
 }
@@ -359,6 +359,8 @@ public class LocationServiceImpl extends ServiceImpl&lt;LocationMapper, Location&gt; i
             locationInfo.setMaxLine(location.getIColumn());
             locationInfo.setMaxLayer(location.getILayer());
             locationInfo.setMaxGrid(location.getIGrid());
+            int minRow = locationMapper.getFirstRowOfZone(ShiroUtils.getWarehouseCode(), type);
+            locationInfo.setMinRow(minRow);
             return locationInfo;
         }
         return null;
@@ -594,4 +596,14 @@ public class LocationServiceImpl extends ServiceImpl&lt;LocationMapper, Location&gt; i
         }
         return location1;
     }
+
+    @Override
+    public int getFirstRowOfZone(String warehouseCode, String locationType) {
+        return locationMapper.getFirstRowOfZone(warehouseCode, locationType);
+    }
+
+    @Override
+    public int getLastRowOfZone(String warehouseCode, String locationType) {
+        return locationMapper.getLastRowOfZone(warehouseCode, locationType);
+    }
 }
@@ -152,7 +152,12 @@
             ORDER BY t.lastUpdated ASC
         </where>
     </select>
-
+    <select id="getFirstRowOfZone" resultType="java.lang.Integer">
+        select min(iRow) from location where warehouseCode=#{warehouseCode} and  locationType = #{locationType}
+    </select>
+    <select id="getLastRowOfZone" resultType="java.lang.Integer">
+        select max(iRow) from location where warehouseCode=#{warehouseCode} and locationType = #{locationType}
+    </select>
  
  
 </mapper>
 \ No newline at end of file
@@ -144,6 +144,7 @@
 <script th:inline="javascript">
     var prefix = ctx + "config/location";
     var grid_row;
+    var grid_row_first;
     var grid_line;
     var grid_layer;
     var list_info;
@@ -180,7 +181,7 @@
             let num=$("#editable-select").val();
             $("#editable-num").children().remove();
             if (num === "row") {
-                for (let i = 1; i <= grid_row; i++) {
+                for (let i = grid_row_first; i <= grid_row; i++) {
                     $("#editable-num").append("<option value='"+i+"'>"+i+"</option>")
                 }
             }
@@ -211,6 +212,7 @@
                 },
                 success:function (res) {
                     grid_row=res.data.maxRow;
+                    grid_row_first = res.data.minRow;
                     grid_line=res.data.maxLine;
                     grid_layer=res.data.maxLayer;
                     //初始格子
@@ -225,7 +227,7 @@
                     let num=$("#editable-select").val();
                     $("#editable-num").children().remove();
                     if (num === "row") {
-                        for (let i = 1; i <= grid_row; i++) {
+                        for (let i = grid_row_first; i <= grid_row; i++) {
                             $("#editable-num").append("<option value='"+i+"'>"+i+"</option>")
                         }
                     }