 钮海涛
|
310da99743
|
合并master代码
|
5 years ago |
汪云昊
|
a52646a65d
|
Merge remote-tracking branch 'remotes/origin/dev' into test
# Conflicts:
# modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java
|
5 years ago |
|
汪云昊
|
26cf4c5e92
|
feat:mongo模块化
|
5 years ago |
|
汪云昊
|
103137e2fc
|
feat:添加条码解析校验模式
|
5 years ago |
wynne1005
|
c3f30530a8
|
erge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
wynne1005
|
086c78f828
|
新增pcn页面的辅助展示组件
|
5 years ago |
joke.wang
|
e3146c9fb4
|
Fix Bug #0776
|
5 years ago |
puxiao.liao
|
ba5befe291
|
Finish Task #2645 Cost:8h
【PCR-20200525-003_委外出库条码变更】中的零件号转化
|
5 years ago |
|
joke.wang
|
84dcf36c86
|
Fix Bug #10708
|
5 years ago |
rock.yu
|
5bfd542402
|
增加工单拉动
|
5 years ago |
 曾贞一
|
fe2017fbe4
|
【622 08 1.2.2.2.6 BOM增加虚阶零件】
|
5 years ago |
|
wynne1005
|
a400bf5aa7
|
还原orderBy
|
5 years ago |
|
wynne1005
|
887e1d04f7
|
baseBean sortParamMap 先注释
|
5 years ago |
|
钮海涛
|
9878547daa
|
合并dev分支代码
|
5 years ago |
|
钮海涛
|
272c92dcb6
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
钮海涛
|
f42ece4f6c
|
优化流程管家执行性能
|
5 years ago |
|
wynne1005
|
a751d5a8a7
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
wynne1005
|
8d7b0fae6a
|
添加小枪日志 与不需要打枪绑定 自动跳过
|
5 years ago |
|
钮海涛
|
ad4b59a700
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
汪云昊
|
2013ca569a
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
汪云昊
|
a45d1ed104
|
fix:分页结束行计算错误的问题
|
5 years ago |
|
wynne1005
|
0d3a8a3af7
|
添加放行记录
|
5 years ago |
许心洁
|
c0629d52d1
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
许心洁
|
1c02cd6562
|
任务#2612，2613
|
5 years ago |
|
wynne1005
|
ba558d640e
|
tmp
|
5 years ago |
陈思洁
|
3baf748329
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
9b9871534a
|
【10493 19048-产品颜色无导入功能】
|
5 years ago |
|
汪云昊
|
bda160ccec
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
5 years ago |
|
汪云昊
|
8d17cfcec0
|
feat:用户定制化配置功能
|
5 years ago |
|
钮海涛
|
54b0af00cc
|
Sweb功能开发
|
5 years ago |
宋军超
|
625b780aaf
|
添加海纳川数据复核工步和产线状态看板变更
|
5 years ago |
|
wynne1005
|
3af4d32a97
|
mes工位运行状态
|
5 years ago |
|
汪云昊
|
a3e8caf085
|
fix:detachObject为空时报错
|
5 years ago |
|
汪云昊
|
55b047448b
|
fix:会话模式为默认时出现不能正常覆盖的问题
|
5 years ago |
|
宋军超
|
6e60bee0dd
|
修改海纳川问题
|
5 years ago |
|
宋军超
|
731b1c60ee
|
修改海纳川问题
|
5 years ago |
 王杰
|
5413fc259c
|
pcn 缺陷
|
5 years ago |
|
汪云昊
|
410f469450
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
5 years ago |
|
汪云昊
|
7f291a26cd
|
会话模式配置-调整默认模式
|
5 years ago |
qianhs
|
86c9bce2aa
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
钮海涛
|
39f6819e9b
|
修复合并版本问题
|
5 years ago |
|
钮海涛
|
f760b72094
|
Merge remote-tracking branch 'remotes/origin/test'
|
5 years ago |
|
qianhs
|
c872663847
|
Finish Task #2080 Cost:8h
|
5 years ago |
|
汪云昊
|
e6ecd4f86f
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
5 years ago |
|
汪云昊
|
0d40470059
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
汪云昊
|
101a71970c
|
虚拟属性数据校验及参数赋值问题
|
5 years ago |
|
汪云昊
|
5a6a7a77fc
|
平台功能优化，移除通用缓存服务
|
5 years ago |
|
王杰
|
9a959a5184
|
pcn enum
|
5 years ago |
|
wynne1005
|
88233f080a
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
wynne1005
|
3ec8109e82
|
枪优化
|
5 years ago |