From dd22e4a01d473357b1bf617f6d3423c34dbb9011 Mon Sep 17 00:00:00 2001 From: tqs <56479841@qq.com> Date: 星期五, 26 五月 2023 09:41:18 +0800 Subject: [PATCH] # --- /dev/null | 43 --------------------- src/main/webapp/views/pakStore/locDetlCheckQuery.html | 2 src/main/webapp/static/js/order/order.js | 24 ++++++------ src/main/webapp/views/pakStore/locDetlQuery.html | 2 src/main/webapp/static/js/common.js | 10 ++-- 5 files changed, 19 insertions(+), 62 deletions(-) diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js index 20b1fec..5839c02 100644 --- a/src/main/webapp/static/js/common.js +++ b/src/main/webapp/static/js/common.js @@ -228,11 +228,11 @@ ] var detlCols = [ - {field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿', sort:true} - ,{field: 'specs', align: 'center',title: '瑙勬牸'} - ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', sort:true} - ,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: false} - ,{field: 'batch', align: 'center',title: '鎵瑰彿', sort:true} + {field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿', sort:true, width: 290} + ,{field: 'specs', align: 'center',title: '瑙勬牸', width: 200} + ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', sort:true, width: 150} + ,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: true} + ,{field: 'batch', align: 'center',title: '鎵瑰彿', sort:true, hide: true} ,{field: 'anfme', align: 'center',title: '鏁伴噺'} ,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉$爜'} diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js index ed11081..86868e3 100644 --- a/src/main/webapp/static/js/order/order.js +++ b/src/main/webapp/static/js/order/order.js @@ -129,11 +129,12 @@ cellMinWidth: 100, cols: [[ {type: 'numbers'}, - {field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160}, - {field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 160}, - {field: 'batch', title: '搴忓垪鐮�'}, - {field: 'anfme', title: '鏁伴噺'}, - {field: 'qty', title: '浣滀笟鏁伴噺', style: 'font-weight: bold'}, + {field: 'matnr', title: '鍟嗗搧缂栫爜', width: 280}, + {field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 150}, + // {field: 'batch', title: '鎵瑰彿'}, + {field: 'specs', title: '瑙勬牸', width: 180}, + {field: 'anfme', title: '鏁伴噺', width: 70}, + {field: 'qty', title: '浣滀笟鏁伴噺', style: 'font-weight: bold', width: 90} // {field: 'unit', title: '鍗曚綅'}, // { // field: 'createTime$', title: '鍒涘缓鏃堕棿', sort: true, templet: function (d) { @@ -142,7 +143,6 @@ // }, // {field: 'inQty', title: '宸插叆搴撻噺'}, // {field: 'color', title: '棰滆壊'}, - {field: 'specs', title: '瑙勬牸'} ]], request: { pageName: 'curr', @@ -236,12 +236,12 @@ cellMinWidth: 100, cols: [[ {type: 'numbers', title: '#'}, - {field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160}, - {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}, - {field: 'sum', title: '搴撳瓨鏁伴噺', style: 'color: red;font-weight: bold', minWidth: 110, width: 110}, + {field: 'matnr', title: '鍟嗗搧缂栫爜', width: 280}, + {field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 150}, + // {field: 'batch', title: '鎵瑰彿', edit: true}, + {field: 'specs', title: '瑙勬牸', width: 180}, + {field: 'anfme', title: '鏁伴噺(淇敼)', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 100}, + {field: 'sum', title: '搴撳瓨鏁伴噺', style: 'color: red;font-weight: bold', minWidth: 110, width: 100}, // {field: 'inQty', title: '宸插叆搴撻噺', minWidth: 100, width: 100}, // {field: 'unit', title: '鍗曚綅', width: 80}, {field: 'memo', title: '澶囨敞' , edit: true}, diff --git a/src/main/webapp/views/pakStore/locDetlCheckQuery.html b/src/main/webapp/views/pakStore/locDetlCheckQuery.html index 959fb21..fca817d 100644 --- a/src/main/webapp/views/pakStore/locDetlCheckQuery.html +++ b/src/main/webapp/views/pakStore/locDetlCheckQuery.html @@ -102,7 +102,7 @@ function getCol() { let cols = [ {type: 'checkbox', merge: ['locNo']} - ,{field: 'locNo', align: 'center',title: '搴撲綅鍙�', merge: true, style: 'font-weight: bold'} + ,{field: 'locNo', align: 'center',title: '搴撲綅鍙�', merge: true, style: 'font-weight: bold', width: 85} ]; cols.push.apply(cols, detlCols); cols.push({field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide: true} diff --git a/src/main/webapp/views/pakStore/locDetlQuery.html b/src/main/webapp/views/pakStore/locDetlQuery.html index 7d5790d..6babd7e 100644 --- a/src/main/webapp/views/pakStore/locDetlQuery.html +++ b/src/main/webapp/views/pakStore/locDetlQuery.html @@ -111,7 +111,7 @@ function getCol() { var cols = [ {type: 'checkbox'} - ,{field: 'locNo$', align: 'center',title: '搴撲綅鍙�'} + ,{field: 'locNo$', align: 'center',title: '搴撲綅鍙�', width: 85} ]; cols.push.apply(cols, detlCols); cols.push({field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide: true} diff --git "a/version/\350\276\271\351\224\213\346\225\260\346\215\256\345\272\223\346\224\271\345\212\25020221028/20221028.bak" "b/version/\350\276\271\351\224\213\346\225\260\346\215\256\345\272\223\346\224\271\345\212\25020221028/20221028.bak" deleted file mode 100644 index a49710c..0000000 --- "a/version/\350\276\271\351\224\213\346\225\260\346\215\256\345\272\223\346\224\271\345\212\25020221028/20221028.bak" +++ /dev/null Binary files differ diff --git "a/version/\350\276\271\351\224\213\346\225\260\346\215\256\345\272\223\346\224\271\345\212\25020221028/\350\276\271\351\224\213\346\225\260\346\215\256\345\272\223\346\224\271\345\212\250.md" "b/version/\350\276\271\351\224\213\346\225\260\346\215\256\345\272\223\346\224\271\345\212\25020221028/\350\276\271\351\224\213\346\225\260\346\215\256\345\272\223\346\224\271\345\212\250.md" deleted file mode 100644 index ac3c807..0000000 --- "a/version/\350\276\271\351\224\213\346\225\260\346\215\256\345\272\223\346\224\271\345\212\25020221028/\350\276\271\351\224\213\346\225\260\346\215\256\345\272\223\346\224\271\345\212\250.md" +++ /dev/null @@ -1,43 +0,0 @@ -鐗╂枡妗�(man_mat)澶氬洓涓瓧娈� - -```sql -store_max decimal 24 9 搴撳瓨涓婇檺 -store_min decimal 24 9 搴撳瓨涓嬮檺 -store_max_date int 0 0 鏈�澶у簱瀛樻粸鐣欐椂闂� -inout_everyday bit 0 0 鏄惁涓洪绻佸嚭鍏ュ簱鐗╂枡, 0:鍚� 1:鏄� - -``` - -澶氫袱涓鍥� - -```sql -asr_check_report -asr_loc_detl_group -``` - - - -澶氫竴涓〃 - -```sql -asr_check_record -``` - -鏂板鍐荤粨瀛楁frozen int 榛樿鍊�0 -缁勬墭妗o細鍏ュ簱閫氱煡妗�/鍘嗗彶妗h〃 -宸ヤ綔涓绘。/鍘嗗彶妗� -搴撳瓨妗� -宸叉湁搴撳瓨鏁版嵁闇�瑕佸垵濮嬪寲frozen鍊间负0 - -``` -澧炲姞frozen 锛坕nt锛� 琛細 -asr_loc_mast -asr_wrk_mast -asr_wrk_mast_log -cust_wait_pakin -cust_wait_pakin_log -asr_wrk_detl - -asr_loc_mast + frozen_memo (varchar(255) -``` - -- Gitblit v1.9.1