2144 Commits (0e218568031ff34dd33f119e14e2053339a81519)

Author	SHA1	Message	Date
陈思洁	1643d57b99	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	a014d8ceaa	【13137 19048 安灯类型没有在看板中展示 20201209】	5 years ago
simon.song	4a120ca375	12736 20027-管理端-控制计划--按照导入模板导入控制计划数据时提示成功，但是无法看到导入的数据-20201124	5 years ago
wynne1005	9242285b4c	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
wynne1005	b09a09f70b	修改mes工位监控 异常停止不能复位问题 bi相关问题	5 years ago
陈思洁	981438c2a2	【12997 19048-条码补打查询不到二检箱标签-20201204】	5 years ago
simon.song	effc34f74d	Merge remote-tracking branch 'remotes/origin/test' into ext-dev ... # Conflicts: # modules/i3plus-pojo-mes-pcn/pom.xml	5 years ago
陈思洁	9478267dd8	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	4cfee2dc9c	【12591 20027-BI-生产经理BI报表-调角器工厂生产线产出情况-浮窗解释不清晰-2020-12-04】	5 years ago
Dominic_Xiao	ae9978a3bb	新增serialNumber字段	5 years ago
王杰	f9ce9641de	增加索引	5 years ago
joke.wang	da293141cd	oee bug修复	5 years ago
许心洁	de9578d439	墨西哥WMS报工业务新增功能：通用脚本导入接口+生产版本DAO层+生产计划主表计划状态FINISH(25, "FINISH", "已完成")	5 years ago
simon.song	8dcb1703c9	首检返回值字段调整	5 years ago
simon.song	d0e1fcd440	Merge remote-tracking branch 'origin/test' into test	5 years ago
simon.song	56989acba2	12362 20027-管理端-首检检验结果报表状态已完成的对应的数量和已检数量显示有问题-20201115	5 years ago
joke.wang	14c47545e7	查询备件库存修改	5 years ago
王杰	2b522ca15d	工步参数 增加字段	5 years ago
王杰	183111cf65	Merge remote-tracking branch 'i3plus-pojo/test' into test	5 years ago
王杰	d64a8fd31c	工步参数 增加字段	5 years ago
陈思洁	7e37a6e22d	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	28da49aa29	【12422 19048 增加喷涂抛光条码查询报表 20201112】	5 years ago
王杰	13868d5cd1	producesn 增加索引	5 years ago
王杰	02d002b958	package detail 增加 联合索引	5 years ago
simon.song	9b57f47af6	修改pom文件	5 years ago
simon.song	3917408421	Merge remote-tracking branch 'remotes/origin/dev' into test	5 years ago
陈思洁	d8d2dea922	Merge remote-tracking branch 'origin/test' into test	5 years ago
陈思洁	a4093d18d1	【12420 19048 喷涂二检增加UNPACK功能 20201112】	5 years ago
王杰	a94b5dd0b0	看板产线配置	5 years ago
陈思洁	fd166bc0ff	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	47e6a86ecd	【天津bug修改】	5 years ago
Dominic_Xiao	0deb9b4733	中航襄阳滑道工厂需求:新增容器编号字段	5 years ago
joke.wang	d5b2f4a4cd	生产队列增加分组号字段	5 years ago
Dominic_Xiao	86f9faa01d	Merge remote-tracking branch 'remotes/origin/test' into dev	5 years ago
陈思洁	b0df747d22	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	19636e308e	【12645 19048-喷涂质检报表用开始和结束工单查询无反应-20201123】	5 years ago
wynne1005	d9b4a8eb4d	修改包扫描路径	5 years ago
王杰	7be62a939b	TJ看板	5 years ago
joke.wang	970f75f8cf	队列表增加分组号字段	5 years ago
Dominic_Xiao	2a94ce3e0e	包装条码绑定解绑	5 years ago
wynne1005	d893e76ab4	merge	5 years ago
wynne1005	aa450c10e4	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
wynne1005	bdf8e0d782	错误pojo修改	5 years ago
simon	55188db083	Merge remote-tracking branch 'remotes/origin/test' into dev	5 years ago
钮海涛	af732b7a4f	合并test代码	5 years ago
宋双双	b188123ab4	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	5 years ago
Dominic_Xiao	fd7799b943	Merge remote-tracking branch 'remotes/origin/test' into dev	5 years ago
陈思洁	0bcb009383	【2977 11 2.5.5 整形业务，单件翻包与整箱过站】	5 years ago
joke.wang	2f56f8949e	eol看板优化	5 years ago
Dominic_Xiao	20999fd63a	新增不良品处理查询位置列表	5 years ago
陈思洁	95c63fb30b	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	6ffec48185	【2977 11 2.5.5 整形业务，单件翻包与整箱过站】	5 years ago
王杰	fa3bb1f53a	涂装 看板	5 years ago
joke.wang	c679e7f19b	半成品看板优化	5 years ago
王杰	cf9d3d9f2d	tz 看板	5 years ago
wynne1005	db87c0c32f	pom版本	5 years ago
joke.wang	f6260cec39	看板产线基础页面	5 years ago
陈思洁	22ec710d78	【12420 19048 喷涂二检增加UNPACK功能 20201112】	5 years ago
陈思洁	4311fef1a3	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	be8d655eb9	【12420 19048 喷涂二检增加UNPACK功能 20201112】	5 years ago
王杰	59f916ddab	produceSn	5 years ago
陈思洁	0fee0dbe67	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	6c04caf728	【天津看板问题修复】	5 years ago
simon	5b2bbf7b1e	Merge remote-tracking branch 'origin/test' into test	5 years ago
simon	c03446866a	中航-首检单历史记录显示与修改	5 years ago
钮海涛	b9283ec075	合并dev代码	5 years ago
钮海涛	b57ae573ed	合并test代码	5 years ago
钮海涛	4ec6267b4e	Merge remote-tracking branch 'remotes/origin/test' into dev	5 years ago
钮海涛	89a45d326b	合并test代码	5 years ago
钮海涛	f63813d66d	合并master代码	5 years ago
钮海涛	ceebe541f2	Merge remote-tracking branch 'remotes/origin/master' into test	5 years ago
joke.wang	0009db6b33	工位技能查询bug修复	5 years ago
joke.wang	7a33df666b	JSA JSP表增加索引	5 years ago
joke.wang	148ef03e78	看板产线员工能力矩阵	5 years ago
王杰	e2d6b573f0	不良记录报表 报工报表	5 years ago
王杰	3636b75780	Merge remote-tracking branch 'i3plus-pojo/test' into test	5 years ago
joke.wang	e21e49ae93	不良处理增加展示字段	5 years ago
simon	0b68fdbee3	Merge remote-tracking branch 'remotes/origin/test' into dev	5 years ago
joke.wang	445f6b309c	备件消耗替代增加查询字段	5 years ago
Dominic_Xiao	8e3943b306	Merge remote-tracking branch 'remotes/origin/test' into dev ... # Conflicts: # modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PackageDetailModel.java	5 years ago
王杰	c615475dee	Merge remote-tracking branch 'i3plus-pojo/test' into test	5 years ago
simon	52974a9633	Merge remote-tracking branch 'origin/test' into test	5 years ago
simon	d3bcf1499e	去掉新增字段非空校验	5 years ago
Dominic_Xiao	183d976c38	新增卡斯马展示组件模型	5 years ago
Dominic_Xiao	27d76d86ae	Merge remote-tracking branch 'origin/test' into test	5 years ago
Dominic_Xiao	a0776b7401	更新卡斯马展示组件,新增展示组件模型	5 years ago
陈思洁	92b395ad3f	【2958 11 2.5.3 热处理上件】	5 years ago
陈思洁	ddc00a617b	【冲突】	5 years ago
陈思洁	2de0d76af3	【2958 11 2.5.3 热处理上件】	5 years ago
王杰	08fc0b54c6	Merge remote-tracking branch 'i3plus-pojo/test' into test	5 years ago
joke.wang	22411fa928	备件导入增加列	5 years ago
汪云昊	f2180f18f3	revert(pojo):还原pom版本	5 years ago
汪云昊	378205ef61	Merge remote-tracking branch 'origin/dev' into test	5 years ago
汪云昊	cc947c08f5	revert(pojo):还原pom版本	5 years ago
王杰	b7e2ddd2c2	包装明细 增加索引	5 years ago
simon	faad8cf4c8	修复取消必填字段	5 years ago
joke.wang	1f306924e4	看板自定义参数页面	5 years ago
宋双双	42feb06058	删除 'modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage'	5 years ago
simon	d8409c5b57	修改文件格式	5 years ago
Dominic_Xiao	22a88a4dc0	卡斯马定时同步实体类	5 years ago
Dominic_Xiao	452024abf6	删除多余类	5 years ago
Dominic_Xiao	f551ede492	Merge remote-tracking branch 'origin/test' into test ... # Conflicts: # modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerLocation.java # modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java # modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java # modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartContainerCapacity.java # modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesContainerLocationRepository.java # modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesCustomerSnRuleRepository.java # modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartContainerCapacityRepository.java # modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java	5 years ago
Dominic_Xiao	61638c391a	包装详情表新增容器位置字段	5 years ago
Dominic_Xiao	f1fedb53f4	增加卡斯马业务pojo	5 years ago
Dominic_Xiao	eb7ed898df	增加卡斯马业务pojo	5 years ago
Dominic_Xiao	8d0e2b942b	增加卡斯马业务pojo	5 years ago
Dominic_Xiao	e919987d68	Merge remote-tracking branch 'origin/test' into test ... # Conflicts: # modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java	5 years ago
joke.wang	928c643031	看板自定义参数	5 years ago
王杰	fa01ec478a	Mes_Package 表加索引	5 years ago
joke.wang	058bd05b4a	mgn-bj esop展示组件优化	5 years ago
陈思洁	14f9dbed22	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	c6a3428cbe	【12420 19048 喷涂二检增加UNPACK功能 20201112】 ... 12391 19048-条码补打(包装)增加关联批次查询条件-20201112 开线管控问题	5 years ago
Dominic_Xiao	de51b68790	新增表:产品缺陷位置	5 years ago
Dominic_Xiao	31a1c64f69	新增字段:缺陷位置代码	5 years ago
宋军超	84986eb644	添加天津报工报表	5 years ago
simon	cea2d334e3	中航-修复公差上线和公差下线赋值问题	5 years ago
Dominic_Xiao	ea1d51f32c	删除无用类	5 years ago
Dominic_Xiao	5780306e94	增加序列化	5 years ago
王杰	86998e109e	总装 质量判定	5 years ago
陈思洁	ad70d8f1a3	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	fddd66796b	【12276 20027-PCN端 - 巡检检验- 系统生成巡检任务单时没有按照通知计划里面维护的时间去生成巡检任务 -20201105】	5 years ago
宋军超	315d92f5c0	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
宋军超	7b6b97c1b7	修改天津涂装质量检测看板	5 years ago
simon	173e145c56	Merge remote-tracking branch 'origin/test' into test	5 years ago
simon	a1dd0fa36b	中航-新增查询质检单检测历史接口	5 years ago
宋军超	5f9d597943	修改天津看板评定项字段DEC->DECEMBER	5 years ago
simon	e1e0c12344	Merge remote-tracking branch 'origin/test' into test	5 years ago
simon	30382c5585	中航-公差上线 公差下线字段调整	5 years ago
宋军超	2df948207c	修改天津涂装看板	5 years ago
Dominic_Xiao	46c0206d6a	卡斯马热处理翻包新增模块的dao	5 years ago
simon	1ba56bc59a	调整过程检验返回结果	5 years ago
Dominic_Xiao	c2f9937b37	新增卡斯马热处理翻包基础模块	5 years ago
Dominic_Xiao	7bb60b8f6e	新增卡斯马三个基础模块的查询条件封装	5 years ago
Dominic_Xiao	7bb8c5cb35	Merge remote-tracking branch 'origin/test' into test	5 years ago
Dominic_Xiao	07cd3de33f	新增容器位置编号字段	5 years ago
simon	a6064a9a19	Merge remote-tracking branch 'origin/test' into test	5 years ago
simon	755d66dbce	中航-停线时根据工单删除当前“巡检项生成明细表”	5 years ago
陈思洁	2911abf193	【12324 20027-PCN端-工单管理-产线管控已经停线，但是在工单管理中点击暂停无法成功提示“90003:工单【1545】需要在停线时才允许暂停[请检查]”-20201109】	5 years ago
宋军超	39da900ae1	添加天津涂装看板	5 years ago
宋军超	12074e24a8	添加天津涂装看板	5 years ago
wynne1005	5070fcc8fb	天津看板 员工矩阵model 新增领导	5 years ago
宋军超	e19d53de4a	添加天津涂装看板	5 years ago
宋军超	98fa35c8a0	添加天津涂装看板	5 years ago
joke.wang	ae1bb43764	mgn-bj edi删除多余项	5 years ago
宋军超	6aeb6bddde	添加天津涂装看板	5 years ago
王杰	e775db87fa	紧急插单	5 years ago
宋军超	9bf8018ac1	添加天津涂装看板	5 years ago
宋军超	06c3992b98	添加天津涂装看板	5 years ago
陈思洁	26f075233e	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	48a678cc16	【12116 19048-工位监控-参数中选择插入条码，依旧提示过程条码在系统中不存在-20201030】	5 years ago
宋军超	2f81a0f35d	添加天津涂装看板	5 years ago
陈思洁	250d2fbf14	【2932 11 2.3.3QMES产品追溯报表】	5 years ago
simon	ece1ca4c01	调整中航看板返回，修复中航pcn原材料上线bug	5 years ago
王杰	b9fef07d7f	总装质量判定	5 years ago
王杰	12224ed8df	工单表加索引 ：workCenterCode workOrderStatus	5 years ago
陈思洁	c0abb5f994	【12077 19048-注塑，喷涂，组装计划生产报表导出无扩展字段内容-20201026】	5 years ago
汪云昊	1825cfbdf3	revert(pojo):还原pom版本	5 years ago
wynne1005	88c942f509	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
wynne1005	fb5df5aedf	照片采集完成	5 years ago
宋军超	52c35877d8	添加天津涂装报表	5 years ago
陈思洁	28dd76f30b	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	11748bb19e	【12066 19048-喷涂展示组件颜色查询方式变更-20201024】	5 years ago
王杰	ade2d60849	总装 质量判定	5 years ago
王杰	d7092a7f52	总装标记不良	5 years ago
宋军超	5d41023df6	修改天津涂装看板	5 years ago
songss	532e99eb8b	Merge remote-tracking branch 'origin/test' into test	5 years ago
songss	76a0703bac	调整中航看板接口地址	5 years ago
joke.wang	0d12d01ebf	生产报功表增加分组标识	5 years ago
wynne1005	ff45755577	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
wynne1005	2ff6eded6e	修改Oee	5 years ago
joke.wang	63b7162932	mgn-bj 半成品看板	5 years ago
汪云昊	dceb9b17a5	revert(pojo):还原pom版本	5 years ago
汪云昊	91f68d50d4	Merge remote-tracking branch 'origin/dev' into test	5 years ago
宋军超	692cd283f7	添加天津涂装看板-设备实时监控	5 years ago
曾贞一	d8e5aa44bc	pom.xml	5 years ago
陈思洁	8dfcb7f429	【合并冲突】	5 years ago
陈思洁	3dc951c34f	【11964 19048-喷涂抛光报表变更-20201021】	5 years ago
宋军超	37c95dc6b3	添加天津涂装看板	5 years ago
wynne1005	20ee1215d2	解决 包名细化 导致冲突	5 years ago
wynne1005	9d81ec30d1	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
wynne1005	6d4e8608c4	注塑 组装报表开发完毕	5 years ago
joke.wang	f57f4e25be	mgn-bj 总屏看板	5 years ago
宋军超	1b6264e80d	添加天津涂装看板	5 years ago
songss	2ed5108699	Merge remote-tracking branch 'origin/test' into test	5 years ago
songss	36928196c1	中航看板-调整返回接口参数	5 years ago
joke.wang	5227540ecc	队列表添加索引	5 years ago
songss	d9040143f9	新增中航产线看板-每小时产量接口	5 years ago
wynne1005	1730dc27c3	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
wynne1005	4d4ad7ff84	天津注塑看板	5 years ago
songss	783022646c	新增中航产线状态图接口	5 years ago
钮海涛	a8cdba48c3	合并Master代码	5 years ago
钮海涛	7afd60073a	Merge remote-tracking branch 'remotes/origin/test'	5 years ago
王杰	f6ad2824b2	11984 19048-组装生产计划报表增加字段-20201020	5 years ago
王杰	97be3f186a	工单生产时间变更定时任务实体	5 years ago
songss	ef316af0c1	Merge remote-tracking branch 'origin/test' into test ... # Conflicts: # modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java	5 years ago
wynne1005	78a3943a3d	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
wynne1005	4c86b836ca	OP20b逻辑变更 esop展示变更	5 years ago
宋军超	6826f04b97	天津看板添加设备状态逻辑	5 years ago
joke.wang	9002bdc936	预装队列显示列优化	5 years ago
王杰	bb3039d1f2	包装关系查询宝贝	5 years ago
songss	17d47fdc55	新增看板图片增删改查接口 ... 新增看板切换配置增删改查接口 新增中航-产线概况接口	5 years ago
陈思洁	92a9f5faba	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	b70a58ba7d	【2867 10 2.3.9 返工返修批量作业】	5 years ago
贾文涛	525cda2768	增加数量处理方法	5 years ago
宋军超	627e8ac215	添加麦格纳看板相关基础数据	5 years ago
陈思洁	061f48dc79	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	e268ed86a9	【11934 19081-工位BOM中需要增加产线和工位的查询条件-20201020】	5 years ago
wynne1005	5d73afd17f	jisa小时接收报表完成	5 years ago
wynne1005	05152538b2	合并冲突	5 years ago
wynne1005	fc36e55a38	新增mes 报表查询周期枚举	5 years ago
宋军超	9c1a9be165	优化天津麦格纳报表	5 years ago
wynne1005	e24bb4c39b	同步新增忽略字段	5 years ago
wynne1005	63c1cc479b	字段长度 model添加planCfgCode	5 years ago
wynne1005	7bca216063	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
wynne1005	8b53722b0f	设备plan更新	5 years ago
joke.wang	cd32eee8ea	排程配置表增加冗余字段	5 years ago
宋军超	fcc66835b8	开发天津看板功能	5 years ago
wynne1005	ddaedf49ee	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
wynne1005	52bdc6c664	设备作业周期 新增planCfgCode	5 years ago
宋军超	bd9547b825	优化天津麦格纳报表	5 years ago
joke.wang	cc2961d4b8	库存排产表增加字段	5 years ago
宋军超	3d8d84ee77	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test ... Conflicts: modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java	5 years ago
宋军超	dc38d2db6f	优化天津麦格纳报表	5 years ago
wynne1005	1e6ca2e0bb	添加设备作业任务 周期类型	5 years ago
贾文涛	1ffebd418f	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
贾文涛	834e3d211d	更新查询大于0的业务时，基础类错误问题。	5 years ago
wynne1005	a86a58fa6d	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
joke.wang	233853e1e6	库存排程	5 years ago
王杰	f58d97fb83	11777 19048-绑定关键件 绑定多个关键件数据出现回滚-20201012	5 years ago
wynne1005	248c8229ff	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
wynne1005	a49ddc004c	添加lob	5 years ago
贾文涛	0c34bce623	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
贾文涛	7e24f4ed4a	修复队列乱跳问题。	5 years ago
贾文涛	d2f9c3502a	修复队列乱跳问题。	5 years ago
wynne1005	18275c8fb2	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
wynne1005	226c31878a	添加缺陷代码	5 years ago
陈思洁	30f8e332fa	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	8f060d4aa4	【2856 10 2.3.8 20027-PCN端工位监控如果报错数据没有采集怎么报警提示】	5 years ago
joke.wang	c442845f94	跳序变更	5 years ago
wynne1005	7fb7db3cb5	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
wynne1005	629e6af9a9	设备指导操作文件	5 years ago
宋军超	4b65842d6f	修改天津麦格纳项目问题	5 years ago
wynne1005	ebf0392057	去除多余optionType枚举	5 years ago
wynne1005	470775b527	备件生成冲突解决	5 years ago
wynne1005	f52f07fe77	备件导入	5 years ago
王杰	6f3f06a8f6	19048-条码补打-补打包装需要可以用过程条码反查包装条码-20201012	5 years ago
wynne1005	d36a7527a6	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
wynne1005	c117515b69	设备自动报警	5 years ago
songss	966ed3536b	Merge remote-tracking branch 'origin/test' into test ... # Conflicts: # modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java	5 years ago
songss	5816f275bf	新增控制计划相关接口	5 years ago
钮海涛	1695d75ff2	合并dev代码	5 years ago
钮海涛	94568777fb	合并test代码	5 years ago
陈思洁	3d8d27d780	【11374 20027-管理端质量检测标准维护基础数据报错（附件是数据模板）-20200915】	5 years ago
wynne1005	814d22fe09	设备报警 mes端完成	5 years ago
songss	e585dce910	Merge remote-tracking branch 'origin/test' into test	5 years ago
songss	037e898cd2	新增控制计划相关接口	5 years ago
宋军超	aa01153c4b	天津麦格纳更新看板子菜单pojo	5 years ago
宋军超	ebb965f46d	天津麦格纳添加看板维护接口	5 years ago
Liquor	83bfaaceab	对SPC-KEY-TATA表的相关接口进行了相关优化。	5 years ago
贾文涛	72faca1092	添加索引	5 years ago
宋军超	2bd7650d48	天津麦格纳pojo中所有Double类型字段添加注解	5 years ago
Liquor	3d8842602d	增加了SPC-KEY-TATA表的相关接口。	5 years ago
wynne1005	8129ca5bee	设备报警 mes端完成	5 years ago
汪云昊	171f39cf01	revert:还原pojo pom.xml报表	5 years ago
汪云昊	56bd07dbf3	Merge remote-tracking branch 'origin/dev' into test	5 years ago
joke.wang	f2177fdc1e	bypass数据采集bug修复	5 years ago
王杰	d548660354	连续扫描	5 years ago
joke.wang	d9d7e47ca7	生产队列明细唯一索引修改	5 years ago
songss	36df78c9b4	Merge remote-tracking branch 'origin/test' into test	5 years ago
songss	8c633f0bc3	优化字段命名规范	5 years ago
wynne1005	ea6fc313c3	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
songss	d7edc3a309	增加产品数据校验记录报表接口	5 years ago
陈思洁	0f1f437a9e	【2794 09 ext 19081-返工返修标签打印变更-20200813】	5 years ago
钮海涛	543058b3a5	合并sweb代码	5 years ago
陈思洁	373e5026c5	【2794 09 ext 19081-返工返修标签打印变更-20200813】	5 years ago
songss	b376450d4b	修改获取复核异常的数据接口返回数据	5 years ago
wynne1005	12f1c4a809	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
joke.wang	9fb8962e4e	客退件bug修复	5 years ago
宋军超	979e18c4a7	天津麦格纳修改涂装质检看板	5 years ago
宋军超	ba6470baad	天津麦格纳修改组托获取托包规数量	5 years ago
wynne1005	2ae471febd	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
wynne1005	3c1c6c8c55	新增通用对象 password	5 years ago
陈思洁	e9ce24d6f9	【2794 09 ext 19081-返工返修标签打印变更-20200813】	5 years ago
joke.wang	612c919e5f	bypass优化	5 years ago
wynne1005	7c9c0890fa	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
songss	28d7b79f82	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
wynne1005	114654dd99	冲突解决	5 years ago
wynne1005	696695ef0e	海纳川变更 10923 10894	5 years ago
songss	d050274450	新增查询生产表数据接口	5 years ago
songss	2f953ac223	新增获取中航DB复核项接口。新增修改生产数据接口	5 years ago
joke.wang	bc383d573b	生产工单增加特殊标示字段	5 years ago
songss	c5de9c9841	Merge remote-tracking branch 'origin/test' into test ... # Conflicts: # modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java	5 years ago
宋军超	735838e27f	天津麦格纳修改紧急问题	5 years ago
宋军超	706d0fc43d	天津麦格纳问题修改	5 years ago
陈思洁	d92c669f79	【11493 20042 标签条码模版需要显示客户名称 0921】	5 years ago
songss	f222395015	襄阳中航新增复核生产数据表数据工步。新增复核生产数据表异常数据	5 years ago
wynne1005	456741c116	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
wynne1005	e7196c3f7f	海纳川 10923 10894	5 years ago
贾文涛	8fb9760f82	对象引用循环嵌套了，此字段不用就删掉。StationRequestBean->MesStateMachineStatus->StepResult->StationRequestBean	5 years ago
贾文涛	772f1b9d28	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
贾文涛	232abdafd3	10984 组装生产线箱条码批次扫描！-2020-09-01,需求开发	5 years ago
宋军超	d5e356938e	天津麦格纳修改组托打印功能	5 years ago
宋军超	0c93ee5877	天津麦格纳修改看板和条码补打问题	5 years ago
joke.wang	72502a863b	Fix Bug #11490	5 years ago
王杰	895eb461ab	数据复核	5 years ago
宋军超	95f008a602	天津麦格纳添加组装打印托标签功能，修改物料颜色名称从物料表中取问题	5 years ago
钮海涛	fa467a2e0d	sweb合并dev代码	5 years ago
钮海涛	5f144781c9	SWEB合并test代码	5 years ago
钮海涛	6749bda558	合并dev代码	5 years ago
钮海涛	b253a020b9	合并test代码	5 years ago
钮海涛	5c104e036f	合并test代码	5 years ago
宋军超	8a392814aa	天津麦格纳修改涂装展示组件添加字段展示	5 years ago
wynne1005	8c0ea0d52f	冲突解决	5 years ago
wynne1005	10d5276fbb	过程检测 演示修改	5 years ago
joke.wang	cce1d91650	客退备件返修	5 years ago
宋军超	e18ad44c14	天津麦格纳修改返工返修	5 years ago
陈思洁	21ca0a9d0d	【11437 19081-半成品预装队列优化-20200917】	5 years ago
陈思洁	d6c9e9a061	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	1072b4fd04	【半成品预装队列】	5 years ago
joke.wang	ba8022f9ca	生产队列明细增加条码字段	5 years ago
宋军超	f58e07fa33	天津麦格纳-添加总装质量检测弹框工步和返工返修接口	5 years ago
宋军超	ad5c122df8	天津麦格纳-添加总装质量检测弹框工步和返工返修接口	5 years ago
陈思洁	50c2258f58	【增加查询参数条件】	5 years ago
joke.wang	817f4b2812	客户产线增加字段	5 years ago
wynne1005	7ab755c9f5	过程检测 16 后端接口完毕	5 years ago
汪云昊	163d0773a9	修改pom文件版本	5 years ago
汪云昊	b38e6ea1ad	Merge remote-tracking branch 'remotes/origin/dev' into test	5 years ago
王杰	6dca5ccb09	异步任务	5 years ago
钮海涛	485c66aaf7	合并test代码	5 years ago
wynne1005	531fe743c2	过程检测 完成首检判断	5 years ago
wynne1005	d00dcd80eb	冲突解决	5 years ago
wynne1005	7412eb3f16	质量检测	5 years ago
陈思洁	f19ee854be	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	802c801013	【11310 19081-下达至下线时间预警-20200913】	5 years ago
王杰	cf26f7eadd	mespcn异步任务	5 years ago
wynne1005	1e9f1a5c47	质量检测 1	5 years ago
陈思洁	d3f754c8a6	【客户JIT生产队列增加字段】	5 years ago
陈思洁	65b18c6b91	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	d127413055	【11225 19081-客户JIT生产队列需要能够选择L7级零件，进行对应订单的筛选-20200910】	5 years ago
宋军超	0c855ba2af	天津麦格纳问题修复	5 years ago
宋军超	bd20bc1552	天津麦格纳修改涂装条码打印	5 years ago
joke.wang	b389da7c2f	Fix Bug #11260	5 years ago
陈思洁	40cef1961c	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	8a1f0c608e	【基础页面增加替代料功能】	5 years ago
宋军超	baafe4cd49	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
宋军超	b978fa390c	修改天津麦格纳涂装计划查询报表和涂装工单导入	5 years ago
陈思洁	644454294c	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	676e43fc33	【增加查询参数条件】	5 years ago
宋军超	799967bde5	修改天津麦格纳问题	5 years ago
宋军超	91aa6f61a0	删除预装区查询接口	5 years ago