1

zhang

1 天以前 40254eb1fc7ad9bef6e820c0ffc0cc5a63e9e53e

1

 src/main/java/com/zy/asrs/entity/LocDetl.java

@@ -7,6 +7,7 @@
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.asrs.service.LocMastService;
import com.zy.asrs.task.OverYearLogScheduler;
import com.zy.common.utils.Synchro;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
@@ -24,161 +25,163 @@

    private static final long serialVersionUID = 1L;

    @ApiModelProperty(value= "库位号")
    @ApiModelProperty(value = "库位号")
    @TableField("loc_no")
    private String locNo;

    @ApiModelProperty(value= "托盘条码")
    @ApiModelProperty(value = "托盘条码")
    private String zpallet;

    @ApiModelProperty(value= "数量")
    @ApiModelProperty(value = "数量")
    @ExcelProperty("数量")
    private Double anfme;

    @ApiModelProperty(value= "商品编号")
    @ApiModelProperty(value = "商品编号")
    @ExcelProperty("商品编号")
    private String matnr;

    @ApiModelProperty(value= "商品名称")
    @ApiModelProperty(value = "商品名称")
    @ExcelProperty("商品名称")
    private String maktx;

    @ApiModelProperty(value= "规格")
    @ApiModelProperty(value = "规格")
    @ExcelProperty("规格")
    private String specs;

    @ApiModelProperty(value= "货品特征")
    @ApiModelProperty(value = "货品特征")
    @ExcelProperty("货品特征")
    private String batch;

    @ApiModelProperty(value= "单据编号")
    @ApiModelProperty(value = "单据编号")
    @ExcelProperty("单据编号")
    @TableField("order_no")
    private String orderNo;

    @ApiModelProperty(value= "型号")
    @ApiModelProperty(value = "型号")
    private String model;

    @ApiModelProperty(value= "颜色")
    @ApiModelProperty(value = "颜色")
    private String color;

    @ApiModelProperty(value= "品牌")
    @ApiModelProperty(value = "品牌")
    private String brand;

    @ApiModelProperty(value= "单位")
    @ApiModelProperty(value = "单位")
    private String unit;

    @ApiModelProperty(value= "单价")
    @ApiModelProperty(value = "单价")
    private Double price;

    @ApiModelProperty(value= "sku")
    @ApiModelProperty(value = "sku")
    private String sku;

    @ApiModelProperty(value= "单位量")
    @ApiModelProperty(value = "单位量")
    private Double units;

    @ApiModelProperty(value= "条码")
    @ApiModelProperty(value = "条码")
    private String barcode;

    @ApiModelProperty(value= "产地")
    @ApiModelProperty(value = "产地")
    private String origin;

    @ApiModelProperty(value= "厂家")
    @ApiModelProperty(value = "厂家")
    private String manu;

    @ApiModelProperty(value= "生产日期")
    @ApiModelProperty(value = "生产日期")
    @TableField("manu_date")
    private String manuDate;

    @ApiModelProperty(value= "品项数")
    @ApiModelProperty(value = "品项数")
    @TableField("item_num")
    private String itemNum;

    @ApiModelProperty(value= "安全库存量")
    @ApiModelProperty(value = "安全库存量")
    @TableField("safe_qty")
    private Double safeQty;

    @ApiModelProperty(value= "重量")
    @ApiModelProperty(value = "重量")
    private Double weight;

    @ApiModelProperty(value= "长度")
    @ApiModelProperty(value = "长度")
    private Double length;

    @ApiModelProperty(value= "体积")
    @ApiModelProperty(value = "体积")
    private Double volume;

    @ApiModelProperty(value= "三方编码")
    @ApiModelProperty(value = "三方编码")
    @TableField("three_code")
    private String threeCode;

    @ApiModelProperty(value= "供应商")
    @ApiModelProperty(value = "供应商")
    private String supp;

    @ApiModelProperty(value= "供应商编码")
    @ApiModelProperty(value = "供应商编码")
    @TableField("supp_code")
    private String suppCode;

    @ApiModelProperty(value= "是否批次 1: 是  0: 否  ")
    @ApiModelProperty(value = "是否批次 1: 是  0: 否  ")
    @TableField("be_batch")
    private Integer beBatch;

    @ApiModelProperty(value= "保质期")
    @ApiModelProperty(value = "保质期")
    @TableField("dead_time")
    private String deadTime;

    @ApiModelProperty(value= "预警天数")
    @ApiModelProperty(value = "预警天数")
    @TableField("dead_warn")
    private Integer deadWarn;

    @ApiModelProperty(value= "制购 1: 制造  2: 采购  3: 外协  ")
    @ApiModelProperty(value = "制购 1: 制造  2: 采购  3: 外协  ")
    private Integer source;

    @ApiModelProperty(value= "要求检验 1: 是  0: 否  ")
    @ApiModelProperty(value = "要求检验 1: 是  0: 否  ")
    private Integer inspect;

    @ApiModelProperty(value= "危险品 1: 是  0: 否  ")
    @ApiModelProperty(value = "危险品 1: 是  0: 否  ")
    private Integer danger;

    @ApiModelProperty(value= "修改人员")
    @ApiModelProperty(value = "修改人员")
    @TableField("modi_user")
    private Long modiUser;

    @ApiModelProperty(value= "修改时间")
    @ApiModelProperty(value = "修改时间")
    @TableField("modi_time")
    private Date modiTime;

    @ApiModelProperty(value= "创建者")
    @ApiModelProperty(value = "创建者")
    @TableField("appe_user")
    private Long appeUser;

    @ApiModelProperty(value= "添加时间")
    @ApiModelProperty(value = "添加时间")
    @TableField("appe_time")
    private Date appeTime;

    @ApiModelProperty(value= "备注")
    @ApiModelProperty(value = "备注")
    private String memo;

    @ApiModelProperty(value= "预留1")
    @ApiModelProperty(value = "预留1")
    private String temp1;
    @ApiModelProperty(value= "预留1")
    @ApiModelProperty(value = "预留1")
    private String temp2;
    @ApiModelProperty(value= "预留1")
    @ApiModelProperty(value = "预留1")
    private String temp3;
    @ApiModelProperty(value= "预留1")
    @ApiModelProperty(value = "预留1")
    private String temp4;

    public String getLocNo$(){
    public String getLocNo$() {
        LocMastService service = SpringUtils.getBean(LocMastService.class);
        LocMast locMast = service.selectById(this.locNo);
        if (!Cools.isEmpty(locMast)){
        if (!Cools.isEmpty(locMast)) {
            return String.valueOf(locMast.getLocNo());
        }
        return null;
    }

    public String getBeBatch$(){
        if (null == this.beBatch){ return null; }
        switch (this.beBatch){
    public String getBeBatch$() {
        if (null == this.beBatch) {
            return null;
        }
        switch (this.beBatch) {
            case 1:
                return "是";
            case 0:
@@ -188,9 +191,11 @@
        }
    }

    public String getSource$(){
        if (null == this.source){ return null; }
        switch (this.source){
    public String getSource$() {
        if (null == this.source) {
            return null;
        }
        switch (this.source) {
            case 1:
                return "制造";
            case 2:
@@ -202,9 +207,11 @@
        }
    }

    public String getInspect$(){
        if (null == this.inspect){ return null; }
        switch (this.inspect){
    public String getInspect$() {
        if (null == this.inspect) {
            return null;
        }
        switch (this.inspect) {
            case 1:
                return "是";
            case 0:
@@ -214,9 +221,11 @@
        }
    }

    public String getDanger$(){
        if (null == this.danger){ return null; }
        switch (this.danger){
    public String getDanger$() {
        if (null == this.danger) {
            return null;
        }
        switch (this.danger) {
            case 1:
                return "是";
            case 0:
@@ -226,47 +235,57 @@
        }
    }

    public String getModiUser$(){
    public String getModiUser$() {
        UserService service = SpringUtils.getBean(UserService.class);
        User user = service.selectById(this.modiUser);
        if (!Cools.isEmpty(user)){
        if (!Cools.isEmpty(user)) {
            return String.valueOf(user.getUsername());
        }
        return null;
    }

    public String getModiTime$(){
        if (Cools.isEmpty(this.modiTime)){
    public String getModiTime$() {
        if (Cools.isEmpty(this.modiTime)) {
            return "";
        }
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
    }

    public String getAppeUser$(){
    public String getAppeUser$() {
        UserService service = SpringUtils.getBean(UserService.class);
        User user = service.selectById(this.appeUser);
        if (!Cools.isEmpty(user)){
        if (!Cools.isEmpty(user)) {
            return String.valueOf(user.getUsername());
        }
        return null;
    }

    public String getAppeTime$(){
        if (Cools.isEmpty(this.appeTime)){
    public String getAppeTime$() {
        if (Cools.isEmpty(this.appeTime)) {
            return "";
        }
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
    }

    public long getStoreDate(){
        if (Cools.isEmpty(this.appeTime)){
    public long getStoreDate() {
        if (Cools.isEmpty(this.appeTime)) {
            this.appeTime = new Date();
        }
        long timeNow = new Date().getTime();
        long timeCreate = this.appeTime.getTime();


        return (timeNow - timeCreate) /24/60/60/1000;
        return (timeNow - timeCreate) / 24 / 60 / 60 / 1000;
    }

    public boolean getAlarmStatus() {
        if (Cools.isEmpty(this.appeTime)) {
            this.appeTime = new Date();
        }
        long timeNow = new Date().getTime();
        long timeCreate = this.appeTime.getTime();

        return OverYearLogScheduler.days > ((timeNow - timeCreate) / 24 / 60 / 60 / 1000);
    }

    public void sync(Object source) {

 src/main/java/com/zy/asrs/task/OverYearLogScheduler.java

@@ -2,6 +2,8 @@

import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.task.handler.OverYearLogHandler;
import com.zy.system.entity.Config;
import com.zy.system.service.ConfigService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -16,15 +18,28 @@

    private static final Logger log = LoggerFactory.getLogger(OverYearLogScheduler.class);

    public static Integer days = 60;

    @Autowired
    private OverYearLogHandler overYearLogHandler;

    @Autowired
    private ConfigService configService;

    @Scheduled(cron = "0/3 * * * * ? ")
    private void execute(){
    private void execute() {
        ReturnT<String> returnT = overYearLogHandler.start();
        if (!returnT.isSuccess()) {
            log.error(returnT.getMsg());
        }
    }


    @Scheduled(cron = "0/2 * * * * ? ")
    private void execute2() {
        Config config = configService.selectConfigByCode("AlarmDays");
        if (config != null && config.getValue() != null && config.getStatus() == 1) {
            days = Integer.parseInt(config.getValue());
        }
    }
}

 src/main/webapp/static/js/locDetl/locDetl.js

@@ -74,6 +74,15 @@
                    res.data[_index][data.value] = 'N';
                }
            });

            var that = this.elem.next();
            res.data.forEach(function (item, index) {
                if (item.alarmStatus) {
                    var tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']");
                    tr.css("background-color", "#FF5722");
                    tr.css("color", "white");
                }
            });
        }
    });


 src/main/webapp/views/locDetl/locDetl.html

@@ -73,7 +73,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/locDetl/locDetl.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/locDetl/locDetl.js?v=1" charset="utf-8"></script>

<iframe id="detail-iframe" scrolling="auto" style="display:none;"></iframe>