3022 Commits (682a086f239c191b5885ec092495756ee76d0358)

Author SHA1 Message Date
聂帅 b8b9daf870 Merge pull request '17245 19081-出库单-条码明细-导出报错' (#289) from junsheng.li/i3plus-pojo-junsheng:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/289
4 years ago
jun 9f7718d92d 17245 19081-出库单-条码明细-导出报错 4 years ago
于学杰 0a8acc71b2 Merge pull request '产线多次提交数据以及 优化首页接口和不合格审理单' (#286) from baoyu.wang/i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/286
4 years ago
王宝玉 35f09a6e50 产线多次提交数据以及 优化首页接口和不合格审理单 4 years ago
andly.pan 98fb50c059 增加枚举
Signed-off-by: andly.pan <andly.pan@estsh.com>
4 years ago
Dominic_Xiao 30eb4e2194 回滚POM版本 4 years ago
Wynne 7de40e37f5 Merge branch 'dev' into test 4 years ago
Wynne bd3dcbac3a Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
Wynne 0dd2f3b3c3 通用界面 requestmodel修改方法组id 4 years ago
jun 1b3b5ea6a5 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
nies 3bfb61178b 修改MES_QC_CHECK_TYPE 4 years ago
nies 88781e7831 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
nies 4850f4ccc2 新增tms的SOFT_TYPE 4 years ago
jun d0c62b9b2d 16909 19081-生产报废单导入XLS后,单据类型是【隔离报废】,而不是正常的【生产报废单】 4 years ago
jhh2579 f4e6c63956 中航工序外协检 4 years ago
nies 5da810fb20 Merge branch 'test' into dev 4 years ago
Wynne 55af273ea7 feat(Screen): 界面回显
界面回显
4 years ago
puxiao.liao 804401e12c 修复枚举导出异常 4 years ago
joke.wang f0c0a4038c ua配置 4 years ago
wynne1005 d8ad92fe24 merge test 还原pom 4 years ago
wynne1005 08a0ca7937 merge dev 还原pom 4 years ago
wynne1005 8cb6abc09d Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 4 years ago
wynne1005 c55875e129 feat(screen): 7.7 通用界面与前端完成回显
7.7 通用界面与前端完成回显
4 years ago
王杰 c22117f395 Merge branch 'test' into dev 4 years ago
joke.wang 72a2a24cf7 用户信息优化 4 years ago
nies 0cda9012f2 Merge branch 'test' into dev 4 years ago
joke.wang d96f4b5d74 16496 19081-设备管理调整- 4 years ago
wynne1005 bb88851f17 还原pom 4 years ago
wynne1005 0e21856803 Merge branch 'dev' into test 4 years ago
wynne1005 85b922d492 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 4 years ago
wynne1005 42fb211a26 625 数据对象更新 4 years ago
陈思洁 28474c8aba Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
王杰 a71774ba24 pom 4 years ago
王杰 3e63b97bc3 Merge branch 'test' into dev 4 years ago
王杰 c14eb6e0bb pcn 4 years ago
王杰 21ca70f863 pom 4 years ago
jun bda7b30475 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
wynne1005 d6b2bce9b0 fix(screen): 6.21 枚举调整 增删改查测试
6.21 枚举调整 增删改查测试
4 years ago
Dominic_Xiao 5a354229f7 泰国电检 4 years ago
陈思洁 9ea5b11f20 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
陈思洁 02cf004828 【3566 20063-鉴定报工-20210618】 4 years ago
joke.wang 8b5447f5ca 停机统计报表 4 years ago
陈思洁 0170a86f60 【3484 20063-待处理报工基础数据-20210610】 4 years ago
puxiao.liao 93906742a6 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev 4 years ago
陈思洁 ee42edc94c 【3484 20063-待处理报工基础数据-20210610】 4 years ago
wynne1005 321209f2b4 Merge branch 'test' into ext-dev 4 years ago
wynne1005 e7df36d3e9 还原merge pom 4 years ago
wynne1005 7aa3d4bddf Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 4 years ago
wynne1005 2b0a7198a5 fix(impp-framework core block): 统一提交
还原pom
添加界面 icloud
升级mysql 驱动版本
添加松下日志切面
4 years ago
王杰 4fe445e4c3 test merge dev 4 years ago