#组托显示操作人

zjj

2023-09-18 08cfde7440965bf14a78f1cd0f031b35b2ccce33

#组托显示操作人

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

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

@@ -179,6 +181,15 @@
    @TableField("uuid")
    private String uuid;

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

    public String getOwner$(){
        LocOwnerService service = SpringUtils.getBean(LocOwnerService.class);
        LocOwner locOwner = service.selectById(this.owner);

 src/main/webapp/static/js/order/order.js

@@ -596,7 +596,7 @@
            layer.closeAll();
            layer.load(1, {shade: [0.1,'#fff']});
            // location.href = "http://192.168.4.121:8082/stwms/orderCheck/printExport/auth?orderNo="+data.orderNo;
            location.href = "http://10.114.97.100:8080/stwms/order/printExport/auth?orderNo="+data.orderNo;
            location.href = baseUrl+"/order/printExport/auth?orderNo="+data.orderNo;
            layer.closeAll('loading');
        });
    }

 src/main/webapp/static/js/orderCheck/orderCheck.js

@@ -774,7 +774,7 @@
            layer.closeAll();
            layer.load(1, {shade: [0.1,'#fff']});
           // location.href = "http://192.168.4.121:8082/stwms/orderCheck/printExport/auth?orderNo="+data.orderNo;
            location.href = "http://10.114.97.100:8080/stwms/orderCheck/printExport/auth?orderNo="+data.orderNo;
            location.href = baseUrl+"/orderCheck/printExport/auth?orderNo="+data.orderNo;
            layer.closeAll('loading');
        });
    }

 src/main/webapp/static/js/waitPakin/waitPakin.js

@@ -3,6 +3,7 @@
    var cols = [ {type: 'checkbox'} ];
    cols.push.apply(cols, detlCols);
    cols.push({field: 'locNo', align: 'center',title: '库位号'}
        ,{field: 'userName$', 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 ";}

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

@@ -5,6 +5,7 @@
    cols.push.apply(cols, detlCols);
    cols.push(
        {field: 'createBy$', align: 'center',title: '操作人', minWidth: 160, width: 160}
        ,{field: 'userName$', align: 'center',title: '操作人'}
        ,{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+"'";