 贾文涛
|
eadf0d67f8
|
添加数据权限处理方法
|
6 years ago |
 曾贞一
|
1901cf6eb0
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
2dac15c248
|
【1709 BH-录入检测值】
|
6 years ago |
 钮海涛
|
40a87d83b3
|
修复合并问题
|
6 years ago |
|
钮海涛
|
bc269e1f71
|
Merge branch 'master' into test
|
6 years ago |
wynne1005
|
1cda7e902b
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
宋军超
|
345b261118
|
设备添加枚举EQU_DEFECT_CAUSE故障原因,EQU_DEFECT_METHOD故障处理措施,EQU_DEFECT_PHENOMENON故障现象;
|
6 years ago |
|
wynne1005
|
27e4fb164b
|
Merge branch 'dev' into test
|
6 years ago |
|
wynne1005
|
d925ec62bf
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
wynne1005
|
888d87f12e
|
task edi
|
6 years ago |
joke.wang
|
f38a47cc68
|
[oee 定时任务]
|
6 years ago |
qianhs
|
fdaa4c1740
|
bug:8268;8267;8266;8265
|
6 years ago |
|
贾文涛
|
a563537750
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
贾文涛
|
e63601716f
|
1736-MES数据权限模块开发
|
6 years ago |
|
qianhs
|
f03e119561
|
bug:8268;8267;8266;8265
|
6 years ago |
|
钮海涛
|
8f884a58cf
|
Merge remote-tracking branch 'origin/test' into test
|
6 years ago |
|
钮海涛
|
90edd435e3
|
bug:8293;8297
|
6 years ago |
|
joke.wang
|
3227cfa47e
|
[oee]
|
6 years ago |
|
wynne1005
|
4ed1770189
|
Merge branch 'dev' into test
|
6 years ago |
 王杰
|
de200de372
|
mes
|
6 years ago |
|
钮海涛
|
a575b4eed4
|
bug:8287;8288;8290
|
6 years ago |
|
王杰
|
da1c10dc4c
|
mes生产计划批量编制
|
6 years ago |
|
钮海涛
|
ac9ffb1ac1
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
袁津哲
|
000c2ad16c
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
袁津哲
|
745455c5bd
|
修改波次规则bug和对接导入模板接口
|
6 years ago |
|
钮海涛
|
bf2cc9843f
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
|
6 years ago |
puxiao.liao
|
b9af2c52f8
|
1713 BH-挑选，返修
|
6 years ago |
|
钮海涛
|
81f380aec4
|
产品入库表新增
|
6 years ago |
|
joke.wang
|
60428b5bad
|
[任务：1690 界面窗口]
|
6 years ago |
汪云昊
|
2ab9045d17
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
汪云昊
|
30c0b2e46a
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
汪云昊
|
241ea78cda
|
检测环境枚举数据调整
|
6 years ago |
|
汪云昊
|
71d30c3232
|
表单-自定义按钮-添加是否需要选中数据校验及实现Http方式扩展
表单-拦截器-实现Http方式扩展
表单-元素-工厂数据隔离功能
表单-动态表单-查询数据默认条件优先级优化
sonar代码优化
|
6 years ago |
|
王杰
|
2b01efb15b
|
mes生产计划批量编制
|
6 years ago |
|
wynne1005
|
d5f69eeefd
|
task 1565 发运修改
|
6 years ago |
|
袁津哲
|
64daf36410
|
动态搜索修改人修改时间开窗处理,BUG:8097
|
6 years ago |
|
袁津哲
|
633aef2d6e
|
动态搜索修改人修改时间开窗处理
|
6 years ago |
wei.peng
|
37922cab29
|
POM 文件修改
Merge remote-tracking branch 'remotes/origin/test'
# Conflicts:
# modules/i3plus-icloud-report/pom.xml
|
6 years ago |
|
wei.peng
|
fe94ad9bf3
|
Merge remote-tracking branch 'remotes/origin/test'
|
6 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
|
6 years ago |
|
宋军超
|
b96eb1b669
|
添加人员技能功能
|
6 years ago |
|
曾贞一
|
bc82c85790
|
【1721 BH-BH检测结果管理】
|
6 years ago |
|
钮海涛
|
cb8688105c
|
task:1727;1728;1729
|
6 years ago |
|
钮海涛
|
3fbf532c84
|
修复pom版本问题
|
6 years ago |
|
钮海涛
|
a1eb3c3bc2
|
修复pom版本问题
|
6 years ago |
|
钮海涛
|
2e2ee2cc6c
|
Merge branch 'test' into dev
|
6 years ago |
|
钮海涛
|
2cc43af431
|
修复pom版本问题
|
6 years ago |
|
钮海涛
|
c6d36af4c9
|
Merge branch 'master' into test
|
6 years ago |
|
joke.wang
|
ce1dd45842
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
joke.wang
|
755fccb45e
|
[任务：1690 产能监控看板]
|
6 years ago |