From 82bcd0328dddbaad65933e2fada22bc68e82b3d5 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期六, 26 八月 2023 10:07:46 +0800
Subject: [PATCH] # 导入订单增加单据类型
---
src/main/webapp/views/home/map.html | 277 ++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 192 insertions(+), 85 deletions(-)
diff --git a/src/main/webapp/views/home/map.html b/src/main/webapp/views/home/map.html
index af9e317..35619e8 100644
--- a/src/main/webapp/views/home/map.html
+++ b/src/main/webapp/views/home/map.html
@@ -6,11 +6,13 @@
<link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
<link rel="stylesheet" href="../../static/css/admin.css?v=318" media="all">
<link rel="stylesheet" href="../../static/css/cool.css" media="all">
+ <link rel="stylesheet" href="../../static/css/element.css">
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js"></script>
<script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script>
<script type="text/javascript" src="../../static/js/common.js"></script>
<script type="text/javascript" src="../../static/js/vue.min.js"></script>
+ <script type="text/javascript" src="../../static/js/element.js"></script>
<style>
.pointContainer {
display: flex;
@@ -99,28 +101,28 @@
position: relative;
}
- .crnBox{
- width: 120px;
- height: 40px;
- background: url("../../static/image/Crane_manual.png") no-repeat;
- position: absolute;
- top: -25px;
- left: -120px;
- transition:left 2s;
- cursor: pointer;
- }
+ /*.crnBox{*/
+ /* width: 120px;*/
+ /* height: 40px;*/
+ /* background: url("../../static/image/Crane_manual.png") no-repeat;*/
+ /* position: absolute;*/
+ /* top: -25px;*/
+ /* left: -120px;*/
+ /* transition:left 2s;*/
+ /* cursor: pointer;*/
+ /*}*/
- .carBox{
- width: 40px;
- height: 40px;
- background: url("../../static/image/ste/car.png") no-repeat;
- background-size: 100% 100%;
- position: absolute;
- top: 0;
- left: 0;
- transition:left 2s;
- cursor: pointer;
- }
+ /*.carBox{*/
+ /* width: 40px;*/
+ /* height: 40px;*/
+ /* background: url("../../static/image/ste/car.png") no-repeat;*/
+ /* background-size: 100% 100%;*/
+ /* position: absolute;*/
+ /* top: 0;*/
+ /* left: 0;*/
+ /* transition:left 2s;*/
+ /* cursor: pointer;*/
+ /*}*/
.popBox {
position: absolute;
@@ -194,7 +196,7 @@
/*婊戝姩鍗＄墖start*/
.hoverCard {
- width: 160px;
+ width: 150px;
height: 224px;
border-radius: 20px;
background: #f5f5f5;
@@ -402,7 +404,7 @@
</head>
<body>
<div id="app" style="display: flex;justify-content: space-around;margin-top: 50px;flex-wrap: wrap;" @click="bgClick()">
- <div style="flex: 12;">
+ <div style="flex: 12;display: flex;" :style="{scale:showScale/100.0,marginTop:(showScale-100)*5 + 'px'}">
<div>
<div class="pointContainer" v-for="(x,index) in map" :key="index">
<div v-if="index != 0 && (index != map.length-1)" v-for="(y,idx) in x" :key="idx">
@@ -411,13 +413,13 @@
<!--搴撲綅-->
<div v-else-if="map[index][idx].value == 0" @contextmenu.prevent="rightEvent(index,idx,$event)">
- <div v-if="map[index][idx].locSts == 'O'" class="pointBox pointBoxBlue">{{ map[index][idx].locSts }}</div>
- <div v-else-if="map[index][idx].locSts == 'F'" @click.left.stop="selectLoc(index,idx)" :class="{'pointBoxSelected':map[index][idx].locOutSelected,'pointBoxSearch':map[index][idx].searchStatus}" class="pointBox pointBoxRed">{{ map[index][idx].locSts }}</div>
- <div v-else-if="map[index][idx].locSts == 'D'" class="pointBox pointBoxEmpty">{{ map[index][idx].locSts }}</div>
- <div v-else-if="map[index][idx].locSts == 'P'" class="pointBox pointBoxOut">{{ map[index][idx].locSts }}</div>
+ <div v-if="map[index][idx].locSts == 'O'" :class="{'pointBoxSearch':map[index][idx].searchStatus}" class="pointBox pointBoxBlue">{{ map[index][idx].locSts }}</div>
+ <div v-else-if="map[index][idx].locSts == 'F'" @click.left="selectLoc(index,idx)" :class="{'pointBoxSelected':map[index][idx].locOutSelected,'pointBoxSearch':map[index][idx].searchStatus}" class="pointBox pointBoxRed">{{ map[index][idx].locSts }}</div>
+ <div v-else-if="map[index][idx].locSts == 'D'" :class="{'pointBoxSearch':map[index][idx].searchStatus}" class="pointBox pointBoxEmpty">{{ map[index][idx].locSts }}</div>
+ <div v-else-if="map[index][idx].locSts == 'P'" :class="{'pointBoxSearch':map[index][idx].searchStatus}" class="pointBox pointBoxOut">{{ map[index][idx].locSts }}</div>
<div v-else-if="map[index][idx].locSts == 'R'" :class="{'pointBoxSearch':map[index][idx].searchStatus}" class="pointBox pointBoxOutYy">{{ map[index][idx].locSts }}</div>
<div v-else-if="map[index][idx].locSts == 'S'" class="pointBox pointBoxInYy">{{ map[index][idx].locSts }}</div>
- <div v-else class="pointBox pointBoxDefault">{{ map[index][idx].locSts }}</div>
+ <div v-else class="pointBox pointBoxDefault" :class="{'pointBoxSearch':map[index][idx].searchStatus}">{{ map[index][idx].locSts }}</div>
</div>
<!--鍫嗗灈鏈�-->
@@ -441,10 +443,23 @@
</div>
</div>
+
+ <div style="width: 40px;display: flex;justify-content: center;align-items: center;">
+ {{ getRealRowByX(index) }}
+ </div>
+
</div>
</div>
+
+ <div>
+ <div style="margin-top: 20px;"><button class="layui-btn" @click="currentLev = 1" :style="{background: currentLev==1?'red':''}">1F</button></div>
+ <div style="margin-top: 20px;"><button class="layui-btn" @click="currentLev = 2" :style="{background: currentLev==2?'red':''}">2F</button></div>
+ <div style="margin-top: 20px;"><button class="layui-btn" @click="currentLev = 3" :style="{background: currentLev==3?'red':''}">3F</button></div>
+ <div style="margin-top: 20px;"><button class="layui-btn" @click="currentLev = 4" :style="{background: currentLev==4?'red':''}">4F</button></div>
+ </div>
</div>
- <div style="padding: 20px;flex: 5;margin-top: -70px;">
+ <div style="padding: 40px 20px 10px 10px;flex: 5;margin-top: -70px;">
+ <el-slider v-model="showScale" :marks="showScaleMarks"></el-slider>
<div style="display: flex;justify-content: space-between;flex-wrap: wrap;">
<div class="hoverCard" style="width: 100%;">
<div class="card-details" style="place-content: normal;height: auto;">
@@ -464,7 +479,13 @@
<!-- <div>-->
<!-- <button @click="locToLoc2" class="layui-btn layui-btn-sm">渚ц竟绉诲簱</button>-->
<!-- </div>-->
- <div v-if="!locOutStatus">
+ <div>
+ <button @click="init" class="layui-btn layui-btn-sm">鍒锋柊</button>
+ </div>
+ <div style="margin-left: 10px;">
+ <button @click="resetSearch" class="layui-btn layui-btn-sm">閲嶇疆</button>
+ </div>
+ <div v-if="!locOutStatus" style="margin-left: 10px;">
<button @click="locOutStatus = true" class="layui-btn layui-btn-sm">鍑哄簱閫夋嫨</button>
</div>
<div v-else style="margin-left: 10px;border: 1px red solid;display: flex;">
@@ -520,24 +541,24 @@
<button class="card-button">搴撲綅鐘舵��</button>
</div>
- <div class="hoverCard">
- <div class="card-details">
- <p class="text-title" style="text-align: center;">妤煎眰 {{currentLev}}F</p>
- <div class="text-body" style="display: flex;">
- <div class="floorSelect">
- <label for="01">1F</label>
- <input id="01" type="radio" name="r" v-model="currentLev" value="1" checked="">
- <label for="02">2F</label>
- <input id="02" type="radio" v-model="currentLev" name="r" value="2">
- <label for="03">3F</label>
- <input id="03" type="radio" v-model="currentLev" name="r" value="3">
- <label for="04">4F</label>
- <input id="04" type="radio" v-model="currentLev" name="r" value="4">
- </div>
- </div>
- </div>
- <button class="card-button">妤煎眰 {{currentLev}}F</button>
- </div>
+<!-- <div class="hoverCard">-->
+<!-- <div class="card-details">-->
+<!-- <p class="text-title" style="text-align: center;">妤煎眰 {{currentLev}}F</p>-->
+<!-- <div class="text-body" style="display: flex;">-->
+<!-- <div class="floorSelect">-->
+<!-- <label for="01">1F</label>-->
+<!-- <input id="01" type="radio" name="r" v-model="currentLev" value="1" checked="">-->
+<!-- <label for="02">2F</label>-->
+<!-- <input id="02" type="radio" v-model="currentLev" name="r" value="2">-->
+<!-- <label for="03">3F</label>-->
+<!-- <input id="03" type="radio" v-model="currentLev" name="r" value="3">-->
+<!-- <label for="04">4F</label>-->
+<!-- <input id="04" type="radio" v-model="currentLev" name="r" value="4">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <button class="card-button">妤煎眰 {{currentLev}}F</button>-->
+<!-- </div>-->
</div>
</div>
@@ -560,17 +581,17 @@
搴撲綅鍙�: {{ map[mapI][mapJ].locNo }}
</div>
<div style="margin-top: 10px;">
- 搴撲綅鐘舵��: {{ map[mapI][mapJ].locSts$ }}
+ 搴撲綅鐘舵��: {{ getLocSts(map[mapI][mapJ].locSts) }}
</div>
<div style="margin-top: 10px;display: flex;justify-content: space-between;flex-wrap: wrap;">
<div style="margin-top: 5px;">
<button class="layui-btn layui-btn-sm" @click="openLocDetail(map[mapI][mapJ].locNo)">搴撲綅璇︽儏</button>
</div>
- <div style="margin-top: 5px;">
- <button v-if="map[mapI][mapJ].locSts == 'F'" class="layui-btn layui-btn-sm" @click="locMove(map[mapI][mapJ].locNo)">搴撲綅绉昏浆</button>
- <button v-else-if="map[mapI][mapJ].locSts == 'D'" class="layui-btn layui-btn-sm" @click="locMove(map[mapI][mapJ].locNo)">搴撲綅绉昏浆</button>
- <button v-else class="layui-btn layui-btn-sm layui-btn-disabled" disabled>搴撲綅绉昏浆</button>
- </div>
+<!-- <div style="margin-top: 5px;">-->
+<!-- <button v-if="map[mapI][mapJ].locSts == 'F'" class="layui-btn layui-btn-sm" @click="locMove(map[mapI][mapJ].locNo)">搴撲綅绉昏浆</button>-->
+<!-- <button v-else-if="map[mapI][mapJ].locSts == 'D'" class="layui-btn layui-btn-sm" @click="locMove(map[mapI][mapJ].locNo)">搴撲綅绉昏浆</button>-->
+<!-- <button v-else class="layui-btn layui-btn-sm layui-btn-disabled" disabled>搴撲綅绉昏浆</button>-->
+<!-- </div>-->
</div>
</div>
</div>
@@ -637,6 +658,18 @@
searchLocNo: "",
outSite: null,
outSites: null,
+ showScale: 77, //鎺у埗鍦板浘鏄剧ず澶у皬姣斾緥
+ showScaleMarks: {//姣斾緥婊戝姩鏉℃樉绀烘爣璁�
+ 0: "0%",
+ 50: {
+ style: {
+ color: '#1989FA'
+ },
+ label: "50%"
+ },
+ 100: "100%",
+ },
+ locStsList: [],//搴撲綅鐘舵�佸垪琛�
},
created(){
this.init()
@@ -659,6 +692,13 @@
deep: true,
handler(val) {
this.init()
+ if (this.searchMatnr != ""
+ || this.searchOrderNo != ""
+ || this.searchSpecs != ""
+ || this.searchMaktx != ""
+ || this.searchLocNo != "") {
+ this.searchLoc()
+ }
}
}
},
@@ -676,6 +716,16 @@
this.locOutStatus = false
this.locOutLocNo = []
+
+ this.getLocStsList();//鑾峰彇搴撲綅鐘舵�佸垪琛�
+ },
+ resetSearch(){
+ this.searchMatnr = ""
+ this.searchOrderNo = ""
+ this.searchSpecs = ""
+ this.searchMaktx = ""
+ this.searchLocNo = ""
+ this.searchLoc()
},
printData() {
this.mapData = JSON.stringify(this.map)
@@ -694,6 +744,19 @@
})
this.map = data
this.printData()
+ },
+ getRealRowByX(x) {
+ //鑾峰彇鐪熷疄搴撲綅琛屽彿锛岄�氳繃鍧愭爣x
+ let data = this.map
+ let rowData = data[x]
+ for (var i = 1; i < rowData.length; i++) {
+ if (rowData[i].locNo != undefined) {
+ let locNo = rowData[i].locNo;
+ return "#" + parseInt(locNo.substr(0, 2));
+ }
+ }
+
+ return "";
},
rightEvent(x, y, e) {
this.rightBox = true
@@ -717,6 +780,29 @@
success: function(layero, index){
}
});
+ },
+ getLocStsList() {
+ //鑾峰彇搴撲綅鐘舵�佸垪琛�
+ let that = this
+ $.ajax({
+ url: baseUrl + "/basLocSts/list/auth",
+ headers: {'token': localStorage.getItem('token')},
+ method: "get",
+ success: (res) => {
+ that.locStsList = res.data.records
+ }
+ })
+ },
+ getLocSts(locSts) {
+ //鑾峰彇搴撲綅鐘舵��
+ let locStsList = this.locStsList
+ let locDesc = ""
+ locStsList.forEach((item,index) => {
+ if (item.locSts == locSts) {
+ locDesc = item.locDesc
+ }
+ })
+ return locDesc
},
locMove(locNo) {
//搴撲綅绉昏浆
@@ -825,7 +911,26 @@
async: false,
success: function (res) {
if (res.code === 200) {
- locDetls = res.data
+ // locDetls = res.data
+ let data = res.data
+ //鍚堝苟鍚岀被鍨�
+ let tmpLocDetls = []
+ data.forEach((item,index) => {
+ let keyIdx = -1;
+ tmpLocDetls.forEach((val,idx) => {
+ if (val.matnr == item.matnr) {
+ keyIdx = idx
+ }
+ })
+
+ if (keyIdx == -1) {
+ tmpLocDetls.push(item);
+ }else {
+ tmpLocDetls[keyIdx].anfme += item.anfme
+ }
+ })
+
+ locDetls = tmpLocDetls
} else if (res.code === 403) {
top.location.href = baseUrl + "/";
} else {
@@ -834,29 +939,34 @@
}
})
+ let alertText = "鍗冲皢鍑哄簱" + locDetls.length + "涓墿鏂�<br/>"
locDetls.forEach((item,index) => {
item.count = item.anfme
+ alertText += "鐗╂枡鍙凤細" + item.matnr + "锛�" + item.anfme + "涓�<br/>"
})
- $.ajax({
- url: baseUrl + "/plate/out/start",
- headers: {'token': localStorage.getItem('token')},
- data: JSON.stringify({
- outSite: this.outSite,
- locDetls: locDetls
- }),
- contentType:'application/json;charset=UTF-8',
- method: 'POST',
- success: function (res) {
- if (res.code === 200){
- $layui.layer.msg(res.msg);
- that.init()
- } else if (res.code === 403){
- top.location.href = baseUrl+"/";
- } else {
- $layui.layer.msg(res.msg)
+ layer.confirm(alertText, {title: '鍑哄簱浣滀笟', shadeClose: true, area: ['auto']}, function(){
+ $.ajax({
+ url: baseUrl + "/plate/out/start",
+ headers: {'token': localStorage.getItem('token')},
+ data: JSON.stringify({
+ outSite: that.outSite,
+ locDetls: locDetls
+ }),
+ contentType:'application/json;charset=UTF-8',
+ method: 'POST',
+ success: function (res) {
+ if (res.code === 200){
+ $layui.layer.msg(res.msg);
+ that.init()
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ $layui.layer.msg(res.msg)
+ }
}
- }
+ });
+ layer.closeAll();
});
},
searchDataIndex(data,dist) {
@@ -951,19 +1061,16 @@
})
})
- data.forEach((item,index) => {
- let locNo = item.locNo
- let y = parseInt(locNo.substr(2,3))
- let x = parseInt(locNo.substr(0,2))
- if (x >= 4 && x <= 11) {
- x++;
- }else if (x >= 12 && x <= 18) {
- x += 2;
- } else if (x >= 19 && x <= 21) {
- x += 3;
- }
- tmp[x][y].searchStatus = true//鎼滅储鏍囪
+ data.forEach((item,i) => {
+ let locNo = item.locNo
+ tmp.forEach((item,index) => {
+ item.forEach((val,idx) => {
+ if (tmp[index][idx].locNo == locNo) {
+ tmp[index][idx].searchStatus = true//鎼滅储鏍囪
+ }
+ })
+ })
})
that.map = tmp
$layui.layer.msg("鎼滅储鎴愬姛");
--
Gitblit v1.9.1