wms / wms4_andelichi · Commits

Commit 724c73e46de385f886e2bb6775c4e546323d1cf9

Authored by 李泰瑜
1 parent 83f56531
develop ... AzureAD

库位监控部分文件(后端) 调整打印标签尺寸

Inline Side-by-side
Showing 22 changed files with 244 additions and 4 deletions
jeecg-boot-master/ant-design-vue-jeecg/src/assets/icon/半盘禁用.png 0 → 100644
View file @724c73e

6.04 KB
jeecg-boot-master/ant-design-vue-jeecg/src/assets/icon/半盘空闲.png 0 → 100644
View file @724c73e

3.68 KB
jeecg-boot-master/ant-design-vue-jeecg/src/assets/icon/半盘锁定.png 0 → 100644
View file @724c73e

4.86 KB
jeecg-boot-master/ant-design-vue-jeecg/src/assets/icon/整盘禁用.png 0 → 100644
View file @724c73e

5.89 KB
jeecg-boot-master/ant-design-vue-jeecg/src/assets/icon/整盘空闲.png 0 → 100644
View file @724c73e

3.87 KB
jeecg-boot-master/ant-design-vue-jeecg/src/assets/icon/整盘锁定.png 0 → 100644
View file @724c73e

4.77 KB
jeecg-boot-master/ant-design-vue-jeecg/src/assets/icon/空.png 0 → 100644
View file @724c73e

1.45 KB
jeecg-boot-master/ant-design-vue-jeecg/src/assets/icon/空柜禁用.png 0 → 100644
View file @724c73e

5.38 KB
jeecg-boot-master/ant-design-vue-jeecg/src/assets/icon/空柜空闲.png 0 → 100644
View file @724c73e

3.62 KB
jeecg-boot-master/ant-design-vue-jeecg/src/assets/icon/空柜锁定.png 0 → 100644
View file @724c73e

4.45 KB
jeecg-boot-master/ant-design-vue-jeecg/src/assets/icon/空盘禁用.png 0 → 100644
View file @724c73e

5.05 KB
jeecg-boot-master/ant-design-vue-jeecg/src/assets/icon/空盘空闲.png 0 → 100644
View file @724c73e

3.37 KB
jeecg-boot-master/ant-design-vue-jeecg/src/assets/icon/空盘锁定.png 0 → 100644
View file @724c73e

3.98 KB
jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/modules/ContainerPrintForm.vue
  View file @724c73e
@@ -12,10 +12,10 @@ @@ -12,10 +12,10 @@
12 <tbody > 12 <tbody >
13 <tr style=" width:80px;height:60px;"> 13 <tr style=" width:80px;height:60px;">
14 <td > 14 <td >
15 - <barcode :value="source.code" :margin="0" :margin-bottom="20" :margin-top="10" :margin-left="10" :height="120" font-size="30"></barcode> 15 + <barcode :value="source.code" :margin="15" :margin-bottom="20" :margin-top="40" :margin-left="0" :height="120" font-size="30"></barcode>
16 </td> 16 </td>
17 <td > 17 <td >
18 - <barcode :value="source.code" :margin="0" :margin-bottom="20" :margin-top="10" :margin-left="10" :height="120" font-size="30"></barcode> 18 + <barcode :value="source.code" :margin="15" :margin-bottom="20" :margin-top="40" :margin-left="10" :height="120" font-size="30"></barcode>
19 </td> 19 </td>
20 </tr> 20 </tr>
21 </tbody> 21 </tbody>
jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/modules/LocationPrintForm.vue
  View file @724c73e
@@ -12,10 +12,10 @@ @@ -12,10 +12,10 @@
12 <tbody > 12 <tbody >
13 <tr style=" width:80px;height:60px;"> 13 <tr style=" width:80px;height:60px;">
14 <td > 14 <td >
15 - <barcode :value="source.code" :margin="0" :margin-bottom="20" :margin-top="10" :margin-left="10" :height="120" font-size="30"></barcode> 15 + <barcode :value="source.code" :margin="15" :margin-bottom="20" :margin-top="40" :margin-left="0" :height="120" font-size="30"></barcode>
16 </td> 16 </td>
17 <td > 17 <td >
18 - <barcode :value="source.code" :margin="0" :margin-bottom="20" :margin-top="10" :margin-left="10" :height="120" font-size="30"></barcode> 18 + <barcode :value="source.code" :margin="15" :margin-bottom="20" :margin-top="40" :margin-left="0" :height="120" font-size="30"></barcode>
19 </td> 19 </td>
20 </tr> 20 </tr>
21 </tbody> 21 </tbody>
jeecg-boot-master/ant-design-vue-jeecg/src/views/system/monitor/locationstatus.vue 0 → 100644
  View file @724c73e
  1 +<template>
  2 +<!-- <style>-->
  3 +<!-- #img_list li{-->
  4 +<!-- font-size: 10px;-->
  5 +<!-- /*width: 50px;*/-->
  6 +<!-- text-align: left;-->
  7 +<!-- margin: 5px 20px 5px 5px;-->
  8 +<!-- }-->
  9 +<!-- #img_list li img{-->
  10 +<!-- height: 35px;-->
  11 +<!-- width: 35px;-->
  12 +<!-- }-->
  13 +<!-- #info_list{-->
  14 +<!-- width: 100%;-->
  15 +<!-- display:inline-block;-->
  16 +<!-- }-->
  17 +<!-- #info_list li{-->
  18 +<!-- margin:8px 3px 0 5px;-->
  19 +<!-- }-->
  20 +<!-- #info_list li span{-->
  21 +<!-- font-size: 12px;-->
  22 +<!-- display: inline-block;-->
  23 +<!-- /*width: 65px;*/-->
  24 +<!-- text-align: center;-->
  25 +<!-- }-->
  26 +<!-- .grid{-->
  27 +<!-- display: inline-block;-->
  28 +<!-- width: 50px;-->
  29 +<!-- height: 50px;-->
  30 +<!-- /*margin: 12px 6px;*/-->
  31 +<!-- margin-bottom: 6px;-->
  32 +<!-- background-size:cover;-->
  33 +<!-- /*background-image: url("../img/icon/空柜空闲.png");*/-->
  34 +<!-- }-->
  35 +<!-- #location span{-->
  36 +<!-- display: inline-block;-->
  37 +<!-- text-align: right;-->
  38 +<!-- width: 50px;-->
  39 +<!-- margin-right: 10px;-->
  40 +<!-- }-->
  41 +<!-- </style>-->
  42 + <div class="container-div">
  43 + <div class="row">
  44 + <div class="col-sm-12 select-info">
  45 + <form id="container-form">
  46 + <div class="select-list">
  47 + <ul id="select_info">
  48 + <li>
  49 + <select id="zoneCode" name="zoneCode" style="width: 100px">
  50 + <option selected></option>
  51 + </select>
  52 + </li>
  53 + <li>
  54 + 第
  55 + <select id="editable-num" name="num" style="width: 70px">
  56 + </select>
  57 + </li>
  58 + <li>
  59 + <select id="editable-select" name="col" style="width: 70px">
  60 + <option value="row" selected>行</option>
  61 + <option value="line">列</option>
  62 + <option value="layer">层</option>
  63 + </select>
  64 + </li>
  65 + <!-- <li>货主编码：-->
  66 + <!-- <input type="text" name="receiptCompanyCode" id="receiptCompanyCode">-->
  67 + <!-- </li>-->
  68 + <li>
  69 + <a class="btn btn-primary btn-rounded btn-sm" onclick="Search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
  70 + </li>
  71 + </ul>
  72 + </div>
  73 + </form>
  74 + </div>
  75 + <div class="col-sm-12 select-info">
  76 + <form id="receiptHeader-form">
  77 + <div class="select-list">
  78 + <ul id="img_list" style="">
  79 + <li>
  80 + 空柜空闲：<img src="~@/assets/icon/空柜空闲.png">
  81 + </li>
  82 + <li>
  83 + 空盘空闲：<img src="~@/assets/icon/空盘空闲.png">
  84 + </li>
  85 + <li>
  86 + 半盘空闲：<img src="~@/assets/icon/半盘空闲.png">
  87 + </li>
  88 + <li>
  89 + 整盘空闲：<img src="~@/assets/icon/整盘空闲.png">
  90 + </li>
  91 + <li>
  92 + 空柜锁定：<img src="~@/assets/icon/空柜锁定.png">
  93 + </li>
  94 + <li>
  95 + 空盘锁定：<img src="~@/assets/icon/空盘锁定.png">
  96 + </li>
  97 + <li>
  98 + 半盘锁定：<img src="~@/assets/icon/半盘锁定.png">
  99 + </li>
  100 + <li>
  101 + 整盘锁定：<img src="~@/assets/icon/整盘锁定.png">
  102 + </li>
  103 + <li>
  104 + 空柜禁用：<img src="~@/assets/icon/空柜禁用.png">
  105 + </li>
  106 + <li>
  107 + 空盘禁用：<img src="~@/assets/icon/空盘禁用.png">
  108 + </li>
  109 + <li>
  110 + 半盘禁用：<img src="~@/assets/icon/半盘禁用.png">
  111 + </li>
  112 + <li>
  113 + 整盘禁用：<img src="~@/assets/icon/整盘禁用.png">
  114 + </li>
  115 + <li><span style="font-size: 12px">库位统计情况：</span>
  116 + <input style="width: 400px; font-size: 12px" type="text" id="zone" disabled/>
  117 + </li>
  118 + </ul><br><br>
  119 + <ul id="info_list">
  120 + <li><span>库位：</span><input type="text" id="code" disabled/></li>
  121 + <li><span>容器编码：</span><input type="text" id="containerCode" disabled/></li>
  122 + <li><span>物料信息：<select id="material" style="width: auto"><option>无</option></select></span></li>
  123 + <li>
  124 + <a class="btn btn-success btn-rounded btn-sm" onclick="checkLocationCode()" ><i class="fa fa-eye"></i>&nbsp;出库查看</a>
  125 + </li>
  126 + </ul>
  127 + <!-- <ul>-->
  128 + <!-- <li style="float:left;margin-left: 40px"><button type="button" class="btn btn-sm btn-success" onclick="searchLocation()">查看库位</button></li>-->
  129 + <!-- <li style="float:left;margin-left: 20px"><button type="button" class="btn btn-sm btn-success" onclick="searchInventory()">查看库存</button></li>-->
  130 + <!-- </ul>-->
  131 + </div>
  132 + </form>
  133 + </div>
  134 + <div class="col-sm-12 select-info">
  135 + <!--style="width: 100%;overflow-x: scroll;white-space:nowrap"-->
  136 + <div id="borderCol" style="overflow-y: scroll;white-space:nowrap">
  137 + <div class="location" id="location">
  138 + <!--<div class="grid"></div>-->
  139 + </div>
  140 + </div>
  141 + </div>
  142 + </div>
  143 + </div>
  144 +</template>
  145 +
  146 +<script>
  147 + export default {
  148 + name: 'locationstatus'
  149 + }
  150 +</script>
  151 +
  152 +<style scoped>
  153 +
  154 +</style>
0 \ No newline at end of file 155 \ No newline at end of file
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/location/controller/LocationController.java
  View file @724c73e
@@ -184,6 +184,23 @@ public class LocationController extends JeecgController&lt;Location, ILocationServi @@ -184,6 +184,23 @@ public class LocationController extends JeecgController&lt;Location, ILocationServi
184 return Result.OK("批量删除成功!"); 184 return Result.OK("批量删除成功!");
185 } 185 }
186 186
  187 +
  188 +
  189 + /**
  190 + * 查询库位列表
  191 + * @return
  192 + */
  193 + @ApiOperation(value="库位监控-查询库位列表", notes="库位监控-查询库位列表")
  194 + @GetMapping(value = "/getAllLocation")
  195 + public Result getAllLocation(String type) {
  196 + if(StringUtils.isEmpty(type)) {
  197 + return Result.error("type不能为空");
  198 + }
  199 + return Result.OK(locationService.getAllLocation(type));
  200 + }
  201 +
  202 +
  203 +
187 /** 204 /**
188 * 通过id查询 205 * 通过id查询
189 * 206 *
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/location/entity/LocationInfo.java 0 → 100644
  View file @724c73e
  1 +package org.jeecg.modules.wms.config.location.entity;
  2 +
  3 +import lombok.Data;
  4 +
  5 +/**
  6 + *
  7 + * @author Enzo Cotter
  8 + * @date 2019/10/25
  9 + */
  10 +@Data
  11 +public class LocationInfo {
  12 + private long maxRow;
  13 + private long minRow = 1;
  14 + private long maxLine;
  15 + private long maxLayer;
  16 + private long maxGrid;
  17 +}
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/location/mapper/LocationMapper.java
  View file @724c73e
@@ -14,4 +14,9 @@ import org.jeecg.modules.wms.config.location.entity.Location; @@ -14,4 +14,9 @@ import org.jeecg.modules.wms.config.location.entity.Location;
14 */ 14 */
15 public interface LocationMapper extends BaseMapper<Location> { 15 public interface LocationMapper extends BaseMapper<Location> {
16 16
  17 + Location getAllLocation(@Param("warehouseCode") String warehouseCode, @Param("type") String type);
  18 +
  19 +
  20 + int getFirstRowOfZone(@Param("warehouseCode") String warehouseCode, @Param("locationType") String locationType);
  21 +
17 } 22 }
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/location/service/ILocationService.java
  View file @724c73e
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService; @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
4 import org.jeecg.common.api.vo.Result; 4 import org.jeecg.common.api.vo.Result;
5 import org.jeecg.modules.wms.config.location.entity.BatchLocation; 5 import org.jeecg.modules.wms.config.location.entity.BatchLocation;
6 import org.jeecg.modules.wms.config.location.entity.Location; 6 import org.jeecg.modules.wms.config.location.entity.Location;
  7 +import org.jeecg.modules.wms.config.location.entity.LocationInfo;
7 8
8 import java.util.List; 9 import java.util.List;
9 10
@@ -39,4 +40,6 @@ public interface ILocationService extends IService&lt;Location&gt; { @@ -39,4 +40,6 @@ public interface ILocationService extends IService&lt;Location&gt; {
39 boolean haveUncompleteTaskInNear(Location location); 40 boolean haveUncompleteTaskInNear(Location location);
40 41
41 Result batchAdd(BatchLocation batchLocation); 42 Result batchAdd(BatchLocation batchLocation);
  43 +
  44 + LocationInfo getAllLocation(String type);
42 } 45 }
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/location/service/impl/LocationServiceImpl.java
  View file @724c73e
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
6 import org.jeecg.common.api.vo.Result; 6 import org.jeecg.common.api.vo.Result;
7 import org.jeecg.modules.wms.config.location.entity.BatchLocation; 7 import org.jeecg.modules.wms.config.location.entity.BatchLocation;
8 import org.jeecg.modules.wms.config.location.entity.Location; 8 import org.jeecg.modules.wms.config.location.entity.Location;
  9 +import org.jeecg.modules.wms.config.location.entity.LocationInfo;
9 import org.jeecg.modules.wms.config.location.mapper.LocationMapper; 10 import org.jeecg.modules.wms.config.location.mapper.LocationMapper;
10 import org.jeecg.modules.wms.config.location.service.ILocationService; 11 import org.jeecg.modules.wms.config.location.service.ILocationService;
11 import org.jeecg.modules.wms.config.locationType.entity.LocationType; 12 import org.jeecg.modules.wms.config.locationType.entity.LocationType;
@@ -42,6 +43,8 @@ public class LocationServiceImpl extends ServiceImpl&lt;LocationMapper, Location&gt; i @@ -42,6 +43,8 @@ public class LocationServiceImpl extends ServiceImpl&lt;LocationMapper, Location&gt; i
42 private ILocationTypeService locationTypeService; 43 private ILocationTypeService locationTypeService;
43 @Resource 44 @Resource
44 private IZoneService zoneService; 45 private IZoneService zoneService;
  46 + @Resource
  47 + private LocationMapper locationMapper;
45 48
46 @Override 49 @Override
47 public Location getLocationByCode(String locationCode, String warehouseCode) { 50 public Location getLocationByCode(String locationCode, String warehouseCode) {
@@ -332,6 +335,22 @@ public class LocationServiceImpl extends ServiceImpl&lt;LocationMapper, Location&gt; i @@ -332,6 +335,22 @@ public class LocationServiceImpl extends ServiceImpl&lt;LocationMapper, Location&gt; i
332 return Result.ok("批量增加库位成功"); 335 return Result.ok("批量增加库位成功");
333 } 336 }
334 337
  338 + @Override
  339 + public LocationInfo getAllLocation(String type) {
  340 + if (StringUtils.isNotEmpty(type)) {
  341 + Location location = locationMapper.getAllLocation("sysLoginModel.getWarehouseCode()", type);
  342 + LocationInfo locationInfo = new LocationInfo();
  343 + locationInfo.setMaxRow(location.getRow());
  344 + locationInfo.setMaxLine(location.getIcolumn());
  345 + locationInfo.setMaxLayer(location.getLayer());
  346 + locationInfo.setMaxGrid(location.getGrid());
  347 + int minRow = locationMapper.getFirstRowOfZone("ShiroUtils.getWarehouseCode()", type);
  348 + locationInfo.setMinRow(minRow);
  349 + return locationInfo;
  350 + }
  351 + return null;
  352 + }
  353 +
335 private boolean getOutSideCanMove(Location location) { 354 private boolean getOutSideCanMove(Location location) {
336 Location locaiton2 = getInsideNear(location); 355 Location locaiton2 = getInsideNear(location);
337 if (locaiton2.getStatus().equals(QuantityConstant.STATUS_LOCATION_LOCK)) { 356 if (locaiton2.getStatus().equals(QuantityConstant.STATUS_LOCATION_LOCK)) {
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/monitor/locationstatus/controller/LocationStatusController.java 0 → 100644
  View file @724c73e
  1 +package org.jeecg.modules.wms.monitor.locationstatus.controller;
  2 +
  3 +import org.apache.shiro.authz.annotation.RequiresPermissions;
  4 +import org.jeecg.modules.wms.framework.controller.BaseController;
  5 +import org.springframework.stereotype.Controller;
  6 +import org.springframework.web.bind.annotation.GetMapping;
  7 +import org.springframework.web.bind.annotation.RequestMapping;
  8 +
  9 +/**
  10 + * Created by Enzo Cotter on 2019/10/25.
  11 + */
  12 +@Controller
  13 +@RequestMapping("/monitor/locationstatus")
  14 +public class LocationStatusController extends BaseController {
  15 +
  16 + private String prefix = "monitor/locationstatus";
  17 +
  18 + @RequiresPermissions("locationstatus:bill:view")
  19 + @GetMapping()
  20 + public String locationStatus()
  21 + {
  22 + return prefix + "/locationstatus";
  23 + }
  24 +
  25 +}