From 10f65a42b77e2c5642ea56b715f25ea4f024fd3f Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期五, 25 四月 2025 10:58:48 +0800
Subject: [PATCH] #新增明细编号
---
src/main/webapp/static/js/locDetlStatis/check.js | 7 -------
src/main/java/com/zy/asrs/entity/param/MatSyncParam.java | 5 +++++
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 1 +
src/main/resources/mapper/CheckDetlMapper.xml | 1 +
src/main/java/com/zy/asrs/entity/CheckDetl.java | 4 ++++
5 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/CheckDetl.java b/src/main/java/com/zy/asrs/entity/CheckDetl.java
index fd36974..369bad0 100644
--- a/src/main/java/com/zy/asrs/entity/CheckDetl.java
+++ b/src/main/java/com/zy/asrs/entity/CheckDetl.java
@@ -21,6 +21,10 @@
@ExcelProperty("鐩樼偣鍗曠紪鍙�")
private String orderNo;
+ @ApiModelProperty(value= "鏄庣粏缂栧彿")
+ @ExcelProperty("鏄庣粏缂栧彿")
+ private String detailId;
+
@ApiModelProperty(value= "鏁伴噺")
@ExcelProperty("鏁伴噺")
diff --git a/src/main/java/com/zy/asrs/entity/param/MatSyncParam.java b/src/main/java/com/zy/asrs/entity/param/MatSyncParam.java
index 70b56da..7ed973a 100644
--- a/src/main/java/com/zy/asrs/entity/param/MatSyncParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/MatSyncParam.java
@@ -65,6 +65,11 @@
private String unitId;
/**
+ * 鏄庣粏缂栫爜
+ */
+ private String detailId;
+
+ /**
* 璐у搧鐗瑰緛
*/
private String batch;
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index beb78b4..5cb108a 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -640,6 +640,7 @@
checkDetl.setMaktx(matParam.getMaktx());
checkDetl.setSpecs(matParam.getSpecs());
checkDetl.setBatch(matParam.getBatch());
+ checkDetl.setDetailId(matParam.getDetailId());
checkDetl.setCreateTime(new Date());
checkDetlService.insert(checkDetl); // 鎻掑叆宸紓璁板綍
diff --git a/src/main/resources/mapper/CheckDetlMapper.xml b/src/main/resources/mapper/CheckDetlMapper.xml
index 69865cb..2ba470f 100644
--- a/src/main/resources/mapper/CheckDetlMapper.xml
+++ b/src/main/resources/mapper/CheckDetlMapper.xml
@@ -14,6 +14,7 @@
<result column="batch" property="batch"/>
<result column="create_time" property="createTime"/>
<result column="order_no" property="orderNo"/>
+ <result column="detail_id" property="detailId"/>
</resultMap>
diff --git a/src/main/webapp/static/js/locDetlStatis/check.js b/src/main/webapp/static/js/locDetlStatis/check.js
index 9731060..72596ef 100644
--- a/src/main/webapp/static/js/locDetlStatis/check.js
+++ b/src/main/webapp/static/js/locDetlStatis/check.js
@@ -20,20 +20,13 @@
cellMinWidth: 50,
cols: [[
{type: 'checkbox'},
-// ,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80}
-// ,{field: 'typeId', align: 'center',title: '璺緞ID'}
- // ,{field: 'typeDesc', align: 'center',title: '浣滀笟绫诲瀷'}
{field: 'orderNo', align: 'center',title: '鐩樼偣鍗曠紪鍙�', style: 'font-weight: bold'},
{field: 'anfme', align: 'center',title: '鐩樼偣鐩堜簭', style: 'font-weight: bold'},
{field: 'createTime$', align: 'center',title: '鍒涘缓鏃堕棿', style: 'font-weight: bold'},
{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿', style: 'font-weight: bold'},
-
{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', style: 'font-weight: bold'},
{field: 'specs', align: 'center',title: '瑙勬牸', style: 'font-weight: bold'},
{field: 'batch', align: 'center',title: '鎵瑰彿', style: 'font-weight: bold'}
-
- // ,{field: 'appeUser$', align: 'center',title: '鍒涘缓鑰�',event: 'appeUser', style: 'cursor:pointer'}
- // ,{field: 'appeTime$', align: 'center',title: '娣诲姞鏃堕棿'}
]],
request: {
pageName: 'curr',
--
Gitblit v1.9.1