许心洁
|
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 |
|
汪云昊
|
52a5fe74af
|
Merge remote-tracking branch 'remotes/origin/dev' 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 |
|
changjiang.gao
|
0e7c7fbfb2
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
changjiang.gao
|
45b4264c67
|
导出显示bug修改
|
6 years ago |
|
jokelone
|
1758a4e50e
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jokelone
|
a79769d229
|
mes-pcn枚举
|
6 years ago |
|
王杰
|
37f7e92d53
|
mes实体类
|
6 years ago |
|
许心洁
|
8deff73454
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
jokelone
|
f15574fc9f
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jokelone
|
5d730ed5c8
|
解决冲突
|
6 years ago |
|
wei.peng
|
f35461ef57
|
WebService Server 优化完成
|
6 years ago |
|
jokelone
|
72bdd253fa
|
解决冲突
|
6 years ago |
|
changjiang.gao
|
ef08c52411
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
changjiang.gao
|
647508d92c
|
导出显示bug修改
|
6 years ago |
|
wei.peng
|
508d4b5aba
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
Conflicts:
modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java
|
6 years ago |
|
汪云昊
|
d83de01d33
|
服务端适配日志bug解决
|
6 years ago |
|
刘辉
|
722146acd8
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
汪云昊
|
624751a697
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
汪云昊
|
9ac327e622
|
细节调整
|
6 years ago |
|
bleakney.liu
|
417b4a09db
|
代码格式优化增加枚举
|
6 years ago |
|
bleakney.liu
|
29fee6b028
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
bleakney.liu
|
746a04f96d
|
代码格式优化
|
6 years ago |
|
许心洁
|
d406532b37
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
wei.peng
|
1e5e35ee6f
|
Pojo 合并代码
|
6 years ago |
|
wei.peng
|
babaf2f7d6
|
WebService 客户端Xml参数调试成功
|
6 years ago |
|
汪云昊
|
fe1e83609e
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
汪云昊
|
f3867c64f4
|
软适配微服务接口
|
6 years ago |
|
wei.peng
|
61a38c9acd
|
WebService Server 优化完成
|
6 years ago |
|
许心洁
|
6fc4474699
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
lbwgithub
|
456657489f
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
lbwgithub
|
a4d873f36f
|
添加过滤条件
|
6 years ago |
|
许心洁
|
a961da57ef
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
bleakney.liu
|
afe19bf6eb
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
bleakney.liu
|
778c1a79a7
|
【静态盘点】增加库存调整盘点
|
6 years ago |
|
jokelone
|
9e2b13e3ad
|
解决冲突
|
6 years ago |
|
crish
|
dc3fd624f2
|
Merge branch 'dev' into test
|
6 years ago |
|
jokelone
|
219b2d2ad3
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jokelone
|
104d308d30
|
PLC DB 设备故障 过程质量检测
|
6 years ago |
|
crish
|
8148fc86e6
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
crish
|
c39462cd35
|
安灯广播
|
6 years ago |
|
许心洁
|
b22c6fbcaf
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
王杰
|
d814887570
|
mes设备
|
6 years ago |
|
许心洁
|
b43f4aef72
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
lbwgithub
|
73b8fd1de4
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
lbwgithub
|
09ea0929e4
|
枚举
|
6 years ago |
陆卫豪
|
a791430fec
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
WYnneaoapc
|
df6f432534
|
1012 修改绑定关键件 和 工序bom添加isBindKey
|
6 years ago |
|
许心洁
|
f778b15ea5
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
WYnneaoapc
|
20843e06a6
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
WYnneaoapc
|
4654fad2bd
|
1011 生成条码工步
|
6 years ago |
|
crish
|
e79ff6946a
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
crish
|
db26628d9f
|
安灯广播
|
6 years ago |
|
王杰
|
096c02d42d
|
修改
|
6 years ago |
|
王杰
|
24a3b0e2b0
|
mes字段
|
6 years ago |
|
陈思洁
|
91fada5cc0
|
枚举修改
|
6 years ago |
|
crish
|
b6179f9f71
|
Merge branch 'dev' into test
|
6 years ago |
|
crish
|
be63f4eab9
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
crish
|
37e2a88ca7
|
物理安灯和软件安灯插入安灯附属表的逻辑
|
6 years ago |
|
王杰
|
5debda474d
|
Merge branch 'dev' into test
|
6 years ago |
|
王杰
|
2a1274df65
|
mes组织模型
|
6 years ago |
|
许心洁
|
04cdf58aef
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
lbwgithub
|
abd2321850
|
格式化代码
|
6 years ago |
|
lbwgithub
|
658b25bd65
|
格式化代码
|
6 years ago |
|
lbwgithub
|
11676cb942
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
lbwgithub
|
3ebf17adb1
|
格式化代码
|
6 years ago |
|
lbwgithub
|
926c9c3d60
|
方法移值
|
6 years ago |