4ff3677fba
Merge branch 'test' into dev
6 years ago
0aef9adac9
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
1328dc7ddd
#Merge branch 'dev' of http://git.estsh.com/i3-MES/i3plus-mes-pcn into dev
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
6 years ago
7ee5312303
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
dd418f8b51
开线信号发送逻辑修改
...
Signed-off-by: crish <570360737@qq.com>
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
4d00397411
修改盘点范围的排序规则
6 years ago
e83efe76e0
软件适配器 测试
6 years ago
1d587f831b
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
王杰
3348d5c81a
merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
王杰
e4aadf35ed
mes生产工单页面按钮控制
6 years ago
王杰
4f37dc42ef
pojo-mes-time-update-wangjie
6 years ago
0b13c6dd70
order by 列类型装换
6 years ago
f10ff69ce0
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
1d55cd22a6
order by 列类型装换
6 years ago
39a00d3a19
order by 列类型装换
6 years ago
7eed51791f
软件适配器-定时适配任务
6 years ago
1b30b927ce
自定义表单功能优化
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
2ca432b6a8
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
f2380f6d14
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
02d60ed1a8
软件适配器-数据适配转换
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
3711873c29
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
c34a369e93
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
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
ef1450e912
Merge branch 'dev' of http://git.estsh.com/i3-MES/i3plus-mes-pcn into dev
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
6 years ago
6c37a60ff4
MES-PCN获取平台打印数据
...
Signed-off-by: crish <570360737@qq.com>
6 years ago
e9c596adce
盘点hql排序修改
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
94924cb264
POJO 合并
6 years ago
718ec36747
POJO 合并
6 years ago
41aff3b560
``
6 years ago
619251474d
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
f5c0ca9383
软适配模型调整
6 years ago
曾贞一
abf155ecd9
库存报表 创建人、创建时间添加
6 years ago
c05e3b13c6
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
391d0129e1
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
63d86a4b0d
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
ecba29948f
816 add method
6 years ago
221f05b175
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
69525fbaa9
表单菜单排序
6 years ago
839c139222
库存移动条码报表优化
6 years ago
235498b162
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
WYnneaoapc
crish
曾贞一
陈思洁
汪云昊
王杰
wei.peng
刘敏
jimmy.zeng