From 84ead25acd7a74ff53c1840b5834b97ae8e46ebd Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 21 九月 2023 16:51:24 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/WrkMast.java | 4 ++--
src/main/resources/mapper/WrkMastMapper.xml | 2 +-
src/main/webapp/static/js/wrkMast/wrkMast.js | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WrkMast.java b/src/main/java/com/zy/asrs/entity/WrkMast.java
index 69a19c4..942c861 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMast.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMast.java
@@ -69,8 +69,8 @@
* 绌挎杞�
*/
@ApiModelProperty(value= "绌挎杞�")
- @TableField("ste_no")
- private Integer steNo;
+ @TableField("shuttle_no")
+ private Integer shuttleNo;
/**
* 杈圭紭搴撲綅
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index db134bf..6f21148 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -12,7 +12,7 @@
<result column="wrk_sts" property="wrkSts" />
<result column="io_type" property="ioType" />
<result column="crn_no" property="crnNo" />
- <result column="ste_no" property="steNo" />
+ <result column="shuttle_no" property="shuttleNo" />
<result column="out_most" property="outMost" />
<result column="sheet_no" property="sheetNo" />
<result column="io_pri" property="ioPri" />
diff --git a/src/main/webapp/static/js/wrkMast/wrkMast.js b/src/main/webapp/static/js/wrkMast/wrkMast.js
index 741a260..546eb7e 100644
--- a/src/main/webapp/static/js/wrkMast/wrkMast.js
+++ b/src/main/webapp/static/js/wrkMast/wrkMast.js
@@ -30,7 +30,7 @@
,{field: 'staNo$', align: 'center',title: '鐩爣绔�'}
,{field: 'sourceLocNo$', align: 'center',title: '婧愬簱浣�'}
,{field: 'locNo$', align: 'center',title: '鐩爣搴撲綅'}
- ,{field: 'steNo', align: 'center',title: '灏忚溅', width: 70}
+ ,{field: 'shuttleNo', align: 'center',title: '灏忚溅', width: 70}
,{field: 'barcode', align: 'center',title: '鏉＄爜', hide: false}
,{field: 'preHave', align: 'center',title: '鍏堝叆鍝�', hide: true}
,{field: 'takeNone', align: 'center',title: '绌烘搷浣�', hide: true}
--
Gitblit v1.9.1