WYnneaoapc
|
030391a93c
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
WYnneaoapc
|
56d7457826
|
工位监控提交
|
6 years ago |
 曾贞一
|
5e7fb00d0c
|
【生产领料】
|
6 years ago |
许心洁
|
1f1b4f7511
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
陈思洁
|
48a6cdc39c
|
作业任务：作业类型 枚举增加
|
6 years ago |
crish
|
e260045c42
|
Merge remote-tracking branch 'origin/test' into test
|
6 years ago |
|
crish
|
97763d6b53
|
安灯广播， 安灯管理显示不同界面， 添加操作来源字段
|
6 years ago |
 王杰
|
b561110e54
|
Merge branch 'dev' into test
|
6 years ago |
|
王杰
|
9cc89f9397
|
mes设备周期计划
|
6 years ago |
|
许心洁
|
2f843a8f5a
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
许心洁
|
88754f9a71
|
收货看板重写
|
6 years ago |
|
许心洁
|
986157043d
|
流程设计：新增组件参数类型：可配字符串
|
6 years ago |
于学杰
|
68a6c85068
|
Merge branch 'dev' into test
|
6 years ago |
|
陈思洁
|
cd8bd3a68b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
3828b4863c
|
添加保质期字段
|
6 years ago |
|
曾贞一
|
dfdb6be4bb
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
6a9924eda6
|
【VDA生产领料】 FIFO推荐组件
|
6 years ago |
|
crish
|
ce187f9720
|
安灯广播
|
6 years ago |
 钮海涛
|
8a316ff2d5
|
add mrp function to aps
|
6 years ago |
|
王杰
|
ef3be61f66
|
Merge branch 'dev' into test
|
6 years ago |
|
王杰
|
14123c008e
|
mes设备周期计划
|
6 years ago |
jokelone
|
ffdb547dc7
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jokelone
|
203b53d3b3
|
解决冲突
|
6 years ago |
|
jokelone
|
da97adcbc7
|
更改db地址清单名称
|
6 years ago |
wei.peng
|
e7e4a8587f
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
于学杰
|
75bb3f4780
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
于学杰
|
fcefe8de38
|
1. 通用接口增加调用软适配的功能（使用脚本引擎实现）
|
6 years ago |
|
王杰
|
611b25abfd
|
Merge branch 'dev' into test
|
6 years ago |
|
王杰
|
9a6b1c4bf1
|
mes设备作业周期计划
|
6 years ago |
|
jokelone
|
2238bee7d4
|
增加查询结果设备名称
|
6 years ago |
汪云昊
|
d91fa61c88
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
汪云昊
|
6c1891c193
|
软适配报文状态及微服务接口调整
|
6 years ago |
|
wei.peng
|
05fd0fe686
|
WebService Server 优化完成
|
6 years ago |
|
许心洁
|
7863325afd
|
本地误拉了测试的代码，还原后提交，在测试分支拉开发分支的代码也得还原
|
6 years ago |
|
许心洁
|
b7b78b85ac
|
误拉了test分支的代码：还原
|
6 years ago |
|
许心洁
|
d351c36ffc
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
WYnneaoapc
|
c681340355
|
工位监控添加枚举一字段
|
6 years ago |
|
汪云昊
|
1910892503
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
许心洁
|
99cf6c8997
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
汪云昊
|
52a5fe74af
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
汪云昊
|
f5801ba43b
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
许心洁
|
d664d4e5f6
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
wei.peng
|
508bc3589b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
汪云昊
|
74fb558135
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
汪云昊
|
95a354f537
|
解决无法处理bug
|
6 years ago |
|
wei.peng
|
029f14d36f
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
Conflicts:
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDatasource.java
|
6 years ago |
刘辉
|
83a7a9e988
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
wei.peng
|
d9dd10761e
|
WebService 欧洲对接完成
|
6 years ago |
changjiang.gao
|
9e1b86eb2b
|
导出显示bug修改
|
6 years ago |
|
王杰
|
2ed8ebdbd7
|
Merge branch 'dev' into test
|
6 years ago |