From 7859473e0c1f3a9cad4fe9fcff3308a181149f2e Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期四, 10 二月 2022 16:46:38 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MatCodeController.java | 21 +++++++
src/main/java/com/zy/asrs/entity/MatCode.java | 62 +++++++-------------
src/main/webapp/views/matCode/matCode_detail.html | 46 +++++++++-----
src/main/webapp/static/js/common.js | 5 +
src/main/resources/application.yml | 4
5 files changed, 80 insertions(+), 58 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MatCodeController.java b/src/main/java/com/zy/asrs/controller/MatCodeController.java
index 94e5ab1..82d0a76 100644
--- a/src/main/java/com/zy/asrs/controller/MatCodeController.java
+++ b/src/main/java/com/zy/asrs/controller/MatCodeController.java
@@ -23,6 +23,7 @@
import com.zy.common.utils.excel.matcode.MatCodeExcel;
import com.zy.common.utils.excel.matcode.MatCodeExcelListener;
import com.zy.common.web.BaseController;
+import com.zy.system.entity.Role;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -228,4 +229,24 @@
return R.ok();
}
+ @RequestMapping("/matType/auth")
+ public R type(){
+ List<Map<String, Object>> result = new ArrayList<>();
+ for (int i = 1; i < 4; i++) {
+ Map<String, Object> item = new HashMap<>();
+ item.put("id",i+"");
+ if (i == 1){
+ item.put("value","鍘熸潗鏂�");
+ }
+ if (i == 2){
+ item.put("value","鎴愬搧");
+ }
+ if (i == 3){
+ item.put("value","鍗婃垚鍝�");
+ }
+ result.add(item);
+ }
+
+ return R.ok(result);
+ }
}
diff --git a/src/main/java/com/zy/asrs/entity/MatCode.java b/src/main/java/com/zy/asrs/entity/MatCode.java
index 5f3ebf0..ad4d3bc 100644
--- a/src/main/java/com/zy/asrs/entity/MatCode.java
+++ b/src/main/java/com/zy/asrs/entity/MatCode.java
@@ -9,11 +9,13 @@
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
import java.io.Serializable;
import java.text.SimpleDateFormat;
import java.util.Date;
+@Data
@TableName("bas_mat_code")
public class MatCode implements Serializable {
@@ -70,23 +72,41 @@
@ApiModelProperty(value= "鍗曢噸")
private Double weight;
+ /**
+ * 鐗╂枡鍗曚綅
+ */
@ApiModelProperty(value= "")
private String str1;
+ /**
+ * 鐗╂枡瑙勬牸
+ */
@ApiModelProperty(value= "")
private String str2;
+
+ /**
+ * 瀹㈡埛鍚嶇О
+ */
@ApiModelProperty(value= "")
private String str3;
+ /**
+ * 椤圭洰淇℃伅
+ */
@ApiModelProperty(value= "")
private String str4;
-
+ /**
+ * 绫诲埆{1:鍘熸潗鏂�,2:鎴愬搧,3:鍗婃垚鍝亇
+ */
@ApiModelProperty(value= "")
private String str5;
+ /**
+ * 鏁伴噺
+ */
@ApiModelProperty(value= "")
- private String str6;
+ private Double str6;
@ApiModelProperty(value= "")
private String str7;
@@ -151,36 +171,7 @@
public MatCode() {}
- public MatCode(String barcode,String matName,String specs,String unit,String size,String color,Double weight,String str1,String str2,String str3,String str4,String str5,String str6,String str7,String str8,String str9,String str10,Double num1,Double num2,Double num3,Double num4,Double num5,Date date1,Long appeUser,Date appeTime,Long modiUser,Date modiTime,Short status) {
- this.barcode = barcode;
- this.matName = matName;
- this.specs = specs;
- this.unit = unit;
- this.size = size;
- this.color = color;
- this.weight = weight;
- this.str1 = str1;
- this.str2 = str2;
- this.str3 = str3;
- this.str4 = str4;
- this.str5 = str5;
- this.str6 = str6;
- this.str7 = str7;
- this.str8 = str8;
- this.str9 = str9;
- this.str10 = str10;
- this.num1 = num1;
- this.num2 = num2;
- this.num3 = num3;
- this.num4 = num4;
- this.num5 = num5;
- this.date1 = date1;
- this.appeUser = appeUser;
- this.appeTime = appeTime;
- this.modiUser = modiUser;
- this.modiTime = modiTime;
- this.status = status;
- }
+
// MatCode matCode = new MatCode(
// null, // 鏉＄爜
@@ -306,13 +297,6 @@
this.str5 = str5;
}
- public String getStr6() {
- return str6;
- }
-
- public void setStr6(String str6) {
- this.str6 = str6;
- }
public String getStr7() {
return str7;
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 12005de..ca34741 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -19,9 +19,9 @@
#url: jdbc:sqlserver://192.168.3.99:1433;databasename=gdasrs
#username: sa
#password: eisoft
- url: jdbc:sqlserver://localhost:1433;databasename=sxjzasrs
+ url: jdbc:sqlserver://47.97.1.152:51433;databasename=sxjzasrs
username: sa
- password: sa@123
+ password: Zoneyung@zy56$
mvc:
static-path-pattern: /**
redis:
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index 4ce17c0..2648778 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -174,6 +174,11 @@
// ,{field: 'num1', align: 'center',title: '鏁伴噺'}
,{field: 'size', align: 'center',title: '灏哄', hide: true}
,{field: 'color', align: 'center',title: '棰滆壊'}
+ ,{field: 'weight', align: 'center', title: '鍗曢噸'}
+ ,{field: 'str3', align: 'center', title: '瀹㈡埛鍚嶇О'}
+ ,{field: 'str4', align: 'center', title: '椤圭洰淇℃伅'}
+ ,{field: 'str5$', align: 'center', title: '绫诲埆'}
+ ,{field: 'str6', align: 'center', title: '鏁伴噺'}
]
diff --git a/src/main/webapp/views/matCode/matCode_detail.html b/src/main/webapp/views/matCode/matCode_detail.html
index 6e75ebc..9dc1602 100644
--- a/src/main/webapp/views/matCode/matCode_detail.html
+++ b/src/main/webapp/views/matCode/matCode_detail.html
@@ -24,9 +24,9 @@
</div>
-->
<div class="layui-inline" style="width:31%;">
- <label class="layui-form-label">浜у搧缂栫爜锛�</label>
+ <label class="layui-form-label"><span class="not-null">*</span>浜у搧缂栫爜锛�</label>
<div class="layui-input-inline">
- <input id="matNo" class="layui-input" type="text" onkeyup="check(this.id, 'matCode')" >
+ <input id="matNo" class="layui-input" type="text" onkeyup="check(this.id, 'matCode')" lay-verify="required" >
</div>
</div>
<div class="layui-inline" style="width:31%;display: none">
@@ -68,7 +68,7 @@
<div class="layui-inline" style="width:31%">
<label class="layui-form-label">鍗曢噸锛�</label>
<div class="layui-input-inline">
- <input id="weight" class="layui-input" type="text" lay-verify="number" >
+ <input id="weight" class="layui-input" lay-verify="number" type="number" placeholder="涓嶅～涓�0">
</div>
</div>
@@ -84,34 +84,46 @@
<input id="str2" class="layui-input" type="text">
</div>
</div>
- <div class="layui-inline" style="width:31%;display: none">
- <label class="layui-form-label">锛�</label>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">瀹㈡埛鍚嶇О锛�</label>
<div class="layui-input-inline">
<input id="str3" class="layui-input" type="text">
</div>
</div>
- <div class="layui-inline" style="width:31%;display: none">
- <label class="layui-form-label">锛�</label>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">椤圭洰淇℃伅锛�</label>
<div class="layui-input-inline">
<input id="str4" class="layui-input" type="text">
</div>
</div>
- <div class="layui-inline" style="width:31%;display: none">
- <label class="layui-form-label">锛�</label>
+<!-- <div class="layui-inline" style="width:31%;">-->
+<!-- <label class="layui-form-label">绫诲埆锛�</label>-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input id="str5" class="layui-input" type="text">-->
+<!-- </div>-->
+<!-- </div>-->
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">绫诲埆锛�</label>
+ <div class="layui-input-inline cool-auto-complete">
+ <input id="str5" name="str5" class="layui-input" type="text" style="display: none">
+ <input id="str5$" name="str5$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏�..." onfocus=this.blur()>
+ <div class="cool-auto-complete-window">
+ <input class="cool-auto-complete-window-input" data-key="matTypeBymatType" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="matTypeBymatTypeSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">鏁伴噺锛�</label>
<div class="layui-input-inline">
- <input id="str5" class="layui-input" type="text">
+ <input id="str6" class="layui-input" type="number" placeholder="涓嶅～涓�0">
</div>
</div>
<div class="layui-inline" style="width:31%;display: none">
<label class="layui-form-label">锛�</label>
<div class="layui-input-inline">
- <input id="str6" class="layui-input" type="text">
- </div>
- </div>
- <div class="layui-inline" style="width:31%;display: none">
- <label class="layui-form-label">锛�</label>
- <div class="layui-input-inline">
- <input id="str7" class="layui-input" type="text">
+ <input id="str7" class="layui-input" type="number" placeholder="涓嶅～涓�0">
</div>
</div>
<div class="layui-inline" style="width:31%;display: none">
--
Gitblit v1.9.1