项目优化

野心家

2023-07-07 5a465d99e842d2d828fe58629d81034d7987e6cc

项目优化

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

@@ -7,6 +7,8 @@
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.asrs.service.LocOwnerService;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@@ -260,4 +262,13 @@
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
    }

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

}

 src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java

@@ -801,7 +801,7 @@
            waitPakinLog.setZpallet(waitPakin.getZpallet());
            waitPakinLog.setAnfme(waitPakin.getAnfme());
            waitPakinLog.setMatnr(waitPakin.getMatnr());
            waitPakinLog.setLocNo(waitPakin.getLocNo());
            waitPakinLog.setLocNo(jsonLocNo);
            waitPakinLog.setMaktx(waitPakin.getMaktx());
            waitPakinLog.setOrderNo(waitPakin.getOrderNo());
            waitPakinLog.setWeight(waitPakin.getWeight());

 src/main/webapp/static/js/waitPakinLog/waitPakinLog.js

@@ -3,7 +3,10 @@
    var cols = [
    ];
    cols.push.apply(cols, detlCols);
    cols.push({field: 'status', align: 'center',title: '数据状态', templet:function(row){
    cols.push(
        {field: 'createBy$', align: 'center',title: '操作人', minWidth: 160, width: 160}
        ,{field: 'locNo', align: 'center',title: '库位号'}
        ,{field: 'status', align: 'center',title: '数据状态', templet:function(row){
                var html = "<input value='status' type='checkbox' lay-skin='switch' lay-text='正常|锁定' lay-filter='tableCheckbox' disabled='disabled' table-index='"+row.LAY_TABLE_INDEX+"'";
                if(row.status === 'Y'){html += " checked ";}
                html += ">";
@@ -15,6 +18,7 @@
                html += ">";
                return html;
            }}

        ,{field: 'modiUser$', align: 'center',title: '修改人员', hide:true}
        ,{field: 'modiTime$', align: 'center',title: '修改时间', hide:true})
    return cols;