自动化立体仓库 - WMS系统
zhangc
2025-01-07 19b6160823c407902c9f93bc6b9c75a851b0036d
添加入库人员字段及关联用户信息
3个文件已修改
17 ■■■■■ 已修改文件
src/main/java/com/zy/asrs/entity/WaitPakinLog.java 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/static/js/waitPakinLog/waitPakinLog.js 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/waitPakinLog/waitPakinLog.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/entity/WaitPakinLog.java
@@ -3,6 +3,9 @@
import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableName;
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -149,6 +152,9 @@
    @TableField("appe_user")
    private Long appeUser;
    @TableField(exist = false)
    private String appeUser$;
    @ApiModelProperty(value= "备注")
    private String memo;
@@ -220,4 +226,12 @@
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
    }
    public String getAppeUser$(){
        UserService service = SpringUtils.getBean(UserService.class);
        User user = service.selectById(this.appeUser);
        if (!Cools.isEmpty(user)){
            return String.valueOf(user.getUsername());
        }
        return null;
    }
}
src/main/webapp/static/js/waitPakinLog/waitPakinLog.js
@@ -15,6 +15,7 @@
                html += ">";
                return html;
            }}
        ,{field: 'appeUser$', align: 'center',title: '入库人员'}
        ,{field: 'modiUser$', align: 'center',title: '修改人员', hide:true}
        ,{field: 'modiTime$', align: 'center',title: '修改时间', hide:true})
    return cols;
src/main/webapp/views/waitPakinLog/waitPakinLog.html
@@ -54,7 +54,7 @@
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/waitPakinLog/waitPakinLog.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/waitPakinLog/waitPakinLog.js?v=1" charset="utf-8"></script>
<iframe id="detail-iframe" scrolling="auto" style="display:none;"></iframe>