From b159e50bbf0f055a69ba5430fb956021ab90b450 Mon Sep 17 00:00:00 2001
From: suerwei <18810552194@163.com>
Date: 星期五, 17 五月 2024 17:41:07 +0800
Subject: [PATCH] 进出库管理调整字段
---
javaweb-plus/javaweb-cms/src/main/resources/templates/geo/deviceLog/edit.html | 35 ++++----
javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/DeviceLogServiceImpl.java | 27 +-----
javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/DeviceLogMapper.xml | 14 ++-
javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/domain/DeviceLog.java | 46 ++++++----
javaweb-plus/javaweb-cms/src/main/resources/templates/geo/deviceLog/deviceLog.html | 38 +++++----
javaweb-plus/javaweb-cms/src/main/resources/templates/geo/deviceLog/add.html | 34 ++++----
javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectData/upload.html | 10 -
7 files changed, 99 insertions(+), 105 deletions(-)
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/domain/DeviceLog.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/domain/DeviceLog.java
index 5b674b3..0c65631 100644
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/domain/DeviceLog.java
+++ b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/domain/DeviceLog.java
@@ -40,20 +40,24 @@
@Excel(name = "璁惧鍚嶇О")
private String deviceName;
- /** 鍑哄叆搴撶被鍨嬶紙in /out锛� */
- @Excel(name = "鍑哄叆搴撶被鍨�", readConverterExp = "i=n,/=out")
+ /** 绫诲瀷锛堣澶囷紝鏉愭枡锛� */
+ @Excel(name = "鍑哄叆搴撶被鍨�", readConverterExp = "绫诲瀷锛堣澶囷紝鏉愭枡锛�")
private String type;
- /** 鍑哄叆搴撴椂闂� */
- @Excel(name = "鍑哄叆搴撴椂闂�")
- private String transactionDate;
+ /** 鍑哄簱鏃堕棿 */
+ @Excel(name = "鍑哄簱鏃堕棿")
+ private String outboundDate;
+
+ /** 鍏ュ簱鏃堕棿 */
+ @Excel(name = "鍏ュ簱鏃堕棿")
+ private String inboundDate;
/** 缁忓姙浜� */
@Excel(name = "缁忓姙浜�")
private String optUser;
/** 浣跨敤浜� */
- @Excel(name = "浣跨敤浜�")
+ @Excel(name = "璐熻矗浜�")
private String applyUser;
/** 鍑哄叆搴撴暟閲� */
@@ -130,25 +134,31 @@
this.type = type;
}
- public String getType()
- {
+ public String getType() {
return type;
}
- public void setTransactionDate(String transactionDate)
- {
- this.transactionDate = transactionDate;
+
+ public String getOutboundDate() {
+ return outboundDate;
}
- public String getTransactionDate()
- {
- return transactionDate;
+ public void setOutboundDate(String outboundDate) {
+ this.outboundDate = outboundDate;
}
- public void setOptUser(String optUser)
- {
+
+ public String getInboundDate() {
+ return inboundDate;
+ }
+
+ public void setInboundDate(String inboundDate) {
+ this.inboundDate = inboundDate;
+ }
+
+ public void setOptUser(String optUser) {
this.optUser = optUser;
}
- public String getOptUser()
+ public String getOptUser()
{
return optUser;
}
@@ -190,8 +200,6 @@
.append("deviceId", getDeviceId())
.append("deviceCode", getDeviceCode())
.append("deviceName", getDeviceName())
- .append("type", getType())
- .append("transactionDate", getTransactionDate())
.append("optUser", getOptUser())
.append("applyUser", getApplyUser())
.append("number", getNumber())
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/DeviceLogServiceImpl.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/DeviceLogServiceImpl.java
index f958545..12845c1 100644
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/DeviceLogServiceImpl.java
+++ b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/DeviceLogServiceImpl.java
@@ -130,24 +130,6 @@
item.setProjectId(projectId);
item.setProjectName(project.getFullName());
- // 杞崲鍑哄叆搴撶被鍨�
- String proTypeCode = RecordType.getKeyByName(item.getType());
- item.setType(proTypeCode);
-
- // 杞崲璁惧缂栫爜
- String deviceCode = item.getDeviceCode();
- if (!ObjectUtils.isEmpty(deviceCode)){
- Device param = new Device();
- param.setCode(deviceCode);
- List<Device> devices = deviceService.selectDeviceList(param);
- if (!ObjectUtils.isEmpty(devices)){
- Device device = devices.get(0);
- item.setDeviceId(device.getId());
- item.setDeviceCode(device.getCode());
- item.setDeviceName(device.getName());
- }
- }
-
item.setCreateDate(DateUtils.getNowDate());
insertDeviceLog(item);
}
@@ -176,11 +158,12 @@
private List<DeviceLog> readData(String filepath) {
ExcelReader reader = ExcelUtil.getReader(filepath, 0);
reader.addHeaderAlias("鍑哄叆搴撳崟瀛愬彿", "code");
- reader.addHeaderAlias("璁惧缂栫爜", "deviceCode");
- reader.addHeaderAlias("鍑哄叆搴撶被鍨�", "type");
- reader.addHeaderAlias("鍑哄叆搴撴椂闂�", "transactionDate");
+ reader.addHeaderAlias("璁惧鍚嶇О", "deviceName");
+ reader.addHeaderAlias("绫诲瀷", "type");
+ reader.addHeaderAlias("鍏ュ簱鏃堕棿", "inboundDate");
+ reader.addHeaderAlias("鍑哄簱鏃堕棿", "outboundDate");
reader.addHeaderAlias("缁忓姙浜�", "optUser");
- reader.addHeaderAlias("浣跨敤浜�", "applyUser");
+ reader.addHeaderAlias("璐熻矗浜�", "applyUser");
reader.addHeaderAlias("鍑哄叆搴撴暟閲�", "number");
reader.addHeaderAlias("澶囨敞", "remark");
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/DeviceLogMapper.xml b/javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/DeviceLogMapper.xml
index fc033af..424d266 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/DeviceLogMapper.xml
+++ b/javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/DeviceLogMapper.xml
@@ -13,7 +13,8 @@
<result property="deviceCode" column="device_code" />
<result property="deviceName" column="device_name" />
<result property="type" column="type" />
- <result property="transactionDate" column="transaction_date" />
+ <result property="outboundDate" column="outbound_date" />
+ <result property="inboundDate" column="inbound_date" />
<result property="optUser" column="opt_user" />
<result property="applyUser" column="apply_user" />
<result property="number" column="number" />
@@ -22,7 +23,7 @@
</resultMap>
<sql id="selectDeviceLogVo">
- select id, code, project_id, project_name, device_id, device_code, device_name, type, transaction_date, opt_user, apply_user, number, create_date, remark from js_device_log
+ select id, code, project_id, project_name, device_id, device_code, device_name, type, outbound_date, inbound_date, opt_user, apply_user, number, create_date, remark from js_device_log
</sql>
<select id="selectDeviceLogList" parameterType="DeviceLog" resultMap="DeviceLogResult">
@@ -57,7 +58,8 @@
<if test="deviceCode != null and deviceCode != ''">device_code,</if>
<if test="deviceName != null and deviceName != ''">device_name,</if>
<if test="type != null and type != ''">type,</if>
- <if test="transactionDate != null and transactionDate != ''">transaction_date,</if>
+ <if test="outboundDate != null and outboundDate != ''">outbound_date,</if>
+ <if test="inboundDate != null and inboundDate != ''">inbound_date,</if>
<if test="optUser != null and optUser != ''">opt_user,</if>
<if test="applyUser != null and applyUser != ''">apply_user,</if>
<if test="number != null and number != ''">number,</if>
@@ -73,7 +75,8 @@
<if test="deviceCode != null and deviceCode != ''">#{deviceCode},</if>
<if test="deviceName != null and deviceName != ''">#{deviceName},</if>
<if test="type != null and type != ''">#{type},</if>
- <if test="transactionDate != null and transactionDate != ''">#{transactionDate},</if>
+ <if test="outboundDate != null and outboundDate != ''">#{outboundDate},</if>
+ <if test="inboundDate != null and inboundDate != ''">#{inboundDate},</if>
<if test="optUser != null and optUser != ''">#{optUser},</if>
<if test="applyUser != null and applyUser != ''">#{applyUser},</if>
<if test="number != null and number != ''">#{number},</if>
@@ -92,7 +95,8 @@
<if test="deviceCode != null and deviceCode != ''">device_code = #{deviceCode},</if>
<if test="deviceName != null and deviceName != ''">device_name = #{deviceName},</if>
<if test="type != null and type != ''">type = #{type},</if>
- <if test="transactionDate != null and transactionDate != ''">transaction_date = #{transactionDate},</if>
+ <if test="outboundDate != null and outboundDate != ''">outbound_date = #{outboundDate},</if>
+ <if test="inboundDate != null and inboundDate != ''">inbound_date = #{inboundDate},</if>
<if test="optUser != null and optUser != ''">opt_user = #{optUser},</if>
<if test="applyUser != null and applyUser != ''">apply_user = #{applyUser},</if>
<if test="number != null and number != ''">number = #{number},</if>
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/deviceLog/add.html b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/deviceLog/add.html
index 6a96c70..1f749e9 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/deviceLog/add.html
+++ b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/deviceLog/add.html
@@ -12,26 +12,14 @@
<input name="code" class="form-control" type="text">
</div>
</div>
- <div class="form-group">
- <label class="col-sm-3 control-label">椤圭洰鍚嶇О锛�</label>
- <div class="col-sm-8">
- <input name="projectName" class="form-control" type="text">
- </div>
- </div>
<div class="form-group">
- <label class="col-sm-3 control-label">璁惧缂栧彿锛�</label>
- <div class="col-sm-8">
- <input name="deviceCode" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">璁惧鍚嶇О锛�</label>
+ <label class="col-sm-3 control-label">鍚嶇О锛�</label>
<div class="col-sm-8">
<input name="deviceName" class="form-control" type="text">
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">鍑哄叆搴撶被鍨嬶細</label>
+ <label class="col-sm-3 control-label">绫诲瀷锛�</label>
<div class="col-sm-8">
<select name="type" class="form-control m-b" th:with="type=${@dict.getType('device_log_type')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
@@ -39,9 +27,15 @@
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">鍑哄叆搴撴椂闂达細</label>
+ <label class="col-sm-3 control-label">鍏ュ簱鏃堕棿锛�</label>
<div class="col-sm-8">
- <input name="transactionDate" class="form-control" type="text">
+ <input name="inboundDate" class="form-control" type="text">
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">鍑哄簱鏃堕棿锛�</label>
+ <div class="col-sm-8">
+ <input name="outboundDate" class="form-control" type="text">
</div>
</div>
<div class="form-group">
@@ -51,7 +45,7 @@
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">浣跨敤浜猴細</label>
+ <label class="col-sm-3 control-label">璐熻矗浜猴細</label>
<div class="col-sm-8">
<input name="applyUser" class="form-control" type="text">
</div>
@@ -62,6 +56,12 @@
<input name="number" class="form-control" type="text">
</div>
</div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">澶囨敞锛�</label>
+ <div class="col-sm-8">
+ <textarea id="remark" name="remark" class="form-control"></textarea>
+ </div>
+ </div>
</form>
</div>
<th:block th:include="include :: footer" />
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/deviceLog/deviceLog.html b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/deviceLog/deviceLog.html
index 8f51043..a801b86 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/deviceLog/deviceLog.html
+++ b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/deviceLog/deviceLog.html
@@ -15,15 +15,11 @@
<input type="text" name="code"/>
</li>
<li>
- <p>椤圭洰鍚嶇О锛�</p>
- <input type="text" name="projectName"/>
- </li>
- <li>
- <p>璁惧鍚嶇О锛�</p>
+ <p>鍚嶇О锛�</p>
<input type="text" name="deviceName"/>
</li>
<li>
- <p>鍑哄叆搴撶被鍨嬶細</p>
+ <p>璁惧/鏉愭枡绫诲瀷锛�</p>
<select name="type" th:with="type=${@dict.getType('device_log_type')}">
<option value="">鎵�鏈�</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
@@ -34,7 +30,7 @@
<input type="text" name="optUser"/>
</li>
<li>
- <p>浣跨敤浜猴細</p>
+ <p>璐熻矗浜猴細</p>
<input type="text" name="applyUser"/>
</li>
<li>
@@ -99,26 +95,32 @@
},
{
field : 'projectName',
- title : '椤圭洰鍚嶇О'
+ title : '鍦哄湴鍚嶇О',
+ visible: false
},
{
field : 'deviceCode',
- title : '璁惧缂栫爜'
+ title : '缂栧彿',
+ visible: false
+ },
+ {
+ field : 'deviceName',
+ title : '鍚嶇О'
},
{
- field : 'deviceName',
- title : '璁惧鍚嶇О'
- },
- {
field : 'type',
- title : '鍑哄叆搴撶被鍨�',
+ title : '璁惧/鏉愭枡绫诲瀷',
formatter: function(value, row, index) {
return $.table.selectDictLabel(typeDatas, value);
}
},
+ {
+ field : 'inboundDate',
+ title : '鍏ュ簱鏃堕棿'
+ },
{
- field : 'transactionDate',
- title : '鍑哄叆搴撴椂闂�'
+ field : 'outboundDate',
+ title : '鍑哄簱鏃堕棿'
},
{
field : 'optUser',
@@ -126,11 +128,11 @@
},
{
field : 'applyUser',
- title : '浣跨敤浜�'
+ title : '璐熻矗浜�'
},
{
field : 'number',
- title : '鍑哄叆搴撴暟閲�'
+ title : '鏁伴噺'
},
{
field : 'remark',
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/deviceLog/edit.html b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/deviceLog/edit.html
index f789000..4353bef 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/deviceLog/edit.html
+++ b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/deviceLog/edit.html
@@ -13,26 +13,14 @@
<input name="code" th:field="*{code}" class="form-control" type="text">
</div>
</div>
- <div class="form-group">
- <label class="col-sm-3 control-label">椤圭洰鍚嶇О锛�</label>
- <div class="col-sm-8">
- <input name="projectName" th:field="*{projectName}" class="form-control" type="text">
- </div>
- </div>
<div class="form-group">
- <label class="col-sm-3 control-label">璁惧缂栧彿锛�</label>
- <div class="col-sm-8">
- <input name="deviceCode" th:field="*{deviceCode}" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">璁惧鍚嶇О锛�</label>
+ <label class="col-sm-3 control-label">鍚嶇О锛�</label>
<div class="col-sm-8">
<input name="deviceName" th:field="*{deviceName}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">鍑哄叆搴撶被鍨嬶細</label>
+ <label class="col-sm-3 control-label">绫诲瀷锛�</label>
<div class="col-sm-8">
<select name="type" class="form-control m-b" th:with="type=${@dict.getType('device_log_type')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{type}"></option>
@@ -40,9 +28,15 @@
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">鍑哄叆搴撴椂闂达細</label>
+ <label class="col-sm-3 control-label">鍏ュ簱鏃堕棿锛�</label>
<div class="col-sm-8">
- <input name="transactionDate" th:field="*{transactionDate}" class="form-control" type="text">
+ <input name="inboundDate" th:field="*{inboundDate}" class="form-control" type="text">
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">鍑哄簱鏃堕棿锛�</label>
+ <div class="col-sm-8">
+ <input name="outboundDate" th:field="*{outboundDate}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
@@ -52,7 +46,7 @@
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">浣跨敤浜猴細</label>
+ <label class="col-sm-3 control-label">璐熻矗浜猴細</label>
<div class="col-sm-8">
<input name="applyUser" th:field="*{applyUser}" class="form-control" type="text">
</div>
@@ -63,6 +57,13 @@
<input name="number" th:field="*{number}" class="form-control" type="text">
</div>
</div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">澶囨敞锛�</label>
+ <div class="col-sm-8">
+ <textarea id="remark" th:field="*{remark}" name="remark" class="form-control"></textarea>
+ </div>
+ </div>
+
</form>
</div>
<th:block th:include="include :: footer" />
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectData/upload.html b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectData/upload.html
index 5a488e6..af16c54 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectData/upload.html
+++ b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectData/upload.html
@@ -34,14 +34,10 @@
</form>
</div>
- <div class="btn-group-sm" id="toolbar" role="group">
-
-
- </div>
-
<div class="col-sm-12 select-table table-striped">
- <span>1銆佸崟涓垨鑰呭涓枃浠惰浠�.ZIP鍘嬬缉鍖呯殑褰㈠紡涓婁紶<br> </span>
- <span>2銆佹爣鍑嗘枃浠朵笉鍏佽鍖呭惈鐗规畩瀛楃锛氱┖鏍� 銆佹鍙嶆枩绾裤�侀棶鍙枫�佹槦鍙风瓑<br> </span>
+ <span>1銆佸崟涓垨鑰呭涓枃浠惰浠�.ZIP鍘嬬缉鍖呯殑褰㈠紡涓婁紶锛屾妸鍗曚釜鎴栬�呭涓枃浠舵斁鍒版枃浠跺す涓紝鍘嬬缉鏂囦欢澶逛负zip鏍煎紡<br> </span>
+ <span>1銆侀檮浠跺悕绉伴渶瑕佷笌绯荤粺鍐呯殑璧勬枡鍚嶇О涓�鑷�<br> </span>
+ <span>2銆佹枃浠朵笉鍏佽鍖呭惈鐗规畩瀛楃锛氱┖鏍� 銆佹鍙嶆枩绾裤�侀棶鍙枫�佹槦鍙风瓑<br> </span>
<span>3銆佷笂浼犳枃浠剁粡杩囦簡 瑙ｅ帇 銆� 绉诲姩 銆侀亶鍘� 銆佹洿鏂版暟鎹簱绛夊涓楠わ紝璇疯�愬績绛夊緟<br> </span>
</div>
--
Gitblit v1.9.1