 贾文涛
|
e63601716f
|
1736-MES数据权限模块开发
|
5 years ago |
宋军超
|
e5e41f09e7
|
新增散件产品配置功能
|
5 years ago |
陈思洁
|
ae156ad82f
|
【动态按钮--完成按钮修改mes和mespcn】
|
5 years ago |
joke.wang
|
3227cfa47e
|
[oee]
|
5 years ago |
wynne1005
|
4ed1770189
|
Merge branch 'dev' into test
|
5 years ago |
|
陈思洁
|
32f6215be7
|
【8309 产品配方导入-导入报错】
|
5 years ago |
 王杰
|
da1c10dc4c
|
mes生产计划批量编制
|
5 years ago |
 曾贞一
|
cf12f354ae
|
[8206 生产工单-导入失败]
|
5 years ago |
|
joke.wang
|
de7d007ef1
|
[获取工步sql server分组函数问题修复]
|
5 years ago |
|
陈思洁
|
ad8255949a
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
陈思洁
|
be925fded9
|
【1693-设备状态监控看板】
|
5 years ago |
|
joke.wang
|
60428b5bad
|
[任务：1690 界面窗口]
|
5 years ago |
|
陈思洁
|
22b42d710b
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
ff6e5ac926
|
【8239 生产作业-单产品扫描（数据写入有误）】
|
5 years ago |
汪云昊
|
2ab9045d17
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
5 years ago |
|
王杰
|
2b01efb15b
|
mes生产计划批量编制
|
5 years ago |
|
wynne1005
|
d5f69eeefd
|
task 1565 发运修改
|
5 years ago |
|
宋军超
|
92c13e5bcd
|
添加人员技能功能
|
5 years ago |
wei.peng
|
37922cab29
|
POM 文件修改
Merge remote-tracking branch 'remotes/origin/test'
# Conflicts:
# modules/i3plus-icloud-report/pom.xml
|
5 years ago |
|
wei.peng
|
8aab106aa9
|
合并代码 pom 冲突
Merge remote-tracking branch 'remotes/origin/dev' into test
# Conflicts:
# modules/i3plus-ics-gateway/src/main/resources/application-docker.properties
|
5 years ago |
|
宋军超
|
b96eb1b669
|
添加人员技能功能
|
5 years ago |
|
陈思洁
|
2c50fceec9
|
【1693-设备状态监控看板】
|
5 years ago |
|
陈思洁
|
87664b96cb
|
【合并冲突】
|
5 years ago |
|
陈思洁
|
abd974f54f
|
【1693-设备状态监控看板】
|
5 years ago |
 钮海涛
|
3fbf532c84
|
修复pom版本问题
|
5 years ago |
|
钮海涛
|
a1eb3c3bc2
|
修复pom版本问题
|
5 years ago |
|
钮海涛
|
2e2ee2cc6c
|
Merge branch 'test' into dev
|
5 years ago |
|
钮海涛
|
c6d36af4c9
|
Merge branch 'master' into test
|
5 years ago |
|
joke.wang
|
755fccb45e
|
[任务：1690 产能监控看板]
|
5 years ago |
|
joke.wang
|
ee1c2131ff
|
[任务：1716 写入产品下线记录]
|
5 years ago |
|
joke.wang
|
aa9ee803b8
|
[任务：1683-看板管理 展示]
|
5 years ago |
|
joke.wang
|
795312637c
|
[任务：1683-看板管理 计划产能]
|
5 years ago |
|
joke.wang
|
e6f3dd5c32
|
[任务：1683-看板管理]
|
5 years ago |
|
王杰
|
9da9a568f5
|
mes
|
5 years ago |
|
joke.wang
|
4e02acb9e3
|
[任务：1683-看板管理]
|
5 years ago |
|
wynne1005
|
fb60d75eea
|
还原test pom
|
5 years ago |
|
wynne1005
|
d6fe718e4c
|
Merge branch 'dev' into test
|
5 years ago |
qianhs
|
0a2d9a3d6d
|
【1432 工位扫描-ESOP展示组件开发，队列组件调整】【工位扫描-ESOP展示组件开发，队列组件调整】
|
5 years ago |
|
joke.wang
|
fa8e4c1b55
|
[任务：1683 看板管理]
|
5 years ago |
|
wynne1005
|
64f3dcf276
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
wynne1005
|
cfb5aab8ea
|
新增工步集合 repository
|
5 years ago |
|
qianhs
|
62883c5cc0
|
【1432 工位扫描-ESOP展示组件开发，队列组件调整】【工位扫描-ESOP展示组件开发，队列组件调整】
|
5 years ago |
|
joke.wang
|
43bc24340c
|
[料架条码打印优化]
|
5 years ago |
|
wynne1005
|
430adb8d97
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
wynne1005
|
1c4050b71f
|
工步返回内容修改
|
5 years ago |
|
王杰
|
74a4a1381c
|
mes
|
5 years ago |
|
joke.wang
|
4c637b4e83
|
[写入JIT发运接口表]
|
5 years ago |
|
joke.wang
|
48ee207a8a
|
[删除多余项]
|
5 years ago |
|
joke.wang
|
d22bd22012
|
[任务：客户JIT自动下达]
|
5 years ago |
|
宋军超
|
8fe5574c67
|
part实体中@Column(name = "产品生产类型")改为@Column(name = "PPT_CODE")
|
5 years ago |
|
陈思洁
|
5d8fec4938
|
合并冲突
|
5 years ago |
|
陈思洁
|
7505087392
|
【mes 产品配方导入功能和基础数据维护】
|
5 years ago |
|
王杰
|
0a14b533d7
|
任务1659 返工返修
|
5 years ago |
|
曾贞一
|
9102a3691b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
曾贞一
|
10fc6ded8d
|
【1558 生产工单管理-泰国需求】
|
5 years ago |
|
joke.wang
|
280385eb20
|
[bug: 8092 SOP信息需求变更]
|
5 years ago |
|
joke.wang
|
54ff0deb87
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
钮海涛
|
efe083a9da
|
修复版本号
|
5 years ago |
|
宋军超
|
e464b4d699
|
删除设备备件管理相关实体
|
5 years ago |
|
宋军超
|
89a9946432
|
添加设备管理相关功能
|
5 years ago |
|
joke.wang
|
b17cf60ac6
|
[任务：1571 生成报功数据 需求变更]
|
5 years ago |
|
曾贞一
|
e5c275499c
|
【冲突解决】
|
5 years ago |
|
曾贞一
|
255aefbcef
|
【1585 销售订单管理-销售订单维护】
|
5 years ago |
|
wynne1005
|
81f05c233a
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
wynne1005
|
93622f5dc7
|
中航 开线管控 提交
|
5 years ago |
|
宋军超
|
aac4e24113
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
宋军超
|
b02d7372f6
|
添加散件bom批量导入功能
|
5 years ago |
|
joke.wang
|
9e0fbef169
|
[按钮组件代码优化]
|
5 years ago |
|
wynne1005
|
48f94c0369
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
wynne1005
|
cc739eac24
|
task `1565` 发运pojo
|
5 years ago |
|
joke.wang
|
99e055da3c
|
[现场问题：111 检测项报表]
|
5 years ago |
|
wynne1005
|
035e77c0ab
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
wynne1005
|
5d6588b5af
|
task `1565` 增加发运字段
|
5 years ago |
|
陈思洁
|
03d2ee9246
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
陈思洁
|
244270684d
|
【泰国项目】
|
5 years ago |
|
wynne1005
|
86713a01f2
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
joke.wang
|
4469d92344
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
joke.wang
|
f1baf4fdbe
|
[麦格纳问题：111 检测项报表]
|
5 years ago |
|
宋军超
|
8109275630
|
添加散件BOM导入
|
5 years ago |
|
宋军超
|
69b620336f
|
散件BOM导入
|
5 years ago |
|
wynne1005
|
15c9e7111b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 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
|
5 years ago |
|
qianhs
|
20f5bfc9eb
|
wms数据同步迁移至mes
|
5 years ago |
|
陈思洁
|
72563a4eb5
|
【1597 条码打印功能新增-管理端 / 条码打印功能新增-管理端】
|
5 years ago |
|
王杰
|
c6aefc89e7
|
test合并dev解决ct
|
5 years ago |
|
王杰
|
94fed3b9b2
|
Merge branch 'test' into dev
|
5 years ago |
|
joke.wang
|
3e33a7ac3a
|
[客户jit增加JIT排序号字段]
|
5 years ago |
|
wynne1005
|
b5ecb91399
|
中航四月十号 内容提交
|
5 years ago |
|
joke.wang
|
4e8c4ae46f
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
joke.wang
|
caf8feb374
|
[采集工步存入生产数据格式修改]
|
5 years ago |
|
joke.wang
|
11adb5ff09
|
[麦格纳问题：111 检测项数据报表]
|
5 years ago |
|
joke.wang
|
1d50c135ac
|
[麦格纳问题：87 增加工单管理页面]
|
5 years ago |
|
wei.peng
|
aa1f7a2845
|
Merge remote-tracking branch 'remotes/origin/test'
|
5 years ago |
|
钮海涛
|
4dee474c73
|
修改POM版本号
|
5 years ago |
|
钮海涛
|
417120358c
|
Merge branch 'test' into dev
|
5 years ago |
|
钮海涛
|
288fb4a16b
|
修改POM版本号
|
5 years ago |
|
陈思洁
|
cd810ce1fc
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
陈思洁
|
5a6c525d1f
|
【MES_生成条码模型增加时分秒字段】
|
5 years ago |
|
王杰
|
3f3d0038e8
|
【任务：1608 数据监听预警配置，定时任务】
|
5 years ago |
|
qianhs
|
2e85d99380
|
联调测试
|
5 years ago |