 曾贞一
|
f30a40520b
|
Merge branch 'dev' into test
|
6 years ago |
WYnneaoapc
|
d826c47d5a
|
修改了mesEvent pojo
|
6 years ago |
|
曾贞一
|
8b457c0618
|
DEV 合并 TEST pom.xml文件修改
|
6 years ago |
于学杰
|
e7913cfb26
|
1. 从 TEST 合并代码后 POM 文件中引用的版本不正确，修改为 DEV
|
6 years ago |
|
WYnneaoapc
|
3dca11a963
|
add a hql
|
6 years ago |
peter.pan
|
363d521c36
|
Merge branch 'test'
|
6 years ago |
|
peter.pan
|
d45b7b77f3
|
Merge branch 'dev' into test
|
6 years ago |
|
WYnneaoapc
|
33a59fdb0f
|
0730 add esop pojo and respository
|
6 years ago |
wei.peng
|
bec3a7098d
|
Merge remote-tracking branch 'remotes/origin/test'
|
6 years ago |
jenkins
|
25fc477991
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
许心洁
|
e9b1d7e595
|
添加条码校验逻辑+工步跳转代码优化+数据同步BUG修改
|
6 years ago |
wei.peng
|
9c201c70e8
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
yiming.gu
|
8a0ecfbaa9
|
新增mes查询条件
|
6 years ago |
汪云昊
|
c07858d5ba
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
许心洁
|
32b0c5080d
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
yiming.gu
|
088dc7dfa4
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
yiming.gu
|
2b59998d16
|
新增mes-pcn同步配置基础数据
|
6 years ago |
|
许心洁
|
d7ba3d445a
|
MES数据同步-POJO调整
|
6 years ago |
|
jenkins
|
28ae6cf85d
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
crish
|
e874862455
|
socket动态配置
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
|
汪云昊
|
a37b9b60aa
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
许心洁
|
5e46ecfe13
|
MES流程配置第一次完整测试JIT队列修改
|
6 years ago |
allen.zhang
|
67e3851a86
|
Merge branch 'dev' into test
|
6 years ago |
|
许心洁
|
5a044130ea
|
MES和MES-PCN产品条码PRODUCT_SN对象属性统一+WMS流程组件去工厂
|
6 years ago |
|
许心洁
|
ae4b32251a
|
WMS【添加“重新推送未处理的移动单到队列”接口+BUG修复：定时处理错误移动单查询移动单没有加上工厂代码+QC推送队列直接放了一整个对象导致交易处理主程序无法解析】MES【JIT队列execute方法+条码校验工步】
|
6 years ago |
|
allen.zhang
|
9eb207145c
|
Merge branch 'dev' into test
|
6 years ago |
jiajack
|
ebfee3d774
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jiajack
|
d3d25f0baa
|
Pcn节点向Mes主服务注册机制代码编写
|
6 years ago |
|
allen.zhang
|
a152d8d565
|
Merge branch 'dev' into test
|
6 years ago |
|
crish
|
1f6eb341cd
|
修改报错
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
|
yiming.gu
|
43c2dd4092
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
yiming.gu
|
63ddfd5a53
|
MES新增基础数据查询条件
|
6 years ago |
|
allen.zhang
|
d714733a27
|
Merge branch 'dev' into test
|
6 years ago |
|
许心洁
|
9200080178
|
MES-POJO添加产品配置名称，产品类型名称作为冗余字段
|
6 years ago |
|
allen.zhang
|
e24e7ef421
|
Merge branch 'dev' into test
|
6 years ago |
|
许心洁
|
76e553234e
|
MES-JIT队列组件+WMS-GOJS位置字段添加@Lob注解
|
6 years ago |
|
allen.zhang
|
8afe54af50
|
Merge branch 'dev' into test
|
6 years ago |
|
yiming.gu
|
85c4f94dcb
|
MES model转移至pojo-mes目录下
|
6 years ago |
|
yiming.gu
|
78145e44e4
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
yiming.gu
|
26fc821d1a
|
MES model修改
|
6 years ago |
|
汪云昊
|
68c8c62542
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
汪云昊
|
93ace83b5f
|
长文本数据类型
|
6 years ago |
|
yiming.gu
|
5fc11292ea
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
yiming.gu
|
280f9a2233
|
MES新增班次休息表、物料关键数据关系表
|
6 years ago |
|
许心洁
|
bdff2c3e2f
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
8e2e1f6543
|
MES：流程配置添加工序，工步基础数据接口
|
6 years ago |
Silliter
|
ac42a9eb37
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
yiming.gu
|
090fdca183
|
MES新增客户零件关系
|
6 years ago |
|
allen.zhang
|
440083b5f2
|
Merge branch 'dev' into test
|
6 years ago |
|
yiming.gu
|
7c7fb30e1a
|
MES新增设备查询条件
|
6 years ago |
|
yiming.gu
|
2d3cc6ea2b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
yiming.gu
|
316077d263
|
MES新增工序流程工作单元对应表
|
6 years ago |
|
jenkins
|
21d3c053ca
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
许心洁
|
b5696a63f7
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
e79987d235
|
MES流程配置接口（流程，产品流程配置）
|
6 years ago |
yihang.lv
|
11d42b3221
|
Merge branch 'dev' into test
|
6 years ago |
|
jiajack
|
564de0acdd
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jiajack
|
9be4b8a7d0
|
工位程序业务编写
|
6 years ago |
|
jenkins
|
a7833ea9dd
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
yiming.gu
|
c60dd62f32
|
新增工步、工序、工步参数查询条件
|
6 years ago |
|
yiming.gu
|
2eb732c7df
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java
# modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java
|
6 years ago |
|
yiming.gu
|
7c647c7844
|
1、班次pojo修改
2、andon项目新增组织模型基础数据
|
6 years ago |
|
jenkins
|
7c20f070e4
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
crish
|
d6221c39ae
|
生产模块bug修改
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
|
allen.zhang
|
5f5b3b84bd
|
Merge branch 'dev' into test
|
6 years ago |
|
yiming.gu
|
68a66c67b0
|
设备pojo新增工作中心代码，区域代码
|
6 years ago |
|
yiming.gu
|
15b5edfaec
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
yiming.gu
|
b1f513d786
|
新增设备pojo，组织模型model
|
6 years ago |
|
crish
|
dd477bdf94
|
生产计划
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
|
jenkins
|
41f03a13d8
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
crish
|
571ad144b7
|
解决冲突
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
|
yunhao.wang
|
6ebc22e6cc
|
master分支配置调整
|
6 years ago |
|
crish
|
c771fa925b
|
更改model位置
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
|
yunhao.wang
|
58247fe3f1
|
清除iml
|
6 years ago |
|
Silliter
|
29b605c749
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
jiajack
|
9137fe9c4f
|
工位程序业务编写
|
6 years ago |
|
jenkins
|
0c7b87bf24
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
crish
|
5daf6d960f
|
hqpPack优化
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
|
Silliter
|
f8b89c930b
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
yiming.gu
|
a1a63c2247
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
yiming.gu
|
feace14920
|
PCN同步MES主数据
|
6 years ago |
|
jenkins
|
2f57ee75d5
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
crish
|
7fc2fe8914
|
生产计划，生产工单，生产队列
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
|
Silliter
|
c8c8dc6750
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
crish
|
e4c1f3ae72
|
生产队列
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
|
jenkins
|
ff991142ae
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
Silliter
|
3d56e2539d
|
合并dev代码
|
6 years ago |
|
crish
|
85ae1e2455
|
生产工单接口开发
|
6 years ago |
|
crish
|
34e6d97b27
|
生产工单
|
6 years ago |
|
jenkins
|
fb4be4580d
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
yiming.gu
|
3112e5e72c
|
生产工单实体添加注解
|
6 years ago |
|
Silliter
|
83ce4f0efb
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
crish
|
a62ead1c25
|
Mes生产计划，生产工单
|
6 years ago |
|
Silliter
|
0c12793473
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
crish
|
82a798083b
|
MES 生产队列，生产工单模块
|
6 years ago |
|
gragon.xu
|
311eaf979a
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
crish
|
21ef38428c
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
crish
|
e5e0c05b9f
|
Mes生产计划开发
|
6 years ago |
|
jiajack
|
2737ea90fd
|
修改排序字段命名
|
6 years ago |
|
Silliter
|
6cb456fcc4
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
crish
|
f7b85978cc
|
MES Repository构建
|
6 years ago |
|
crish
|
71607407ac
|
MES 班次信息实体构建
|
6 years ago |
|
Silliter
|
1896472e63
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
crish
|
6916ae20de
|
客户产线代码实体和Repository
|
6 years ago |
|
crish
|
5f13bf7f1d
|
实体属性修改
|
6 years ago |
|
Silliter
|
65b388d048
|
合并dev分支代码
|
6 years ago |
|
jiajack
|
3cf0c42569
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jiajack
|
7e14a06a8d
|
添加方法类型备注
|
6 years ago |
|
yunhao.wang
|
9c54bc6f9d
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
crish
|
b422165082
|
MES Repository构建
|
6 years ago |
|
crish
|
49dcd8b009
|
MES Repository构建
|
6 years ago |
|
Silliter
|
b198b38b43
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
crish
|
d08b12e1d7
|
Mes业务表实体，增加数据类型返回为空的get方法
|
6 years ago |
|
Silliter
|
df714efc3b
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
crish
|
3675175bf1
|
MES项目pojo构建
|
6 years ago |
|
Silliter
|
d885d6b877
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
crish
|
8543318e32
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
crish
|
ab124f2c29
|
MES业务Bean
|
6 years ago |
|
jiajack
|
3980e05d2b
|
mes新增通用功能可配置的业务-完善
|
6 years ago |
|
crish
|
f981047fb4
|
MES实体
|
6 years ago |
|
jiajack
|
3a5f43f97b
|
删除iml文件
|
6 years ago |
|
Silliter
|
dcd044beeb
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
jiajack
|
a819af268c
|
实体新增
|
6 years ago |
|
Silliter
|
92c5457521
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
jiajack
|
9c468e70d1
|
实体新增
|
6 years ago |
|
Silliter
|
b9d013280f
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
jiajack
|
c4e0f42416
|
实体新增
|
6 years ago |
|
yunhao.wang
|
19a57e8c3e
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
jiajack
|
4093330dc3
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jiajack
|
6f823a5ed9
|
删除多余实体
|
6 years ago |
|
jiajack
|
b04895c67c
|
实体新增
|
6 years ago |
|
wei.peng
|
60ca989dfc
|
无法创建表问题修复
不懂请看提交日志
|
6 years ago |
|
Silliter
|
111c6177c9
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
alwaysfrin
|
ea2eb6103d
|
优化调整
|
6 years ago |
|
wei.peng
|
47105866be
|
合并代码 解决冲突
|
7 years ago |
|
wei.peng
|
47dd4c68b5
|
配置文件修改 Test to dev
|
7 years ago |
|
wei.peng
|
9eb7122e99
|
发布 正式版本 1.0
|
7 years ago |
|
yunhao.wang
|
cb95d0a713
|
项目pom版本更新为test
|
7 years ago |
|
wei.peng
|
5584ec7ce5
|
定时任务
定时任务表达式 功能完成
定时任务 功能完成
权限
用户管理 功能完成
用户登录 功能完成
|
7 years ago |
|
wei.peng
|
c2b3d3b5ba
|
删除target 文件夹 或者删除.iml 文件
|
7 years ago |
|
alwaysfrin
|
00f95dda13
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# modules/i3plus-pojo-platform/target/classes/cn/estsh/i3plus/pojo/platform/bean/SessionUser.class
# modules/i3plus-pojo-platform/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
# modules/i3plus-pojo-platform/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
# modules/i3plus-pojo-wms/target/classes/cn/estsh/i3plus/pojo/wms/repository/FactoryStoreRepository.class
|
7 years ago |
|
alwaysfrin
|
883c31288b
|
ignore整理
|
7 years ago |
|
wei.peng
|
cdb48374ac
|
移除iml文件的版本控制
|
7 years ago |
|
wei.peng
|
9121cafcff
|
移除iml文件的版本控制
|
7 years ago |
|
alwaysfrin
|
231efdcf13
|
ignore整理
|
7 years ago |
|
alwaysfrin
|
daf65deb32
|
国家化封装
|
7 years ago |
|
wei.peng
|
aaa0a1b21b
|
初始化系统配置
|
7 years ago |
|
alwaysfrin
|
a208e592bd
|
基础对象初始化
|
7 years ago |