From b77d09f258ef7d5458f61ff1a90d1a686cb2f181 Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期三, 14 一月 2026 14:24:47 +0800
Subject: [PATCH] #
---
src/main/resources/mapper/WrkMastLogMapper.xml | 2 ++
src/main/webapp/views/wrkMast/wrkMast.html | 4 ++++
src/main/webapp/static/js/wrkMastLog/wrkMastLog.js | 2 ++
src/main/java/com/zy/asrs/entity/WrkMast.java | 14 ++++++++++++++
src/main/resources/mapper/WrkMastMapper.xml | 2 ++
src/main/java/com/zy/asrs/entity/WrkMastLog.java | 14 ++++++++++++++
src/main/java/com/zy/common/service/CommonService.java | 8 ++++++++
7 files changed, 46 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WrkMast.java b/src/main/java/com/zy/asrs/entity/WrkMast.java
index 20b6591..e339021 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMast.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMast.java
@@ -175,6 +175,20 @@
@TableField(value = "system_msg")
private String systemMsg;
+ /**
+ * 鎵规鍙�
+ */
+ @ApiModelProperty(value= "鎵规鍙�")
+ @TableField(value = "batch")
+ private String batch;
+
+ /**
+ * 椤哄簭鍙�
+ */
+ @ApiModelProperty(value= "椤哄簭鍙�")
+ @TableField(value = "batch_seq")
+ private Integer batchSeq;
+
public String getWrkSts$(){
BasWrkStatusMapper mapper = SpringUtils.getBean(BasWrkStatusMapper.class);
BasWrkStatus entity = mapper.selectById(this.wrkSts);
diff --git a/src/main/java/com/zy/asrs/entity/WrkMastLog.java b/src/main/java/com/zy/asrs/entity/WrkMastLog.java
index aa9b739..4212cba 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMastLog.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMastLog.java
@@ -180,6 +180,20 @@
@TableField(value = "system_msg")
private String systemMsg;
+ /**
+ * 鎵规鍙�
+ */
+ @ApiModelProperty(value= "鎵规鍙�")
+ @TableField(value = "batch")
+ private String batch;
+
+ /**
+ * 椤哄簭鍙�
+ */
+ @ApiModelProperty(value= "椤哄簭鍙�")
+ @TableField(value = "batch_seq")
+ private Integer batchSeq;
+
public WrkMastLog() {}
public String getWrkSts$(){
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 03425d5..6026fd8 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -343,6 +343,14 @@
wrkMast.setAppeTime(now);
wrkMast.setModiTime(now);
+ if (!Cools.isEmpty(param.getBatch())) {
+ wrkMast.setBatch(param.getBatch());
+ }
+
+ if (!Cools.isEmpty(param.getBatchSeq())) {
+ wrkMast.setBatchSeq(param.getBatchSeq());
+ }
+
if (findCrnResult.getCrnType().equals(SlaveType.Crn)) {
BasCrnp basCrnp = basCrnpService.selectOne(new EntityWrapper<BasCrnp>().eq("crn_no", crnNo));
if(basCrnp == null) {
diff --git a/src/main/resources/mapper/WrkMastLogMapper.xml b/src/main/resources/mapper/WrkMastLogMapper.xml
index fd421ef..714d6b0 100644
--- a/src/main/resources/mapper/WrkMastLogMapper.xml
+++ b/src/main/resources/mapper/WrkMastLogMapper.xml
@@ -28,6 +28,8 @@
<result column="rgv_no" property="rgvNo" />
<result column="wms_wrk_no" property="wmsWrkNo" />
<result column="system_msg" property="systemMsg" />
+ <result column="batch" property="batch" />
+ <result column="batch_seq" property="batchSeq" />
</resultMap>
</mapper>
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index bdd8323..8af8efe 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -27,6 +27,8 @@
<result column="rgv_no" property="rgvNo" />
<result column="wms_wrk_no" property="wmsWrkNo" />
<result column="system_msg" property="systemMsg" />
+ <result column="batch" property="batch" />
+ <result column="batch_seq" property="batchSeq" />
</resultMap>
diff --git a/src/main/webapp/static/js/wrkMastLog/wrkMastLog.js b/src/main/webapp/static/js/wrkMastLog/wrkMastLog.js
index 2423335..073329a 100644
--- a/src/main/webapp/static/js/wrkMastLog/wrkMastLog.js
+++ b/src/main/webapp/static/js/wrkMastLog/wrkMastLog.js
@@ -32,6 +32,8 @@
,{field: 'locNo', align: 'center',title: '鐩爣搴撲綅'}
,{field: 'crnNo', align: 'center',title: '鍫嗗灈鏈�'}
,{field: 'dualCrnNo', align: 'center',title: '鍙屽伐浣嶅爢鍨涙満'}
+ ,{field: 'batch', align: 'center',title: '鎵规'}
+ ,{field: 'batchSeq', align: 'center',title: '鎵规搴忓垪'}
,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide:true}
,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', hide:true}
// ,{field: 'appeUser$', align: 'center',title: '鍒涘缓鑰�',event: 'appeUser', style: 'cursor:pointer'}
diff --git a/src/main/webapp/views/wrkMast/wrkMast.html b/src/main/webapp/views/wrkMast/wrkMast.html
index 782b496..1a611ca 100644
--- a/src/main/webapp/views/wrkMast/wrkMast.html
+++ b/src/main/webapp/views/wrkMast/wrkMast.html
@@ -72,6 +72,10 @@
</el-table-column>
<el-table-column property="dualCrnNo" label="鍙屽伐浣嶅爢鍨涙満">
</el-table-column>
+ <el-table-column property="batch" label="鎵规">
+ </el-table-column>
+ <el-table-column property="batchSeq" label="鎵规搴忓垪">
+ </el-table-column>
<el-table-column property="systemMsg" label="绯荤粺娑堟伅">
</el-table-column>
<el-table-column label="鎿嶄綔" width="100">
--
Gitblit v1.9.1