From d0226747665355acecd5b4f2b5c0beb020586729 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 17 一月 2025 15:37:32 +0800
Subject: [PATCH] # 23. PDA拣货单据，勾选或点击确认按钮后，完成当前单据 （已完成） 24. PDA出库成功后，界面数据重置，避免重复操作 （已修复） 25. PDA接口请求，添加一个Loading遮档 （已修复） 27. 非平库单据，在平库可做入库操作 （已修复） 28. 平库已组拖数据，组拖完成后依然可组拖 （已修复） 29. 平库入库后，订单明细没有添加（已修复） 30. 平库入库后，单据类型没有修改（已修复） 31. 没有绑定播种位，不能进行播种，前后端都需加判定（已修复） 33. 平库入库未修改入库已完成数量（已修复） 34. cacheSite缓存站点逻辑需重新梳理，入库生成波次时（已完成） 35. PDA添加发货确认，默认全选 （已修复） 36. 大屏获取任务时，是由容器到达的拖盘码确认通知 （已修复） 37. 拣货单序号不显示 问题修复 （已修复） 42. pda发货确认，添加不同颜色区分是否全部完成拣货，绿色全部拣货完成，红色完成部分拣货（已修复） 43. CTU入库完成后，订单明细没有删除，执行中数量清空（已修复） 44. 平库入库完成后，历史档明细完成数量没有更新 （已修复） 45. PDA料号不显示 （已修复） 46. 发货完成后，波次管理数据未加入历史档 （已修复）
---
zy-asrs-openapi/src/main/webapp/static/js/common.js | 390 +++++++++++++++++++++++++++---------------------------
1 files changed, 195 insertions(+), 195 deletions(-)
diff --git a/zy-asrs-openapi/src/main/webapp/static/js/common.js b/zy-asrs-openapi/src/main/webapp/static/js/common.js
index b1809e5..e6c6f8a 100644
--- a/zy-asrs-openapi/src/main/webapp/static/js/common.js
+++ b/zy-asrs-openapi/src/main/webapp/static/js/common.js
@@ -1,195 +1,195 @@
-var baseUrl = "/openapi";
-
-// 璧嬪��
-function setVal(el, val) {
- if (el.text() !== val){
- el.html(val);
- }
-}
-
-// 璇︽儏绐楀彛-楂樺害
-var detailHeight = '80%';
-// 璇︽儏绐楀彛-瀹藉害
-var detailWidth = '90%';
-
-// 闈炵┖鍒ゆ柇
-function isEmpty(obj){
- return typeof obj == "undefined" || obj == null || obj === "";
-}
-
-// 鏃堕棿 ==>> 瀛楃涓�
-function dateToStr(date) {
- var time = new Date(date);
- var y = time.getFullYear();
- var M = time.getMonth() + 1;
- M = M < 10 ? ("0" + M) : M;
- var d = time.getDate();
- d = d < 10 ? ("0" + d) : d;
- var h = time.getHours();
- h = h < 10 ? ("0" + h) : h;
- var m = time.getMinutes();
- m = m < 10 ? ("0" + m) : m;
- var s = time.getSeconds();
- s = s < 10 ? ("0" + s) : s;
- return y + "-" + M + "-" + d + " " + h + ":" + m + ":" + s;
-}
-
-// 瀛楃涓� ===>> 鏃堕棿
-function strToDate(str) {
- var t = Date.parse(str);
- if (!isNaN(t)) {
- return new Date(Date.parse(str.replace(/-/g, "/")));
- } else {
- return null;
- }
-}
-
-// 娓呯悊瀵硅薄null鍊�
-function reObject(data) {
- for (var obj in data) {
- if (data[obj]===null){
- delete data[obj];
- }
- }
- return data;
-}
-
-/**
- * disabled 灞炴�ц浆鎹�
- */
-function convertDisabled(el, param) {
- el.each(function () {
- $(this).attr("disabled", param);
- });
-}
-
-// 鏉冮檺
-function limit(child){
- if (child == null){
- child = false;
- }
- var param = (child?parent.window:window).location.href.split("?")[1];
- if (null != param) {
- var resourceId = param.split("=")[1];
- $.ajax({
- url: baseUrl+"/power/menu/"+resourceId+"/auth",
- headers: {'token': localStorage.getItem('token')},
- method: 'GET',
- async: false,
- success: function (res) {
- if (res.code === 200){
- for(var i = 0, len = res.data.length; i < len; i++) {
- (child?parent:window).$('#'+res.data[i].code).css("display", "inline-block");
- (child?parent:window).$('.'+res.data[i].code).css("display", "inline-block");
- }
- } else if (res.code === 403){
- window.location.href = baseUrl;
- } else {
- layer.msg(res.msg)
- }
- }
- });
- }
-
-}
-
-
-
-// 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 baseUrl = "/openapi";
+
+// 璧嬪��
+function setVal(el, val) {
+ if (el.text() !== val){
+ el.html(val);
+ }
+}
+
+// 璇︽儏绐楀彛-楂樺害
+var detailHeight = '80%';
+// 璇︽儏绐楀彛-瀹藉害
+var detailWidth = '90%';
+
+// 闈炵┖鍒ゆ柇
+function isEmpty(obj){
+ return typeof obj == "undefined" || obj == null || obj === "";
+}
+
+// 鏃堕棿 ==>> 瀛楃涓�
+function dateToStr(date) {
+ var time = new Date(date);
+ var y = time.getFullYear();
+ var M = time.getMonth() + 1;
+ M = M < 10 ? ("0" + M) : M;
+ var d = time.getDate();
+ d = d < 10 ? ("0" + d) : d;
+ var h = time.getHours();
+ h = h < 10 ? ("0" + h) : h;
+ var m = time.getMinutes();
+ m = m < 10 ? ("0" + m) : m;
+ var s = time.getSeconds();
+ s = s < 10 ? ("0" + s) : s;
+ return y + "-" + M + "-" + d + " " + h + ":" + m + ":" + s;
+}
+
+// 瀛楃涓� ===>> 鏃堕棿
+function strToDate(str) {
+ var t = Date.parse(str);
+ if (!isNaN(t)) {
+ return new Date(Date.parse(str.replace(/-/g, "/")));
+ } else {
+ return null;
+ }
+}
+
+// 娓呯悊瀵硅薄null鍊�
+function reObject(data) {
+ for (var obj in data) {
+ if (data[obj]===null){
+ delete data[obj];
+ }
+ }
+ return data;
+}
+
+/**
+ * disabled 灞炴�ц浆鎹�
+ */
+function convertDisabled(el, param) {
+ el.each(function () {
+ $(this).attr("disabled", param);
+ });
+}
+
+// 鏉冮檺
+function limit(child){
+ if (child == null){
+ child = false;
+ }
+ var param = (child?parent.window:window).location.href.split("?")[1];
+ if (null != param) {
+ var resourceId = param.split("=")[1];
+ $.ajax({
+ url: baseUrl+"/power/menu/"+resourceId+"/auth",
+ headers: {'token': localStorage.getItem('token')},
+ method: 'GET',
+ async: false,
+ success: function (res) {
+ if (res.code === 200){
+ for(var i = 0, len = res.data.length; i < len; i++) {
+ (child?parent:window).$('#'+res.data[i].code).css("display", "inline-block");
+ (child?parent:window).$('.'+res.data[i].code).css("display", "inline-block");
+ }
+ } else if (res.code === 403){
+ window.location.href = baseUrl;
+ } else {
+ layer.msg(res.msg)
+ }
+ }
+ });
+ }
+
+}
+
+
+
+// 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;
+}
--
Gitblit v1.9.1