汪云昊
|
56381b76f1
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
汪云昊
|
db019bf4eb
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
jenkins
|
d44d5d79ab
|
Jenkins自动合并
|
6 years ago |
|
汪云昊
|
26e7f975bf
|
数据源适配器支持IN
|
6 years ago |
 钮海涛
|
0dddbb936c
|
新增报表接口
|
6 years ago |
|
汪云昊
|
f5a0f24355
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
汪云昊
|
f2c0c1206a
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
汪云昊
|
3faa679cf9
|
Job测试
新增资源初始化方式（导入，导出）
异常日志持久化bug
OPC服务
MQ管理接口
|
6 years ago |
 王杰
|
6da48220a5
|
Merge branch 'dev' into test
|
6 years ago |
|
王杰
|
6959d126a0
|
增加枚举
|
6 years ago |
crish
|
376700de0d
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
钮海涛
|
d4f963ee70
|
新增报表接口
|
6 years ago |
|
crish
|
74224b20ac
|
安灯主界面开发
|
6 years ago |
陆卫豪
|
7556ada2d4
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
王杰
|
9e64ee8258
|
【需求：1221，导入】
|
6 years ago |
|
jenkins
|
8a34eee5c5
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
jokelone
|
a49fdf87b8
|
【任务：1211报表质量数据】
|
6 years ago |
陈思洁
|
d5ff3e4ce1
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
54d3e351be
|
合并冲突
|
6 years ago |
|
陆卫豪
|
5af777c4fd
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
WYnneaoapc
|
b69bd1ae53
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
WYnneaoapc
|
ed89db8be3
|
6565 更新 同步流程
|
6 years ago |
|
jenkins
|
dcd36cb6e5
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
gcj
|
af1324e9c7
|
【采购收货】
|
6 years ago |
wei.peng
|
6d5fc7ab39
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
wei.peng
|
25cbbb5837
|
雪花ID 生成器 改为prop 配置
|
6 years ago |
|
王杰
|
73b1e827d6
|
Merge branch 'dev' into test
|
6 years ago |
|
王杰
|
1ab2c3605a
|
【需求：1221，导入】
|
6 years ago |
|
王杰
|
e9055e3c5d
|
Merge branch 'dev' into test
|
6 years ago |
|
王杰
|
2893d13e9f
|
需求1221，导入
|
6 years ago |
|
jenkins
|
f6506bdd0b
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
 曾贞一
|
ca6b596b14
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
47ccfcc9e3
|
【EU成品发运-检查数量组件】【bug1177】
【EU成品发运-检查单据是否操作完成组件】【bug1176】
【EU成品发运-成品发运FIFO推荐组件】【bug1174】
|
6 years ago |
|
王杰
|
1d920627ec
|
Merge branch 'dev' into test
|
6 years ago |
|
钮海涛
|
5f3f973c3e
|
新增报表接口
|
6 years ago |
|
王杰
|
a41c00f129
|
Merge branch 'dev' into test
|
6 years ago |
|
jokelone
|
5bc9b9b082
|
【任务：1193字段类型修改】
|
6 years ago |
|
王杰
|
dd0304d713
|
Merge branch 'dev' into test
|
6 years ago |
|
jokelone
|
3eda200854
|
【bug：6545类型信息增加枚举】
|
6 years ago |
|
王杰
|
09cf450156
|
Merge branch 'dev' into test
|
6 years ago |
|
crish
|
4d3adf5daf
|
Merge branch 'dev' into test
|
6 years ago |
|
汪云昊
|
f0e77305dd
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
汪云昊
|
3856a6d600
|
LAC调整微服务指令集操作方式
OPC UA工具订阅方式调整
|
6 years ago |
|
1111
|
f0290a758d
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
1111
|
e349ab3e9b
|
【采购收货】
|
6 years ago |
|
wei.peng
|
11bc240347
|
功能权限国际完成
|
6 years ago |
|
crish
|
55ee26db3c
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
crish
|
f836daf8a6
|
将广播设备写死的代码配置化
|
6 years ago |
|
陆卫豪
|
62800f757e
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
WYnneaoapc
|
185b40a586
|
6518 管控代码修改
|
6 years ago |