wynne1005
|
5d6588b5af
|
task `1565` 增加发运字段
|
6 years ago |
陈思洁
|
03d2ee9246
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
244270684d
|
【泰国项目】
|
6 years ago |
|
wynne1005
|
86713a01f2
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
joke.wang
|
4469d92344
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
joke.wang
|
f1baf4fdbe
|
[麦格纳问题：111 检测项报表]
|
6 years ago |
宋军超
|
8109275630
|
添加散件BOM导入
|
6 years ago |
|
宋军超
|
69b620336f
|
散件BOM导入
|
6 years ago |
|
wynne1005
|
15c9e7111b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
qianhs
|
ca85c59cdb
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
|
6 years ago |
|
qianhs
|
20f5bfc9eb
|
wms数据同步迁移至mes
|
6 years ago |
|
陈思洁
|
72563a4eb5
|
【1597 条码打印功能新增-管理端 / 条码打印功能新增-管理端】
|
6 years ago |
 王杰
|
c6aefc89e7
|
test合并dev解决ct
|
6 years ago |
|
王杰
|
94fed3b9b2
|
Merge branch 'test' into dev
|
6 years ago |
|
joke.wang
|
3e33a7ac3a
|
[客户jit增加JIT排序号字段]
|
6 years ago |
|
wynne1005
|
b5ecb91399
|
中航四月十号 内容提交
|
6 years ago |
|
joke.wang
|
4e8c4ae46f
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
joke.wang
|
caf8feb374
|
[采集工步存入生产数据格式修改]
|
6 years ago |
|
joke.wang
|
11adb5ff09
|
[麦格纳问题：111 检测项数据报表]
|
6 years ago |
|
joke.wang
|
1d50c135ac
|
[麦格纳问题：87 增加工单管理页面]
|
6 years ago |
wei.peng
|
aa1f7a2845
|
Merge remote-tracking branch 'remotes/origin/test'
|
6 years ago |
 钮海涛
|
4dee474c73
|
修改POM版本号
|
6 years ago |
|
钮海涛
|
417120358c
|
Merge branch 'test' into dev
|
6 years ago |
|
钮海涛
|
288fb4a16b
|
修改POM版本号
|
6 years ago |
|
陈思洁
|
cd810ce1fc
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
5a6c525d1f
|
【MES_生成条码模型增加时分秒字段】
|
6 years ago |
|
王杰
|
3f3d0038e8
|
【任务：1608 数据监听预警配置，定时任务】
|
6 years ago |
|
qianhs
|
2e85d99380
|
联调测试
|
6 years ago |
|
wynne1005
|
dbba31670d
|
增加条码生产
|
6 years ago |
|
wynne1005
|
17f6ac6609
|
删除重复字段
|
6 years ago |
|
wynne1005
|
07d8e12216
|
commit stationrequestbean
|
6 years ago |
|
wynne1005
|
2e177ba671
|
dev合并test test有修改
|
6 years ago |
汪云昊
|
2772ea6a2f
|
Merge remote-tracking branch 'remotes/origin/dev' into test
# Conflicts:
# modules/i3plus-pojo-andon/pom.xml
# modules/i3plus-pojo-aps/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-ptl/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 |
|
汪云昊
|
8a8c3ee34d
|
pom版本调整
|
6 years ago |
|
wynne1005
|
763d72b128
|
dev合并麦格纳的test
|
6 years ago |
|
joke.wang
|
14bb71f9f2
|
[料架条码打印查询修改]
|
6 years ago |
|
wynne1005
|
581d900123
|
状态机model提交
|
6 years ago |
|
qianhs
|
ba4b450437
|
联调测试
|
6 years ago |
|
wynne1005
|
12e31f630b
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
wynne1005
|
ba90a50621
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
qianhs
|
8c635c3557
|
联调测试
|
6 years ago |
|
qianhs
|
7244fb38b1
|
联调测试
|
6 years ago |
|
wynne1005
|
e289414363
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
宋军超
|
b3032ca8e8
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
宋军超
|
45dda6ea57
|
添加散件配置报文关系和工装明细实体
|
6 years ago |
|
陈思洁
|
30608f886b
|
解决冲突
|
6 years ago |
|
陈思洁
|
d9d2113f75
|
【MES_增加枚举】
|
6 years ago |
 贾文涛
|
492dfbff82
|
pom通过变量方式存在只能引用jar不能引用到项目文件的问题，暂时先还原为最初方式
|
6 years ago |
|
qianhs
|
836a4f710d
|
联调测试
|
6 years ago |
|
宋军超
|
b3cecc9481
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
宋军超
|
f64a543a4a
|
添加产品流程批量配置功能
|
6 years ago |
|
王杰
|
cd99a63233
|
mes
|
6 years ago |
|
汪云昊
|
0d75c1eac7
|
Merge remote-tracking branch 'remotes/origin/dev' into test
# Conflicts:
# modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
|
6 years ago |
|
wynne1005
|
032fb350c8
|
queueordermodel添加构造函数
|
6 years ago |
|
王杰
|
5fc4c6c025
|
mes
|
6 years ago |
|
钮海涛
|
52a5c1e2f8
|
Merge branch 'test' into dev
|
6 years ago |
|
qianhs
|
851bd1feec
|
联调测试
|
6 years ago |
|
wynne1005
|
4324457b61
|
merge
|
6 years ago |
|
wynne1005
|
dce52df770
|
组件传参给工步
|
6 years ago |
|
qianhs
|
241ec4974b
|
联调测试
|
6 years ago |
|
wynne1005
|
351ea8755e
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
wynne1005
|
6a36ad7601
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
zcg
|
83d7a618bf
|
按钮组件model修改
|
6 years ago |
|
qianhs
|
3654d60214
|
【bug7947】PLC监听工步装队列无法显示
|
6 years ago |
|
zcg
|
078e1a77a4
|
【bug 7895 PLC信息-页面需修改】
|
6 years ago |
|
钮海涛
|
82d5332861
|
修复POM文件问题
|
6 years ago |
|
钮海涛
|
c3a5564652
|
任务【1483】：LES-新增拉动规则表
任务【1484】：LES-物料表属性变更
任务【1485】：LES-库位物料属性变更
任务【1486】：LES-存储区属性变更
任务【1487】：LES-生产计划属性变更
任务【1488】：LES-拉动任务属性变更
任务【1489】：LES-入场管理新增窗口时间表
任务【1490】：LES-巡线拉动
任务【1491】：LES-计划拉动
任务【1492】：LES-过点拉动
任务【1493】：LES-手工拉动
任务【1494】：LES-预留外部拉动接口
|
6 years ago |
|
汪云昊
|
ec1d52e7dd
|
MAVEN 版本控制调整
|
6 years ago |
|
贾文涛
|
7106c06221
|
统一修改pom文件的项目版本问题0331
|
6 years ago |
|
joke.wang
|
1b0d0f8c6b
|
[任务：1576 动态按钮加载]
|
6 years ago |
|
wynne1005
|
d1ff70adc4
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
wynne1005
|
44696061ee
|
修改pom文件为最新
|
6 years ago |
|
zcg
|
75832427e8
|
【task 1539 工位扫描-按钮组件结构搭建】
|
6 years ago |
 曾贞一
|
bcb8dee045
|
【1558 生产工单管理-泰国需求】
|
6 years ago |
|
wynne1005
|
3c08e7794f
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
贾文涛
|
eed24e0297
|
统一修改pom文件的项目版本问题
|
6 years ago |
|
qianhs
|
3b763b45cd
|
【1432 工位扫描-ESOP展示组件开发，队列组件调整】【工位扫描-ESOP展示组件开发，队列组件调整】
|
6 years ago |
|
joke.wang
|
4cb3d89ad6
|
[bug: 7637 生产数据ees查询修改]
|
6 years ago |
|
钮海涛
|
c37809d5b7
|
合并源仓库的修改
|
6 years ago |
|
wynne1005
|
f345ed2b2f
|
Merge branch 'dev' into test
|
6 years ago |
|
wynne1005
|
d80b341620
|
还原test pom
|
6 years ago |
|
王杰
|
0502f6d736
|
【任务：1529，料架分组队列展示组件】
|
6 years ago |
|
joke.wang
|
7a6e9b9e21
|
[任务：1479 料架打印]
|
6 years ago |
|
陈思洁
|
c4032b8ed5
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
320969f2f0
|
【1527 半成品标签自动打印】
|
6 years ago |
|
贾文涛
|
048419d823
|
修改打包时版本号的定义，后续可以通过mvn clean install Pdev 命令进行打包,最后dev还可以更换为test、prod、docker。
|
6 years ago |
|
wynne1005
|
4b4bf4e433
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
钮海涛
|
9d5567f4a6
|
Merge branch 'test' into dev
|
6 years ago |
|
王杰
|
e3a9defdab
|
任务1528，生成并打印门锁标签
|
6 years ago |
|
wynne1005
|
6336ebd8e9
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
wynne1005
|
8b750e6a76
|
修改生产数据类型
|
6 years ago |
|
王杰
|
a9a7d78bd5
|
解决冲突
|
6 years ago |
|
joke.wang
|
9d55a2a8b3
|
[解决冲突1]
|
6 years ago |
|
joke.wang
|
8b681af622
|
[解决冲突]
|
6 years ago |
|
joke.wang
|
045dc01479
|
[任务：1479 料架条码打印]
|
6 years ago |
|
王杰
|
f578311f55
|
数据复核
|
6 years ago |
|
qianhs
|
564ba1e116
|
【1472 工步-设备状态采集（原PLC采集【设备状态】）】
|
6 years ago |
|
qianhs
|
c53999b0d2
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
joke.wang
|
79788daf8b
|
pom 修改
|
6 years ago |
|
zcg
|
74e4aa953b
|
【任务 1480 照片采集】
|
6 years ago |
joke lin
|
62cee148cd
|
[bug: 7875 客户JIT生产工单]
|
6 years ago |
|
钮海涛
|
9da6628884
|
Merge branch 'master' into test
|
6 years ago |
|
陈思洁
|
cc207240b4
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
bacab3fb88
|
【MES_新增设备工装关系和工装操作记录pojo】
|
6 years ago |
|
王杰
|
9f8e51830e
|
mes enum
|
6 years ago |
|
qianhs
|
8d18c61d63
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
joke lin
|
126440c976
|
[任务：1435 客户JIT导入]
|
6 years ago |
|
陈思洁
|
310bf49af6
|
【MES_校验是否换膜并推送换模信号 】
|
6 years ago |
|
陈思洁
|
22788f1c44
|
还原POM文件TEST-DEV
|
6 years ago |
|
qianhs
|
a93882c881
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
曾贞一
|
779b9d209c
|
【修改 DEV-pom.xml】
|
6 years ago |
|
qianhs
|
26bf62fbe7
|
设备状态采集工步
|
6 years ago |
|
陈思洁
|
474bb995d6
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
王杰
|
7d743c2c7f
|
Merge branch 'dev' of jhforever.wang/wangjie-i3plus-pojo into test
|
6 years ago |
|
陈思洁
|
b3e38170e6
|
【1440 PLC采集工步【生产数据】】
|
6 years ago |
luweihao
|
e90ea98d1f
|
解决冲突
|
6 years ago |
|
luweihao
|
03f1c4fddf
|
修改生产数据结构
|
6 years ago |
|
王杰
|
af4cb74392
|
Merge branch 'dev' of jhforever.wang/wangjie-i3plus-pojo into test
|
6 years ago |
|
joke lin
|
3b928c6ddc
|
[bug: 7637 生产数据]
|
6 years ago |
|
joke lin
|
e8f48bcb04
|
[bug: 7637 生产数据查询]
|
6 years ago |
|
王杰
|
b6a83fff5d
|
Merge branch 'dev' into test
|
6 years ago |
|
zcg
|
3d28840bae
|
【新增枚举，pojo】
|
6 years ago |
|
luweihao
|
16879a4f20
|
Merge branch 'dev' into test
|
6 years ago |
|
陆卫豪
|
a65350bbf8
|
Merge branch 'dev' of chungui.zhou/i3plus-pojo into dev
|
6 years ago |
|
luweihao
|
12579c7a14
|
还原pom
|
6 years ago |
|
luweihao
|
b52bb02d73
|
task `1430` 工位扫描，产品信号监听，队列监听
|
6 years ago |
|
zcg
|
416c2ceffc
|
【任务 1443 excel模板导入功能修改】
|
6 years ago |
|
zcg
|
9388e3b4f2
|
【pojo 冲突提交】
|
6 years ago |
|
luweihao
|
679319635a
|
task `1430` 工位扫描，产品信号监听，队列监听
|
6 years ago |
|
陈思洁
|
4fec84f810
|
【PTL_PLC配置表增加字段】
|
6 years ago |
|
陆卫豪
|
60ab731ffd
|
Merge branch 'dev' of huasheng.qian/i3plus-pojo into dev
|
6 years ago |
|
joke lin
|
d4e1e854c5
|
[任务：1441 plc推送数据]
|
6 years ago |
|
qianhs
|
65572b34a0
|
【1432 工位扫描-ESOP展示组件开发，队列组件调整】【工位扫描-ESOP展示组件开发，队列组件调整】
|
6 years ago |
|
zcg
|
bd82a0fba7
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
2625c2cb0f
|
【修改 TSET-pom.xml】
|
6 years ago |
|
joke lin
|
4823660070
|
[任务：1435 计划管理]
|
6 years ago |
|
王杰
|
80ca438ce3
|
test合并到dev解决pom冲突
|
6 years ago |
|
曾贞一
|
5ebb5cbf20
|
【修改 TSET-pom.xml】
|
6 years ago |
|
贾文涛
|
30722b130c
|
Merge branch 'test' of i3-IMPP/i3plus-pojo into master
|
6 years ago |
|
王杰
|
068a0956db
|
解决冲突
|
6 years ago |
|
王杰
|
b77d3065a4
|
Merge branch 'test' into dev
|
6 years ago |
|
曾贞一
|
4fcd7cbc3f
|
Merge branch 'dev' of joke.wang/joke-i3plus-pojo into dev
|
6 years ago |
|
joke lin
|
cb09776bdb
|
[任务：1435 计划管理]
|
6 years ago |
|
陈思洁
|
102af98a75
|
【PTL_增加主任务编号字段和组内编号字段】
|
6 years ago |
|
zcg
|
7aecf9dcc0
|
【task 1436 工步-关键件绑定校验并转过程条码】
|
6 years ago |
|
joke lin
|
ccf2817788
|
[计划管理]
|
6 years ago |
|
曾贞一
|
0acf2dc0ae
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
钮海涛
|
ca6e094271
|
Merge branch 'dev' of joke.wang/joke-i3plus-pojo into dev
|
6 years ago |
|
luweihao
|
00252caa0c
|
移动mespcn公用model
|
6 years ago |
|
luweihao
|
005db6ac5b
|
Merge branch 'dev' into test
|
6 years ago |