From 893032f4bcb74982c2f93700da22d0df6e14357a Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 20 九月 2022 15:05:16 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 2 +-
src/main/java/com/zy/asrs/entity/BasSte.java | 29 ++++++++++++++++-------------
src/main/webapp/views/basSte/basSte.html | 6 ++++++
src/main/webapp/static/js/basSte/basSte.js | 1 +
src/main/resources/mapper/BasSteMapper.xml | 1 +
5 files changed, 25 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/BasSte.java b/src/main/java/com/zy/asrs/entity/BasSte.java
index fb54c42..cd557b1 100644
--- a/src/main/java/com/zy/asrs/entity/BasSte.java
+++ b/src/main/java/com/zy/asrs/entity/BasSte.java
@@ -1,24 +1,20 @@
package com.zy.asrs.entity;
-import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.enums.IdType;
import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
+import com.core.common.Cools;
import com.core.common.SpringUtils;
-import com.zy.system.service.UserService;
import com.zy.system.entity.User;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import org.springframework.format.annotation.DateTimeFormat;
-import com.core.common.SpringUtils;
import com.zy.system.service.UserService;
-import com.zy.system.entity.User;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import com.baomidou.mybatisplus.annotations.TableName;
+import org.springframework.format.annotation.DateTimeFormat;
+
import java.io.Serializable;
+import java.text.SimpleDateFormat;
+import java.util.Date;
@Data
@TableName("asr_bas_ste")
@@ -130,7 +126,14 @@
private String pakMk;
/**
- * 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
+ * 鏈�浣庣數閲�
+ */
+ @ApiModelProperty(value= "鏈�浣庣數閲�")
+ @TableField("charge_line")
+ private String chargeLine;
+
+ /**
+ * 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
*/
@ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
private Integer status;
diff --git a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
index 15d1175..2963b36 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -91,7 +91,7 @@
while (iterator.hasNext()) {
String next = iterator.next();
LocMast locMast = this.selectById(next);
- if (locMast.getLocSts().equals("F") || locMast.getLocSts().equals("D") || !excludeLocNos.contains(locMast.getLocNo())) {
+ if (locMast.getLocSts().equals("F") || locMast.getLocSts().equals("D") || excludeLocNos.contains(locMast.getLocNo())) {
continue;
}
iterator.remove();
diff --git a/src/main/resources/mapper/BasSteMapper.xml b/src/main/resources/mapper/BasSteMapper.xml
index d445c94..faad74e 100644
--- a/src/main/resources/mapper/BasSteMapper.xml
+++ b/src/main/resources/mapper/BasSteMapper.xml
@@ -19,6 +19,7 @@
<result column="idle_loc" property="idleLoc" />
<result column="ste_err" property="steErr" />
<result column="pak_mk" property="pakMk" />
+ <result column="charge_line" property="chargeLine" />
<result column="status" property="status" />
<result column="create_by" property="createBy" />
<result column="create_time" property="createTime" />
diff --git a/src/main/webapp/static/js/basSte/basSte.js b/src/main/webapp/static/js/basSte/basSte.js
index 90cc02f..9239199 100644
--- a/src/main/webapp/static/js/basSte/basSte.js
+++ b/src/main/webapp/static/js/basSte/basSte.js
@@ -38,6 +38,7 @@
,{field: 'hisLev', align: 'center',title: '鍘嗗彶灞�', hide: true}
,{field: 'idleLoc', align: 'center',title: '鏆傚瓨搴撲綅'}
,{field: 'steErr', align: 'center',title: '閿欒鐮�'}
+ ,{field: 'chargeLine', align: 'center',title: '鏈�浣庣數閲�%'}
,{field: 'pakMk', align: 'center',title: '鏍囪', hide: true}
// ,{field: 'status$', align: 'center',title: '鐘舵��'}
// ,{field: 'createBy$', align: 'center',title: '娣诲姞浜哄憳'}
diff --git a/src/main/webapp/views/basSte/basSte.html b/src/main/webapp/views/basSte/basSte.html
index 82d6f05..0a97472 100644
--- a/src/main/webapp/views/basSte/basSte.html
+++ b/src/main/webapp/views/basSte/basSte.html
@@ -98,6 +98,12 @@
<input class="layui-input" name="idleLoc" placeholder="璇疯緭鍏ユ殏瀛樺簱浣�">
</div>
</div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鏈�浣庣數閲�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" type="number" name="chargeLine" placeholder="璇疯緭鍏ユ渶浣庣數閲�">
+ </div>
+ </div>
</div>
</div>
--
Gitblit v1.9.1