 王杰
|
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 |
|
王杰
|
921859f4de
|
Merge branch 'dev' into test
|
6 years ago |
|
王杰
|
6c54f204b7
|
mes设备
|
6 years ago |
|
王杰
|
982f8ad741
|
mes设置组织模型
|
6 years ago |
|
lbwgithub
|
d11058019b
|
枚举
|
6 years ago |
|
lbwgithub
|
cf3ee95623
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
lbwgithub
|
6596931124
|
枚举
|
6 years ago |
|
许心洁
|
56f7048098
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
crish
|
4b032ac426
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
crish
|
16073eb7e5
|
安灯附属表插入时， 完整数据； 添加安灯来源接口
|
6 years ago |
|
许心洁
|
89ab1816e3
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
lbwgithub
|
8d7c77d3ed
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
lbwgithub
|
71a68e8cf6
|
枚举
|
6 years ago |
|
许心洁
|
c955047746
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
许心洁
|
1769e7765f
|
加了main方法发版报错
|
6 years ago |
|
王杰
|
95cc0b433e
|
mes组织模型bug修复
|
6 years ago |
|
王杰
|
18bc35f60d
|
Merge branch 'dev' into test
|
6 years ago |
|
lbwgithub
|
c67fe92297
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
lbwgithub
|
3e8bcbeb84
|
枚举
|
6 years ago |
 钮海涛
|
5c68a15d0c
|
add mrp function to aps
|
6 years ago |
|
WYnneaoapc
|
60f441e685
|
Merge branch 'dev' into test
|
6 years ago |
|
WYnneaoapc
|
76149da904
|
提交
|
6 years ago |
|
WYnneaoapc
|
a1525eae8b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
wei.peng
|
d495046dcf
|
添加XML 工具实现
|
6 years ago |
|
WYnneaoapc
|
18ec7d091a
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
WYnneaoapc
|
c9a572469c
|
同步限制解除
|
6 years ago |
|
lbwgithub
|
473e2caea0
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
lbwgithub
|
2cf4759c21
|
枚举
|
6 years ago |
|
刘辉
|
60d1798b9c
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
王杰
|
ddfb47e6ac
|
mes设备台账功能开发
|
6 years ago |
|
陈思洁
|
0bdc3592e2
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
f67e7df17f
|
新增冗余字段
|
6 years ago |
 曾贞一
|
28af3c27e3
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
320c7f6b1f
|
【生产快速入库】生产快速入库导入接口
|
6 years ago |
|
汪云昊
|
de685a0627
|
删除pojo数据默认值
|
6 years ago |
|
汪云昊
|
9553e962e3
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
汪云昊
|
bd55a18bf6
|
微服务接口 - 打印模板分页查询
|
6 years ago |
|
曾贞一
|
9d3b45d2e2
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
ddd91f51b5
|
【生产快速入库】组件选择，任务编号1051
|
6 years ago |
|
许心洁
|
232c675444
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
许心洁
|
d2c3045575
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
84a96a22fa
|
新加NotNumBiggerPackContainsZero方法
|
6 years ago |
|
lbwgithub
|
4477820c1b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
lbwgithub
|
68b0058e1b
|
枚举
|
6 years ago |
|
许心洁
|
1b5df102e7
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
许心洁
|
ccd04804c0
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
95f156adf4
|
所有double类型的属性都要加上精度注解，否则数据库中自动生成的类型为double
|
6 years ago |
|
陆卫豪
|
6c434e114d
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
WYnneaoapc
|
8cca6706b2
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
WYnneaoapc
|
4eada1c343
|
表同步
|
6 years ago |
|
许心洁
|
1a7b4e3438
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
刘辉
|
1defd0d8be
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
陈思洁
|
113bb8755d
|
解决冲突
|
6 years ago |
|
陈思洁
|
4ac7bae38b
|
新增hql
|
6 years ago |
|
bleakney.liu
|
0fa1ffa23b
|
[物流线路修改]修改数据类型
|
6 years ago |
|
bleakney.liu
|
f682d056be
|
[物流线路管理]修改查询条件
|
6 years ago |
|
许心洁
|
653c8dca1f
|
直送发运扣减JOB过滤打印状态为线边退料生成的条码的代码逻辑错误
|
6 years ago |
|
WYnneaoapc
|
a11eeae45c
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
WYnneaoapc
|
7ee11674ab
|
读取托盘
|
6 years ago |
|
crish
|
7646e1fcfc
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
曾贞一
|
e24474fc8c
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
2b62357ab5
|
VDA收货【生产快速入库】组件，任务编号1051
|
6 years ago |
|
wei.peng
|
cecd37a1e7
|
添加Xml 工具
|
6 years ago |
|
许心洁
|
1d17198daf
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
WYnneaoapc
|
9b6887dd40
|
#1050 工位监控
|
6 years ago |
|
王杰
|
72c9a5892d
|
修改注释
|
6 years ago |
|
汪云昊
|
ac1c18581e
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
汪云昊
|
d8c740819c
|
FTP适配器
|
6 years ago |