 曾贞一
|
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 |
|
曾贞一
|
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 |
|
刘敏
|
8034e9e505
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
刘敏
|
da1c9af3d4
|
库存报表新增
|
6 years ago |
|
曾贞一
|
47d4a53706
|
Merge branch 'dev'
# 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 |
|
曾贞一
|
8b457c0618
|
DEV 合并 TEST pom.xml文件修改
|
6 years ago |
于学杰
|
4235184afc
|
Merge branch 'Process' into dev
|
6 years ago |
|
于学杰
|
e7913cfb26
|
1. 从 TEST 合并代码后 POM 文件中引用的版本不正确，修改为 DEV
|
6 years ago |
|
于学杰
|
24da688384
|
Merge branch 'test' into dev
|
6 years ago |
|
许心洁
|
b3f4e62a74
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into Process
|
6 years ago |
|
刘敏
|
794d4b69d6
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
刘敏
|
145600a5d0
|
单据查询精准查询
|
6 years ago |
|
许心洁
|
31313baec9
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into Process
|
6 years ago |
|
许心洁
|
f6c425c649
|
平台获取设备ID方式改变+所有pojo加上序列化
|
6 years ago |
|
曾贞一
|
3db421b825
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
b3a0a71065
|
库存初始化信息
|
6 years ago |
|
wei.peng
|
837d6ea567
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
许心洁
|
af7b2404dd
|
Merge branch 'Process' of http://git.estsh.com/i3-IMPP/i3plus-pojo into Process
|
6 years ago |
|
许心洁
|
d8786d8132
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
a4f2a7c848
|
hql修改asn订单明细
|
6 years ago |
peter.pan
|
f365dc197f
|
Merge branch 'test'
|
6 years ago |
|
peter.pan
|
4d83030c51
|
Merge branch 'dev' into test
|
6 years ago |
|
许心洁
|
6431417462
|
dragon
|
6 years ago |