wms / WMS_LZZT · Commits

12 Nov, 2018

16 commits

修复入库组盘之后报错。
55a2a5ca

xqs authored
6 years ago
Browse Dir »
出入库的任务状态分别只对应出或入的任务状态
6e1cb3be

xqs authored
6 years ago
Browse Dir »
库存交易小改字段名称， ...
b3108511
```
修复出库单编辑404错误
```
xqs authored
6 years ago
Browse Dir »
Merge branch 'develop' of http://172.16.29.40:8010/huhai/WMSV1 into develop
cb81e48b

xqs authored
6 years ago
Browse Dir »
Merge branch 'develop' of http://172.16.29.40:8010/huhai/WMSV1 into develop
4e067882

mocan authored
6 years ago
Browse Dir »
修复出库单明细编辑
0e58d79a

mocan authored
6 years ago
Browse Dir »
修改手动组盘的图标样式...
79457ae8

魏娟 authored
6 years ago
Browse Dir »
Merge branch 'develop' of http://172.16.29.40:8010/huhai/WMSV1 into develop
aa8e5db3

xqs authored
6 years ago
Browse Dir »
Merge branch 'develop' of http://172.16.29.40:8010/huhai/WMSV1 into develop
a2484342

tangying authored
6 years ago
Browse Code »
修改一个自动出库组盘的bug
0a7d06ce

tangying authored
6 years ago
Browse Dir »
Merge branch 'develop' of http://172.16.29.40:8010/huhai/WMSV1 into develop
ccd00564

xqs authored
6 years ago
Browse Code »
Merge branch 'develop' of http://172.16.29.40:8010/huhai/WMSV1 into develop
3d80a7dd

游杰 authored
6 years ago
Browse Dir »
add ShiroUtils.setUser
21e6b002

游杰 authored
6 years ago
Browse Dir »
Merge branch 'develop' of http://172.16.29.40:8010/huhai/WMSV1 into develop
1db3d46f

xqs authored
6 years ago
Browse Dir »
库存交易小改字段名称
a9409aa3

xqs authored
6 years ago
Browse Dir »
完成出库自动组盘的编写
9c03fc78

tangying authored
6 years ago
Browse Dir »

09 Nov, 2018

24 commits

修改出库组盘的bug
35f8d389

tangying authored
6 years ago
Browse Dir »
Merge branch 'develop' of http://172.16.29.40:8010/huhai/WMSV1 into develop
5177cabc

tangying authored
6 years ago
Browse Code »
出库组盘页面载入后再查询，减少重复
996ba425

tangying authored
6 years ago
Browse Dir »
Merge branch 'develop' of http://172.16.29.40:8010/huhai/WMSV1 into develop
b2ad2003

pengcheng authored
6 years ago
Browse Dir »
优化serviceImpl代码，避免重复代码和代码冗长，货主的仓库问题
64ddc127

pengcheng authored
6 years ago
Browse Dir »
出库组盘明细加上物料名称
ea273af1

tangying authored
6 years ago
Browse Dir »
Merge branch 'develop' of http://172.16.29.40:8010/huhai/WMSV1 into develop
8bafd52b

tangying authored
6 years ago
Browse Code »
解决session中的user被修改问题，改为克隆一个user返回，修改session中货主组的变量名
1dd436dc

tangying authored
6 years ago
Browse Dir »
Merge remote-tracking branch 'origin/develop' into develop ...
fedd06ec
```
# Conflicts:
#	src/main/resources/templates/inventory/inventoryTransaction/inventoryTransaction.html
```
xqs authored
6 years ago
Browse Dir »
Merge branch 'develop' of http://172.16.29.40:8010/huhai/WMSV1 into develop
becbc752

mocan authored
6 years ago
Browse Dir »
库存交易和库存查看添加按ID排序（降序）
af667e5d

mocan authored
6 years ago
Browse Dir »
压缩huahengUI.js，修改版本为V2.3.1
01a02be4

xqs authored
6 years ago
Browse Dir »
Merge branch 'develop' of http://172.16.29.40:8010/huhai/WMSV1 into develop
e5dcb8d6

tangying authored
6 years ago
Browse Code »
解决session中的user被修改问题，改为克隆一个user返回
74b343b4

tangying authored
6 years ago
Browse Dir »
Merge branch 'develop' of http://172.16.29.40:8010/huhai/WMSV1 into develop
6cea709f

魏娟 authored
6 years ago
Browse Dir »
统一输入框的样式，这个另类了...
33fcc0d8

魏娟 authored
6 years ago
Browse Dir »
Merge branch 'develop' of http://172.16.29.40:8010/huhai/WMSV1 into develop
0fb05642

xqs authored
6 years ago
Browse Dir »
huahengUI.增加查看方法-checklook, ...
d593d82b
```
容器调用checklook方法
```
xqs authored
6 years ago
Browse Dir »
Merge branch 'develop' of http://172.16.29.40:8010/huhai/WMSV1 into develop
8c1b63b5

魏娟 authored
6 years ago
Browse Dir »
库存-库存交易，删除“新增与删除”
703edf0b

魏娟 authored
6 years ago
Browse Dir »
Merge branch 'develop' of http://172.16.29.40:8010/huhai/WMSV1 into develop ...
4d5bd739
```
# Conflicts:
#	src/main/resources/mybatis/inventory/InventoryMapper.xml
```
tangying authored
6 years ago
Browse Dir »
修改盘点的货主bug问题
45c33d10

tangying authored
6 years ago
Browse Dir »
Merge branch 'develop' of http://172.16.29.40:8010/huhai/WMSV1 into develop
6374ad21

xqs authored
6 years ago
Browse Dir »
修复任务管理完成SQL报错
0ebcc8b2

xqs authored
6 years ago
Browse Dir »