自动化立体仓库 - WMS系统
野心家
2024-12-10 cfb29c53a447c2168db6ab832978a9d6104de2ff
Merge remote-tracking branch 'origin/wldlzasrs' into wldlzasrs

# Conflicts:
# src/main/resources/license.lic
3个文件已修改
18 ■■■■ 已修改文件
src/main/java/com/zy/asrs/entity/LocDetl.java 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/common/service/CommonService.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/static/js/locDetl/locDetl.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -249,12 +249,12 @@
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
    }
    public long getStoreDate(){
        long timeNow = new Date().getTime();
        long timeCreate = this.appeTime.getTime();
        return (timeNow - timeCreate) /24/60/60/1000;
    }
//    public long getStoreDate(){
//        long timeNow = new Date().getTime();
//        long timeCreate = this.appeTime.getTime();
//
//        return (timeNow - timeCreate) /24/60/60/1000;
//    }
    public void sync(Object source) {
        Synchro.Copy(source, this);
src/main/java/com/zy/common/service/CommonService.java
@@ -373,13 +373,13 @@
                            locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>()
                                    .eq("loc_no", shallowLoc).eq("loc_sts", "F"));
                            if (!Cools.isEmpty(locMast2)) {
                                locMast = locMast2;
                                locMast = locMast1;
                                break;
                            } else {
                                locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>()
                                        .eq("loc_no", shallowLoc).eq("loc_sts", "D"));
                                if (!Cools.isEmpty(locMast2)) {
                                    locMast = locMast2;
                                    locMast = locMast1;
                                    break;
                                }
                            }
src/main/webapp/static/js/locDetl/locDetl.js
@@ -2,7 +2,7 @@
function getCol() {
    var cols = [
        {field: 'locNo$', align: 'center',title: '库位号'}
        ,{field: 'storeDate', align: 'center',title: '库龄(天)', sort:true}
        // ,{field: 'storeDate', align: 'center',title: '库龄(天)', sort:true}
        ,{field: 'matnr', align: 'center',title: '商品编号', sort:true}
        ,{field: 'maktx', align: 'center',title: '商品名称', sort:true}
        ,{field: 'orderNo', align: 'center',title: '单据编号', hide: true}