From 29578eda327f96e2e7311c4ef347bc2a1a378150 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期六, 16 八月 2025 16:42:11 +0800
Subject: [PATCH] #
---
license.lic | 0
src/main/java/com/zy/asrs/entity/WrkMastStaLog.java | 14 +++++++
src/main/webapp/static/js/wrkMastSta/wrkMastSta.js | 2 +
src/main/webapp/views/wrkMastSta/wrkMastSta.html | 12 ++++++
src/main/java/com/zy/asrs/service/impl/MatServiceImpl.java | 4 ++
src/main/resources/mapper/WrkMastStaMapper.xml | 2 +
src/main/webapp/views/wrkMastStaLog/wrkMastStaLog.html | 12 ++++++
src/main/java/com/zy/asrs/entity/WrkMastSta.java | 14 +++++++
src/main/resources/mapper/WrkMastStaLogMapper.xml | 3 +
src/main/java/com/zy/asrs/mapper/MatMapper.java | 1
src/main/resources/mapper/MatMapper.xml | 5 ++
src/main/java/com/zy/asrs/controller/MatController.java | 2 +
src/main/resources/license.lic | 0
src/main/java/com/zy/asrs/service/MatService.java | 2 +
14 files changed, 72 insertions(+), 1 deletions(-)
diff --git a/license.lic b/license.lic
index 4966cf8..d74cdb5 100644
--- a/license.lic
+++ b/license.lic
Binary files differ
diff --git a/src/main/java/com/zy/asrs/controller/MatController.java b/src/main/java/com/zy/asrs/controller/MatController.java
index 53e9135..533c8a4 100644
--- a/src/main/java/com/zy/asrs/controller/MatController.java
+++ b/src/main/java/com/zy/asrs/controller/MatController.java
@@ -140,9 +140,11 @@
if (Cools.isEmpty(mat) || null==mat.getId()){
return R.error();
}
+ String oldMatnr = matService.getOldMatnr(mat.getId());
mat.setUpdateBy(getUserId());
mat.setUpdateTime(new Date());
matService.updateById(mat);
+
return R.ok();
}
diff --git a/src/main/java/com/zy/asrs/entity/WrkMastSta.java b/src/main/java/com/zy/asrs/entity/WrkMastSta.java
index ae3679d..7093f24 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMastSta.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMastSta.java
@@ -34,6 +34,20 @@
private Long wrkNo;
/**
+ * rvg鍙�
+ */
+ @ApiModelProperty(value = "RGV缂栧彿")
+ @TableField("rgv_no")
+ private Integer rgvNo;
+
+ /**
+ * 宸ヤ綅鍙�
+ */
+ @ApiModelProperty(value = "宸ヤ綅鍙�")
+ @TableField("work_sta")
+ private Integer workSta;
+
+ /**
* 宸ヤ綔妗ｅ紑濮嬩綅缃�
*/
@ApiModelProperty(value = "宸ヤ綔妗ｅ紑濮嬩綅缃�")
diff --git a/src/main/java/com/zy/asrs/entity/WrkMastStaLog.java b/src/main/java/com/zy/asrs/entity/WrkMastStaLog.java
index 103acf6..b15845d 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMastStaLog.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMastStaLog.java
@@ -35,6 +35,20 @@
private Long wrkNo;
/**
+ * rvg鍙�
+ */
+ @ApiModelProperty(value = "RGV缂栧彿")
+ @TableField("rgv_no")
+ private Integer rgvNo;
+
+ /**
+ * 宸ヤ綅鍙�
+ */
+ @ApiModelProperty(value = "宸ヤ綅鍙�")
+ @TableField("work_sta")
+ private Integer workSta;
+
+ /**
* 宸ヤ綔妗ｅ紑濮嬩綅缃�
*/
@ApiModelProperty(value= "宸ヤ綔妗ｅ紑濮嬩綅缃�")
diff --git a/src/main/java/com/zy/asrs/mapper/MatMapper.java b/src/main/java/com/zy/asrs/mapper/MatMapper.java
index c8457c2..1a09c1f 100644
--- a/src/main/java/com/zy/asrs/mapper/MatMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/MatMapper.java
@@ -26,5 +26,6 @@
List<Mat> getMatTurnPage(Map<String, Object> map);
Integer getStockOutPageCount(Map<String, Object> map);
+ String getOldMatnr(Long id);
}
diff --git a/src/main/java/com/zy/asrs/service/MatService.java b/src/main/java/com/zy/asrs/service/MatService.java
index dd30afd..03df0a3 100644
--- a/src/main/java/com/zy/asrs/service/MatService.java
+++ b/src/main/java/com/zy/asrs/service/MatService.java
@@ -17,5 +17,7 @@
Page<Mat> getMatTurnPage(Page<Mat> page);
Mat selectNewUpdateTime();
+ String getOldMatnr(Long id);
+
}
diff --git a/src/main/java/com/zy/asrs/service/impl/MatServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MatServiceImpl.java
index 8ab8e75..62fa15c 100644
--- a/src/main/java/com/zy/asrs/service/impl/MatServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MatServiceImpl.java
@@ -44,6 +44,10 @@
page.setTotal(16);
return page;
};
+ @Override
+ public String getOldMatnr(Long id){
+ return this.baseMapper.getOldMatnr(id);
+ }
diff --git a/src/main/resources/license.lic b/src/main/resources/license.lic
index 4966cf8..d74cdb5 100644
--- a/src/main/resources/license.lic
+++ b/src/main/resources/license.lic
Binary files differ
diff --git a/src/main/resources/mapper/MatMapper.xml b/src/main/resources/mapper/MatMapper.xml
index de36573..9416387 100644
--- a/src/main/resources/mapper/MatMapper.xml
+++ b/src/main/resources/mapper/MatMapper.xml
@@ -141,4 +141,9 @@
and a.matnr = #{matnr}
</if>
</select>
+ <select id="getOldMatnr" resultType="String">
+ select matnr
+ from man_mat
+ where id = #{id}
+ </select>
</mapper>
diff --git a/src/main/resources/mapper/WrkMastStaLogMapper.xml b/src/main/resources/mapper/WrkMastStaLogMapper.xml
index 169895d..d04430b 100644
--- a/src/main/resources/mapper/WrkMastStaLogMapper.xml
+++ b/src/main/resources/mapper/WrkMastStaLogMapper.xml
@@ -18,7 +18,8 @@
<result column="wrk_type" property="wrkType" />
<result column="bign_time" property="bignTime" />
<result column="wrk_crn" property="wrkCrn" />
-
+ <result column="work_sta" property="workSta"/>
+ <result column="rgv_no" property="rgvNo"/>
</resultMap>
</mapper>
diff --git a/src/main/resources/mapper/WrkMastStaMapper.xml b/src/main/resources/mapper/WrkMastStaMapper.xml
index 9b30ed6..11ad76d 100644
--- a/src/main/resources/mapper/WrkMastStaMapper.xml
+++ b/src/main/resources/mapper/WrkMastStaMapper.xml
@@ -17,6 +17,8 @@
<result column="line_number" property="lineNumber" />
<result column="wrk_type" property="wrkType" />
<result column="bign_time" property="bignTime" />
+ <result column="work_sta" property="workSta"/>
+ <result column="rgv_no" property="rgvNo"/>
</resultMap>
diff --git a/src/main/webapp/static/js/wrkMastSta/wrkMastSta.js b/src/main/webapp/static/js/wrkMastSta/wrkMastSta.js
index 5ecf639..fdfcd6c 100644
--- a/src/main/webapp/static/js/wrkMastSta/wrkMastSta.js
+++ b/src/main/webapp/static/js/wrkMastSta/wrkMastSta.js
@@ -28,6 +28,8 @@
,{field: 'wrkEnd', align: 'center',title: '宸ヤ綔妗ｇ粨鏉熶綅缃�',hide: false}
,{field: 'staStart', align: 'center',title: '灏忚溅鎺ヨ揣浣嶇疆',hide: false}
,{field: 'staEnd', align: 'center',title: '灏忚溅鏀捐揣浣嶇疆',hide: false}
+ ,{field: 'rgvNo', align: 'center',title: 'RGV鎵ц缂栧彿',hide: false}
+ ,{field: 'workSta', align: 'center',title: 'RGV鎵ц宸ヤ綅',hide: false}
,{field: 'type$', align: 'center',title: '璐х墿绫诲瀷',hide: false}
,{field: 'wrkSts$', align: 'center',title: '宸ヤ綔鐘舵��',hide: false}
,{field: 'lineNumber', align: 'center',title: '琛屽彿',hide: true}
diff --git a/src/main/webapp/views/wrkMastSta/wrkMastSta.html b/src/main/webapp/views/wrkMastSta/wrkMastSta.html
index f16dfe1..7ffee8a 100644
--- a/src/main/webapp/views/wrkMastSta/wrkMastSta.html
+++ b/src/main/webapp/views/wrkMastSta/wrkMastSta.html
@@ -143,6 +143,18 @@
<input class="layui-input" name="staEnd" placeholder="璇疯緭鍏ュ皬杞︽斁璐т綅缃�" lay-vertype="tips" lay-verify="required">
</div>
</div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">RGV鎵ц缂栧彿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="rgvNo" placeholder="璇疯緭鍏GV鎵ц缂栧彿" lay-vertype="tips" >
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">RGV鎵ц宸ヤ綅: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="workSta" placeholder="璇疯緭鍏GV鎵ц缂栧彿" lay-vertype="tips" >
+ </div>
+ </div>
<!-- <div class="layui-form-item">-->
<!-- <label class="layui-form-label">娣诲姞鏃堕棿: </label>-->
<!-- <div class="layui-input-block">-->
diff --git a/src/main/webapp/views/wrkMastStaLog/wrkMastStaLog.html b/src/main/webapp/views/wrkMastStaLog/wrkMastStaLog.html
index e88ae18..e04286c 100644
--- a/src/main/webapp/views/wrkMastStaLog/wrkMastStaLog.html
+++ b/src/main/webapp/views/wrkMastStaLog/wrkMastStaLog.html
@@ -144,6 +144,18 @@
</div>
</div>
<div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">RGV鎵ц缂栧彿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="rgvNo" placeholder="璇疯緭鍏GV鎵ц缂栧彿" lay-vertype="tips" >
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">RGV鎵ц宸ヤ綅: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="workSta" placeholder="璇疯緭鍏GV鎵ц缂栧彿" lay-vertype="tips" >
+ </div>
+ </div>
+ <div class="layui-form-item">
<label class="layui-form-label">娣诲姞鏃堕棿: </label>
<div class="layui-input-block">
<input class="layui-input" name="createTime" id="createTime$" placeholder="璇疯緭鍏ユ坊鍔犳椂闂�">
--
Gitblit v1.9.1