 钮海涛
|
ac268c1cbc
|
Merge branch 'test' into dev
|
5 years ago |
陈思洁
|
543f0f5c4c
|
【代码合并还原】
|
5 years ago |
joke.wang
|
b450df5754
|
[任务：1752工厂oee]
|
5 years ago |
|
joke.wang
|
142f8e79c6
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
joke.wang
|
f41cd22258
|
[bug: 8353 拍照采集]
|
5 years ago |
wynne1005
|
63bc0b5928
|
merge test
|
5 years ago |
|
wynne1005
|
46a91a13bc
|
jis 去除rule关键字
|
5 years ago |
|
wynne1005
|
25b2fb8e21
|
jis pojo 去除rule 关键字
|
5 years ago |
|
陈思洁
|
28de0251ea
|
【sonar bug修改】
|
5 years ago |
|
钮海涛
|
bbe03cc6fd
|
解决合并冲突问题
|
5 years ago |
|
钮海涛
|
1b88b20e13
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
钮海涛
|
40a87d83b3
|
修复合并问题
|
5 years ago |
 贾文涛
|
6760ed79dd
|
数据权限-修改启用禁用问题
|
5 years ago |
|
钮海涛
|
005d0f7f86
|
修复合并问题
|
5 years ago |
|
钮海涛
|
d74d78353d
|
Merge branch 'test' into dev
|
5 years ago |
|
钮海涛
|
bc269e1f71
|
Merge branch 'master' into test
|
5 years ago |
 王杰
|
1dff3327d7
|
任务：1733 条码模板逻辑调整
|
5 years ago |
|
joke.wang
|
363ac22ade
|
[任务：1750 OEE运算JOB]
|
5 years ago |
|
wynne1005
|
1cda7e902b
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
宋军超
|
f9dfc8e0e2
|
plc地址清单添加plc类型字段(枚举)，设备台账添加作业校验模式字段(枚举)
|
5 years ago |
|
wynne1005
|
27e4fb164b
|
Merge branch 'dev' into test
|
5 years ago |
|
王杰
|
724e784fe3
|
Merge remote-tracking branch 'i3plus-pojo/dev' into dev
|
5 years ago |
|
王杰
|
c5d4cd7dad
|
生产计划编制
|
5 years ago |
|
wynne1005
|
d925ec62bf
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
wynne1005
|
888d87f12e
|
task edi
|
5 years ago |
|
joke.wang
|
f38a47cc68
|
[oee 定时任务]
|
5 years ago |
|
贾文涛
|
a563537750
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
贾文涛
|
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 |