宋军超
|
3a31ccae70
|
队列明细添加临时字段
|
5 years ago |
 贾文涛
|
a577eac60a
|
修复缓存redis时，忽略ModuleServer对象。
|
5 years ago |
wynne1005
|
f3a13522a1
|
解决冲突
|
5 years ago |
|
wynne1005
|
3ba1c8ee62
|
新增组件类型枚举
|
5 years ago |
joke.wang
|
a1af94fe70
|
Fix Bug #9760
|
5 years ago |
|
宋军超
|
ae285a6dc6
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
 王杰
|
4df8a743a7
|
9735 19048-物料信息导入模板增加喷涂必需信息的维护-2020-07-21
|
5 years ago |
|
宋军超
|
076c6c1b4f
|
扭矩二合一查询关键件清单逻辑优化--目前根据 队列主表，队列明细表，车型散件配置清单，物料信息表。加上条件【一百位条码】,年度型相同，车型相同 内联查出所有的关键件零件——>查询车型散件配置清单中的零件信息
工位监控逻辑修改:产线添加工位监控模式字段，为空或10执行之前逻辑，为20时不需要查询工单信息，后面逻辑不变
|
5 years ago |
puxiao.liao
|
31c3fcd868
|
泰国需求
|
5 years ago |
|
wynne1005
|
194f49ca11
|
agv停车信号 工位重做 倒计时 1
|
5 years ago |
|
wynne1005
|
d5ee3d3b29
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
wynne1005
|
2116fdafc7
|
agv枚举
|
5 years ago |
 钮海涛
|
809c625fc5
|
解决合并冲突
|
5 years ago |
|
宋军超
|
63163e1140
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
宋军超
|
1ac8fae269
|
修改枪头更换逻辑
|
5 years ago |
 曾贞一
|
b6a0d43bd0
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
曾贞一
|
a379c97461
|
【2444 坤泰流程配置测试】
|
5 years ago |
|
钮海涛
|
3e95dd4029
|
修复北京麦格纳生产报工问题
|
5 years ago |
|
宋军超
|
a77bf1a98a
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
宋军超
|
a25df616e3
|
修改展示组件，添加查询队列刷新时间；修改PLC标签地址查询条件
|
5 years ago |
|
puxiao.liao
|
88b85b03d2
|
Finish Task #2436 Cost:8h
拣货、客户发运流程简化配置
|
5 years ago |
qianhs
|
c9e4c72901
|
Finish Task #2080 Cost:8h
|
5 years ago |
|
钮海涛
|
e140910db7
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
qianhs
|
e17318dbcb
|
Finish Task #2080 Cost:8h
|
5 years ago |
汪云昊
|
94c21581dc
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
汪云昊
|
50999e49f2
|
软适配添加原始报文查询
|
5 years ago |
|
汪云昊
|
c230c57c97
|
定时任务 导入导出
定时任务 重载功能
|
5 years ago |
|
王杰
|
b3999ad481
|
dev merge test
|
5 years ago |
|
王杰
|
767c1bffbc
|
test merge dev
|
5 years ago |
|
钮海涛
|
886db365e3
|
Merge remote-tracking branch 'origin/master'
|
5 years ago |
|
钮海涛
|
81266fbfb6
|
解决合并冲突
|
5 years ago |
|
王杰
|
3fd979a565
|
test merge master
|
5 years ago |
|
钮海涛
|
02d46cfb69
|
解决合并冲突
|
5 years ago |
|
王杰
|
9a74188e55
|
master merge test
|
5 years ago |
|
qianhs
|
9461057a07
|
Finish Task #2080 Cost:8h
|
5 years ago |
陈思洁
|
930472492f
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
5 years ago |
|
陈思洁
|
1d799ed294
|
2447 中航 扣减错误信息保存
|
5 years ago |
|
王杰
|
204da853c3
|
[任务：2442]
|
5 years ago |
|
qianhs
|
747cfeb125
|
Finish Task #2080 Cost:8h
|
5 years ago |
|
qianhs
|
61603e2aa5
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
joke.wang
|
8f7d6d46af
|
Fix Bug #9457
|
5 years ago |
|
joke.wang
|
54a51a4c69
|
Fix Bug #916
|
5 years ago |
|
王杰
|
9b6be3167d
|
dev merge test
|
5 years ago |
|
王杰
|
d2ff83e22b
|
test merge dev
|
5 years ago |
|
王杰
|
411fdbaa7d
|
Merge branch 'test' into dev
|
5 years ago |
|
王杰
|
699b444223
|
Merge branch 'dev' of jhforever.wang/wangjie-i3plus-pojo into dev
|
5 years ago |
|
王杰
|
7533a3ef44
|
[任务2408]
|
5 years ago |
|
陈思洁
|
ffbf18944c
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
f5b4c666bf
|
【天津bug修改 9627,9615,9614,9610,9585,9445,9439,9428,9421,9401】
|
5 years ago |
|
曾贞一
|
fd958c1c5f
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |