Merge remote-tracking branch 'origin/wldlzasrs' into wldlzasrs
# Conflicts:
# src/main/resources/license.lic
| | |
| | | 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); |
| | |
| | | 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; |
| | | } |
| | | } |
| | |
| | | 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} |