root/jieMei
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

页面优化

Browse Source
This commit is contained in:
18188916393
2022-09-29 22:25:21 +08:00
parent 38121f3a57
commit d7ad5afbeb
18 changed files with 223 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
acs/hd/nladmin-system/src/main/resources/config/application-dev.yml
View File

@@ -8,11 +8,12 @@ spring:
druid:
db-type: com.alibaba.druid.pool.DruidDataSource
driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:jmtest_acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
#url: jdbc:log4jdbc:mysql://${DB_HOST:47.97.157.227}:${DB_PORT:3306}/${DB_NAME:jm_acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
#url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:jmtest_acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.81.252}:${DB_PORT:3306}/${DB_NAME:jm_acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
username: ${DB_USER:root}
#password: ${DB_PWD:P@ssw0rd}
password: ${DB_PWD:123456}
password: ${DB_PWD:Root.123456}
#password: ${DB_PWD:123456}
# 初始连接数
initial-size: 5
# 最小连接数

6
wms/hd/nladmin-system/src/main/java/org/nl/wms/dis/rest/GroupInfoController.java
View File

@@ -57,5 +57,11 @@ public class GroupInfoController {
public ResponseEntity<Object> queryInfoByCode() {
return new ResponseEntity<>(groupInfoService.queryInfoByCode(), HttpStatus.OK);
}
@PostMapping("/queryMaterial")
@Log("查询仓位物料")
@ApiOperation("查询仓位状态")
public ResponseEntity<Object> queryMaterial() {
return new ResponseEntity<>(groupInfoService.queryMaterial(), HttpStatus.OK);
}
}

4
wms/hd/nladmin-system/src/main/java/org/nl/wms/dis/service/GroupInfoService.java
View File

@@ -33,5 +33,9 @@ public interface GroupInfoService {
* 根据仓位查询仓位信息
*/
JSONObject queryInfoByCode();
/**
* 查询仓位物料
*/
JSONObject queryMaterial();
}

18
wms/hd/nladmin-system/src/main/java/org/nl/wms/dis/service/impl/GroupInfoServiceImpl.java
View File

@@ -2,6 +2,7 @@
package org.nl.wms.dis.service.impl;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONArray;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -49,11 +50,26 @@ public class GroupInfoServiceImpl implements GroupInfoService {
for (int i = 0; i < Arr.size(); i++) {
JSONObject structObj = Arr.getJSONObject(i);
String struct_code = structObj.getString("struct_code");
JSONObject jo = WQL.getWO("QST_OUTSTBYVEHICLE_01").addParam("flag", "4").addParam("struct_code",struct_code).process().uniqueResult(0);
JSONObject jo = WQL.getWO("QST_OUTSTBYVEHICLE_01").addParam("flag", "4").addParam("struct_code", struct_code).process().uniqueResult(0);
returnArr.put(structObj.getString("point_code"), jo);
}
return returnArr;
}
@Override
public JSONObject queryMaterial() {
JSONArray Arr = WQL.getWO("QST_OUTSTBYVEHICLE_01").addParam("flag", "5").process().getResultJSONArray(0);
JSONObject returnArr = new JSONObject();
for (int i = 0; i < Arr.size(); i++) {
JSONObject structObj = Arr.getJSONObject(i);
String material_spec = structObj.getString("material_spec");
if (StrUtil.isEmpty(material_spec)) {
material_spec = "空" ;
}
returnArr.put(structObj.getString("point_code"), material_spec);
}
return returnArr;
}
}

9
wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/rest/PointController.java
View File

@@ -2,6 +2,7 @@
package org.nl.wms.sch.rest;
import com.alibaba.fastjson.JSON;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
@@ -102,4 +103,12 @@ public class PointController {
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
}
@PostMapping("lock")
@Log("批量锁定")
@ApiOperation("批量锁定")
//@PreAuthorize("@el.check('point:add')")
public ResponseEntity<Object> lock(@RequestBody Map<String,Object> whereJson) {
pointService.lock(whereJson);
return new ResponseEntity<>(HttpStatus.CREATED);
}
}

7
wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/PointService.java
View File

@@ -102,4 +102,11 @@ public interface PointService {
*/
void changeActive(JSONObject json);
/**
* 批量锁定
*
* @return Map<String, Object>
*/
Map<String, Object> lock(Map<String,Object> jsonObject);
}

15
wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/PointServiceImpl.java
View File

@@ -183,5 +183,20 @@ public class PointServiceImpl implements PointService {
WQLObject.getWQLObject("sch_base_point").update(json);
}
@Override
public Map<String, Object> lock(Map<String, Object> map) {
JSONObject.toJSONString(map);
JSONObject jsonObject = JSONObject.parseObject(JSON.toJSONString(map));
JSONArray ja = jsonObject.getJSONArray("data");
WQLObject point_table = WQLObject.getWQLObject("sch_base_point");
for (int i = 0; i < ja.size(); i++) {
String point_code = ja.getJSONObject(i).getString("point_code");
JSONObject jsonObject1 = point_table.query("point_code = '" + point_code + "'").uniqueResult(0);
jsonObject1.put("lock_type", "01");
point_table.update(jsonObject1);
}
return null;
}
}

3
wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/DumpTask.java
View File

@@ -50,6 +50,9 @@ public class DumpTask extends AbstractAcsTask {
}
if (TaskStatusEnum.FINISHED.getCode().equals(status)) {
if (TaskStatusEnum.FINISHED.getCode().equals(taskObj.getString("task_status"))) {
return;
}
//更新转储单的状态
JSONObject dumpObj = WQLObject.getWQLObject("st_buss_dumpinv").query("task_uuid='" + task_uuid + "'").uniqueResult(0);
if (ObjectUtil.isNotEmpty(dumpObj)) {

4
wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InTask.java
View File

@@ -44,6 +44,10 @@ public class InTask extends AbstractAcsTask {
}
if (TaskStatusEnum.FINISHED.getCode().equals(status)) {
//防止更新两次 导致库存信息不对
if (TaskStatusEnum.FINISHED.getCode().equals(taskObj.getString("task_status"))) {
return;
}
// 更新任务状态为完成
jsonTask.put("task_status", TaskStatusEnum.FINISHED.getCode());
jsonTask.put("taskfinish_mode", taskObj.getString("taskfinish_mode"));

5
wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/OutStByVehicleTask.java
View File

@@ -36,6 +36,9 @@ public class OutStByVehicleTask extends AbstractAcsTask {
//修改完成
if (TaskStatusEnum.FINISHED.getCode().equals(status)) {
//修改任务表状态
if (TaskStatusEnum.FINISHED.getCode().equals(taskObj.getString("task_status"))) {
return;
}
taskObj.put("update_by", SecurityUtils.getCurrentUsername());
taskObj.put("update_time", DateUtil.now());
taskObj.put("task_status", TaskStatusEnum.FINISHED.getCode());
@@ -46,7 +49,7 @@ public class OutStByVehicleTask extends AbstractAcsTask {
WQLObject st_buss_outStByVehicleTable = WQLObject.getWQLObject("st_buss_OutStByVehicle");
JSONObject billJo = st_buss_outStByVehicleTable.query("task_uuid='" + task_uuid + "'").uniqueResult(0);
billJo.put("bill_status", "03");
billJo.put("is_can_back","1");
billJo.put("is_can_back", "1");
st_buss_outStByVehicleTable.update(billJo);
//减少库存
JSONObject paramIvt = new JSONObject();

4
wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/OutTask.java
View File

@@ -42,7 +42,9 @@ public class OutTask extends AbstractAcsTask {
}
if (TaskStatusEnum.FINISHED.getCode().equals(status)) {
if (TaskStatusEnum.FINISHED.getCode().equals(taskObj.getString("task_status"))) {
return;
}
WQLObject dtltable = WQLObject.getWQLObject("st_buss_IOStoreDtl");
// 更新任务状态为完成
taskjo.put("task_status", TaskStatusEnum.FINISHED.getCode());

22
wms/hd/nladmin-system/src/main/java/org/nl/wms/st/wql/QST_OUTSTBYVEHICLE_01.wql
View File

@@ -155,4 +155,24 @@
ENDOPTION
ENDSELECT
ENDQUERY
ENDIF
ENDIF
IF 输入.flag = "5"
QUERY
SELECT
point_code,
point_code AS struct_code,
point_name,
point_status,
material.material_uuid,
material.material_code,
material.material_spec
FROM
sch_base_point point
LEFT JOIN st_ivt_structivt ivt ON ivt.struct_uuid = point.point_uuid
LEFT JOIN md_base_material material ON material.material_uuid = ivt.material_uuid
WHERE
point.area_type IN ( '01', '02' )
ENDSELECT
ENDQUERY
ENDIF

2
wms/hd/nladmin-system/src/main/resources/config/application.yml
View File

@@ -2,7 +2,7 @@ spring:
freemarker:
check-template-location: false
profiles:
active: dev
active: prod
jackson:
time-zone: GMT+8
data:

2
wms/qd/package.json
View File

@@ -102,7 +102,7 @@
"lint-staged": "8.1.5",
"plop": "2.3.0",
"runjs": "^4.3.2",
"sass": "^1.26.10",
"sass": "~1.26.5",
"sass-loader": "^7.1.0",
"script-ext-html-webpack-plugin": "2.1.3",
"script-loader": "0.7.2",

10
wms/qd/src/api/wms/sch/point.js
View File

@@ -45,4 +45,12 @@ export function changeIs_active(data) {
})
}
export default { add, edit, del, syncStruct, changeIs_active, findPoints }
export function lock(data) {
return request({
url: 'api/point/lock',
method: 'post',
data
})
}
export default { add, edit, del, syncStruct, changeIs_active, findPoints, lock}

9
wms/qd/src/api/wms/st/dis.js
View File

@@ -45,6 +45,13 @@ export function queryStructStatus(data) {
data
})
}
export function queryMaterial(data) {
return request({
url: 'api/dis/queryMaterial',
method: 'post',
data
})
}
export function queryInfoByCode(data) {
return request({
@@ -54,4 +61,4 @@ export function queryInfoByCode(data) {
})
}
export default { add, edit, del, getStatus, getBackStatus, queryInfoByCode, queryStructStatus }
export default { add, edit, del, getStatus, getBackStatus, queryInfoByCode, queryStructStatus, queryMaterial }

32
wms/qd/src/views/wms/sch/point/index.vue
View File

@@ -123,6 +123,17 @@
>
仓位同步
</el-button>
<el-button
slot="right"
class="filter-item"
type="info"
:loading="syncLoading"
icon="el-icon-position"
size="mini"
@click="lockpoint()"
>
批量锁定
</el-button>
</crudOperation>
<!--表单组件-->
<el-dialog
@@ -276,6 +287,7 @@ import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation'
import udOperation from '@crud/UD.operation'
import pagination from '@crud/Pagination'
import ioStoreCrud from '@/api/wms/st/core/IOStore'
const defaultForm = {
point_uuid: null,
@@ -384,6 +396,8 @@ export default {
})
},
sync() {
debugger
alert("测试")
this.syncLoading = true
crudPoint.syncStruct().then(() => {
this.crud.toQuery()
@@ -392,6 +406,24 @@ export default {
}).catch(err => {
console.log(err.response.data.message)
})
},
lockpoint() {
const _selectData = this.$refs.table.selection
if (!_selectData) {
this.crud.notify('请选择一条记录', CRUD.NOTIFICATION_TYPE.INFO)
return
}
const param1 ={
data:_selectData
}
crudPoint.lock(param1).then(res => {
this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.crud.toQuery()
}).catch(err => {
console.log(err.response.data.message)
})
}
}

144
wms/qd/src/views/wms/st/visable/index2.vue
View File

@@ -21,10 +21,10 @@
<div
slot="reference"
class="grid-content bg-purple-dark"
style="border: 1px solid #d3dce6;display: inline-block;text-align: center;"
style="border: 1px solid #d3dce6;display: inline-block;text-align: center;font-size: 10px "
:style="'background:'+arr['0101-0'+count+'-02']+';width: '+div_width+'px;height: '+div_height+'px;'"
>
1排</br>{{ count }}列</br>2层
1排</br>{{ count }}列</br>2层</br>{{arr3['0101-0'+count+'-02']}}
</div>
</el-popover>
</el-col>
@@ -43,10 +43,10 @@
<div
slot="reference"
class="grid-content bg-purple-dark"
style="border: 1px solid #d3dce6;display: inline-block;text-align: center;"
style="border: 1px solid #d3dce6;display: inline-block;text-align: center; font-size: 10px;"
:style="'background:'+arr['0101-0'+count+'-01']+';width: '+div_width+'px;height: '+div_height+'px;'"
>
1排</br>{{ count }}列</br>1层
1排</br>{{ count }}列</br>1层</br>{{arr3['0101-0'+count+'-01']}}
</div>
</el-popover>
</el-col>
@@ -74,10 +74,10 @@
<div
slot="reference"
class="grid-content bg-purple-dark"
style="border: 1px solid #d3dce6;display: inline-block;text-align: center;"
style="border: 1px solid #d3dce6;display: inline-block;text-align: center; font-size: 10px;"
:style="'background:'+arr['0102-0'+count+'-02']+';width: '+div_width+'px;height: '+div_height+'px;'"
>
2排</br>{{ count }}列</br>2层
2排</br>{{ count }}列</br>2层</br>{{arr3['0101-0'+count+'-02']}}
</div>
</el-popover>
</el-col>
@@ -96,10 +96,10 @@
<div
slot="reference"
class="grid-content bg-purple-dark"
style="border: 1px solid #d3dce6;display: inline-block;text-align: center;"
style="border: 1px solid #d3dce6;display: inline-block;text-align: center; font-size: 10px;"
:style="'background:'+arr['0102-0'+count+'-01']+';width: '+div_width+'px;height: '+div_height+'px;'"
>
2排</br>{{ count }}列</br>1层
2排</br>{{ count }}列</br>1层</br>{{arr3['0102-0'+count+'-01']}}
</div>
</el-popover>
</el-col>
@@ -127,10 +127,10 @@
<div
slot="reference"
class="grid-content bg-purple-dark"
style="border: 1px solid #d3dce6;display: inline-block;text-align: center;"
style="border: 1px solid #d3dce6;display: inline-block;text-align: center; font-size: 10px;"
:style="'background:'+arr['0103-0'+count+'-02']+';width: '+div_width+'px;height: '+div_height+'px;'"
>
3排</br>{{ count }}列</br>2层
3排</br>{{ count }}列</br>2层</br>{{arr3['0103-0'+count+'-02']}}
</div>
</el-popover>
</el-col>
@@ -147,10 +147,10 @@
<div
slot="reference"
class="grid-content bg-purple-dark"
style="border: 1px solid #d3dce6;display: inline-block;text-align: center;"
style="border: 1px solid #d3dce6;display: inline-block;text-align: center; font-size: 10px;"
:style="'background:'+arr['0103-'+((count+6) >= 10 ? (count+6) : '0'+(count+6)) +'-02']+';width: '+div_width+'px;height: '+div_height+'px;'"
>
3排</br>{{ (count + 6) }}列</br>2层
3排</br>{{ (count + 6) }}列</br>2层</br>{{arr3['0103-'+((count+6) >= 10 ? (count+6) : '0'+(count+6)) +'-02']}}
</div>
</el-popover>
</el-col>
@@ -169,10 +169,10 @@
<div
slot="reference"
class="grid-content bg-purple-dark"
style="border: 1px solid #d3dce6;display: inline-block;text-align: center;"
style="border: 1px solid #d3dce6;display: inline-block;text-align: center; font-size: 10px;"
:style="'background:'+arr['0103-0'+count+'-01']+';width: '+div_width+'px;height: '+div_height+'px;'"
>
3排</br>{{ count }}列</br>1层
3排</br>{{ count }}列</br>1层</br>{{arr3['0103-0'+count+'-01']}}
</div>
</el-popover>
</el-col>
@@ -196,10 +196,10 @@
<div
slot="reference"
class="grid-content bg-purple-dark"
style="border: 1px solid #d3dce6;display: inline-block;text-align: center;"
style="border: 1px solid #d3dce6;display: inline-block;text-align: center; font-size: 10px;"
:style="'background:'+arr['0103-'+((count+6) >= 10 ? (count+6) : '0'+(count+6)) +'-01']+';width: '+div_width+'px;height: '+div_height+'px;'"
>
3排</br>{{ (count + 6) }}列</br>1层
3排</br>{{ (count + 6) }}列</br>1层</br>{{arr3['0103-'+((count+6) >= 10 ? (count+6) : '0'+(count+6)) +'-01']}}
</div>
</el-popover>
</el-col>
@@ -220,10 +220,10 @@
<div
slot="reference"
class="grid-content bg-purple-dark"
style="border: 1px solid #d3dce6;display: inline-block;text-align: center;"
style="border: 1px solid #d3dce6;display: inline-block;text-align: center; font-size: 10px;"
:style="'background:'+arr['0104-0'+count+'-02']+';width: '+div_width+'px;height: '+div_height+'px;'"
>
4排</br>{{ count }}列</br>2层
4排</br>{{ count }}列</br>2层</br>{{arr3['0104-0'+count+'-02']}}
</div>
</el-popover>
</el-col>
@@ -240,10 +240,10 @@
<div
slot="reference"
class="grid-content bg-purple-dark"
style="border: 1px solid #d3dce6;display: inline-block;text-align: center;"
style="border: 1px solid #d3dce6;display: inline-block;text-align: center; font-size: 10px;"
:style="'background:'+arr['0104-'+((count+6) >= 10 ? (count+6) : '0'+(count+6)) +'-02']+';width: '+div_width+'px;height: '+div_height+'px;'"
>
4排</br>{{ (count + 6) }}列</br>2层
4排</br>{{ (count + 6) }}列</br>2层</br>{{arr['0104-'+((count+6) >= 10 ? (count+6) : '0'+(count+6)) +'-02']}}
</div>
</el-popover>
</el-col>
@@ -262,10 +262,10 @@
<div
slot="reference"
class="grid-content bg-purple-dark"
style="border: 1px solid #d3dce6;display: inline-block;text-align: center;"
style="border: 1px solid #d3dce6;display: inline-block;text-align: center; font-size: 10px;"
:style="'background:'+arr['0104-'+((count+6) >= 10 ? (count+6) : '0'+(count+6)) +'-01']+';width: '+div_width+'px;height: '+div_height+'px;'"
>
4排</br>{{ count }}列</br>1层
4排</br>{{ count }}列</br>1层</br>{{arr3['0104-'+((count+6) >= 10 ? (count+6) : '0'+(count+6)) +'-01']}}
</div>
</el-popover>
</el-col>
@@ -289,10 +289,10 @@
<div
slot="reference"
class="grid-content bg-purple-dark"
style="border: 1px solid #d3dce6;display: inline-block;text-align: center;"
style="border: 1px solid #d3dce6;display: inline-block;text-align: center; font-size: 10px;"
:style="'background:'+arr['0104-'+((count+6) >= 10 ? (count+6) : '0'+(count+6)) +'-01']+';width: '+div_width+'px;height: '+div_height+'px;'"
>
4排</br>{{ (count + 6) }}列</br>1层
4排</br>{{ (count + 6) }}列</br>1层</br>{{arr3['0104-'+((count+6) >= 10 ? (count+6) : '0'+(count+6)) +'-01']}}
</div>
</el-popover>
</el-col>
@@ -313,10 +313,10 @@
<div
slot="reference"
class="grid-content bg-purple-dark"
style="border: 1px solid #d3dce6;display: inline-block;text-align: center;"
style="border: 1px solid #d3dce6;display: inline-block;text-align: center; font-size: 10px;"
:style="'background:'+arr['0105-'+((count) >= 10 ? (count) : '0'+(count)) +'-02']+';width: '+div_width+'px;height: '+div_height+'px;'"
>
5排</br>{{ count }}列</br>2层
5排</br>{{ count }}列</br>2层</br>{{arr3['0105-'+((count) >= 10 ? (count) : '0'+(count)) +'-02']}}
</div>
</el-popover>
</el-col>
@@ -333,10 +333,10 @@
<div
slot="reference"
class="grid-content bg-purple-dark"
style="border: 1px solid #d3dce6;display: inline-block;text-align: center;"
style="border: 1px solid #d3dce6;display: inline-block;text-align: center; font-size: 10px;"
:style="'background:'+arr['0105-'+((count+12) >= 10 ? (count+12) : '0'+(count+12)) +'-02']+';width: '+div_width+'px;height: '+div_height+'px;'"
>
5排</br>{{ (count + 12) }}列</br>2层
5排</br>{{ (count + 12) }}列</br>2层</br>{{arr3['0105-'+((count+12) >= 10 ? (count+12) : '0'+(count+12)) +'-02']}}
</div>
</el-popover>
</el-col>
@@ -355,10 +355,10 @@
<div
slot="reference"
class="grid-content bg-purple-dark"
style="border: 1px solid #d3dce6;display: inline-block;text-align: center;"
style="border: 1px solid #d3dce6;display: inline-block;text-align: center; font-size: 10px;"
:style="'background:'+arr['0105-'+((count) >= 10 ? (count) : '0'+(count)) +'-01']+';width: '+div_width+'px;height: '+div_height+'px;'"
>
5排</br>{{ count }}列</br>1层
5排</br>{{ count }}列</br>1层</br>{{arr3['0105-'+((count) >= 10 ? (count) : '0'+(count)) +'-01']}}
</div>
</el-popover>
</el-col>
@@ -382,10 +382,10 @@
<div
slot="reference"
class="grid-content bg-purple-dark"
style="border: 1px solid #d3dce6;display: inline-block;text-align: center;"
style="border: 1px solid #d3dce6;display: inline-block;text-align: center; font-size: 10px;"
:style="'background:'+arr['0105-'+((count+12) >= 10 ? (count+12) : '0'+(count+12)) +'-01']+';width: '+div_width+'px;height: '+div_height+'px;'"
>
5排</br>{{ (count + 12) }}列</br>1层
5排</br>{{ (count + 12) }}列</br>1层</br>{{arr3['0105-'+((count+12) >= 10 ? (count+12) : '0'+(count+12)) +'-01']}}
</div>
</el-popover>
</el-col>
@@ -406,10 +406,10 @@
<div
slot="reference"
class="grid-content bg-purple-dark"
style="border: 1px solid #d3dce6;display: inline-block;text-align: center;"
style="border: 1px solid #d3dce6;display: inline-block;text-align: center; font-size: 10px;"
:style="'background:'+arr['0106-'+((count) >= 10 ? (count) : '0'+(count)) +'-02']+';width: '+div_width+'px;height: '+div_height+'px;'"
>
6排</br>{{ count }}列</br>2层
6排</br>{{ count }}列</br>2层</br>{{arr3['0106-'+((count) >= 10 ? (count) : '0'+(count)) +'-02']}}
</div>
</el-popover>
</el-col>
@@ -426,10 +426,10 @@
<div
slot="reference"
class="grid-content bg-purple-dark"
style="border: 1px solid #d3dce6;display: inline-block;text-align: center;"
style="border: 1px solid #d3dce6;display: inline-block;text-align: center; font-size: 10px;"
:style="'background:'+arr['0106-'+((count+12) >= 10 ? (count+12) : '0'+(count+12)) +'-02']+';width: '+div_width+'px;height: '+div_height+'px;'"
>
6排</br>{{ (count + 12) }}列</br>2层
6排</br>{{ (count + 12) }}列</br>2层</br>{{arr3['0106-'+((count+12) >= 10 ? (count+12) : '0'+(count+12)) +'-02']}}
</div>
</el-popover>
</el-col>
@@ -448,10 +448,10 @@
<div
slot="reference"
class="grid-content bg-purple-dark"
style="border: 1px solid #d3dce6;display: inline-block;text-align: center;"
style="border: 1px solid #d3dce6;display: inline-block;text-align: center; font-size: 10px;"
:style="'background:'+arr['0106-'+((count) >= 10 ? (count) : '0'+(count)) +'-01']+';width: '+div_width+'px;height: '+div_height+'px;'"
>
6排</br>{{ count }}列</br>1层
6排</br>{{ count }}列</br>1层</br>{{arr3['0106-'+((count) >= 10 ? (count) : '0'+(count)) +'-01']}}
</div>
</el-popover>
</el-col>
@@ -475,10 +475,10 @@
<div
slot="reference"
class="grid-content bg-purple-dark"
style="border: 1px solid #d3dce6;display: inline-block;text-align: center;"
style="border: 1px solid #d3dce6;display: inline-block;text-align: center; font-size: 10px;"
:style="'background:'+arr['0106-'+((count+12) >= 10 ? (count+12) : '0'+(count+12)) +'-01']+';width: '+div_width+'px;height: '+div_height+'px;'"
>
6排</br>{{ (count + 12) }}列</br>1层
6排</br>{{ (count + 12) }}列</br>1层</br>{{arr3['0106-'+((count+12) >= 10 ? (count+12) : '0'+(count+12)) +'-01']}}
</div>
</el-popover>
</el-col>
@@ -499,10 +499,10 @@
<div
slot="reference"
class="grid-content bg-purple-dark"
style="border: 1px solid #d3dce6;display: inline-block;text-align: center;"
style="border: 1px solid #d3dce6;display: inline-block;text-align: center; font-size: 10px;"
:style="'background:'+arr['0107-'+((count) >= 10 ? (count) : '0'+(count)) +'-02']+';width: '+div_width+'px;height: '+div_height+'px;'"
>
7排</br>{{ count }}列</br>2层
7排</br>{{ count }}列</br>2层</br>{{arr3['0107-'+((count) >= 10 ? (count) : '0'+(count)) +'-02']}}
</div>
</el-popover>
</el-col>
@@ -519,10 +519,10 @@
<div
slot="reference"
class="grid-content bg-purple-dark"
style="border: 1px solid #d3dce6;display: inline-block;text-align: center;"
style="border: 1px solid #d3dce6;display: inline-block;text-align: center; font-size: 10px;"
:style="'background:'+arr['0107-'+((count+12) >= 10 ? (count+12) : '0'+(count+12)) +'-02']+';width: '+div_width+'px;height: '+div_height+'px;'"
>
7排</br>{{ (count + 12) }}列</br>2层
7排</br>{{ (count + 12) }}列</br>2层</br>{{arr3['0107-'+((count+12) >= 10 ? (count+12) : '0'+(count+12)) +'-02']}}
</div>
</el-popover>
</el-col>
@@ -541,10 +541,10 @@
<div
slot="reference"
class="grid-content bg-purple-dark"
style="border: 1px solid #d3dce6;display: inline-block;text-align: center;"
style="border: 1px solid #d3dce6;display: inline-block;text-align: center; font-size: 10px;"
:style="'background:'+arr['0107-'+((count) >= 10 ? (count) : '0'+(count)) +'-01']+';width: '+div_width+'px;height: '+div_height+'px;'"
>
7排</br>{{ count }}列</br>1层
7排</br>{{ count }}列</br>1层</br>{{arr3['0107-'+((count) >= 10 ? (count) : '0'+(count)) +'-01']}}
</div>
</el-popover>
</el-col>
@@ -568,10 +568,10 @@
<div
slot="reference"
class="grid-content bg-purple-dark"
style="border: 1px solid #d3dce6;display: inline-block;text-align: center;"
style="border: 1px solid #d3dce6;display: inline-block;text-align: center; font-size: 10px;"
:style="'background:'+arr['0107-'+((count+12) >= 10 ? (count+12) : '0'+(count+12)) +'-01']+';width: '+div_width+'px;height: '+div_height+'px;'"
>
7排</br>{{ (count + 12) }}列</br>1层
7排</br>{{ (count + 12) }}列</br>1层</br>{{arr3['0107-'+((count+12) >= 10 ? (count+12) : '0'+(count+12)) +'-01']}}
</div>
</el-popover>
</el-col>
@@ -592,10 +592,10 @@
<div
slot="reference"
class="grid-content bg-purple-dark"
style="border: 1px solid #d3dce6;display: inline-block;text-align: center;"
style="border: 1px solid #d3dce6;display: inline-block;text-align: center; font-size: 10px;"
:style="'background:'+arr['0108-'+((count) >= 10 ? (count) : '0'+(count)) +'-02']+';width: '+div_width+'px;height: '+div_height+'px;'"
>
8排</br>{{ count }}列</br>2层
8排</br>{{ count }}列</br>2层</br>{{arr3['0108-'+((count) >= 10 ? (count) : '0'+(count)) +'-02']}}
</div>
</el-popover>
</el-col>
@@ -612,10 +612,10 @@
<div
slot="reference"
class="grid-content bg-purple-dark"
style="border: 1px solid #d3dce6;display: inline-block;text-align: center;"
style="border: 1px solid #d3dce6;display: inline-block;text-align: center; font-size: 10px;"
:style="'background:'+arr['0108-'+((count+12) >= 10 ? (count+12) : '0'+(count+12)) +'-02']+';width: '+div_width+'px;height: '+div_height+'px;'"
>
8排</br>{{ (count + 12) }}列</br>2层
8排</br>{{ (count + 12) }}列</br>2层</br>{{arr3['0108-'+((count+12) >= 10 ? (count+12) : '0'+(count+12)) +'-02']}}
</div>
</el-popover>
</el-col>
@@ -634,10 +634,10 @@
<div
slot="reference"
class="grid-content bg-purple-dark"
style="border: 1px solid #d3dce6;display: inline-block;text-align: center;"
style="border: 1px solid #d3dce6;display: inline-block;text-align: center; font-size: 10px;"
:style="'background:'+arr['0108-'+((count) >= 10 ? (count) : '0'+(count)) +'-01']+';width: '+div_width+'px;height: '+div_height+'px;'"
>
8排</br>{{ count }}列</br>1层
8排</br>{{ count }}列</br>1层</br>{{arr3['0108-'+((count) >= 10 ? (count) : '0'+(count)) +'-01']}}
</div>
</el-popover>
</el-col>
@@ -661,10 +661,10 @@
<div
slot="reference"
class="grid-content bg-purple-dark"
style="border: 1px solid #d3dce6;display: inline-block;text-align: center;"
style="border: 1px solid #d3dce6;display: inline-block;text-align: center; font-size: 10px;"
:style="'background:'+arr['0108-'+((count+12) >= 10 ? (count+12) : '0'+(count+12)) +'-01']+';width: '+div_width+'px;height: '+div_height+'px;'"
>
8排</br>{{ (count + 12) }}列</br>1层
8排</br>{{ (count + 12) }}列</br>1层</br>{{arr3['0108-'+((count+12) >= 10 ? (count+12) : '0'+(count+12)) +'-01']}}
</div>
</el-popover>
</el-col>
@@ -685,16 +685,16 @@
<div
slot="reference"
class="grid-content bg-purple-dark"
style="border: 1px solid #d3dce6;display: inline-block;text-align: center;"
style="border: 1px solid #d3dce6;display: inline-block;text-align: center; font-size: 10px;"
:style="'background:'+arr['0109-'+((count) >= 10 ? (count) : '0'+(count)) +'-02']+';width: '+div_width+'px;height: '+div_height+'px;'"
>
9排</br>{{ count }}列</br>2层
9排</br>{{ count }}列</br>2层</br>{{arr3['0109-'+((count) >= 10 ? (count) : '0'+(count)) +'-02']}}
</div>
</el-popover>
</el-col>
<el-col :span="12" :offset="2">
<el-popover
v-for="count in 14"
v-for="count in 13"
placement="bottom"
title="货位详情"
trigger="hover"
@@ -705,10 +705,10 @@
<div
slot="reference"
class="grid-content bg-purple-dark"
style="border: 1px solid #d3dce6;display: inline-block;text-align: center;"
style="border: 1px solid #d3dce6;display: inline-block;text-align: center; font-size: 10px;"
:style="'background:'+arr['0109-'+((count+12) >= 10 ? (count+12) : '0'+(count+12)) +'-02']+';width: '+div_width+'px;height: '+div_height+'px;'"
>
9排</br>{{ (count + 12) }}列</br>2层
9排</br>{{ (count + 12) }}列</br>2层</br>{{arr3['0109-'+((count+12) >= 10 ? (count+12) : '0'+(count+12)) +'-02']}}
</div>
</el-popover>
</el-col>
@@ -727,10 +727,10 @@
<div
slot="reference"
class="grid-content bg-purple-dark"
style="border: 1px solid #d3dce6;display: inline-block;text-align: center;"
style="border: 1px solid #d3dce6;display: inline-block;text-align: center; font-size: 10px;"
:style="'background:'+arr['0109-'+((count) >= 10 ? (count) : '0'+(count)) +'-01']+';width: '+div_width+'px;height: '+div_height+'px;'"
>
9排</br>{{ count }}列</br>1层
9排</br>{{ count }}列</br>1层</br>{{arr3['0109-'+((count) >= 10 ? (count) : '0'+(count)) +'-01']}}
</div>
</el-popover>
</el-col>
@@ -743,7 +743,7 @@
</el-col>
<el-col :span="12">
<el-popover
v-for="count in 14"
v-for="count in 13"
placement="bottom"
title="货位详情"
trigger="hover"
@@ -754,10 +754,10 @@
<div
slot="reference"
class="grid-content bg-purple-dark"
style="border: 1px solid #d3dce6;display: inline-block;text-align: center;"
style="border: 1px solid #d3dce6;display: inline-block;text-align: center; font-size: 10px;"
:style="'background:'+arr['0109-'+((count+12) >= 10 ? (count+12) : '0'+(count+12)) +'-01']+';width: '+div_width+'px;height: '+div_height+'px;'"
>
9排</br>{{ (count + 12) }}列</br>1层
9排</br>{{ (count + 12) }}列</br>1层</br>{{arr3['0109-'+((count+12) >= 10 ? (count+12) : '0'+(count+12)) +'-01']}}
</div>
</el-popover>
</el-col>
@@ -767,16 +767,17 @@
</template>
<script>
import dis from '@/api/wms/st/dis'
import dis, { queryMaterial } from '@/api/wms/st/dis'
export default {
name: 'Test',
data() {
return {
arr: {},
arr2: {},
arr3:{},
width: '2500',
div_width: '43',
div_height: '60',
div_width: '35',
div_height: '58',
row_color: '#0d3fad'
}
},
@@ -784,9 +785,14 @@ export default {
},
mounted() {
const timer = setInterval(() => {
debugger
dis.queryStructStatus().then(res => {
this.arr = res
})
dis.queryMaterial().then(res => {
debugger
this.arr3 = res
})
dis.queryInfoByCode().then(res => {
this.arr2 = res
})