From f13c3c30079b05f5e58f8e86a339ca9b4b7ea002 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 15 五月 2023 14:45:40 +0800
Subject: [PATCH] 堆垛机异常日志

---
 src/main/webapp/static/js/common.js |  207 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 200 insertions(+), 7 deletions(-)

diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index 9907798..3779158 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -1,8 +1,11 @@
-// 鐢熶骇
-// var baseUrl = "/asrs";
-// 娴嬭瘯
-var baseUrl = "";
+var baseUrl = "/wcs";
 
+// 璧嬪��
+function setVal(el, val) {
+    if (el.text() !== val){
+        el.html(val);
+    }
+}
 
 // 璇︽儏绐楀彛-楂樺害
 var detailHeight = '80%';
@@ -15,7 +18,7 @@
 }
 
 // 鏃堕棿 ==>> 瀛楃涓�
-function dateToStr(date) {
+function dateToStr(date, millisecond) {
     var time = new Date(date);
     var y = time.getFullYear();
     var M = time.getMonth() + 1;
@@ -28,7 +31,18 @@
     m = m < 10 ? ("0" + m) : m;
     var s = time.getSeconds();
     s = s < 10 ? ("0" + s) : s;
-    return y + "-" + M + "-" + d + " " + h + ":" + m + ":" + s;
+    if (!millisecond) {
+        return y + "-" + M + "-" + d + " " + h + ":" + m + ":" + s;
+    } else {
+        var p = time.getMilliseconds();
+        if (p < 10) {
+            p = "00" + p;
+        }
+        if (p <  100) {
+            p = "0" + p;
+        }
+        return y + "-" + M + "-" + d + " " + h + ":" + m + ":" + s + "," + p;
+    }
 }
 
 // 瀛楃涓� ===>> 鏃堕棿
@@ -80,7 +94,7 @@
                         (child?parent:window).$('.'+res.data[i].code).css("display", "inline-block");
                     }
                 } else if (res.code === 403){
-                    top.location.href = baseUrl;
+                    window.location.href = baseUrl;
                 } else {
                     layer.msg(res.msg)
                 }
@@ -89,3 +103,182 @@
     }
 
 }
+
+
+
+// http璇锋眰
+!function (n) {
+    "use strict";
+
+    var http = {
+        toAjax: function (params) {
+            $.ajax(params);
+        },
+        get: function (url, data, callback) {
+            http.toAjax({
+                method: 'GET',
+                url: url,
+                data: data,
+                dataType: 'json',
+                header: {'Content-Type': 'application/json'},
+                timeout: 10000,
+                cache: false,
+                success: function (result) {
+                    callback(result);
+                },
+                error: function (res, type) {
+
+                }
+            })
+        },
+        post: function (url, param, callback, type) {
+            var headerType;
+            if (type === 'json') {
+                headerType = {'Content-Type': 'application/json'}
+            } else {
+                headerType = {'Content-Type': 'application/x-www-form-urlencoded'}
+            }
+            headerType['token'] = localStorage.getItem('token');
+            http.toAjax({
+                method: 'POST',
+                url: url,
+                data: param,
+                dataType: 'json',
+                headers: headerType,
+                timeout: 10000,
+                cache: false,
+                success: function (res) {
+                    if (res.code === 200){
+                        callback(res);
+                    } else if (res.code === 403){
+                        parent.location.href = baseUrl+"/login";
+                    }  else {
+                        layer.msg(res.msg, {icon: 2});
+                    }
+                },
+                error: function (res, type) {
+
+                }
+            })
+        },
+    };
+
+
+    "function" == typeof define && define.amd ? define(function () {
+        return http
+    }) : "object" == typeof module && module.exports ? module.exports = http : n.http = http
+}(this);
+
+/**
+ * 鑾峰彇url閿�煎
+ */
+function getUrlVal(key) {
+    var reg = new RegExp('(^|&)' + key + '=([^&]*)(&|$)', 'i');
+    var r = window.location.search.substr(1).match(reg);
+    if (r != null) {
+        return unescape(r[2]);
+    }
+    return null;
+}
+
+function getDateFormat(value){
+    var date = new Date();// 鑾峰彇褰撳墠鏃堕棿
+    date.setDate(date.getDate() + value);// 璁剧疆澶╂暟 -1 澶�
+    return date.Format("MM-dd");
+}
+/**
+ * 鏃ユ湡鏍煎紡鍖�
+ */
+Date.prototype.Format = function (fmt) {
+    var o = {
+        "M+": this.getMonth() + 1, //鏈堜唤
+        "d+": this.getDate(), //鏃�
+        "h+": this.getHours(), //灏忔椂
+        "m+": this.getMinutes(), //鍒�
+        "s+": this.getSeconds(), //绉�
+        "q+": Math.floor((this.getMonth() + 3) / 3), //瀛ｅ害
+        "S": this.getMilliseconds() //姣
+    };
+    if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (this.getFullYear() + "").substr(4 - RegExp.$1.length));
+    for (var k in o)
+        if (new RegExp("(" + k + ")").test(fmt)) fmt = fmt.replace(RegExp.$1, (RegExp.$1.length === 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k]).length)));
+    return fmt;
+}
+
+
+var matCols = [
+    {field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿', width: 180}
+    // {field: 'id', align: 'center',title: 'ID'}
+    // ,{field: 'uuid', align: 'center',title: '缂栧彿'}
+    // ,{field: 'tagId$', align: 'center',title: '鎵�灞炲綊绫�'}
+    ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', width: 200}
+    // ,{field: 'name', align: 'center',title: '鍒悕'}
+    // ,{field: 'specs', align: 'center',title: '閰嶇疆'}
+    // ,{field: 'model', align: 'center',title: '浠ｇ爜', hide: false}
+    // ,{field: 'color', align: 'center',title: '棰滆壊', hide: true}
+    ,{field: 'brand', align: 'center',title: '鍝佺墝', hide: true}
+    ,{field: 'unit', align: 'center',title: '鍗曚綅', hide: true}
+    // ,{field: 'price', align: 'center',title: '鍗曚环', hide: true}
+    ,{field: 'sku', align: 'center',title: 'sku', hide: true}
+    ,{field: 'units', align: 'center',title: '鍗曚綅閲�', hide: true}
+    // ,{field: 'barcode', align: 'center',title: '鏉＄爜', hide: true}
+    ,{field: 'origin', align: 'center',title: '浜у湴', hide: true}
+    ,{field: 'manu', align: 'center',title: '鍘傚', hide: true}
+    ,{field: 'manuDate', align: 'center',title: '鐢熶骇鏃ユ湡', hide: true}
+    ,{field: 'itemNum', align: 'center',title: '鍝侀」鏁�', hide: true}
+    ,{field: 'safeQty', align: 'center',title: '瀹夊叏搴撳瓨閲�', hide: true}
+    ,{field: 'weight', align: 'center',title: '鍑�閲�', hide: false}
+    ,{field: 'length', align: 'center',title: '姣涢噸', hide: false}
+    ,{field: 'volume', align: 'center',title: '浣撶Н', hide: false}
+    ,{field: 'threeCode', align: 'center',title: '灏哄', hide: false}
+    ,{field: 'supp', align: 'center',title: '渚涘簲鍟�', hide: true}
+    ,{field: 'suppCode', align: 'center',title: '渚涘簲鍟嗙紪鐮�', hide: true}
+    ,{field: 'beBatch$', align: 'center',title: '鏄惁鎵规', hide: true}
+    // ,{field: 'deadTime', align: 'center',title: '淇濊川鏈�', hide: true}
+    ,{field: 'deadWarn', align: 'center',title: '棰勮澶╂暟', hide: true}
+    ,{field: 'source$', align: 'center',title: '鍒惰喘', hide: true}
+    ,{field: 'check$', align: 'center',title: '瑕佹眰妫�楠�', hide: true}
+    ,{field: 'danger$', align: 'center',title: '鍗遍櫓鍝�', hide: true}
+    // ,{field: 'status$', align: 'center',title: '鐘舵��'}
+    // ,{field: 'createBy$', align: 'center',title: '娣诲姞浜哄憳'}
+    // ,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿'}
+    ,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳', hide: true}
+    ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿', hide: true}
+    ,{field: 'memo', align: 'center',title: '澶囨敞', hide: true}
+]
+
+var detlCols = [
+    {field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿', sort:true}
+    ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', sort:true}
+    // ,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: false}
+    ,{field: 'batch', align: 'center',title: '鎵瑰彿', sort:true}
+    ,{field: 'anfme', align: 'center',title: '閲嶉噺锛坘g锛�'}
+    // ,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
+
+    ,{field: 'specs', align: 'center',title: '閰嶇疆'}
+    ,{field: 'model', align: 'center',title: '浠ｇ爜', hide: false}
+    ,{field: 'color', align: 'center',title: '棰滆壊', hide: true}
+    ,{field: 'brand', align: 'center',title: '鍝佺墝', hide: true}
+    ,{field: 'unit', align: 'center',title: '鍗曚綅', hide: true}
+    // ,{field: 'price', align: 'center',title: '鍗曚环', hide: true}
+    ,{field: 'sku', align: 'center',title: 'sku', hide: true}
+    ,{field: 'units', align: 'center',title: '鍗曚綅閲�', hide: true}
+    // ,{field: 'barcode', align: 'center',title: '鏉＄爜', hide: true}
+    ,{field: 'origin', align: 'center',title: '浜у湴', hide: true}
+    ,{field: 'manu', align: 'center',title: '鍘傚', hide: true}
+    ,{field: 'manuDate', align: 'center',title: '鐢熶骇鏃ユ湡', hide: true}
+    ,{field: 'itemNum', align: 'center',title: '鍝侀」鏁�', hide: true}
+    ,{field: 'safeQty', align: 'center',title: '瀹夊叏搴撳瓨閲�', hide: true}
+    ,{field: 'weight', align: 'center',title: '鍑�閲�', hide: false}
+    ,{field: 'length', align: 'center',title: '姣涢噸', hide: false}
+    ,{field: 'volume', align: 'center',title: '浣撶Н', hide: false}
+    ,{field: 'threeCode', align: 'center',title: '灏哄', hide: false}
+    ,{field: 'supp', align: 'center',title: '渚涘簲鍟�', hide: true}
+    ,{field: 'suppCode', align: 'center',title: '渚涘簲鍟嗙紪鐮�', hide: true}
+    ,{field: 'beBatch$', align: 'center',title: '鏄惁鎵规', hide: true}
+    ,{field: 'deadTime', align: 'center',title: '淇濊川鏈�', hide: true}
+    ,{field: 'deadWarn', align: 'center',title: '棰勮澶╂暟', hide: true}
+    ,{field: 'source$', align: 'center',title: '鍒惰喘', hide: true}
+    ,{field: 'check$', align: 'center',title: '瑕佹眰妫�楠�', hide: true}
+    ,{field: 'danger$', align: 'center',title: '鍗遍櫓鍝�', hide: true}
+]
\ No newline at end of file

--
Gitblit v1.9.1