From fced23efe533199700ef5fd07572aee5fe318e11 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期二, 24 十二月 2024 11:12:28 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/matnrCode/matnrCode.js | 8 ++++----
src/main/webapp/views/matnrCode/matnrCode.html | 14 +++++++-------
src/main/java/com/zy/asrs/entity/MatnrCode.java | 2 +-
pom.xml | 2 +-
src/main/java/com/zy/asrs/controller/MatnrCodeController.java | 7 +++++++
5 files changed, 20 insertions(+), 13 deletions(-)
diff --git a/pom.xml b/pom.xml
index a64e0b8..aced17e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-tomcat</artifactId>
- <scope>provided</scope>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
diff --git a/src/main/java/com/zy/asrs/controller/MatnrCodeController.java b/src/main/java/com/zy/asrs/controller/MatnrCodeController.java
index ea5c631..1e8ecea 100644
--- a/src/main/java/com/zy/asrs/controller/MatnrCodeController.java
+++ b/src/main/java/com/zy/asrs/controller/MatnrCodeController.java
@@ -60,6 +60,13 @@
@RequestMapping(value = "/matnrCode/add/auth")
@ManagerAuth
public R add(MatnrCode matnrCode) {
+ MatnrCode code = matnrCodeService.selectOne(new EntityWrapper<MatnrCode>().eq("matnr", matnrCode.getMatnr()));
+ if (!Cools.isEmpty(code)){
+ return R.error("褰撳墠鐗╂枡宸插瓨鍦�");
+ }
+ MatnrCode lastOne = matnrCodeService.selectOne(new EntityWrapper<MatnrCode>().orderBy("id", false));
+ matnrCode.setCode(lastOne.getCode() + 1);
+
matnrCodeService.insert(matnrCode);
return R.ok();
}
diff --git a/src/main/java/com/zy/asrs/entity/MatnrCode.java b/src/main/java/com/zy/asrs/entity/MatnrCode.java
index 180ef29..6fe9e13 100644
--- a/src/main/java/com/zy/asrs/entity/MatnrCode.java
+++ b/src/main/java/com/zy/asrs/entity/MatnrCode.java
@@ -16,7 +16,7 @@
@ApiModelProperty(value= "")
@TableId(value = "id", type = IdType.AUTO)
- private Integer id;
+ private Long id;
@ApiModelProperty(value= "")
private Integer code;
diff --git a/src/main/webapp/static/js/matnrCode/matnrCode.js b/src/main/webapp/static/js/matnrCode/matnrCode.js
index 062693a..d07312b 100644
--- a/src/main/webapp/static/js/matnrCode/matnrCode.js
+++ b/src/main/webapp/static/js/matnrCode/matnrCode.js
@@ -22,9 +22,9 @@
height: 'full-120',
cols: [[
{type: 'checkbox'}
- ,{field: 'id', align: 'center',title: ''}
- ,{field: 'code', align: 'center',title: ''}
- ,{field: 'matnr', align: 'center',title: ''}
+ ,{field: 'id', align: 'center',title: '搴忓彿'}
+ ,{field: 'code', align: 'center',title: '浠ｇ爜'}
+ ,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栫爜'}
,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
]],
@@ -141,7 +141,7 @@
admin.open({
type: 1,
area: '600px',
- title: (mData ? '淇敼' : '娣诲姞') + '璁㈠崟鐘舵��',
+ title: (mData ? '淇敼' : '娣诲姞') + '鐗╂枡浠ｇ爜',
content: $('#editDialog').html(),
success: function (layero, dIndex) {
layDateRender(mData);
diff --git a/src/main/webapp/views/matnrCode/matnrCode.html b/src/main/webapp/views/matnrCode/matnrCode.html
index c0c90c2..bf31030 100644
--- a/src/main/webapp/views/matnrCode/matnrCode.html
+++ b/src/main/webapp/views/matnrCode/matnrCode.html
@@ -63,14 +63,14 @@
<input name="id" type="hidden">
<div class="layui-row">
<div class="layui-col-md12">
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label">浠ｇ爜: </label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input class="layui-input" name="code" placeholder="璇疯緭鍏�">-->
+<!-- </div>-->
+<!-- </div>-->
<div class="layui-form-item">
- <label class="layui-form-label">: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="code" placeholder="璇疯緭鍏�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">: </label>
+ <label class="layui-form-label">鍟嗗搧缂栫爜: </label>
<div class="layui-input-block">
<input class="layui-input" name="matnr" placeholder="璇疯緭鍏�">
</div>
--
Gitblit v1.9.1