From 03a853465a52d4150acc261406f3c84b4d0f0b22 Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期一, 05 九月 2022 17:40:11 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/entity/ProjectType.java | 14 ++++++++++++++
src/main/webapp/views/projectType/projectType.html | 9 +++++++++
src/main/resources/mapper/ProjectTypeMapper.xml | 1 +
src/main/webapp/static/js/projectType/projectType.js | 1 +
src/main/resources/application.yml | 13 ++++---------
5 files changed, 29 insertions(+), 9 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/entity/ProjectType.java b/src/main/java/zy/cloud/wms/manager/entity/ProjectType.java
index f56df81..62a5bb0 100644
--- a/src/main/java/zy/cloud/wms/manager/entity/ProjectType.java
+++ b/src/main/java/zy/cloud/wms/manager/entity/ProjectType.java
@@ -13,9 +13,12 @@
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotations.TableName;
+import lombok.Data;
+
import java.io.Serializable;
@TableName("sys_project_type")
+@Data
public class ProjectType implements Serializable {
private static final long serialVersionUID = 1L;
@@ -52,6 +55,9 @@
@TableField("str_3")
private String str3;
+ @TableField("is_asrs")
+ private Integer isAsrs;
+
public ProjectType() {}
public ProjectType(Integer id,Integer typeId,String typeName,Integer typeStatus,Integer typeClass,String str1,String str2,String str3) {
@@ -80,6 +86,14 @@
return id;
}
+ public String getIsAsrs$(){
+ if (this.isAsrs == 0) {
+ return "鍚�";
+ }else {
+ return "鏄�";
+ }
+ }
+
public void setId(Integer id) {
this.id = id;
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index fd4e3a8..c0fc9ae 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -7,17 +7,12 @@
application:
name: @pom.build.finalName@
datasource:
- # mysql
-# driver-class-name: com.mysql.jdbc.Driver
-# url: jdbc:mysql://127.0.0.1:3306/cool?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
-# username: root
-# password: xltys1995
# sql-server
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-# url: jdbc:sqlserver://127.0.0.1:51433;databasename=zypms
-# username: sa
-# password: Zoneyung@zy56$
- url: jdbc:sqlserver://192.168.4.15:1433;databasename=zypms_pro
+ #姝ｅ紡鏁版嵁搴�
+# url: jdbc:sqlserver://192.168.4.15:1433;databasename=zypms_pro
+ #澶囦唤鏁版嵁搴�
+ url: jdbc:sqlserver://192.168.4.15:1433;databasename=zypms
username: sa
password: sa@123
mvc:
diff --git a/src/main/resources/mapper/ProjectTypeMapper.xml b/src/main/resources/mapper/ProjectTypeMapper.xml
index 3e71407..4e16e70 100644
--- a/src/main/resources/mapper/ProjectTypeMapper.xml
+++ b/src/main/resources/mapper/ProjectTypeMapper.xml
@@ -12,6 +12,7 @@
<result column="str_1" property="str1" />
<result column="str_2" property="str2" />
<result column="str_3" property="str3" />
+ <result column="is_asrs" property="isAsrs" />
</resultMap>
diff --git a/src/main/webapp/static/js/projectType/projectType.js b/src/main/webapp/static/js/projectType/projectType.js
index d270aae..6b0e683 100644
--- a/src/main/webapp/static/js/projectType/projectType.js
+++ b/src/main/webapp/static/js/projectType/projectType.js
@@ -24,6 +24,7 @@
,{field: 'id', align: 'center',title: '鍞竴ID'}
// ,{field: 'typeId', align: 'center',title: ''}
,{field: 'typeName', align: 'center',title: '绫诲瀷鍚嶇О'}
+ ,{field: 'isAsrs$', align: 'center',title: '鏄惁涓虹珛搴�'}
// ,{field: 'typeStatus', align: 'center',title: ''}
// ,{field: 'typeClass', align: 'center',title: ''}
,{field: 'str1', align: 'center',title: '澶囨敞', width: 100}
diff --git a/src/main/webapp/views/projectType/projectType.html b/src/main/webapp/views/projectType/projectType.html
index 2a47dc6..0463274 100644
--- a/src/main/webapp/views/projectType/projectType.html
+++ b/src/main/webapp/views/projectType/projectType.html
@@ -92,6 +92,15 @@
<input class="layui-input" name="str1" placeholder="璇疯緭鍏�">
</div>
</div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">鏄惁涓虹珛搴�: </label>
+ <div class="layui-input-block">
+ <select name="isAsrs">
+ <option value="0">鍚�</option>
+ <option value="1">鏄�</option>
+ </select>
+ </div>
+ </div>
<!-- <div class="layui-form-item">-->
<!-- <label class="layui-form-label">: </label>-->
<!-- <div class="layui-input-block">-->
--
Gitblit v1.9.1