#

luxiaotao1123

2022-09-20 893032f4bcb74982c2f93700da22d0df6e14357a

#

 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;

 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();

 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" />

 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: '添加人员'}

 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>