 曾贞一
|
b10b967b73
|
Merge remote-tracking branch 'remotes/origin/test'
|
6 years ago |
jimmy.zeng
|
d340133e7a
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
陈思洁
|
f56f8d714b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
617bb73dad
|
增加业务类型字段、修改临时变量字段类型
修改hql查询字段
|
6 years ago |
刘敏
|
a83b552203
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
刘敏
|
2bc04b407e
|
计划日期、时间新增
|
6 years ago |
许心洁
|
cb49d8d848
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
ffb6f8a17c
|
任务列表不分页，主要查询字段加索引
|
6 years ago |
|
jimmy.zeng
|
4359f347c6
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
曾贞一
|
acd1e6cfb6
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
ce70994a57
|
盘点 按照盘点差异类型汇总
|
6 years ago |
|
jimmy.zeng
|
a2a4dc6beb
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
陈思洁
|
4d00397411
|
修改盘点范围的排序规则
|
6 years ago |
wei.peng
|
e8741ec364
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
陈思洁
|
b3a552d65d
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
070bacf20e
|
所有外部单据增加创建时间和创建人的查询条件
|
6 years ago |
|
曾贞一
|
7fab9a4d89
|
Merge remote-tracking branch 'remotes/origin/test'
|
6 years ago |
|
jimmy.zeng
|
0d532b78c0
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
曾贞一
|
e1cb06da5c
|
Merge remote-tracking branch 'remotes/origin/test'
|
6 years ago |
|
jimmy.zeng
|
483ea59142
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
刘敏
|
7a935276a1
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
刘敏
|
bc953bb2c8
|
查询条件封装
|
6 years ago |
|
刘敏
|
de381d438a
|
领料单模板创建
|
6 years ago |
|
曾贞一
|
9d70008912
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
61ce4d1b3f
|
优化
|
6 years ago |
汪云昊
|
b9d9d7402e
|
Merge remote-tracking branch 'remotes/origin/test'
|
6 years ago |
|
jimmy.zeng
|
ef40914935
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
陈思洁
|
e9c596adce
|
盘点hql排序修改
|
6 years ago |
|
jimmy.zeng
|
02baed5dbf
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
陈思洁
|
4573b09392
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
2058789438
|
盘点业务修改bug
|
6 years ago |
|
jimmy.zeng
|
7002ac5a8a
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
曾贞一
|
abf155ecd9
|
库存报表 创建人、创建时间添加
|
6 years ago |
|
jimmy.zeng
|
221f05b175
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
刘敏
|
839c139222
|
库存移动条码报表优化
|
6 years ago |
|
jimmy.zeng
|
235498b162
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
陈思洁
|
638d9cb1a1
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
9ff9c11c97
|
字段调整
|
6 years ago |
|
曾贞一
|
fbe8544a02
|
Merge remote-tracking branch 'remotes/origin/test'
|
6 years ago |
|
曾贞一
|
cef48801df
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
许心洁
|
a713e835fd
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
wei.peng
|
aee54acafc
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
曾贞一
|
ff52a412d4
|
库存初始化信息
|
6 years ago |
|
陈思洁
|
b604c5d9a0
|
交易记录增加字段
|
6 years ago |
|
许心洁
|
92d4bf46ce
|
#5255,#5039
|
6 years ago |
|
曾贞一
|
7a62200736
|
Merge remote-tracking branch 'remotes/origin/test'
# Conflicts:
# modules/i3plus-pojo-andon/pom.xml
# modules/i3plus-pojo-base/pom.xml
# modules/i3plus-pojo-form/pom.xml
# modules/i3plus-pojo-hardswitch/pom.xml
# modules/i3plus-pojo-jobflow/pom.xml
# modules/i3plus-pojo-lac/pom.xml
# modules/i3plus-pojo-mes-pcn/pom.xml
# modules/i3plus-pojo-mes/pom.xml
# modules/i3plus-pojo-model/pom.xml
# modules/i3plus-pojo-platform/pom.xml
# modules/i3plus-pojo-report/pom.xml
# modules/i3plus-pojo-softswitch/pom.xml
# modules/i3plus-pojo-sweb/pom.xml
# modules/i3plus-pojo-wms/pom.xml
# modules/i3plus-pojo-workflow/pom.xml
# pom.xml
|
6 years ago |
|
曾贞一
|
7ca6e46e4b
|
Merge branch 'dev' into test
|
6 years ago |
|
jimmy.zeng
|
bf293d4758
|
生产报工时，原材料move单号写入关联移动单号中
|
6 years ago |
|
刘敏
|
dacc203119
|
库存报表修改
|
6 years ago |
|
曾贞一
|
380efb664e
|
Merge branch 'dev' into test
|
6 years ago |