From 0610019317ad541683fa59d268db7fd62b29ff7d Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期四, 11 十二月 2025 13:12:28 +0800
Subject: [PATCH] 单据明细页面字段显示
---
src/main/java/com/zy/asrs/entity/OrderDetlPakout.java | 11 ++
src/main/java/com/zy/asrs/entity/OrderDetl.java | 10 ++
src/main/webapp/static/js/orderPakout/order.js | 83 ++++++++++++--------
src/main/webapp/static/js/locCache/locCache.js | 1
src/main/webapp/static/js/order/order.js | 56 ++++++++++----
src/main/webapp/static/js/orderPakin/order.js | 21 ++--
src/main/java/com/zy/asrs/entity/Order.java | 3
7 files changed, 125 insertions(+), 60 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/Order.java b/src/main/java/com/zy/asrs/entity/Order.java
index 90aac1d..403e4e4 100644
--- a/src/main/java/com/zy/asrs/entity/Order.java
+++ b/src/main/java/com/zy/asrs/entity/Order.java
@@ -4,9 +4,11 @@
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.asrs.service.DocTypeService;
+import com.zy.asrs.service.MatService;
import com.zy.asrs.service.OrderSettleService;
import com.zy.common.utils.Synchro;
import com.zy.system.entity.User;
@@ -473,6 +475,7 @@
}
}
+
public String getPayTime$(){
if (Cools.isEmpty(this.payTime)){
return "";
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetl.java b/src/main/java/com/zy/asrs/entity/OrderDetl.java
index 743578e..13348f6 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetl.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetl.java
@@ -9,6 +9,7 @@
import com.core.common.SpringUtils;
import com.zy.asrs.service.BasProcessProceduresService;
import com.zy.asrs.service.BasQualityTestingService;
+import com.zy.asrs.service.MatService;
import com.zy.asrs.service.OrderService;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
@@ -481,6 +482,15 @@
}
}
+ public String getTag$() {
+ MatService service = SpringUtils.getBean(MatService.class);
+ Mat order = service.selectOne(new EntityWrapper<Mat>().eq("matnr", this.matnr));
+ if (Cools.isEmpty(order)){
+ return null;
+ }
+ return order.getTagId$();
+ }
+
public String getInspect$(){
if (null == this.inspect){ return null; }
switch (this.inspect){
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetlPakout.java b/src/main/java/com/zy/asrs/entity/OrderDetlPakout.java
index 273c4df..5e86238 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetlPakout.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetlPakout.java
@@ -9,6 +9,7 @@
import com.core.common.SpringUtils;
import com.zy.asrs.service.BasProcessProceduresService;
import com.zy.asrs.service.BasQualityTestingService;
+import com.zy.asrs.service.MatService;
import com.zy.asrs.service.OrderService;
import com.zy.common.utils.Synchro;
import com.zy.system.entity.User;
@@ -461,6 +462,16 @@
}
}
+ public String getTag$() {
+ MatService service = SpringUtils.getBean(MatService.class);
+ Mat order = service.selectOne(new EntityWrapper<Mat>().eq("matnr", this.matnr));
+ if (Cools.isEmpty(order)){
+ return null;
+ }
+ return order.getTagId$();
+ }
+
+
public String getStatus$(){
if (null == this.status){ return null; }
switch (this.status){
diff --git a/src/main/webapp/static/js/locCache/locCache.js b/src/main/webapp/static/js/locCache/locCache.js
index 2e5534d..b44b445 100644
--- a/src/main/webapp/static/js/locCache/locCache.js
+++ b/src/main/webapp/static/js/locCache/locCache.js
@@ -151,7 +151,6 @@
// 鍒濆鍖栦繚瀛�
form.on('submit(initDo)', function (data) {
- console.log(data.field)
$.ajax({
url: baseUrl + "/locCache/init/auth",
headers: {'token': localStorage.getItem('token')},
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index 0d083ce..6069ce3 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -41,14 +41,26 @@
page: true,
cellMinWidth: 100,
cols: [[
- {type: 'numbers'},
- {field: 'orderNo', title: '鍗曟嵁缂栧彿', templet: '#orderNoTpl'},
- {field: 'docType$', align: 'center', title: '绫诲瀷', minWidth: 160, width: 160},
- {align: 'center', title: '鏄庣粏', toolbar: '#tbLook', minWidth: 160, width: 160},
- {field: 'createTime$', title: '鍒涘缓鏃堕棿', minWidth: 200, width: 200},
- {field: 'settle$', align: 'center', title: '鐘舵��', templet: '#settleTpl', minWidth: 160, width: 160},
- {field: 'memo', align: 'center',title: '澶囨敞', hide: true},
- {align: 'center', title: '鎿嶄綔', toolbar: '#operate', width: 180}
+ // {type: 'numbers'},
+ // {field: 'orderNo', title: '鍗曟嵁缂栧彿', templet: '#orderNoTpl'},
+ // {field: 'docType$', align: 'center', title: '绫诲瀷', minWidth: 160, width: 160},
+ // {align: 'center', title: '鏄庣粏', toolbar: '#tbLook', minWidth: 160, width: 160},
+ // {field: 'createTime$', title: '鍒涘缓鏃堕棿', minWidth: 200, width: 200},
+ // {field: 'settle$', align: 'center', title: '鐘舵��', templet: '#settleTpl', minWidth: 160, width: 160},
+ // {field: 'memo', align: 'center',title: '澶囨敞', hide: true},
+ // {align: 'center', title: '鎿嶄綔', toolbar: '#operate', width: 180}
+ { type: 'numbers' },
+ { field: 'orderNo', title: '鍗曟嵁缂栧彿', templet: '#orderNoTpl' , minWidth: 180},
+ { field: 'defNumber', align: 'center', title: '娴佹按鍙�', minWidth: 160, width: 160 },
+ { field: 'number', align: 'center', title: '娲惧伐鍗曞彿', minWidth: 160, width: 160 },
+ { field: 'cstmrName', align: 'center', title: '鍏徃ID', minWidth: 160, width: 160 },
+ { field: 'itemName', align: 'center', title: '绠卞彿', minWidth: 160, width: 160 },
+ { field: 'docType$', align: 'center', title: '绫诲瀷', minWidth: 130},
+ { field: 'orderTime', align: 'center', title: '娲惧伐鏃堕棿', minWidth: 160, width: 160 },
+ { field: 'createTime$', title: '鍒涘缓鏃堕棿', minWidth: 160, width: 160 },
+ { field: 'settle$', align: 'center', title: '鐘舵��', templet: '#settleTpl', minWidth: 100, width: 100 },
+ { align: 'center', title: '鏄庣粏', toolbar: '#tbLook', minWidth: 160, width: 160 },
+ { align: 'center', title: '鎿嶄綔', toolbar: '#operate', width: 180 }
]],
request: {
pageName: 'curr',
@@ -120,15 +132,27 @@
height: '450px;',
cellMinWidth: 100,
cols: [[
+ // { type: 'numbers' },
+ // { field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160 },
+ // { field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 160 },
+ // { field: 'standby1', title: '渚涘簲鍟嗙紪鐮�', width: 160 },
+ // { field: 'batch', title: '鎵瑰彿' },
+ // { field: 'anfme', title: '寰呭畬缁撴暟閲�' },
+ // { field: 'workQty', title: '寰呬笂鎶ユ暟閲�' },
+ // { field: 'qty', title: '宸插畬缁撴暟閲�', style: 'font-weight: bold' },
+ // { field: 'specs', title: '瑙勬牸' }
{ type: 'numbers' },
- { field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160 },
- { field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 160 },
- { field: 'standby1', title: '渚涘簲鍟嗙紪鐮�', width: 160 },
- { field: 'batch', title: '鎵瑰彿' },
- { field: 'anfme', title: '寰呭畬缁撴暟閲�' },
- { field: 'workQty', title: '寰呬笂鎶ユ暟閲�' },
- { field: 'qty', title: '宸插畬缁撴暟閲�', style: 'font-weight: bold' },
- { field: 'specs', title: '瑙勬牸' }
+ {field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿锛堝搧鍙凤級', sort:true}
+ ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О锛堝搧鍚嶏級', sort:true}
+ ,{field: 'anfme', align: 'center',title: '鏁伴噺', hide: false}
+ ,{field: 'specs', align: 'center',title: '瑙勬牸', hide: false}
+ ,{field: 'tag$', align: 'center',title: '闆朵欢绫诲瀷', hide: false}
+ ,{field: 'threeCode', align: 'center',title: 'BS Code', hide: false}
+ ,{ field: 'anfme', title: '鏁伴噺', align: 'center',hide: false}
+ ,{ field: 'workQty', title: '浣滀笟鏁伴噺', align: 'center',hide: false }
+ ,{ field: 'qty', title: '瀹屾垚鏁伴噺' , align: 'center',hide: false}
+ ,{field: 'length', align: 'center',title: '閲嶉噺', hide: false }
+ ,{field: 'volume', align: 'center',title: '灏哄', hide: false}
]],
request: {
pageName: 'curr',
diff --git a/src/main/webapp/static/js/orderPakin/order.js b/src/main/webapp/static/js/orderPakin/order.js
index 3124a93..30a82f5 100644
--- a/src/main/webapp/static/js/orderPakin/order.js
+++ b/src/main/webapp/static/js/orderPakin/order.js
@@ -121,16 +121,17 @@
cellMinWidth: 100,
cols: [[
{ type: 'numbers' },
- { field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160 },
- { field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 160 },
- { field: 'standby1', title: '渚涘簲鍟嗙紪鐮�', width: 160 },
- { field: 'threeCode', title: 'BS Code', width: 160 },
- { field: 'tag$', title: '鐗╂枡绉嶇被' },
- // { field: 'batch', title: '鎵瑰彿' },
- { field: 'anfme', title: '鏁伴噺' },
- { field: 'workQty', title: '浣滀笟鏁伴噺' },
- { field: 'qty', title: '瀹屾垚鏁伴噺', style: 'font-weight: bold' },
- { field: 'specs', title: '瑙勬牸' }
+ {field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿锛堝搧鍙凤級', sort:true}
+ ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О锛堝搧鍚嶏級', sort:true}
+ ,{field: 'anfme', align: 'center',title: '鏁伴噺', hide: false}
+ ,{field: 'specs', align: 'center',title: '瑙勬牸', hide: false}
+ ,{field: 'tag$', align: 'center',title: '闆朵欢绫诲瀷', hide: false}
+ ,{field: 'threeCode', align: 'center',title: 'BS Code', hide: false}
+ ,{ field: 'anfme', title: '鏁伴噺', align: 'center',hide: false}
+ ,{ field: 'workQty', title: '浣滀笟鏁伴噺', align: 'center',hide: false }
+ ,{ field: 'qty', title: '瀹屾垚鏁伴噺' , align: 'center',hide: false}
+ ,{field: 'length', align: 'center',title: '閲嶉噺', hide: false }
+ ,{field: 'volume', align: 'center',title: '灏哄', hide: false}
]],
request: {
pageName: 'curr',
diff --git a/src/main/webapp/static/js/orderPakout/order.js b/src/main/webapp/static/js/orderPakout/order.js
index 4f4ad51..b78d895 100644
--- a/src/main/webapp/static/js/orderPakout/order.js
+++ b/src/main/webapp/static/js/orderPakout/order.js
@@ -41,15 +41,18 @@
page: true,
cellMinWidth: 100,
cols: [[
- {type: 'numbers'},
- {field: 'orderNo', title: '鍗曟嵁缂栧彿', templet: '#orderNoTpl'},
- {field: 'itemName$', align: 'center', title: '鍑哄簱鍖哄煙', minWidth: 160, width: 160},
- {field: 'docType$', align: 'center', title: '绫诲瀷', minWidth: 160, width: 160},
- {align: 'center', title: '鏄庣粏', toolbar: '#tbLook', minWidth: 160, width: 160},
- {field: 'createTime$', title: '鍒涘缓鏃堕棿', minWidth: 200, width: 200},
- {field: 'settle$', align: 'center', title: '鐘舵��', templet: '#settleTpl', minWidth: 160, width: 160},
- {field: 'memo', align: 'center',title: '澶囨敞', hide: true},
- {align: 'center', title: '鎿嶄綔', toolbar: '#operate'}
+ { type: 'numbers' },
+ { field: 'orderNo', title: '鍗曟嵁缂栧彿', templet: '#orderNoTpl' , minWidth: 180},
+ { field: 'defNumber', align: 'center', title: '娴佹按鍙�', minWidth: 160, width: 160 },
+ { field: 'number', align: 'center', title: '娲惧伐鍗曞彿', minWidth: 160, width: 160 },
+ { field: 'cstmrName', align: 'center', title: '鍏徃ID', minWidth: 160, width: 160 },
+ { field: 'itemName', align: 'center', title: '绠卞彿', minWidth: 160, width: 160 },
+ { field: 'docType$', align: 'center', title: '绫诲瀷', minWidth: 130},
+ { field: 'orderTime', align: 'center', title: '娲惧伐鏃堕棿', minWidth: 160, width: 160 },
+ { field: 'createTime$', title: '鍒涘缓鏃堕棿', minWidth: 160, width: 160 },
+ { field: 'settle$', align: 'center', title: '鐘舵��', templet: '#settleTpl', minWidth: 100, width: 100 },
+ { align: 'center', title: '鏄庣粏', toolbar: '#tbLook', minWidth: 160, width: 160 },
+ { align: 'center', title: '鎿嶄綔', toolbar: '#operate', width: 180 }
]],
request: {
pageName: 'curr',
@@ -116,17 +119,22 @@
page: true,
height: '450px;',
cellMinWidth: 100,
- cols: [[
- { type: 'numbers' },
- { field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160 },
- { field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 160 },
- { field: 'standby1', title: '渚涘簲鍟嗙紪鐮�', width: 160 },
- { field: 'batch', title: '鎵瑰彿' },
- { field: 'anfme', title: '鏁伴噺' },
- { field: 'workQty', title: '浣滀笟鏁伴噺' },
- { field: 'qty', title: '瀹屾垚鏁伴噺', style: 'font-weight: bold' },
- { field: 'specs', title: '瑙勬牸' }
- ]],
+ cols: [
+ // [
+ // { type: 'numbers' },
+ // { field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160 },
+ // { field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 160 },
+ // { field: 'standby1', title: '渚涘簲鍟嗙紪鐮�', width: 160 },
+ // { field: 'threeCode', title: 'BS Code', width: 160 },
+ // { field: 'tag$', title: '鐗╂枡绉嶇被' },
+ // { field: 'anfme', title: '鏁伴噺' },
+ // { field: 'workQty', title: '浣滀笟鏁伴噺' },
+ // { field: 'qty', title: '瀹屾垚鏁伴噺', style: 'font-weight: bold' },
+ // { field: 'specs', title: '瑙勬牸' }
+ // ]
+ getCol()
+
+ ],
request: {
pageName: 'curr',
pageSize: 'limit'
@@ -151,6 +159,12 @@
});
}
});
+
+ function getCol() {
+ var cols = [];
+ cols.push.apply(cols, cacheCols);
+ return cols;
+ }
// 鏄剧ず琛ㄥ崟寮圭獥
function showEditModel(expTpe) {
@@ -246,19 +260,22 @@
page: true,
height: '350px;',
cellMinWidth: 100,
- cols: [[
- {type: 'numbers', title: '#'},
- {field: 'matnr', title: '闆朵欢浠ｇ爜', width: 160},
- {field: 'maktx', title: '闆朵欢鍚嶇О', width: 200},
- // {field: 'batch', title: '鎵瑰彿', edit: true},
- {field: 'standby1', title: '渚涘簲鍟嗕唬鐮�', edit: true},
- {field: 'specs', title: '瑙勬牸'},
- {field: 'anfme', title: '鏁伴噺(淇敼)', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110},
- {field: 'workQty', title: '浣滀笟鏁伴噺', minWidth: 100, width: 100},
- // {field: 'unit', title: '鍗曚綅', width: 80},
- {field: 'memo', title: '澶囨敞' , edit: true},
- {align: 'center', title: '鎿嶄綔', toolbar: '#formSSXMTableBar', minWidth: 80, width: 80, fixed: 'right'}
- ]],
+ cols: [
+ getCol()
+ // [
+ // {type: 'numbers', title: '#'},
+ // {field: 'matnr', title: '闆朵欢浠ｇ爜', width: 160},
+ // {field: 'maktx', title: '闆朵欢鍚嶇О', width: 200},
+ // // {field: 'batch', title: '鎵瑰彿', edit: true},
+ // {field: 'standby1', title: '渚涘簲鍟嗕唬鐮�', edit: true},
+ // {field: 'specs', title: '瑙勬牸'},
+ // {field: 'anfme', title: '鏁伴噺(淇敼)', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110},
+ // {field: 'workQty', title: '浣滀笟鏁伴噺', minWidth: 100, width: 100},
+ // // {field: 'unit', title: '鍗曚綅', width: 80},
+ // {field: 'memo', title: '澶囨敞' , edit: true},
+ // {align: 'center', title: '鎿嶄綔', toolbar: '#formSSXMTableBar', minWidth: 80, width: 80, fixed: 'right'}
+ // ]
+ ],
done: function (res) {
$(layero).find('.layui-table-view').css('margin', '0');
},
--
Gitblit v1.9.1