From 64c256128e8cf5c65e409c4682cf3c32466748b2 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期二, 25 七月 2023 14:22:12 +0800
Subject: [PATCH] agv 站点可视化管理功能
---
src/main/webapp/static/js/agvLocDetl/locDetl.js | 2
src/main/webapp/static/js/report/workCountOut.js | 2
src/main/webapp/views/pda/stockIn.html | 2
src/main/java/com/zy/common/model/AgvBasDevpDto.java | 18
src/main/webapp/views/pda/comb.html | 2
src/main/java/com/zy/asrs/service/impl/AgvBasDevpServiceImpl.java | 62 +++
src/main/java/com/zy/asrs/controller/AgvBasDevpController.java | 11
src/main/webapp/static/js/orderDetl/orderDetl.js | 2
src/main/webapp/views/pda/locDetlIframe.html | 2
src/main/webapp/views/pda/matQuery.html | 2
src/main/webapp/static/js/locDetl/locDetl.js | 2
src/main/webapp/static/js/agvBasDevpVisualized/basDevp.js | 705 +++++++++++++++++++++++++++++++++++++
src/main/java/com/zy/asrs/controller/AgvMobileController.java | 7
src/main/webapp/static/js/order/out.js | 4
src/main/webapp/views/agvBasDevpVisualized/basDevp.html | 240 ++++++++++++
src/main/webapp/static/js/order/order.js | 4
src/main/webapp/views/order/out.html | 6
src/main/webapp/views/orderDetl/orderDetl.html | 2
src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java | 2
src/main/webapp/static/js/report/workCountIn.js | 2
src/main/java/com/zy/asrs/service/AgvBasDevpService.java | 4
src/main/webapp/views/pack/pack.html | 2
22 files changed, 1,057 insertions(+), 28 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvBasDevpController.java b/src/main/java/com/zy/asrs/controller/AgvBasDevpController.java
index c2f2115..6587f41 100644
--- a/src/main/java/com/zy/asrs/controller/AgvBasDevpController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvBasDevpController.java
@@ -148,6 +148,17 @@
return R.ok();
}
+ @RequestMapping(value = "/basDevp/visualized/list/auth")
+ public R visualizedList(@RequestBody JSONObject param){
+
+ String stationCode = param.get("stationCode").toString();
+
+
+ Map<String, Object> result = agvBasDevpService.getAgvBasDevpDtoByStationCode(stationCode);
+
+ return R.ok(result);
+ }
+
private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
for (Map.Entry<String, Object> entry : map.entrySet()){
String val = String.valueOf(entry.getValue());
diff --git a/src/main/java/com/zy/asrs/controller/AgvMobileController.java b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
index 90e71b5..d7b10ae 100644
--- a/src/main/java/com/zy/asrs/controller/AgvMobileController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
@@ -1,7 +1,6 @@
package com.zy.asrs.controller;
import com.core.common.R;
-import com.core.exception.CoolException;
import com.zy.asrs.entity.AgvBasDevp;
import com.zy.asrs.entity.param.CombParam;
import com.zy.asrs.service.AgvBasDevpService;
@@ -74,11 +73,7 @@
List<String> devNos = (List<String>) map.get("devNo");
List<AgvBasDevp> agvBasDevpList = devNos.stream().map(devNo -> {
- AgvBasDevp agvBasDevp = agvBasDevpService.selectById(devNo);
- if (!"F".equals(agvBasDevp.getLocSts())) {
- throw new CoolException("褰撳墠绔欑偣璐т綅鐘舵�佷笉涓篎.鍦ㄥ簱锛岃閲嶆柊閫夋嫨");
- }
- return agvBasDevp;
+ return agvBasDevpService.selectById(devNo);
}).collect(Collectors.toList());
workService.createWaitPainWrkMastStart(agvBasDevpList, getUserId());
diff --git a/src/main/java/com/zy/asrs/service/AgvBasDevpService.java b/src/main/java/com/zy/asrs/service/AgvBasDevpService.java
index f6a81b0..755e724 100644
--- a/src/main/java/com/zy/asrs/service/AgvBasDevpService.java
+++ b/src/main/java/com/zy/asrs/service/AgvBasDevpService.java
@@ -3,6 +3,8 @@
import com.baomidou.mybatisplus.service.IService;
import com.zy.asrs.entity.AgvBasDevp;
+import java.util.Map;
+
public interface AgvBasDevpService extends IService<AgvBasDevp> {
public void clearBasDevp();
@@ -10,4 +12,6 @@
public void initBasDevp();
public void updateLocStsAndBarcodeByDevNo(String devNo, String locSts, String barcode);
+
+ public Map<String, Object> getAgvBasDevpDtoByStationCode(String stationCode);
}
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvBasDevpServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvBasDevpServiceImpl.java
index fbecf3d..636dc93 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvBasDevpServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvBasDevpServiceImpl.java
@@ -1,16 +1,24 @@
package com.zy.asrs.service.impl;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.core.common.Cools;
import com.zy.asrs.entity.AgvBasDevp;
+import com.zy.asrs.entity.AgvWaitPakin;
+import com.zy.asrs.entity.AgvWrkMast;
import com.zy.asrs.mapper.AgvBasDevpMapper;
import com.zy.asrs.service.AgvBasDevpService;
+import com.zy.asrs.service.AgvWaitPakinService;
+import com.zy.asrs.service.AgvWrkDetlService;
+import com.zy.asrs.service.AgvWrkMastService;
+import com.zy.common.model.AgvBasDevpDto;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
+import java.util.stream.Collectors;
@Service
@Transactional
@@ -18,6 +26,12 @@
@Autowired
AgvBasDevpMapper agvBasDevpMapper;
+ @Autowired
+ AgvWrkMastService agvWrkMastService;
+ @Autowired
+ AgvWrkDetlService agvWrkDetlService;
+ @Autowired
+ AgvWaitPakinService agvWaitPakinService;
public void clearBasDevp(){
agvBasDevpMapper.deleteAll();
@@ -80,4 +94,46 @@
this.updateById(agvBasDevp);
}
+ public Map<String, Object> getAgvBasDevpDtoByStationCode(String stationCode) {
+
+ List<Map<String, Object>> body = new ArrayList<>();
+ for(int i=3; i>=1; i--){
+ List<AgvBasDevp> agvBasDevpList = this.selectList(new EntityWrapper<AgvBasDevp>()
+ .eq("station_code", stationCode)
+ .like("dev_no","0"+ i +"@"));
+
+ Map<String, Object> map = new HashMap<>();
+
+ List<AgvBasDevpDto> agvBasDevpDtoList = agvBasDevpList.stream().map(agvBasDevp -> {
+ AgvBasDevpDto agvBasDevpDto = new AgvBasDevpDto();
+ BeanUtils.copyProperties(agvBasDevp, agvBasDevpDto);
+
+ if (Cools.isEmpty(agvBasDevpDto.getBarcode())) {
+ return agvBasDevpDto;
+ }
+
+ AgvWaitPakin agvWaitPakin = agvWaitPakinService.selectOne(new EntityWrapper<AgvWaitPakin>()
+ .eq("zpallet", agvBasDevpDto.getBarcode()));
+
+ agvBasDevpDto.setAgvWaitPakin(agvWaitPakin);
+
+ AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>()
+ .eq("barcode", agvBasDevpDto.getBarcode()));
+
+ agvBasDevpDto.setAgvWrkMast(agvWrkMast);
+
+ return agvBasDevpDto;
+
+ }).collect(Collectors.toList());
+
+ map.put("loc",agvBasDevpDtoList);
+ body.add(map);
+ }
+
+ Map<String, Object> result = new HashMap<>();
+ result.put("body", body);
+
+ return result;
+ }
+
}
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
index 4d06510..9079d7c 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
@@ -49,7 +49,7 @@
agvBasDevpList.forEach(agvBasDevp -> {
if(Cools.isEmpty(agvBasDevp.getBarcode())){
- throw new CoolException("閫変腑鐨勭珯鐐逛腑鍚湁浣嶇粦瀹氭墭鐩樼殑绔欑偣锛岃閲嶆柊閫夋嫨");
+ throw new CoolException("閫変腑鐨勭珯鐐逛腑鍚湁鏈粦瀹氭墭鐩樼殑绔欑偣锛岃閲嶆柊閫夋嫨");
}
if(!"F".equals(agvBasDevp.getLocSts())){
diff --git a/src/main/java/com/zy/common/model/AgvBasDevpDto.java b/src/main/java/com/zy/common/model/AgvBasDevpDto.java
new file mode 100644
index 0000000..da9de2d
--- /dev/null
+++ b/src/main/java/com/zy/common/model/AgvBasDevpDto.java
@@ -0,0 +1,18 @@
+package com.zy.common.model;
+
+import com.zy.asrs.entity.AgvBasDevp;
+import com.zy.asrs.entity.AgvWaitPakin;
+import com.zy.asrs.entity.AgvWrkMast;
+import lombok.Data;
+
+/**
+ * 鐢ㄤ簬灞曠ずAGV绔欑偣鍙鍖栫鐞嗛〉闈㈢殑鏁版嵁
+ */
+@Data
+public class AgvBasDevpDto extends AgvBasDevp {
+
+ private AgvWrkMast agvWrkMast;
+
+ private AgvWaitPakin agvWaitPakin;
+
+}
diff --git a/src/main/webapp/static/js/agvBasDevpVisualized/basDevp.js b/src/main/webapp/static/js/agvBasDevpVisualized/basDevp.js
new file mode 100644
index 0000000..75c55ac
--- /dev/null
+++ b/src/main/webapp/static/js/agvBasDevpVisualized/basDevp.js
@@ -0,0 +1,705 @@
+var pageCurr;
+layui.use(['table','laydate', 'form'], function(){
+ var table = layui.table;
+ var $ = layui.jquery;
+ var layer = layui.layer;
+ var layDate = layui.laydate;
+ var form = layui.form;
+
+ // 鏁版嵁娓叉煋
+ tableIns = table.render({
+ elem: '#agvBasDevp',
+ headers: {token: localStorage.getItem('token')},
+ url: baseUrl+'/agv/basDevp/list/auth',
+ page: true,
+ limit: 16,
+ limits: [16, 30, 50, 100, 200, 500],
+ even: true,
+ toolbar: '#toolbar',
+ cellMinWidth: 50,
+ cols: [[
+ {type: 'checkbox', fixed: 'left'}
+// ,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80}
+ ,{field: 'stationCode', align: 'center',sort:true,title: '宸ヤ綔绔欑紪鍙�'}
+ ,{field: 'devNo', align: 'center',sort:true,title: '宸ヤ綔浣嶇紪鍙�',width:150}
+ // ,{field: 'decDesc', align: 'center',title: '璁惧鎻忚堪'}
+ // ,{field: 'devMk', align: 'center',title: '澶囨敞'}
+ ,{field: 'inEnable', align: 'center',title: '鍙叆', templet:function(row){
+ var html = "<input value='inEnable' type='checkbox' lay-skin='primary' lay-filter='tableCheckbox' table-index='"+row.LAY_TABLE_INDEX+"'";
+ if(row.inEnable === 'Y'){html += " checked ";}
+ html += ">";
+ return html;
+ }}
+ ,{field: 'outEnable', align: 'center',title: '鍙嚭', templet:function(row){
+ var html = "<input value='outEnable' type='checkbox' lay-skin='primary' lay-filter='tableCheckbox' table-index='"+row.LAY_TABLE_INDEX+"'";
+ if(row.outEnable === 'Y'){html += " checked ";}
+ html += ">";
+ return html;
+ }}
+ ,{field: 'autoing', align: 'center',title: '鑷姩', templet:function(row){
+ var html = "<input value='autoing' type='checkbox' lay-skin='primary' lay-filter='tableCheckbox' table-index='"+row.LAY_TABLE_INDEX+"'";
+ if(row.autoing === 'Y'){html += " checked ";}
+ html += ">";
+ return html;
+ }}
+ // ,{field: 'loading', align: 'center',title: '鏈夌墿', templet:function(row){
+ // var html = "<input value='loading' type='checkbox' lay-skin='primary' lay-filter='tableCheckbox' table-index='"+row.LAY_TABLE_INDEX+"'";
+ // if(row.loading === 'Y'){html += " checked ";}
+ // html += ">";
+ // return html;
+ // }}
+ // ,{field: 'canining', align: 'center',title: '鑳藉叆', templet:function(row){
+ // var html = "<input value='canining' type='checkbox' lay-skin='primary' lay-filter='tableCheckbox' table-index='"+row.LAY_TABLE_INDEX+"'";
+ // if(row.canining === 'Y'){html += " checked ";}
+ // html += ">";
+ // return html;
+ // }}
+ // ,{field: 'canouting', align: 'center',title: '鑳藉嚭', templet:function(row){
+ // var html = "<input value='canouting' type='checkbox' lay-skin='primary' lay-filter='tableCheckbox' table-index='"+row.LAY_TABLE_INDEX+"'";
+ // if(row.canouting === 'Y'){html += " checked ";}
+ // html += ">";
+ // return html;
+ // }}
+ // ,{field: 'fronting', align: 'center',title: ''}
+ // ,{field: 'rearing', align: 'center',title: ''}
+ // ,{field: 'uping', align: 'center',title: ''}
+ // ,{field: 'downing', align: 'center',title: ''}
+ // ,{field: 'inreq1', align: 'center',title: '闇�姹�1', templet:function(row){
+ // var html = "<input value='inreq1' type='checkbox' lay-skin='primary' lay-filter='tableCheckbox' table-index='"+row.LAY_TABLE_INDEX+"'";
+ // if(row.inreq1 === 'Y'){html += " checked ";}
+ // html += ">";
+ // return html;
+ // }}
+ ,{field: 'cacheShelves', align: 'center',title: '鏄惁缂撳瓨璐ф灦', templet:function(row){
+ var html = "<input value='cacheShelves' type='checkbox' lay-skin='primary' lay-filter='tableCheckbox' table-index='"+row.LAY_TABLE_INDEX+"'";
+ if(row.cacheShelves === 'Y'){html += " checked ";}
+ html += ">";
+ return html;
+ }}
+ ,{field: 'locSts$', align: 'center',title: '璐т綅鐘舵��'}
+ //,{field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�', edit:true, style:'color: blue;font-weight: bold'}
+ ,{field: 'floor', align: 'center',title: '妤�'}
+ //,{field: 'locType1$', align: 'center',title: '楂樹綆'}
+ ,{field: 'barcode', align: 'center',title: '鏉″舰鐮�'}
+ // ,{field: 'inQty', align: 'center',title: '鍏ュ簱鏆傚瓨'}
+ // ,{field: 'row1', align: 'center',title: ''}
+ // ,{field: 'ioTime$', align: 'center',title: ''}
+ // ,{field: 'area', align: 'center',title: ''}
+ // ,{field: 'inOk', align: 'center',title: ''}
+ // ,{field: 'outOk', align: 'center',title: ''}
+ ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳',event: 'modiUser', hide:true}
+ ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', hide:true}
+ // ,{field: 'appeUser$', align: 'center',title: '鍒涘缓鑰�',event: 'appeUser', style: 'text-decoration: underline;cursor:pointer'}
+ // ,{field: 'appeTime$', align: 'center',title: '娣诲姞鏃堕棿'}
+ // ,{field: 'stdQty', align: 'center',title: ''}
+ // ,{field: 'minWt', align: 'center',title: ''}
+ // ,{field: 'maxWt', align: 'center',title: ''}
+ //,{field: 'grossWt', align: 'center',title: '閲嶉噺'}
+ // ,{field: 'cartPos', align: 'center',title: ''}
+
+ ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:200}
+ ]],
+ request: {
+ pageName: 'curr',
+ pageSize: 'limit'
+ },
+ parseData: function (res) {
+ return {
+ 'code': res.code,
+ 'msg': res.msg,
+ 'count': res.data.total,
+ 'data': res.data.records
+ }
+ },
+ response: {
+ statusCode: 200
+ },
+ done: function(res, curr, count) {
+ if (res.code === 403) {
+ top.location.href = baseUrl+"/";
+ }
+ pageCurr=curr;
+ limit();
+ form.on('checkbox(tableCheckbox)', function (data) {
+ var _index = $(data.elem).attr('table-index')||0;
+ if(data.elem.checked){
+ res.data[_index][data.value] = 'Y';
+ }else{
+ res.data[_index][data.value] = 'N';
+ }
+ });
+ }
+ });
+
+ // 椤甸潰淇敼
+ table.on('edit(basDevp)', function (obj) {
+ if (isNaN(obj.value)) {
+ layer.msg("璇疯緭鍏ユ暟瀛�");
+ tableReload();
+ return;
+ }
+ $.ajax({
+ url: baseUrl+"/agv/basDevp/update/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: top.reObject({
+ devNo: obj.data.devNo,
+ wrkNo: obj.value
+ }),
+ method: 'POST',
+ success: function (res) {
+ if (res.code === 200){
+ $(".layui-laypage-btn")[0].click();
+ layer.msg(res.msg);
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ }else {
+ layer.msg(res.msg)
+ }
+ }
+ })
+ });
+
+ // 鐩戝惉鎺掑簭浜嬩欢
+ table.on('sort(basDevp)', function (obj) {
+ var searchData = {};
+ $.each($('#search-box [name]').serializeArray(), function() {
+ searchData[this.name] = this.value;
+ });
+ searchData['orderByField'] = obj.field;
+ searchData['orderByType'] = obj.type;
+ tableIns.reload({
+ where: searchData,
+ page: {
+ curr: 1
+ },
+ done: function (res, curr, count) {
+ if (res.code === 403) {
+ top.location.href = baseUrl+"/";
+ }
+ pageCurr=curr;
+ limit();
+ }
+ });
+ });
+
+ // 鐩戝惉澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(basDevp)', function (obj) {
+ var checkStatus = table.checkStatus(obj.config.id);
+ switch(obj.event) {
+ case 'addData':
+ layer.open({
+ type: 2,
+ title: '鏂板',
+ maxmin: true,
+ area: [top.detailWidth, top.detailHeight],
+ shadeClose: false,
+ content: 'basDevp_detail.html',
+ success: function(layero, index){
+ layer.getChildFrame('#autoing,#loading,#canining,#canouting,#inreq1,#inreq2,#wrkNo,#barcode,#ctnType,#grossWt', index).parent().parent().hide();
+ layer.getChildFrame('#data-detail-submit-edit', index).hide();
+ clearFormVal(layer.getChildFrame('#detail', index));
+ layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
+ }
+ });
+ break;
+ case 'refreshData':
+ tableIns.reload({
+ page: {
+ curr: pageCurr
+ }
+ });
+ limit();
+ break;
+ case 'deleteData':
+ var data = checkStatus.data;
+ if (data.length === 0){
+ layer.msg('璇烽�夋嫨鏁版嵁');
+ } else {
+ layer.confirm('纭畾鍒犻櫎'+(data.length===1?'姝�':data.length)+'鏉℃暟鎹悧', function(){
+ $.ajax({
+ url: baseUrl+"/agv/basDevp/delete/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: {param: JSON.stringify(data)},
+ method: 'POST',
+ traditional:true,
+ success: function (res) {
+ if (res.code === 200){
+ layer.closeAll();
+ tableReload(false);
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg)
+ }
+ }
+ })
+ });
+ }
+ break;
+ case "createWrk":
+ var data = checkStatus.data;
+ if (data.length === 0){
+ layer.msg('璇烽�夋嫨鏁版嵁');
+ } else {
+ layer.confirm('纭畾鍏ュ簱'+(data.length===1?'姝�':data.length)+'涓珯鐐硅揣鐗╁悧锛�', function(){
+ $.ajax({
+ url: baseUrl+"/agv/create/waitPain/wrkMast/start",
+ headers: {'token': localStorage.getItem('token')},
+ data: {param: JSON.stringify(data)},
+ method: 'POST',
+ traditional:true,
+ success: function (res) {
+ if (res.code === 200){
+ layer.closeAll();
+ tableReload(false);
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg)
+ }
+ }
+ })
+ })
+ }
+
+ break;
+ case "init":
+ layer.prompt({title: '璇疯緭鍏ュ彛浠わ紝骞堕噸缃簱浣�', formType: 1, shadeClose: true}, function(pass, idx){
+ http.get(baseUrl+"/locMast/init/pwd", {pwd: pass}, function (res) {
+ if (res.data) {
+ $.ajax({
+ url: baseUrl+"/agv/basDevp/init/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: {param: JSON.stringify(data)},
+ method: 'POST',
+ traditional:true,
+ success: function (res) {
+ if (res.code === 200){
+ layer.closeAll();
+ tableReload(false);
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg)
+ }
+ }
+ })
+ } else {
+ layer.msg("鍙ｄ护閿欒");
+ }
+ layer.close(idx);
+ })
+ });
+ break;
+ case 'exportData':
+ layer.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
+ var titles=[];
+ var fields=[];
+ obj.config.cols[0].map(function (col) {
+ if (col.type === 'normal' && col.hide === false && col.toolbar == null) {
+ titles.push(col.title);
+ fields.push(col.field);
+ }
+ });
+ var exportData = {};
+ $.each($('#search-box [name]').serializeArray(), function() {
+ exportData[this.name] = this.value;
+ });
+ var param = {
+ 'basDevp': exportData,
+ 'fields': fields
+ };
+ $.ajax({
+ url: baseUrl+"/agv/basDevp/export/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: JSON.stringify(param),
+ dataType:'json',
+ contentType:'application/json;charset=UTF-8',
+ method: 'POST',
+ success: function (res) {
+ layer.closeAll();
+ if (res.code === 200) {
+ table.exportFile(titles,res.data,'xls');
+ } else if (res.code === 403) {
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg)
+ }
+ }
+ });
+ });
+ break;
+ }
+ });
+
+ // 鐩戝惉琛屽伐鍏蜂簨浠�
+ table.on('tool(basDevp)', function(obj){
+ var data = obj.data;
+ switch (obj.event) {
+ // 璇︽儏
+ case 'detail':
+ layer.open({
+ type: 2,
+ title: '璇︽儏',
+ maxmin: true,
+ area: [top.detailWidth, top.detailHeight],
+ shadeClose: false,
+ content: 'basDevp_detail.html',
+ success: function(layero, index){
+ setFormVal(layer.getChildFrame('#detail', index), data, true);
+ top.convertDisabled(layer.getChildFrame('#data-detail :input', index), true);
+ layer.getChildFrame('#data-detail-submit-save,#prompt', index).hide();
+ layer.getChildFrame('#data-detail-submit-edit', index).hide();
+ layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
+ layero.find('iframe')[0].contentWindow.layui.form.render('select');
+ layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');
+ }
+ });
+ break;
+ // 缂栬緫
+ case 'edit':
+ layer.open({
+ type: 2,
+ title: '淇敼',
+ maxmin: true,
+ area: [top.detailWidth, top.detailHeight],
+ shadeClose: false,
+ content: 'basDevp_detail.html',
+ success: function(layero, index){
+ layer.getChildFrame('#data-detail-submit-save', index).hide();
+ setFormVal(layer.getChildFrame('#detail', index), data, false);
+ top.convertDisabled(layer.getChildFrame('#data-detail :input', index), false);
+ top.convertDisabled(layer.getChildFrame('#devNo', index), true);
+ layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
+ layero.find('iframe')[0].contentWindow.layui.form.render('select');
+ layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');
+ }
+ });
+ break;
+ case 'detl':
+ // locDetl(data.locNo);
+ if (data.locSts.trim() === ''
+ || data.locSts.trim() === 'S'
+ || data.locSts.trim() === 'D'
+ || data.locSts.trim() === 'O') {
+ layer.msg("姝ょ珯鐐圭殑鐘舵�佷笉瀛樺湪鐗╂枡");
+ return;
+ }
+ locDetlToLayer(data.barcode);
+ break;
+ case 'unbind':
+ // locDetl(data.locNo);
+ if (data.barcode === null || data.barcode.trim() === '') {
+ layer.msg("姝ょ珯鐐规殏鏈粦瀹氫换浣曟潯鐮�");
+ return;
+ }
+ layer.confirm('纭畾瑙ｇ粦'+(data.devNo)+'绔欑偣鐨勬墭鐩樼爜锛�', function(){
+ $.ajax({
+ url: baseUrl+"/agv/basDevp/unbind/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: {param: JSON.stringify(data)},
+ method: 'POST',
+ traditional:true,
+ success: function (res) {
+ if (res.code === 200){
+ layer.closeAll();
+ tableReload(false);
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg)
+ }
+ }
+ })
+ });
+ break;
+ case 'modiUser':
+ var param = top.reObject(data).modiUser;
+ if (param === undefined) {
+ layer.msg("鏃犳暟鎹�");
+ } else {
+ layer.open({
+ type: 2,
+ title: '淇敼璇︽儏',
+ maxmin: true,
+ area: [top.detailWidth, top.detailHeight],
+ shadeClose: false,
+ content: '../user/user_detail.html',
+ success: function(layero, index){
+ $.ajax({
+ url: baseUrl+"/user/"+ param +"/auth",
+ headers: {'token': localStorage.getItem('token')},
+ method: 'GET',
+ success: function (res) {
+ if (res.code === 200){
+ setFormVal(layer.getChildFrame('#detail', index), res.data, true);
+ top.convertDisabled(layer.getChildFrame('#data-detail :input', index), true);
+ layer.getChildFrame('#password,#createTime\\$,#status', index).parent().parent().hide();
+ layer.getChildFrame('#data-detail-submit,#prompt', index).hide();
+ layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
+ layero.find('iframe')[0].contentWindow.layui.form.render('select');
+ layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');
+ } else if (res.code === 403){
+ parent.location.href = "/";
+ }else {
+ layer.msg(res.msg)
+ }
+ }
+ })
+ }
+ });
+ }
+ break;
+ case 'appeUser':
+ var param = top.reObject(data).appeUser;
+ if (param === undefined) {
+ layer.msg("鏃犳暟鎹�");
+ } else {
+ layer.open({
+ type: 2,
+ title: '鍒涜鎯�',
+ maxmin: true,
+ area: [top.detailWidth, top.detailHeight],
+ shadeClose: false,
+ content: '../user/user_detail.html',
+ success: function(layero, index){
+ $.ajax({
+ url: baseUrl+"/user/"+ param +"/auth",
+ headers: {'token': localStorage.getItem('token')},
+ method: 'GET',
+ success: function (res) {
+ if (res.code === 200){
+ setFormVal(layer.getChildFrame('#detail', index), res.data, true);
+ top.convertDisabled(layer.getChildFrame('#data-detail :input', index), true);
+ layer.getChildFrame('#data-detail-submit', index).hide();
+ layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
+ layero.find('iframe')[0].contentWindow.layui.form.render('select');
+ layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');
+ } else if (res.code === 403){
+ parent.location.href = "/";
+ }else {
+ layer.msg(res.msg)
+ }
+ }
+ })
+ }
+ });
+ }
+ break;
+
+ }
+ });
+
+ // 鏁版嵁淇濆瓨鍔ㄤ綔
+ form.on('submit(save)', function () {
+ if (banMsg != null){
+ layer.msg(banMsg);
+ return;
+ }
+ method("add");
+ });
+
+ // 鏁版嵁淇敼鍔ㄤ綔
+ form.on('submit(edit)', function () {
+ method("update")
+ });
+
+ function method(name){
+ var index = layer.load(1, {
+ shade: [0.5,'#000'] //0.1閫忔槑搴︾殑鑳屾櫙
+ });
+ var data = {
+// id: $('#id').val(),
+ stationCode: $('#stationCode').val(),
+ devNo: $('#devNo').val(),
+ cacheShelves: $('#cacheShelves').val(),
+ decDesc: $('#decDesc').val(),
+ devMk: $('#devMk').val(),
+ inEnable: $('#inEnable').val(),
+ outEnable: $('#outEnable').val(),
+ autoing: $('#autoing').val(),
+ loading: $('#loading').val(),
+ canining: $('#canining').val(),
+ canouting: $('#canouting').val(),
+ fronting: $('#fronting').val(),
+ rearing: $('#rearing').val(),
+ uping: $('#uping').val(),
+ downing: $('#downing').val(),
+ inreq1: $('#inreq1').val(),
+ inreq2: $('#inreq2').val(),
+ wrkNo: $('#wrkNo').val(),
+ wrkNo1: $('#wrkNo1').val(),
+ ctnType: $('#ctnType').val(),
+ barcode: $('#barcode').val(),
+ inQty: $('#inQty').val(),
+ row1: $('#row1').val(),
+ ioTime: top.strToDate($('#ioTime\\$').val()),
+ area: $('#area').val(),
+ inOk: $('#inOk').val(),
+ outOk: $('#outOk').val(),
+ modiUser: $('#modiUser').val(),
+ modiTime: top.strToDate($('#modiTime\\$').val()),
+ appeUser: $('#appeUser').val(),
+ appeTime: top.strToDate($('#appeTime\\$').val()),
+ stdQty: $('#stdQty').val(),
+ minWt: $('#minWt').val(),
+ maxWt: $('#maxWt').val(),
+ grossWt: $('#grossWt').val(),
+ cartPos: $('#cartPos').val(),
+
+ };
+ console.log(data);
+ $.ajax({
+ url: baseUrl+"/agv/basDevp/"+name+"/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: top.reObject(data),
+ method: 'POST',
+ success: function (res) {
+ if (res.code === 200){
+ parent.layer.closeAll();
+ parent.$(".layui-laypage-btn")[0].click();
+ $("#data-detail :input").each(function () {
+ $(this).val("");
+ });
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ }else {
+ layer.msg(res.msg)
+ }
+ layer.close(index);
+ }
+ })
+ }
+
+ // iframe鐗╂枡璇︽儏
+ function locDetlToLayer(val) {
+ barcode = val;
+ layer.open({
+ type: 2,
+ title: '绔欑偣鏄庣粏',
+ maxmin: true,
+ area: [top.detailWidth, top.detailHeight],
+ shadeClose: true,
+ content: '../agvBasDevp/basDevpWaitPakinDetail.html',
+ success: function(layero, index){
+ }
+ });
+ }
+
+ // 鎼滅储鏍忔悳绱簨浠�
+ form.on('submit(search)', function (data) {
+ pageCurr = 1;
+ tableReload(false);
+ });
+
+ // 鎼滅储鏍忛噸缃簨浠�
+ form.on('submit(reset)', function (data) {
+ pageCurr = 1;
+ clearFormVal($('#search-box'));
+ tableReload(false);
+ });
+
+ // 鏃堕棿閫夋嫨鍣�
+ layDate.render({
+ elem: '#ioTime\\$',
+ type: 'datetime'
+ });
+ layDate.render({
+ elem: '#modiTime\\$',
+ type: 'datetime'
+ });
+ layDate.render({
+ elem: '#appeTime\\$',
+ type: 'datetime'
+ });
+
+
+});
+
+// 鍏抽棴鍔ㄤ綔
+$(document).on('click','#data-detail-close', function () {
+ parent.layer.closeAll();
+});
+
+function tableReload(child) {
+ var searchData = {};
+ $.each($('#search-box [name]').serializeArray(), function() {
+ searchData[this.name] = this.value;
+ });
+ (child ? parent.tableIns : tableIns).reload({
+ where: searchData,
+ page: {
+ curr: pageCurr
+ },
+ done: function (res, curr, count) {
+ if (res.code === 403) {
+ top.location.href = baseUrl+"/";
+ }
+ pageCurr=curr;
+ if (res.data.length === 0 && count !== 0) {
+ tableIns.reload({
+ where: searchData,
+ page: {
+ curr: pageCurr-1
+ }
+ });
+ pageCurr -= 1;
+ }
+ limit(child);
+ }
+ });
+}
+
+function setFormVal(el, data, showImg) {
+ for (var val in data) {
+ var find = el.find(":input[id='" + val + "']");
+ if (find[0]!=null){
+ if (find[0].type === 'checkbox'){
+ if (data[val]==='Y'){
+ find.attr("checked","checked");
+ find.val('Y');
+ } else {
+ find.remove("checked");
+ find.val('N');
+ }
+ continue;
+ }
+ }
+ find.val(data[val]);
+ if (showImg){
+ var next = find.next();
+ if (next.get(0)){
+ if (next.get(0).localName === "img") {
+ find.hide();
+ next.attr("src", data[val]);
+ next.show();
+ }
+ }
+ }
+ }
+}
+
+function clearFormVal(el) {
+ $(':input', el)
+ .val('')
+ .removeAttr('checked')
+ .removeAttr('selected');
+}
+
+function detailScreen(index) {
+ var detail = layer.getChildFrame('#data-detail', index);
+ var height = detail.height()+60;
+ if (height > ($(window).height()*0.9)) {
+ height = ($(window).height()*0.8);
+ }
+ layer.style(index, {
+// top: (($(window).height()-height)/3)+"px",
+ height: height+'px'
+ });
+}
+
+$('body').keydown(function () {
+ if (event.keyCode === 13) {
+ $("#search").click();
+ }
+});
diff --git a/src/main/webapp/static/js/agvLocDetl/locDetl.js b/src/main/webapp/static/js/agvLocDetl/locDetl.js
index 6892802..7081a55 100644
--- a/src/main/webapp/static/js/agvLocDetl/locDetl.js
+++ b/src/main/webapp/static/js/agvLocDetl/locDetl.js
@@ -4,7 +4,7 @@
var cols = [
{field: 'locNo', align: 'center',title: '搴撲綅鍙�'},
{field: 'matnr', align: 'center',title: '鐗╂枡鍙�', sort:true}
- ,{field: 'maktx', align: 'center',title: '鐗╂枡鍙�', sort:true}
+ ,{field: 'maktx', align: 'center',title: '鐗╂枡鍚嶇О', sort:true}
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: false}
,{field: 'batch', align: 'center',title: '搴忓垪鐮�', width: 300, sort:true}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
diff --git a/src/main/webapp/static/js/locDetl/locDetl.js b/src/main/webapp/static/js/locDetl/locDetl.js
index dda89c0..67f93de 100644
--- a/src/main/webapp/static/js/locDetl/locDetl.js
+++ b/src/main/webapp/static/js/locDetl/locDetl.js
@@ -4,7 +4,7 @@
var cols = [
{field: 'locNo$', align: 'center',title: '搴撲綅鍙�'},
{field: 'matnr', align: 'center',title: '鐗╂枡鍙�', sort:true}
- ,{field: 'maktx', align: 'center',title: '鐗╂枡鍙�', sort:true}
+ ,{field: 'maktx', align: 'center',title: '鐗╂枡鍚嶇О', sort:true}
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: false}
,{field: 'batch', align: 'center',title: '搴忓垪鐮�', width: 300, sort:true}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index ebd66fd..5f68cdd 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -131,7 +131,7 @@
cols: [[
{type: 'numbers'},
{field: 'matnr', title: '鐗╂枡鍙�', width: 160},
- {field: 'maktx', title: '鐗╂枡鍙�', width: 160},
+ {field: 'maktx', title: '鐗╂枡鍚嶇О', width: 160},
{field: 'batch', title: '搴忓垪鐮�'},
{field: 'anfme', title: '鏁伴噺'},
{field: 'qty', title: '浣滀笟鏁伴噺', style: 'font-weight: bold'},
@@ -238,7 +238,7 @@
cols: [[
{type: 'numbers', title: '#'},
{field: 'matnr', title: '鐗╂枡鍙�', width: 160},
- {field: 'maktx', title: '鐗╂枡鍙�', width: 200},
+ {field: 'maktx', title: '鐗╂枡鍚嶇О', width: 200},
{field: 'batch', title: '搴忓垪鐮�', edit: true},
{field: 'specs', title: '瑙勬牸'},
{field: 'anfme', title: '鏁伴噺(淇敼)', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110},
diff --git a/src/main/webapp/static/js/order/out.js b/src/main/webapp/static/js/order/out.js
index c053d55..b68649a 100644
--- a/src/main/webapp/static/js/order/out.js
+++ b/src/main/webapp/static/js/order/out.js
@@ -33,7 +33,7 @@
,{type: 'numbers', title: '#'}
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', templet: '#orderNoTpl', width: 160}
,{field: 'matnr', align: 'center',title: '鐗╂枡鍙�', width: 160}
- ,{field: 'maktx', align: 'center',title: '鐗╂枡鍙�', width: 200}
+ ,{field: 'maktx', align: 'center',title: '鐗╂枡鍚嶇О', width: 200}
,{field: 'batch', align: 'center',title: '搴忓垪鐮�'}
,{field: 'specs', align: 'center',title: '瑙勬牸'}
// ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
@@ -386,7 +386,7 @@
cols: [[
{type: 'checkbox'},
{field: 'matnr', title: '鐗╂枡鍙�', align: 'center', width: 350},
- {field: 'maktx', title: '鐗╂枡鍙�', align: 'center'},
+ {field: 'maktx', title: '鐗╂枡鍚嶇О', align: 'center'},
{field: 'specs', title: '瑙勬牸', align: 'center'},
{field: 'batch', title: '鎵瑰彿', align: 'center'},
{field: 'anfme', title: '鏁伴噺', align: 'center', width: 90, style: 'font-weight: bold'},
diff --git a/src/main/webapp/static/js/orderDetl/orderDetl.js b/src/main/webapp/static/js/orderDetl/orderDetl.js
index 9ab257f..b6e3708 100644
--- a/src/main/webapp/static/js/orderDetl/orderDetl.js
+++ b/src/main/webapp/static/js/orderDetl/orderDetl.js
@@ -26,7 +26,7 @@
,{field: 'orderId$', align: 'center',title: '璁㈠崟鍐呯爜'}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
,{field: 'matnr', align: 'center',title: '鐗╂枡鍙�'}
- ,{field: 'maktx', align: 'center',title: '鐗╂枡鍙�'}
+ ,{field: 'maktx', align: 'center',title: '鐗╂枡鍚嶇О'}
,{field: 'name', align: 'center',title: '鍚嶇О'}
,{field: 'specs', align: 'center',title: '瑙勬牸'}
,{field: 'model', align: 'center',title: '閫氱敤鍨嬪彿'}
diff --git a/src/main/webapp/static/js/report/workCountIn.js b/src/main/webapp/static/js/report/workCountIn.js
index 819e115..e9ea3aa 100644
--- a/src/main/webapp/static/js/report/workCountIn.js
+++ b/src/main/webapp/static/js/report/workCountIn.js
@@ -3,7 +3,7 @@
var cols = [
{field: 'oneday', align: 'center', title: '鍏ュ簱鏃ユ湡', width: 200}
,{field: 'matnr', align: 'center',title: '鐗╂枡鍙�'}
- ,{field: 'maktx', align: 'center',title: '鐗╂枡鍙�'}
+ ,{field: 'maktx', align: 'center',title: '鐗╂枡鍚嶇О'}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
];
diff --git a/src/main/webapp/static/js/report/workCountOut.js b/src/main/webapp/static/js/report/workCountOut.js
index b5a0798..6ef3da7 100644
--- a/src/main/webapp/static/js/report/workCountOut.js
+++ b/src/main/webapp/static/js/report/workCountOut.js
@@ -3,7 +3,7 @@
var cols = [
{field: 'oneday', align: 'center', title: '鍏ュ簱鏃ユ湡', width: 200}
,{field: 'matnr', align: 'center',title: '鐗╂枡鍙�'}
- ,{field: 'maktx', align: 'center',title: '鐗╂枡鍙�'}
+ ,{field: 'maktx', align: 'center',title: '鐗╂枡鍚嶇О'}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
];
diff --git a/src/main/webapp/views/agvBasDevpVisualized/basDevp.html b/src/main/webapp/views/agvBasDevpVisualized/basDevp.html
new file mode 100644
index 0000000..521e936
--- /dev/null
+++ b/src/main/webapp/views/agvBasDevpVisualized/basDevp.html
@@ -0,0 +1,240 @@
+<!DOCTYPE html>
+<html lang="en" xmlns="http://www.w3.org/1999/html">
+<head>
+ <meta charset="utf-8">
+ <title></title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../static/css/cool.css" media="all">
+ <link rel="stylesheet" href="../../static/css/common.css" media="all">
+</head>
+<body>
+
+<!-- 鎼滅储鏍� -->
+<div id="search-box" class="layui-form layui-card-header">
+ <div class="layui-inline">
+ <label class="layui-form-label">妤煎眰锛�</label>
+ <div class="layui-input-inline">
+ <select id="floorSelect" name="row" lay-filter="floorSelect">
+ <option value="1">1妤�</option>
+ <option value="3">3妤�</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 120px">缂撳瓨璐ф灦绔欙細</label>
+ <div class="layui-input-inline">
+ <select id="rowSelect" name="row" lay-filter="rowSelect">
+ <option value="CS-101">1鍙�</option>
+ <option value="CS-102">2鍙�</option>
+ </select>
+ </div>
+ </div>
+
+ <!-- 寰呮坊鍔� -->
+ <div id="data-search-btn" class="layui-btn-container layui-form-item">
+ <button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">鎼滅储</button>
+ <button id="checkAll" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="checkAll">鍏ㄩ��</button>
+ <button id="uncheckAll" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="uncheckAll">鍙嶉��</button>
+ <button id="start" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="start">鍚姩鍏ュ簱</button>
+ </div>
+</div>
+
+<div id="basDevpContain">
+ <table class="layui-table" id="basDevpMap" lay-filter="basDevpMap"></table>
+</div>
+
+<script type="text/template" id="basDevpMapTemplate">
+ <tbody id="tb">
+ {{#each body}}
+ <tr style="height: 280px">
+ {{#each loc}}
+ <td class="a-loc" title="{{devNo}}" style="background-color:blue;color:white">
+ <div class="layui-card-body" >
+ <div style="float:left; width:15%;">
+ <input type="checkbox" lay-skin="primary" name="cardCheckBox" value="{{devNo}}"/>
+ </div>
+ <div style="float:right; width:85%;">
+ <div>
+ 宸ヤ綔绔欑紪鐮侊細{{devNo}} </br>
+ 绔欑偣鐘舵�侊細{{locSts$}}
+ </div>
+ {{#if agvWaitPakin}}
+ <div style="padding-top: 10px;">
+ 鐗╂枡鍙凤細{{agvWaitPakin.matnr}} </br>
+ {{#if agvWaitPakin.batch}}
+ 搴忓垪鐮侊細{{agvWaitPakin.batch}} </br>
+ {{/if}}
+ 鎵樼洏鐮侊細{{agvWaitPakin.zpallet}} </br>
+ 鏁伴噺锛歿{agvWaitPakin.anfme}}
+ </div>
+ {{/if}}
+ {{#if agvWrkMast}}
+ <div style="padding-top: 10px;">
+ 宸ヤ綔鍙凤細{{agvWrkMast.wrkNo}} </br>
+ 宸ヤ綔鐘舵�侊細{{agvWrkMast.wrkSts$ }} </br>
+ 宸ヤ綔绫诲瀷锛歿{agvWrkMast.ioType$}}
+ </div>
+ {{/if}}
+ </div>
+ </div>
+ </td>
+ {{/each}}
+ </tr>
+ {{/each}}
+ </tbody>
+</script>
+
+<!--鏄庣粏琛�-->
+<div id="detlTable" style="display: none">
+ <div class="layui-inline" style="width:90%;margin-top: 10px;margin-left: 20px">
+ <span style=" color: indianred">浠ヤ笅涓哄綋鍓嶇珯鐐圭殑鐗╂枡鏄庣粏</span>
+ </div>
+
+ <table class="layui-hide" id="basDevpDetl" lay-filter="locDetlByMap"></table>
+</div>
+
+<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
+<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script>
+<script type="text/javascript" src="../../static/js/agvBasDevpVisualized/basDevp.js" charset="utf-8"></script>
+
+<iframe id="detail-iframe" scrolling="auto" style="display:none;"></iframe>
+
+</body>
+
+<script type="text/javascript">
+ layui.use(['table','laydate', 'form'], function(){
+ var form = layui.form;
+ var $ =layui.jquery;
+ var table = layui.table;
+ var layer = layui.layer;
+ var param = {'stationCode' : 'CS-101'};
+
+ form.on('select(floorSelect)', function (data) {
+
+ $('#rowSelect').empty();
+ if(data.value == 1){
+ $('#rowSelect').append("<option value=CS-101>1鍙�</option>");
+ $('#rowSelect').append("<option value=CS-102>2鍙�</option>")
+ }
+ if(data.value == 3){
+ $('#rowSelect').append("<option value=CS-305>1鍙�</option>");
+ $('#rowSelect').append("<option value=CS-306>2鍙�</option>")
+ $('#rowSelect').append("<option value=CS-307>3鍙�</option>")
+ }
+ form.render();
+
+ });
+
+ // 鎼滅储
+ form.on('submit(search)', function (data) {
+ param = null;
+ param = {'stationCode' : $('#rowSelect').val()};
+ loadData(param);
+ // $.ajax({
+ // url: baseUrl+"/agv/basDevp/visualized/list/auth",
+ // headers: {'token': localStorage.getItem('token')},
+ // data: JSON.stringify(param),
+ // dataType:'json',
+ // contentType:'application/json;charset=UTF-8',
+ // method: 'POST',
+ // success: function (res) {
+ // if (res.code === 200){
+ // var tpl = $("#basDevpMapTemplate").html();
+ // var template = Handlebars.compile(tpl);
+ // var html = template(res.data);
+ // $('#basDevpMap').html(html);
+ // } else if (res.code === 403){
+ // top.location.href = baseUrl+"/";
+ // }else {
+ // layer.msg(res.msg)
+ // }
+ // }
+ // })
+ });
+
+ //鍏ㄩ��
+ form.on('submit(checkAll)', function () {
+ var cks = document.querySelectorAll("#tb input");
+ for (var i = 0; i < cks.length; i++) {
+ cks[i].checked = true;
+ }
+ });
+
+ //鍙嶉��
+ form.on('submit(uncheckAll)', function () {
+ var cks = document.querySelectorAll("#tb input");
+ for (var i = 0; i < cks.length; i++) {
+ cks[i].checked = !cks[i].checked;
+ }
+ });
+
+ //鍚姩鍏ュ簱
+ form.on('submit(start)', function () {
+ var cks = document.querySelectorAll("#tb input");
+ var devNoList = new Array();
+ for (var i = 0; i < cks.length; i++) {
+ if(cks[i].checked){
+ devNoList.push(cks[i].value);
+ }
+ }
+ var param = {'devNo' : devNoList};
+ $.ajax({
+ url: baseUrl+"/agvMobile/pakin/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: JSON.stringify(param),
+ dataType:'json',
+ contentType:'application/json;charset=UTF-8',
+ method: 'POST',
+ success: function (res) {
+ if (res.code === 200){
+ layer.msg(res.msg)
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg)
+ }
+ }
+ })
+ });
+
+ //瀹氭椂鍒锋柊鏁版嵁
+ //setInterval(loadData(param), 1000);
+
+ setInterval(function() {
+ loadData(param);
+ }, 1000);
+
+ function loadData(param){
+ $.ajax({
+ url: baseUrl+"/agv/basDevp/visualized/list/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: JSON.stringify(param),
+ dataType:'json',
+ contentType:'application/json;charset=UTF-8',
+ method: 'POST',
+ success: function (res) {
+ if (res.code === 200){
+ var tpl = $("#basDevpMapTemplate").html();
+ var template = Handlebars.compile(tpl);
+ var html = template(res.data);
+ $('#basDevpMap').html(html);
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ }else {
+ layer.msg(res.msg)
+ }
+ }
+ })
+ }
+
+ });
+
+</script>
+</html>
+
diff --git a/src/main/webapp/views/order/out.html b/src/main/webapp/views/order/out.html
index 4b917b6..5e56678 100644
--- a/src/main/webapp/views/order/out.html
+++ b/src/main/webapp/views/order/out.html
@@ -104,13 +104,13 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鐗╂枡鍙�:</label>
+ <label class="layui-form-label">鐗╂枡鍚嶇О:</label>
<div class="layui-input-inline">
- <input name="maktx" class="layui-input" placeholder="鐗╂枡鍙�"/>
+ <input name="maktx" class="layui-input" placeholder="鐗╂枡鍚嶇О"/>
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">搴忓垪鐮�:</label>
+ <label class="layui-form-label">璁㈠崟鍙�:</label>
<div class="layui-input-inline">
<input name="batch" class="layui-input" placeholder="搴忓垪鐮�"/>
</div>
diff --git a/src/main/webapp/views/orderDetl/orderDetl.html b/src/main/webapp/views/orderDetl/orderDetl.html
index ce8f79f..debde49 100644
--- a/src/main/webapp/views/orderDetl/orderDetl.html
+++ b/src/main/webapp/views/orderDetl/orderDetl.html
@@ -88,7 +88,7 @@
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label">鐗╂枡鍙�: </label>
+ <label class="layui-form-label">鐗╂枡鍚嶇О: </label>
<div class="layui-input-block">
<input class="layui-input" name="maktx" placeholder="璇疯緭鍏ュ晢鍝佸悕绉�">
</div>
diff --git a/src/main/webapp/views/pack/pack.html b/src/main/webapp/views/pack/pack.html
index aaf76e9..8380b1a 100644
--- a/src/main/webapp/views/pack/pack.html
+++ b/src/main/webapp/views/pack/pack.html
@@ -103,7 +103,7 @@
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label">搴忓垪鐮�: </label>
+ <label class="layui-form-label">璁㈠崟鍙�: </label>
<div class="layui-input-block">
<input class="layui-input" name="batch" placeholder="璇疯緭鍏ュ簭鍒楃爜">
</div>
diff --git a/src/main/webapp/views/pda/comb.html b/src/main/webapp/views/pda/comb.html
index ea35335..ada5b5c 100644
--- a/src/main/webapp/views/pda/comb.html
+++ b/src/main/webapp/views/pda/comb.html
@@ -56,7 +56,7 @@
cols: [[
{fixed: 'left', align: 'center', field: 'count', title: '鏁伴噺', style:'color: blue', width:50},
{field: 'matnr', align: 'center', title: '鐗╂枡鍙�'},
- {field: 'maktx', align: 'center', title: '鐗╂枡鍙�'}
+ {field: 'maktx', align: 'center', title: '鐗╂枡鍚嶇О'}
]],
done: function (res, curr, count) {
}
diff --git a/src/main/webapp/views/pda/locDetlIframe.html b/src/main/webapp/views/pda/locDetlIframe.html
index 70a1d63..4850f1f 100644
--- a/src/main/webapp/views/pda/locDetlIframe.html
+++ b/src/main/webapp/views/pda/locDetlIframe.html
@@ -83,7 +83,7 @@
<input id="matnr" type="text" disabled="disabled">
</div>
<div class="form-item">
- <span>鐗╂枡鍙�</span>
+ <span>鐗╂枡鍚嶇О</span>
<input id="maktx" type="text" disabled="disabled">
</div>
<div class="form-item">
diff --git a/src/main/webapp/views/pda/matQuery.html b/src/main/webapp/views/pda/matQuery.html
index 668c742..38ba406 100644
--- a/src/main/webapp/views/pda/matQuery.html
+++ b/src/main/webapp/views/pda/matQuery.html
@@ -81,7 +81,7 @@
<input id="matNo" type="text" placeholder="鎵爜 / 杈撳叆" onkeyup="find(this)" autocomplete="off">
</div>
<div class="form-item">
- <span>鐗╂枡鍙�</span>
+ <span>鐗╂枡鍚嶇О</span>
<input id="matName" type="text" disabled="disabled">
</div>
<div class="form-item">
diff --git a/src/main/webapp/views/pda/stockIn.html b/src/main/webapp/views/pda/stockIn.html
index 0ebaad4..9825eb6 100644
--- a/src/main/webapp/views/pda/stockIn.html
+++ b/src/main/webapp/views/pda/stockIn.html
@@ -121,7 +121,7 @@
cols: [[
{fixed: 'left', align: 'center', field: 'count', title: '鏁伴噺', style:'color: blue', width:50},
{field: 'matnr', align: 'center', title: '鐗╂枡鍙�'},
- {field: 'maktx', align: 'center', title: '鐗╂枡鍙�'}
+ {field: 'maktx', align: 'center', title: '鐗╂枡鍚嶇О'}
]],
done: function (res, curr, count) {
--
Gitblit v1.9.1