f7b366fe29
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
c584f2e048
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
12a2a27b18
mes， pcn条码打印
...
Signed-off-by: crish <570360737@qq.com>
6 years ago
曾贞一
18aff86ea0
Merge remote-tracking branch 'remotes/origin/test'
6 years ago
6d925d6b9f
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
王杰
b375983304
mes条码生成规则CURD及mesbug修复
6 years ago
c901f18f89
pom版本还原
6 years ago
c7842e63a1
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
2deb384cca
提交
6 years ago
曾贞一
b10b967b73
Merge remote-tracking branch 'remotes/origin/test'
6 years ago
5e72d98ad8
提交
6 years ago
d340133e7a
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
王杰
60eadfac7a
mes维护页面加模糊查询
6 years ago
4359f347c6
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
4ff3677fba
Merge branch 'test' into dev
6 years ago
0aef9adac9
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
1328dc7ddd
#Merge branch 'dev' of http://git.estsh.com/i3-MES/i3plus-mes-pcn into dev
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
6 years ago
a2a4dc6beb
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
王杰
e4aadf35ed
mes生产工单页面按钮控制
6 years ago
王杰
4f37dc42ef
pojo-mes-time-update-wangjie
6 years ago
曾贞一
e1cb06da5c
Merge remote-tracking branch 'remotes/origin/test'
6 years ago
483ea59142
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
ef1450e912
Merge branch 'dev' of http://git.estsh.com/i3-MES/i3plus-mes-pcn into dev
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
6 years ago
b9d9d7402e
Merge remote-tracking branch 'remotes/origin/test'
6 years ago
7002ac5a8a
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
ecba29948f
816 add method
6 years ago
曾贞一
fbe8544a02
Merge remote-tracking branch 'remotes/origin/test'
6 years ago
78267a3a45
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
0f99cb1027
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
5df9896258
维修， 报废， 系统配置， pcn节点基础数据接口
...
Signed-off-by: crish <570360737@qq.com>
6 years ago
曾贞一
7a62200736
Merge remote-tracking branch 'remotes/origin/test'
...
# Conflicts:
# modules/i3plus-pojo-andon/pom.xml
# modules/i3plus-pojo-base/pom.xml
# modules/i3plus-pojo-form/pom.xml
# modules/i3plus-pojo-hardswitch/pom.xml
# modules/i3plus-pojo-jobflow/pom.xml
# modules/i3plus-pojo-lac/pom.xml
# modules/i3plus-pojo-mes-pcn/pom.xml
# modules/i3plus-pojo-mes/pom.xml
# modules/i3plus-pojo-model/pom.xml
# modules/i3plus-pojo-platform/pom.xml
# modules/i3plus-pojo-report/pom.xml
# modules/i3plus-pojo-softswitch/pom.xml
# modules/i3plus-pojo-sweb/pom.xml
# modules/i3plus-pojo-wms/pom.xml
# modules/i3plus-pojo-workflow/pom.xml
# pom.xml
6 years ago
66e20acfe9
0730 Add File Operation in ODS Module untested
6 years ago
曾贞一
7ca6e46e4b
Merge branch 'dev' into test
6 years ago
0e444aa993
PCN接口开发， 数据同步配置
...
Signed-off-by: crish <570360737@qq.com>
6 years ago
曾贞一
47d4a53706
Merge branch 'dev'
...
# Conflicts:
# modules/i3plus-pojo-andon/pom.xml
# modules/i3plus-pojo-base/pom.xml
# modules/i3plus-pojo-form/pom.xml
# modules/i3plus-pojo-hardswitch/pom.xml
# modules/i3plus-pojo-jobflow/pom.xml
# modules/i3plus-pojo-lac/pom.xml
# modules/i3plus-pojo-mes-pcn/pom.xml
# modules/i3plus-pojo-mes/pom.xml
# modules/i3plus-pojo-model/pom.xml
# modules/i3plus-pojo-platform/pom.xml
# modules/i3plus-pojo-report/pom.xml
# modules/i3plus-pojo-softswitch/pom.xml
# modules/i3plus-pojo-sweb/pom.xml
# modules/i3plus-pojo-wms/pom.xml
# modules/i3plus-pojo-workflow/pom.xml
# pom.xml
6 years ago
曾贞一
f30a40520b
Merge branch 'dev' into test
6 years ago
d826c47d5a
修改了mesEvent pojo
6 years ago
曾贞一
8b457c0618
DEV 合并 TEST pom.xml文件修改
6 years ago
e7913cfb26
1. 从 TEST 合并代码后 POM 文件中引用的版本不正确，修改为 DEV
6 years ago
3dca11a963
add a hql
6 years ago
363d521c36
Merge branch 'test'
6 years ago
d45b7b77f3
Merge branch 'dev' into test
6 years ago
33a59fdb0f
0730 add esop pojo and respository
6 years ago
bec3a7098d
Merge remote-tracking branch 'remotes/origin/test'
6 years ago
25fc477991
Merge remote-tracking branch 'origin/dev' into test
6 years ago
e9b1d7e595
添加条码校验逻辑+工步跳转代码优化+数据同步BUG修改
6 years ago
9c201c70e8
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
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
088dc7dfa4
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
2b59998d16
新增mes-pcn同步配置基础数据
6 years ago
d7ba3d445a
MES数据同步-POJO调整
6 years ago
28ae6cf85d
Merge remote-tracking branch 'origin/dev' into test
6 years ago
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
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方法+条码校验工步】
7 years ago
9eb207145c
Merge branch 'dev' into test
7 years ago
ebfee3d774
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
7 years ago
d3d25f0baa
Pcn节点向Mes主服务注册机制代码编写
7 years ago
a152d8d565
Merge branch 'dev' into test
7 years ago
1f6eb341cd
修改报错
...
Signed-off-by: crish <570360737@qq.com>
7 years ago
43c2dd4092
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
7 years ago
63ddfd5a53
MES新增基础数据查询条件
7 years ago
d714733a27
Merge branch 'dev' into test
7 years ago
9200080178
MES-POJO添加产品配置名称，产品类型名称作为冗余字段
7 years ago
e24e7ef421
Merge branch 'dev' into test
7 years ago
76e553234e
MES-JIT队列组件+WMS-GOJS位置字段添加@Lob注解
7 years ago
8afe54af50
Merge branch 'dev' into test
7 years ago
85c4f94dcb
MES model转移至pojo-mes目录下
7 years ago
78145e44e4
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
7 years ago
26fc821d1a
MES model修改
7 years ago
68c8c62542
Merge remote-tracking branch 'remotes/origin/dev' into test
7 years ago
93ace83b5f
长文本数据类型
7 years ago
5fc11292ea
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
7 years ago
280f9a2233
MES新增班次休息表、物料关键数据关系表
7 years ago
bdff2c3e2f
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
7 years ago
8e2e1f6543
MES：流程配置添加工序，工步基础数据接口
7 years ago
ac42a9eb37
Merge remote-tracking branch 'remotes/origin/dev' into test
7 years ago
090fdca183
MES新增客户零件关系
7 years ago
440083b5f2
Merge branch 'dev' into test
7 years ago
7c7fb30e1a
MES新增设备查询条件
7 years ago
2d3cc6ea2b
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
7 years ago
316077d263
MES新增工序流程工作单元对应表
7 years ago
21d3c053ca
Merge remote-tracking branch 'origin/dev' into test
7 years ago
b5696a63f7
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
7 years ago
e79987d235
MES流程配置接口（流程，产品流程配置）
7 years ago
11d42b3221
Merge branch 'dev' into test
7 years ago
564de0acdd
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
7 years ago
9be4b8a7d0
工位程序业务编写
7 years ago
a7833ea9dd
Merge remote-tracking branch 'origin/dev' into test
7 years ago
c60dd62f32
新增工步、工序、工步参数查询条件
7 years ago
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
7 years ago
7c647c7844
1、班次pojo修改
...
2、andon项目新增组织模型基础数据
7 years ago
7c20f070e4
Merge remote-tracking branch 'origin/dev' into test
7 years ago
d6221c39ae
生产模块bug修改
...
Signed-off-by: crish <570360737@qq.com>
7 years ago
5f5b3b84bd
Merge branch 'dev' into test
7 years ago
68a66c67b0
设备pojo新增工作中心代码，区域代码
7 years ago
15b5edfaec
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
7 years ago
b1f513d786
新增设备pojo，组织模型model
7 years ago
dd477bdf94
生产计划
...
Signed-off-by: crish <570360737@qq.com>
7 years ago
41f03a13d8
Merge remote-tracking branch 'origin/dev' into test
7 years ago
571ad144b7
解决冲突
...
Signed-off-by: crish <570360737@qq.com>
7 years ago
6ebc22e6cc
master分支配置调整
7 years ago
c771fa925b
更改model位置
...
Signed-off-by: crish <570360737@qq.com>
7 years ago
58247fe3f1
清除iml
7 years ago
29b605c749
Merge remote-tracking branch 'remotes/origin/dev' into test
7 years ago
9137fe9c4f
工位程序业务编写
7 years ago
0c7b87bf24
Merge remote-tracking branch 'origin/dev' into test
7 years ago
5daf6d960f
hqpPack优化
...
Signed-off-by: crish <570360737@qq.com>
7 years ago
f8b89c930b
Merge remote-tracking branch 'remotes/origin/dev' into test
7 years ago
a1a63c2247
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
7 years ago
feace14920
PCN同步MES主数据
7 years ago
2f57ee75d5
Merge remote-tracking branch 'origin/dev' into test
7 years ago
7fc2fe8914
生产计划，生产工单，生产队列
...
Signed-off-by: crish <570360737@qq.com>
7 years ago
c8c8dc6750
Merge remote-tracking branch 'remotes/origin/dev' into test
7 years ago
e4c1f3ae72
生产队列
...
Signed-off-by: crish <570360737@qq.com>
7 years ago
ff991142ae
Merge remote-tracking branch 'origin/dev' into test
7 years ago
3d56e2539d
合并dev代码
7 years ago
85ae1e2455
生产工单接口开发
7 years ago
34e6d97b27
生产工单
7 years ago
fb4be4580d
Merge remote-tracking branch 'origin/dev' into test
7 years ago
3112e5e72c
生产工单实体添加注解
7 years ago
83ce4f0efb
Merge remote-tracking branch 'remotes/origin/dev' into test
7 years ago
a62ead1c25
Mes生产计划，生产工单
7 years ago
0c12793473
Merge remote-tracking branch 'remotes/origin/dev' into test
7 years ago
82a798083b
MES 生产队列，生产工单模块
7 years ago
311eaf979a
Merge remote-tracking branch 'remotes/origin/dev' into test
7 years ago
21ef38428c
Merge remote-tracking branch 'origin/dev' into dev
7 years ago
e5e0c05b9f
Mes生产计划开发
7 years ago
2737ea90fd
修改排序字段命名
7 years ago
6cb456fcc4
Merge remote-tracking branch 'remotes/origin/dev' into test
7 years ago
f7b85978cc
MES Repository构建
7 years ago
71607407ac
MES 班次信息实体构建
7 years ago
1896472e63
Merge remote-tracking branch 'remotes/origin/dev' into test
7 years ago
6916ae20de
客户产线代码实体和Repository
7 years ago
5f13bf7f1d
实体属性修改
7 years ago
65b388d048
合并dev分支代码
7 years ago
3cf0c42569
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
7 years ago
7e14a06a8d
添加方法类型备注
7 years ago
9c54bc6f9d
Merge remote-tracking branch 'remotes/origin/dev' into test
7 years ago
b422165082
MES Repository构建
7 years ago
49dcd8b009
MES Repository构建
7 years ago
b198b38b43
Merge remote-tracking branch 'remotes/origin/dev' into test
7 years ago
d08b12e1d7
Mes业务表实体，增加数据类型返回为空的get方法
7 years ago
df714efc3b
Merge remote-tracking branch 'remotes/origin/dev' into test
7 years ago
3675175bf1
MES项目pojo构建
7 years ago
d885d6b877
Merge remote-tracking branch 'remotes/origin/dev' into test
7 years ago
8543318e32
Merge remote-tracking branch 'origin/dev' into dev
7 years ago
ab124f2c29
MES业务Bean
7 years ago
3980e05d2b
mes新增通用功能可配置的业务-完善
7 years ago
f981047fb4
MES实体
7 years ago
3a5f43f97b
删除iml文件
7 years ago
dcd044beeb
Merge remote-tracking branch 'remotes/origin/dev' into test
7 years ago
a819af268c
实体新增
7 years ago
92c5457521
Merge remote-tracking branch 'remotes/origin/dev' into test
7 years ago
9c468e70d1
实体新增
7 years ago
b9d013280f
Merge remote-tracking branch 'remotes/origin/dev' into test
7 years ago
c4e0f42416
实体新增
7 years ago
19a57e8c3e
Merge remote-tracking branch 'remotes/origin/dev' into test
7 years ago
4093330dc3
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
7 years ago
6f823a5ed9
删除多余实体
7 years ago
b04895c67c
实体新增
7 years ago
60ca989dfc
无法创建表问题修复
...
不懂请看提交日志
7 years ago
111c6177c9
Merge remote-tracking branch 'remotes/origin/dev' into test
7 years ago
ea2eb6103d
优化调整
7 years ago
47105866be
合并代码 解决冲突
7 years ago
47dd4c68b5
配置文件修改 Test to dev
7 years ago
9eb7122e99
发布 正式版本 1.0
7 years ago
cb95d0a713
项目pom版本更新为test
7 years ago
5584ec7ce5
定时任务
...
定时任务表达式 功能完成
定时任务 功能完成
权限
用户管理 功能完成
用户登录 功能完成
7 years ago
c2b3d3b5ba
删除target 文件夹 或者删除.iml 文件
7 years ago
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
883c31288b
ignore整理
7 years ago
cdb48374ac
移除iml文件的版本控制
7 years ago
9121cafcff
移除iml文件的版本控制
7 years ago
231efdcf13
ignore整理
7 years ago
daf65deb32
国家化封装
7 years ago
aaa0a1b21b
初始化系统配置
7 years ago
a208e592bd
基础对象初始化
7 years ago
crish
曾贞一
jimmy.zeng
王杰
WYnneaoapc
汪云昊
于学杰
peter.pan
wei.peng
jenkins
许心洁
wei.peng
yiming.gu
allen.zhang
jiajack
Silliter
yihang.lv
alwaysfrin