Commits · 0c5f4ada87f3bbbc94f05451e1bb1468646a45df · zhangyusheng / YX_IDENT_REFACTORING

19 Dec, 2018 1 commit
- 添加了groupList的实体,service,Impl,在SpecialCard的xml增加了查找特殊证件表的方法 · 0c5f4ada
  Administrator authored Dec 19, 2018
  
  0c5f4ada
18 Dec, 2018 4 commits
- Merge remote-tracking branch 'origin/dev' into dev · 5bed5387
  Administrator authored Dec 18, 2018
```
# Conflicts:
#	src/main/resources/mapper/GroupNoMapper.xml
```
  5bed5387
- 修改了typeList,groupList的xml,增添了TypeList实体 · faae0a54
  Administrator authored Dec 18, 2018
  
  faae0a54
- 更新组号列表的实体 · 02ec270d
  Administrator authored Dec 18, 2018
  
  02ec270d
- 更新组号列表的实体 · 01dc90ed
  Administrator authored Dec 18, 2018
  
  01dc90ed
14 Dec, 2018 2 commits
- Merge remote-tracking branch 'origin/dev' into dev · 85e0aabd
  Administrator authored Dec 14, 2018
  
  85e0aabd
- 修改了groupList,conutyList,typeList,派出所申领表,交接单,出入库时间,出入库数 · 8a6d8bc9
  Administrator authored Dec 14, 2018
  
  8a6d8bc9
13 Dec, 2018 1 commit

Administrator authored Dec 13, 2018

添加更新入库页面
添加交接单页面
修改查询生产统计报表页面

5c165924

12 Dec, 2018 3 commits
- 添加废证页面 · f73676d5
  Administrator authored Dec 12, 2018
```
添加查询证件页面
添加受理信息页面
添加特殊证件页面
```
  f73676d5
- Merge remote-tracking branch 'origin/dev' into dev · 53b2cac0
  Administrator authored Dec 12, 2018
  
  53b2cac0
- 编写任务单页面 · a6a4e88e
  Administrator authored Dec 12, 2018
  
  a6a4e88e
11 Dec, 2018 4 commits
- 修改了groupList,conutyList,typeList,派出所申领表,交接单, · fd92d9d4
  Administrator authored Dec 11, 2018
  
  fd92d9d4
- 修改了groupList,conutyList,typeList,派出所申领表,交接单, · 3d495c0e
  Administrator authored Dec 11, 2018
  
  3d495c0e
- Merge remote-tracking branch 'origin/dev' into dev · 5b1715d0
  Administrator authored Dec 11, 2018
  
  5b1715d0
- 除了下载交接单以外的大部分的接口已完成 · c457ef0b
  Administrator authored Dec 11, 2018
  
  c457ef0b
05 Dec, 2018 3 commits
- 完成通过视图查询卡基统计报表 · 381c8bd4
  xuwang authored Dec 05, 2018
```
查询在受理库任务单详情
```
  381c8bd4
- Merge remote-tracking branch 'origin/dev' into dev · a0e2ed0b
  xuwang authored Dec 05, 2018
  
  a0e2ed0b
- 补充上次忘记的文件 · b1570851
  xuwang authored Dec 05, 2018
  
  b1570851
03 Dec, 2018 2 commits
- Merge remote-tracking branch 'origin/dev' into dev · 00a640b3
  Administrator authored Dec 03, 2018
  
  00a640b3
- 修改了通过地市,区县,派出所查询派出所申领表 · b263c7b7
  Administrator authored Dec 03, 2018
  
  b263c7b7
27 Nov, 2018 4 commits
- Merge remote-tracking branch 'origin/dev' into dev · 50f6e2e5
  xuwang authored Nov 27, 2018
  
  50f6e2e5
- 完成通过视图查询卡基统计报表 · 16c34d84
  xuwang authored Nov 27, 2018
```
查询在受理库任务单详情
```
  16c34d84
- 完成通过视图查询卡基统计报表 · 81654509
  xuwang authored Nov 27, 2018
```
查询在受理库任务单详情
```
  81654509
- 下载装箱单并连接盈信库 · b817ff81
  Administrator authored Nov 27, 2018
```
更新异常状态并更新异常信息
更新出库时间和入库时间
查询交接单
```
  b817ff81
20 Nov, 2018 10 commits
- Merge branch 'dev' of http://121.22.111.250:8000/zhangyusheng/YX_IDENT_REFACTORING into dev · 67e09846
  xuwang authored Nov 20, 2018
  
  67e09846
- pull · fea7f976
  xuwang authored Nov 20, 2018
  
  fea7f976
- Merge remote-tracking branch 'origin/dev' into dev · 51213b5f
  Administrator authored Nov 20, 2018
  
  51213b5f
- 下载装箱单并连接盈信库 · d65c69bc
  Administrator authored Nov 20, 2018
```
更新异常状态并更新异常信息
更新出库时间和入库时间
查询交接单
```
  d65c69bc
- 编写页面 · b0884e93
  Administrator authored Nov 20, 2018
  
  b0884e93
- Merge remote-tracking branch 'origin/dev' into dev · b53ecaf6
  Administrator authored Nov 20, 2018
```
# Conflicts:
#	src/main/java/com/yxproject/start/entity/CountyListInfoEntity.java
#	src/main/java/com/yxproject/start/service/impl/TaskServiceImpl.java
```
  b53ecaf6
- 下载装箱单并连接盈信库 · b4b3adcf
  Administrator authored Nov 20, 2018
```
更新异常状态并更新异常信息
更新出库时间和入库时间
```
  b4b3adcf
- 下载装箱单并连接盈信库 · 359d1836
  Administrator authored Nov 20, 2018
```
更新异常状态并更新异常信息
更新出库时间和入库时间
```
  359d1836
- 下载装箱单并连接盈信库 · b2a253d0
  Administrator authored Nov 20, 2018
```
更新异常状态并更新异常信息
更新出库时间和入库时间
```
  b2a253d0
- 更新实体对应字段 · 60d0b2da
  Administrator authored Nov 20, 2018
  
  60d0b2da
19 Nov, 2018 6 commits

Merge remote-tracking branch 'origin/dev' into dev · 17dccbab

Administrator authored Nov 19, 2018

# Conflicts:
#	src/main/java/com/yxproject/start/api/AdminApi.java
#	src/main/java/com/yxproject/start/api/UserApi.java

17dccbab

push · de04730a
Administrator authored Nov 19, 2018

de04730a
下载装箱单并连接盈信库 · 14857152
Administrator authored Nov 19, 2018
```
更新异常状态并更新异常信息
更新出库时间和入库时间
```
14857152
下载装箱单并连接盈信库 · 52c3ee46
Administrator authored Nov 19, 2018
```
更新异常状态并更新异常信息
更新出库时间和入库时间
```
52c3ee46
Merge remote-tracking branch 'origin/dev' into dev · 6bef8517
Administrator authored Nov 19, 2018

6bef8517

Merge remote-tracking branch 'origin/dev' into dev · 02557039

Administrator authored Nov 19, 2018

# Conflicts:
#	pom.xml
#	src/main/java/com/yxproject/start/api/ShiroApi.java
#	src/main/java/com/yxproject/start/config/JerseyConfig.java
#	src/main/java/com/yxproject/start/entity/GroupinfoEntity.java
#	src/main/java/com/yxproject/start/entity/ProductionTaskListEntity.java
#	src/main/java/com/yxproject/start/mapper/GroupinfoMapper.java
#	src/main/java/com/yxproject/start/mapper/ProductionTaskListMapper.java
#	src/main/java/com/yxproject/start/service/ProductionTaskListService.java
#	src/main/java/com/yxproject/start/service/impl/TaskServiceImpl.java
#	src/main/resources/application.properties
#	src/main/resources/mapper/GroupinfoMapper.xml
#	src/main/resources/mapper/ProductionTaskListMapper.xml

02557039