zy-asrs.git - Gitblit

			@@ -6,15 +6,17 @@
			<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;
			justify-content: center;
			justify-content: flex-start;
			margin-top: 1px;
			}

			@@ -33,8 +35,8 @@

			.pointBox {
			background: #fffef9;
			width: 40px;
			height: 40px;
			width: 35px;
			height: 35px;
			margin-right: 1px;
			display: flex;
			justify-content: center;
			@@ -44,6 +46,7 @@
			color: #fff;
			/transform: perspective(130px) rotateX(30deg) translateZ(-20px);/
			box-shadow: 2px 2px 10px rgba(0, 0, 0, 0.5);
			/border-radius: 50% 20% / 10% 40%;/
			}

			.pointBox:hover{
			@@ -71,7 +74,7 @@
			}

			.pointBoxGreen {
			background: #00ff7f;
			background: #945833;
			}

			.pointBoxBlue {
			@@ -99,7 +102,7 @@
			}

			.pointBoxDefault {
			background: #f9f4dc;
			background: #ffffff;
			}

			.pointBoxSelected {
			@@ -119,28 +122,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;
			@@ -214,7 +217,7 @@

			/滑动卡片start/
			.hoverCard {
			width: 160px;
			width: 152px;
			height: 224px;
			border-radius: 20px;
			background: #f5f5f5;
			@@ -421,9 +424,9 @@
			</style>
			</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>
			<div id="app" style="display: flex;justify-content: space-around;margin-top: 50px;flex-wrap:nowrap; " @click="bgClick()">
			<div style="flex: 3;overflow: auto; " :style="{scale:showScale/100.0,marginTop:(showScale-100)*5 + 'px'}">
			<div style="width: 100%;overflow: auto;">
			<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">
			<div v-if="idx != 0 && (idx != map[index].length-1)">
			@@ -431,13 +434,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-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.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-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-if="map[index][idx].locSts == 'S'" :class="{'pointBoxSearch':map[index][idx].searchStatus}" class="pointBox pointBoxInYy">{{ map[index][idx].locSts }}</div>
			<div v-else class="pointBox pointBoxDefault" :class="{'pointBoxSearch':map[index][idx].searchStatus}">{{ map[index][idx].locSts }}</div>
			</div>

			<!--堆垛机-->
			@@ -461,10 +464,16 @@

			</div>
			</div>

			<div style="width: 40px; display: flex;justify-content: flex-end;align-items: center;">
			{{ getRealRowByX(index) }}
			</div>

			</div>
			</div>
			</div>
			<div style="padding: 20px;flex: 5;margin-top: -70px;">
			<div style="padding: 20px;flex: 1;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;">
			@@ -472,7 +481,7 @@
			<div style="width: 100%;margin-bottom: 20px;">
			<div style="display: flex;justify-content: space-between;">
			<div><input v-model="searchMatnr" placeholder="物料号" type="text" class="search-input"></div>
			<div><input v-model="searchOrderNo" placeholder="订单号" type="text" class="search-input"></div>
			<div style="margin-left: 20px"><input v-model="searchOrderNo" placeholder="订单号" type="text" class="search-input"></div>
			</div>
			<div style="display: flex;justify-content: space-between;margin-top: 10px;">
			<div><input style="width: 110px;" v-model="searchMaktx" placeholder="物料名称" type="text" class="search-input"></div>
			@@ -482,6 +491,12 @@
			<button style="width: 100%;margin-top: 10px;" @click="searchLoc" class="layui-btn layui-btn-sm">搜索</button>
			</div>
			<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 style="margin-left: 10px;">
			<button @click="locToLoc2" class="layui-btn layui-btn-sm">侧边移库</button>
			</div>
			<div v-if="!locOutStatus" style="margin-left: 10px;">
			@@ -504,6 +519,47 @@
			</div>
			<button class="card-button">功能区</button>
			</div>



			<div class="hoverCard">
			<div class="card-details">
			<p class="text-title" style="text-align: center;">库位层 {{currentLev}}</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">

			</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;">库区 {{areaName}}</p>-->
			<!-- <div class="text-body" style="display: flex;">-->
			<!-- <div class="floorSelect">-->
			<!-- <label for="area01">A区</label>-->
			<!-- <input id="area01" type="radio" name="r" v-model="area" value="1" checked="">-->
			<!-- <label for="area03">B区</label>-->
			<!-- <input id="area03" type="radio" v-model="area" name="r" value="3">-->
			<!-- <label for="area04">C区</label>-->
			<!-- <input id="area04" type="radio" v-model="area" name="r" value="4">-->
			<!-- <label for="area05">D区</label>-->
			<!-- <input id="area05" type="radio" v-model="area" name="r" value="5">-->


			<!-- </div>-->
			<!-- </div>-->
			<!-- </div>-->
			<!-- <button class="card-button">库区 {{areaName}}</button>-->
			<!-- </div>-->

			<div class="hoverCard">
			<div class="card-details">
			@@ -540,31 +596,6 @@
			<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">
			<label for="05">5F</label>
			<input id="05" type="radio" v-model="currentLev" name="r" value="5">
			<label for="06">6F</label>
			<input id="06" type="radio" v-model="currentLev" name="r" value="6">
			<label for="07">7F</label>
			<input id="07" type="radio" v-model="currentLev" name="r" value="7">
			</div>
			</div>
			</div>
			<button class="card-button">楼层 {{currentLev}}F</button>
			</div>

			</div>
			</div>

			@@ -586,17 +617,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>
			@@ -650,6 +681,8 @@
			rightBoxLeft: "0px",
			pointContainerWidth: 0,
			currentLev: 1,
			area:1,
			areaName:"立库",
			crnList: null,
			crnBox: false,
			crnBoxTop: "0px",
			@@ -663,6 +696,19 @@
			searchLocNo: "",
			outSite: null,
			outSites: null,
			showScale: 85, //控制地图显示大小比例
			showScaleMarks: {//比例滑动条显示标记
			0: "0%",
			50: {
			style: {
			color: '#1989FA'
			},
			label: "50%"
			},
			100: "100%",
			},
			locStsList: [],//库位状态列表
			y: 1
			},
			created(){
			this.init()
			@@ -685,6 +731,43 @@
			deep: true,
			handler(val) {
			this.init()
			if (this.searchMatnr != ""
			\|\| this.searchOrderNo != ""
			\|\| this.searchSpecs != ""
			\|\| this.searchMaktx != ""
			\|\| this.searchLocNo != "") {
			this.searchLoc()
			}
			}
			},
			area: {
			deep: true,
			handler(val) {
			if (val == 1){
			this.areaName = "A区"

			}else if (val == 3){
			this.areaName = "B区"
			}
			else if (val == 4){
			this.areaName = "C区"
			}
			else if (val == 5){
			this.areaName = "D区"
			}
			else if (val == 6){
			this.areaName = "E区"
			}


			this.init()
			if (this.searchMatnr != ""
			\|\| this.searchOrderNo != ""
			\|\| this.searchSpecs != ""
			\|\| this.searchMaktx != ""
			\|\| this.searchLocNo != "") {
			this.searchLoc()
			}
			}
			}
			},
			@@ -692,7 +775,11 @@
			init(){
			let that = this
			$.ajax({
			url: baseUrl + "/map/getData/" + this.currentLev + "/auth",
			url: baseUrl + "/map/getData/auth",
			data:{
			lev : this.currentLev,
			area : this.area
			},
			headers: {'token': localStorage.getItem('token')},
			method: "get",
			success: (data) => {
			@@ -702,6 +789,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)
			@@ -715,11 +812,40 @@
			val.searchStatus = false//搜索标记
			data2.push(val)
			})
			this.pointContainerWidth = item.length * (40+1)
			this.pointContainerWidth = item.length * (35+1)
			data.push(data2)
			})
			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 (this.area == 1){
			if (rowData[i].locNo != undefined) {
			let locNo = rowData[i].locNo;
			return "#" + parseInt(locNo.substr(2, 2));
			}
			}else if (this.area == 6){
			if (rowData[i].locNo != undefined) {
			let locNo = rowData[i].locNo;
			return "#" + parseInt(locNo.substr(7, 2));
			}
			}
			else {
			if (rowData[i].locNo != undefined) {
			let locNo = rowData[i].locNo;
			return "#" + parseInt(locNo.substr(7, 2));
			}
			}
			}

			return "";
			},
			rightEvent(x, y, e) {
			this.rightBox = true
			@@ -743,6 +869,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) {
			//库位移转
			@@ -1124,24 +1273,34 @@

			})
			})
			data.forEach((item,index) => {
			// data.forEach((item,index) => {
			// let locNo = item.locNo
			// let y = parseInt(locNo.substr(2,3))
			// let x = parseInt(locNo.substr(0,2))
			// console.log(x)
			// // if ( (x+2) %5 === 0 ) {
			// // x = 5*item.crnNo-2;
			// // }else
			// if(x<17){
			// if (x % 4 == 0 \|\| (x+1) % 4 == 0){
			// x = item.crnNo+x
			// }else {
			// x = item.crnNo+x-1
			// }
			// }
			// console.log(x)
			//
			// tmp[x][y].searchStatus = true//搜索标记
			// })
			data.forEach((item,i) => {
			let locNo = item.locNo
			let y = parseInt(locNo.substr(2,3))
			let x = parseInt(locNo.substr(0,2))
			console.log(x)
			// if ( (x+2) %5 === 0 ) {
			// x = 5*item.crnNo-2;
			// }else
			if(x<17){
			if (x % 4 == 0 \|\| (x+1) % 4 == 0){
			x = item.crnNo+x
			}else {
			x = item.crnNo+x-1
			}
			}
			console.log(x)

			tmp[x][y].searchStatus = true//搜索标记
			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("搜索成功");