From ec3e9c8b3cd8d31359ce0a25e8eb97d84a55a284 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 10 七月 2020 09:10:01 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MatCodeController.java | 2
src/main/webapp/views/pdaCe/index.html | 101 +++++++++++++++++----------------
src/main/java/com/zy/asrs/controller/MobileController.java | 11 +++
src/main/webapp/views/pdaCe/login.html | 16 +++++
4 files changed, 81 insertions(+), 49 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MatCodeController.java b/src/main/java/com/zy/asrs/controller/MatCodeController.java
index 2b48214..1594efb 100644
--- a/src/main/java/com/zy/asrs/controller/MatCodeController.java
+++ b/src/main/java/com/zy/asrs/controller/MatCodeController.java
@@ -46,7 +46,7 @@
}
@RequestMapping(value = "/matCode/auth")
-// @ManagerAuth
+ @ManagerAuth
public R find(@RequestParam("id") String id) {
return R.ok(matCodeService.selectById(String.valueOf(id)));
}
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 4f3b62b..9e8be25 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -47,6 +47,17 @@
return R.ok();
}
+
+ /**
+ * 缁勬墭
+ */
+ @RequestMapping("/comb/form")
+ @ManagerAuth(memo = "缁勬墭")
+ public R combForm(@RequestParam CombParam combParam){
+ mobileService.comb(combParam, getUserId());
+ return R.ok();
+ }
+
/**
* 鏍规嵁搴撲綅鍙锋煡鎵惧簱瀛樻槑缁�
*/
diff --git a/src/main/webapp/views/pdaCe/index.html b/src/main/webapp/views/pdaCe/index.html
index fce94cf..296d1b8 100644
--- a/src/main/webapp/views/pdaCe/index.html
+++ b/src/main/webapp/views/pdaCe/index.html
@@ -116,7 +116,7 @@
</div>
<div>
<span>鐗╂枡</span>
- <input type="text" id="matnr" onkeyup="find(this)" autocomplete="off">
+ <input type="text" id="matNo" onkeyup="find(this)" autocomplete="off">
</div>
<div class="mat-msg" id="mat-msg-id">
@@ -164,7 +164,7 @@
var matMsgTableBlankRows = 0; // 绌虹櫧琛屾暟
var matData = []; // 琛ㄦ牸鏁版嵁
var code = document.getElementById("code")
- var matnr = document.getElementById("matnr")
+ var matNo = document.getElementById("matNo")
var matMsg = document.getElementById("mat-msg-id");
var matMsgTable = document.getElementById("mat-msg-table");
var tthead = document.getElementById("tthead");
@@ -185,6 +185,7 @@
httpRequest({
httpUrl: baseUrl + "/matCode/auth",
type: 'post',
+ headers: [{token: getCookie('token')}],
data: {
id: el.value
},
@@ -204,8 +205,10 @@
btnCon.style.display = 'block';
matDetail.style.display = 'none';
}
+ } else if (res.code === 403) {
+ window.location.href = baseUrl + "/pda/ce";
} else {
- alert(res.msg);
+ tips(res.msg, true)
}
})
}
@@ -222,52 +225,26 @@
tips("璇锋彁鍙栫墿鏂�", true);
return;
}
+ console.log(JSON.stringify({
+ barcode: barcode,
+ combMats: matData
+ }))
httpRequest({
- httpUrl: baseUrl+"/mobile/comb/auth",
+ httpUrl: baseUrl+"/mobile/comb/form",
type: 'post',
- data: JSON.stringify({
+ headers: [{token: getCookie('token')}],
+ data: {
barcode: barcode,
combMats: matData
- }),
+ },
}, function (res) {
if (res.code === 200) {
- if (res.data != null) {
- // 鏍峰紡
- matMsg.style.display = 'none';
- btnCon.style.display = 'none';
- matDetail.style.display = 'block';
- // 濉厖鏁版嵁
- matName.value = res.data.matName;
- str1.value = res.data.str1;
- count.value = initMatCount;
- } else {
- matMsg.style.display = 'block';
- btnCon.style.display = 'block';
- matDetail.style.display = 'none';
- }
+ reset();
+ tips("缁勬墭鎴愬姛")
+ } else if (res.code === 403) {
+ window.location.href = baseUrl + "/pda/ce";
} else {
- alert(res.msg);
- }
- })
- $.ajax({
- url: baseUrl+"/mobile/comb/auth",
- headers: {'token': localStorage.getItem('token')},
- data: JSON.stringify({
- barcode: barcode,
- combMats: matData
- }),
- contentType:'application/json;charset=UTF-8',
- method: 'POST',
- async: false,
- success: function (res) {
- if (res.code === 200) {
- reset();
- tips("缁勬墭鎴愬姛")
- } else if (res.code === 403) {
- top.location.href = baseUrl + "/pda";
- } else {
- tips(res.msg, true)
- }
+ tips(res.msg, true)
}
})
}
@@ -305,7 +282,7 @@
}
var toPush = true;
for (var j=0;j<matData.length;j++){
- if (data.matnr === matData[j].matnr) {
+ if (data.matNo === matData[j].matNo) {
matData[j].count = Number(matData[j].count) + Number(data.count);
toPush = false;
}
@@ -316,7 +293,7 @@
var html = "";
for (var i=0;i<matData.length;i++) {
html += " <div class='table-data'>\n" +
- " <span>" + matData[i].matnr + "</span>\n" +
+ " <span>" + matData[i].matNo + "</span>\n" +
" <span>" + matData[i].matName + "</span>\n" +
" <span>" + matData[i].str1 + "</span>\n" +
" <span>" + matData[i].count + "</span>\n" +
@@ -329,7 +306,7 @@
// 閲嶇疆
function reset() {
code.value = "";
- matnr.value = "";
+ matNo.value = "";
cancel();
while(ttbody.hasChildNodes()) {
ttbody.removeChild(ttbody.firstChild);
@@ -357,7 +334,7 @@
// 鎻愬彇
function confirm() {
addTableData({
- matnr: matnr.value,
+ matNo: matNo.value,
matName: matName.value,
str1: str1.value,
count: count.value
@@ -367,7 +344,7 @@
}
// 鍙栨秷
function cancel() {
- matnr.value = "";
+ matNo.value = "";
matName.value = "";
str1.value = "";
count.value = initMatCount;
@@ -385,6 +362,21 @@
return;
}
count.value = count.value - 1;
+ }
+
+ //鑾峰彇 cookie
+ function getCookie(objName){//鑾峰彇鎸囧畾鍚嶇О鐨刢ookie鐨勫��
+ //澶氫釜cookie 淇濆瓨鐨勬椂鍊欐槸浠� ;绌烘牸 鍒嗗紑鐨�
+ var arrStr = document.cookie.split("; ");
+ for (var i = 0; i < arrStr.length; i++) {
+ var temp = arrStr[i].split("=");
+ if (temp[0] === objName){
+ return decodeURIComponent(temp[1]);
+ }else{
+ return "";
+ }
+
+ }
}
function httpRequest(paramObj,fun,errFun) {
@@ -410,6 +402,8 @@
var httpUrl = paramObj.httpUrl || '';
/*鏄惁寮傛璇锋眰*/
var async = paramObj.async || true;
+ /*璇锋眰澶村弬鏁�*/
+ var headerData = paramObj.headers || [];
/*璇锋眰鍙傛暟--post璇锋眰鍙傛暟鏍煎紡涓猴細foo=bar&lorem=ipsum*/
var paramData = paramObj.data || [];
var requestData = '';
@@ -436,7 +430,18 @@
}else if(httpType === 'POST'){
xmlhttp.open("POST",httpUrl,async);
//鍙戦�佸悎閫傜殑璇锋眰澶翠俊鎭�
- xmlhttp.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
+ var defaultContentType = true;
+ for (var i=0;i<headerData.length;i++) {
+ for(var key in headerData[i]) {
+ if (key === "Content-type") {
+ defaultContentType = false;
+ }
+ xmlhttp.setRequestHeader(key, headerData[i][key]);
+ }
+ }
+ if (defaultContentType) {
+ xmlhttp.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
+ }
xmlhttp.send(requestData);
}
}
diff --git a/src/main/webapp/views/pdaCe/login.html b/src/main/webapp/views/pdaCe/login.html
index ae52528..1db6f01 100644
--- a/src/main/webapp/views/pdaCe/login.html
+++ b/src/main/webapp/views/pdaCe/login.html
@@ -59,6 +59,9 @@
}
}, function (res) {
if (res.code === 200) {
+ // localStorage.setItem("token", res.data.token);
+ // localStorage.setItem("username", res.data.username);
+ setCookie("token", res.data.token);
window.location.href = "index.html";
} else {
alert(res.msg);
@@ -67,6 +70,19 @@
})
}
+ // 璁剧疆cookie
+ function setCookie(objName, objValue){//娣诲姞cookie
+ var str = objName + "=" + encodeURIComponent(objValue);
+ // if (objHours > 0) {//涓�0鏃朵笉璁惧畾杩囨湡鏃堕棿锛屾祻瑙堝櫒鍏抽棴鏃禼ookie鑷姩娑堝け
+ // var date = new Date();
+ // var ms = objHours * 3600 * 1000;
+ // date.setTime(date.getTime() + ms);
+ // str += "; expires=" + date.toUTCString();
+ // }
+ str += "; path=/";
+ document.cookie = str;
+ }
+
function httpRequest(paramObj,fun,errFun) {
var xmlhttp = null;
/*鍒涘缓XMLHttpRequest瀵硅薄锛�
--
Gitblit v1.9.1