From c4c82d17fed4f68562650e000c23e3eef8db8f43 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期二, 13 一月 2026 15:22:03 +0800
Subject: [PATCH] 字段显示修改
---
src/main/webapp/static/js/locDetl/locDetl.js | 10 ++--
src/main/webapp/static/js/orderPakout/order.js | 8 ---
src/main/webapp/static/js/orderPakout/out.js | 2
src/main/java/com/zy/asrs/utils/OrderExcelListener.java | 1
src/main/webapp/views/mat/mat.html | 4 +-
src/main/java/com/zy/asrs/entity/WrkMast.java | 4 -
src/main/webapp/static/js/order/order.js | 2 +
src/main/java/com/zy/asrs/service/impl/WrkMastLogServiceImpl.java | 4 +-
src/main/java/com/zy/asrs/entity/TaskLog.java | 16 ++++----
src/main/webapp/static/js/common.js | 26 ++++++------
src/main/webapp/static/js/orderPakin/order.js | 2 +
11 files changed, 38 insertions(+), 41 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/TaskLog.java b/src/main/java/com/zy/asrs/entity/TaskLog.java
index 47d9f5c..3822af2 100644
--- a/src/main/java/com/zy/asrs/entity/TaskLog.java
+++ b/src/main/java/com/zy/asrs/entity/TaskLog.java
@@ -508,14 +508,14 @@
// null //
// );
- public String getWrkNo$(){
- WrkMastService service = SpringUtils.getBean(WrkMastService.class);
- WrkMast wrkMast = service.selectById(this.wrkNo);
- if (!Cools.isEmpty(wrkMast)){
- return String.valueOf(wrkMast.getId());
- }
- return null;
- }
+// public String getWrkNo$(){
+// WrkMastService service = SpringUtils.getBean(WrkMastService.class);
+// WrkMast wrkMast = service.selectById(this.wrkNo);
+// if (!Cools.isEmpty(wrkMast)){
+// return String.valueOf(wrkMast.getId());
+// }
+// return null;
+// }
public String getYmd$(){
if (Cools.isEmpty(this.ymd)){
diff --git a/src/main/java/com/zy/asrs/entity/WrkMast.java b/src/main/java/com/zy/asrs/entity/WrkMast.java
index 142a023..5127f37 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMast.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMast.java
@@ -22,14 +22,12 @@
private static final long serialVersionUID = 1L;
- private Long id;
-
/**
* 宸ヤ綔鍙�
*/
@ApiModelProperty(value= "宸ヤ綔鍙�")
@TableField("wrk_no")
- @TableId(value = "wrk_no", type = IdType.AUTO)
+ @TableId(value = "wrk_no")
private Integer wrkNo;
@ApiModelProperty("浠诲姟绫诲瀷锛� agv, crn")
diff --git a/src/main/java/com/zy/asrs/service/impl/WrkMastLogServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkMastLogServiceImpl.java
index 0321a08..9920416 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkMastLogServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkMastLogServiceImpl.java
@@ -36,8 +36,8 @@
}
WrkMastLog mastLog = new WrkMastLog();
BeanUtils.copyProperties(mast, mastLog);
- mastLog.setLogId(mast.getId());
-
+// mastLog.setLogId(mast.getId());
+//
if (!wrkMastLogService.insert(mastLog)) {
throw new CoolException("浠诲姟鏃ュ織淇濆瓨澶辫触锛侊紒");
}
diff --git a/src/main/java/com/zy/asrs/utils/OrderExcelListener.java b/src/main/java/com/zy/asrs/utils/OrderExcelListener.java
index 76e343a..0efd602 100644
--- a/src/main/java/com/zy/asrs/utils/OrderExcelListener.java
+++ b/src/main/java/com/zy/asrs/utils/OrderExcelListener.java
@@ -123,6 +123,7 @@
detl.setMaktx(mat.getMaktx());
detl.setQty(data.getQty());
detl.setUnit(data.getUnit());
+ detl.setModel(data.getModel());
detl.setBrand(data.getBrand());
detl.setSpecs(data.getSpecs());
detl.setBatch(Objects.isNull(data.getBatch()) ? "1" : data.getBatch());
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index b81003f..c0f9841 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -186,19 +186,9 @@
// ,{field: 'uuid', align: 'center',title: '缂栧彿'}
, {field: 'maktx', align: 'center', title: '鍟嗗搧鍚嶇О锛堝搧鍚嶏級', width: 200}
, {field: 'specs', align: 'center', title: '瑙勬牸'}
- , {
- field: 'safeQty', align: 'center', title: '褰掗浂闃�鍊�', templet: function (d) {
- var raw = d.safeQty;
- if (raw === null || raw === undefined) return '';
- if (typeof raw === 'string' && raw.trim() === '') return '';
- var num = Number(raw);
- if (!isFinite(num)) return '';
- return num.toFixed(2);
- }
- }
- , {field: 'model', align: 'center', title: '浠ｇ爜', hide: true}
+ , {field: 'model', align: 'center', title: '鍨嬪彿', hide: false}
, {field: 'color', align: 'center', title: '棰滆壊', hide: true}
- , {field: 'brand', align: 'center', title: '鍝佺墝', hide: true}
+ , {field: 'brand', align: 'center', title: '鍝佺墝', hide: false}
, {field: 'upQty', align: 'center', title: '缁勬墭涓婇檺', hide: true}
, {field: 'unit', align: 'center', title: '鍗曚綅', hide: false}
, {field: 'price', align: 'center', title: '鍗曚环', hide: true}
@@ -214,6 +204,16 @@
, {
field: 'volume', align: 'center', title: '姣忓叕鏂ら暱搴�', templet: function (d) {
var raw = d.volume;
+ if (raw === null || raw === undefined) return '';
+ if (typeof raw === 'string' && raw.trim() === '') return '';
+ var num = Number(raw);
+ if (!isFinite(num)) return '';
+ return num.toFixed(2);
+ }
+ }
+ , {
+ field: 'safeQty', align: 'center', title: '褰掗浂闃�鍊�', templet: function (d) {
+ var raw = d.safeQty;
if (raw === null || raw === undefined) return '';
if (typeof raw === 'string' && raw.trim() === '') return '';
var num = Number(raw);
@@ -298,9 +298,9 @@
return num.toFixed(2);
}
}
- , {field: 'model', align: 'center', title: '浠ｇ爜', hide: true}
, {field: 'color', align: 'center', title: '棰滆壊', hide: true}
, {field: 'brand', align: 'center', title: '鍝佺墝', hide: false}
+ , {field: 'model', align: 'center', title: '鍨嬪彿', hide: false}
, {field: 'unit', align: 'center', title: '鍗曚綅', hide: false}
, {field: 'price', align: 'center', title: '鍗曚环', hide: true}
, {field: 'sku', align: 'center', title: 'sku', hide: true}
diff --git a/src/main/webapp/static/js/locDetl/locDetl.js b/src/main/webapp/static/js/locDetl/locDetl.js
index 14c17ee..1d927c7 100644
--- a/src/main/webapp/static/js/locDetl/locDetl.js
+++ b/src/main/webapp/static/js/locDetl/locDetl.js
@@ -7,14 +7,14 @@
,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿', sort:true}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', sort:true}
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: true}
- ,{field: 'batch', align: 'center',title: '鎵瑰彿', width: 300, sort:true}
+ ,{field: 'batch', align: 'center',title: '鎵瑰彿', sort:true}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
- ,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
+ ,{field: 'zpallet', align: 'center',title: 'SN'}
,{field: 'specs', align: 'center',title: '瑙勬牸'}
- ,{field: 'model', align: 'center',title: '浠ｇ爜', hide: true}
+ ,{field: 'model', align: 'center',title: '鍨嬪彿'}
,{field: 'color', align: 'center',title: '棰滆壊', hide: true}
- ,{field: 'brand', align: 'center',title: '鍝佺墝', hide: true}
- ,{field: 'unit', align: 'center',title: '鍗曚綅', hide: true}
+ ,{field: 'brand', align: 'center',title: '鍝佺墝'}
+ ,{field: 'unit', align: 'center',title: '鍗曚綅'}
,{field: 'price', align: 'center',title: '鍗曚环', hide: true}
,{field: 'sku', align: 'center',title: 'sku', hide: true}
,{field: 'units', align: 'center',title: '鍗曚綅閲�', hide: true}
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index d74b5e7..11e4bb3 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -130,6 +130,7 @@
{field: 'brand', title: '鍝佺墝' },
{ field: 'batch', title: '鎵瑰彿' },
{ field: 'specs', title: '瑙勬牸' },
+ {field: 'model', title: '鍨嬪彿' },
{ field: 'unit', title: '鍗曚綅' },
{ field: 'anfme', title: '寰呭畬缁撴暟閲�' },
{ field: 'qty', title: '寰呬笂鎶ユ暟閲�', style: 'font-weight: bold' },
@@ -245,6 +246,7 @@
{ field: 'batch', title: '鎵瑰彿', edit: true },
{ field: 'specs', title: '瑙勬牸' },
{field: 'brand', title: '鍝佺墝' },
+ {field: 'model', title: '鍨嬪彿' },
{ field: 'unit', title: '鍗曚綅' },
{ field: 'anfme', title: '鏁伴噺(淇敼)', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110 },
{ field: 'workQty', title: '浣滀笟鏁伴噺', minWidth: 100, width: 100 },
diff --git a/src/main/webapp/static/js/orderPakin/order.js b/src/main/webapp/static/js/orderPakin/order.js
index d08e291..9c475cd 100644
--- a/src/main/webapp/static/js/orderPakin/order.js
+++ b/src/main/webapp/static/js/orderPakin/order.js
@@ -127,6 +127,7 @@
{field: 'barcode', title: 'SN', width: 140 },
{field: 'brand', title: '鍝佺墝' },
{ field: 'batch', title: '鎵瑰彿' },
+ {field: 'model', title: '鍨嬪彿' },
{ field: 'specs', title: '瑙勬牸' },
{ field: 'unit', title: '鍗曚綅' },
{ field: 'anfme', title: '鏁伴噺' },
@@ -242,6 +243,7 @@
{field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160},
{field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 200},
{field: 'batch', title: '鎵瑰彿', edit: true},
+ {field: 'model', title: '鍨嬪彿' },
{field: 'barcode', title: 'SN', edit: true},
{field: 'specs', title: '瑙勬牸'},
{field: 'anfme', title: '鏁伴噺(淇敼)', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110},
diff --git a/src/main/webapp/static/js/orderPakout/order.js b/src/main/webapp/static/js/orderPakout/order.js
index 4ae3e23..3c19a79 100644
--- a/src/main/webapp/static/js/orderPakout/order.js
+++ b/src/main/webapp/static/js/orderPakout/order.js
@@ -126,19 +126,13 @@
{field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 160},
{field: 'batch', title: '鎵瑰彿'},
{field: 'brand', title: '鍝佺墝'},
+ {field: 'model', title: '鍨嬪彿'},
{field: 'specs', title: '瑙勬牸'},
{field: 'standby1', title: '鏈哄彴'},
{field: 'unit', title: '鍗曚綅'},
{field: 'anfme', title: '鏁伴噺'},
{field: 'workQty', title: '浣滀笟鏁伴噺'},
{field: 'qty', title: '瀹屾垚鏁伴噺', style: 'font-weight: bold'},
- // {
- // field: 'createTime$', title: '鍒涘缓鏃堕棿', sort: true, templet: function (d) {
- // return util.toDateString(d.createTime);
- // }, width: 180
- // },
- // {field: 'inQty', title: '宸插叆搴撻噺'},
- // {field: 'color', title: '棰滆壊'},
]],
request: {
pageName: 'curr',
diff --git a/src/main/webapp/static/js/orderPakout/out.js b/src/main/webapp/static/js/orderPakout/out.js
index 87b973e..a10a2d3 100644
--- a/src/main/webapp/static/js/orderPakout/out.js
+++ b/src/main/webapp/static/js/orderPakout/out.js
@@ -40,7 +40,7 @@
// ,{field: 'qty', align: 'center',title: '浣滀笟鏁伴噺', style: 'font-weight: bold'}
, {field: 'enableQty', align: 'center', title: '寰呭嚭鏁伴噺', style: 'font-weight: bold'}
// ,{field: 'name', align: 'center',title: '鍚嶇О'}
- // ,{field: 'model', align: 'center',title: '鍨嬪彿'}
+ ,{field: 'model', align: 'center',title: '鍨嬪彿'}
, {field: 'unit', align: 'center', title: '鍗曚綅'}
, {field: 'barcode', align: 'center', title: '鍟嗗搧鏉＄爜', hide: true}
// ,{field: 'supplier', align: 'center',title: '渚涘簲鍟�'}
diff --git a/src/main/webapp/views/mat/mat.html b/src/main/webapp/views/mat/mat.html
index fd76498..a1f8b4f 100644
--- a/src/main/webapp/views/mat/mat.html
+++ b/src/main/webapp/views/mat/mat.html
@@ -60,7 +60,7 @@
<div class="layui-fluid">
<!-- 宸� -->
<div class="layui-row layui-col-space15">
- <div class="layui-col-md3">
+ <div class="layui-col-md2">
<div class="layui-card">
<div class="layui-card-body" style="padding: 10px;">
<!-- 鏍戝伐鍏锋爮 -->
@@ -80,7 +80,7 @@
</div>
</div>
<!-- 鍙� -->
- <div class="layui-col-md9">
+ <div class="layui-col-md10">
<div class="layui-card">
<div class="layui-card-body" style="padding: 10px;">
<!-- 琛ㄦ牸宸ュ叿鏍�2 -->
--
Gitblit v1.9.1