wynne1005
|
63bc0b5928
|
merge test
|
5 years ago |
|
wynne1005
|
46a91a13bc
|
jis 去除rule关键字
|
5 years ago |
陈思洁
|
28de0251ea
|
【sonar bug修改】
|
5 years ago |
 曾贞一
|
1901cf6eb0
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
曾贞一
|
2dac15c248
|
【1709 BH-录入检测值】
|
5 years ago |
 钮海涛
|
1b88b20e13
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
钮海涛
|
40a87d83b3
|
修复合并问题
|
5 years ago |
 贾文涛
|
4c8f3c34a2
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
贾文涛
|
6760ed79dd
|
数据权限-修改启用禁用问题
|
5 years ago |
|
钮海涛
|
05276bcf46
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
钮海涛
|
d74d78353d
|
Merge branch 'test' into dev
|
5 years ago |
|
钮海涛
|
bc269e1f71
|
Merge branch 'master' into test
|
5 years ago |
 王杰
|
696c6a8da3
|
Merge branch 'dev' of jhforever.wang/wangjie-i3plus-pojo into dev
|
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 |
宋军超
|
345b261118
|
设备添加枚举EQU_DEFECT_CAUSE故障原因,EQU_DEFECT_METHOD故障处理措施,EQU_DEFECT_PHENOMENON故障现象;
|
5 years ago |
|
宋军超
|
f9dfc8e0e2
|
plc地址清单添加plc类型字段(枚举)，设备台账添加作业校验模式字段(枚举)
|
5 years ago |
|
wynne1005
|
27e4fb164b
|
Merge branch 'dev' into test
|
5 years ago |
|
王杰
|
39a2def9ab
|
Merge branch 'dev' of jhforever.wang/wangjie-i3plus-pojo into dev
|
5 years ago |
|
王杰
|
724e784fe3
|
Merge remote-tracking branch 'i3plus-pojo/dev' into dev
|
5 years ago |
|
王杰
|
c5d4cd7dad
|
生产计划编制
|
5 years ago |
|
钮海涛
|
2b85a05645
|
新增脚本WebSocket
|
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 |
|
钮海涛
|
dd70688754
|
新增脚本WebSocket
|
5 years ago |
qianhs
|
dd3249fc12
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
qianhs
|
fdaa4c1740
|
bug:8268;8267;8266;8265
|
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 |
|
qianhs
|
f03e119561
|
bug:8268;8267;8266;8265
|
5 years ago |
|
钮海涛
|
6e2344b303
|
bug:8330
|
5 years ago |
汪云昊
|
627257fc22
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
汪云昊
|
32460a3272
|
sqlserver 适配处理，in 参数类型不准确
|
5 years ago |
|
陈思洁
|
ae156ad82f
|
【动态按钮--完成按钮修改mes和mespcn】
|
5 years ago |
|
钮海涛
|
8f884a58cf
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
钮海涛
|
90edd435e3
|
bug:8293;8297
|
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 |
|
王杰
|
5dcddb0010
|
Merge branch 'dev' of jhforever.wang/wangjie-i3plus-pojo into dev
|
5 years ago |
|
王杰
|
de200de372
|
mes
|
5 years ago |
|
曾贞一
|
0a51c0e10c
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
曾贞一
|
97d7fdbf24
|
【8181 20011-- 条码打印界面增加一个打印组号按钮，用于现场母条码丢失或者损坏的场景来补打母条码】
|
5 years ago |
|
钮海涛
|
a575b4eed4
|
bug:8287;8288;8290
|
5 years ago |
|
王杰
|
47fc864a62
|
Merge branch 'dev' of jhforever.wang/wangjie-i3plus-pojo into dev
|
5 years ago |
|
王杰
|
da1c10dc4c
|
mes生产计划批量编制
|
5 years ago |
|
曾贞一
|
fb15536a34
|
【8254 中航-出库单-客户发运-新增销售订单字段】
|
5 years ago |