8629 Commits (7b9a91fd0f133de7191a356c5e90ae349a17f464)

Author	SHA1	Message	Date
许心洁	6a95335e0f	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
许心洁	ee37d6f5eb	任务#12597	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
钮海涛	8cd41d322a	Merge remote-tracking branch 'origin/test' into test	5 years ago
钮海涛	36130d12f2	新增供应商退货业务类型	5 years ago
许心洁	c04895784a	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
joke.wang	c679e7f19b	半成品看板优化	5 years ago
许心洁	a604e70771	BUG#12711	5 years ago
许心洁	3ebcfd21e7	BUG#12711,12509	5 years ago
王杰	cf9d3d9f2d	tz 看板	5 years ago
puxiao.liao	21cfe5c740	Fix bug#12004 ... 19058-KT其他出库用例	5 years ago
rock.yu	70f659593b	通用接口增加 cron 表达式的支持	5 years ago
许心洁	be272fd12e	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
许心洁	2d47eeb84d	BUG#12487	5 years ago
钮海涛	12edbb64d5	Merge remote-tracking branch 'origin/test' into test	5 years ago
钮海涛	6fe792f75b	posn新增供应商生产批次字段	5 years ago
wynne1005	db87c0c32f	pom版本	5 years ago
钮海涛	3bad341970	Merge remote-tracking branch 'origin/test' into test	5 years ago
钮海涛	5cea79571b	PO订单查看按创建时间倒叙排序	5 years ago
许心洁	49fb55bb42	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
许心洁	66de2c1cbb	任务#2965	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
王杰	a5935b59eb	Merge branch 'test' of jhforever.wang/wangjie-i3plus-pojo into test	5 years ago
puxiao.liao	a6ca2b35d3	修复北京特殊领料	5 years ago
puxiao.liao	5f73b892ba	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
许心洁	81543e3697	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
puxiao.liao	4392b513f7	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
许心洁	4757408a3b	任务#2965	5 years ago
王杰	59f916ddab	produceSn	5 years ago
钮海涛	7381ac2ca0	Merge remote-tracking branch 'origin/test' into test	5 years ago
钮海涛	bf51e5bb7a	修改登录平台为固定密码	5 years ago
puxiao.liao	d4eef85177	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	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
puxiao.liao	d153205ead	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
simon	5b2bbf7b1e	Merge remote-tracking branch 'origin/test' into test	5 years ago
simon	c03446866a	中航-首检单历史记录显示与修改	5 years ago
puxiao.liao	9d7ae4a90f	修复北京特殊领料	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
puxiao.liao	e250883f22	Fix bug#12004 ... 19058-KT其他出库用例	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
许心洁	0f5ab7b144	BUG#12609	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
许心洁	79ee6eb901	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
许心洁	359e085aac	BUG#12430	5 years ago
陈思洁	92b395ad3f	【2958 11 2.5.3 热处理上件】	5 years ago
陈思洁	88376bb350	【2958 11 2.5.3 热处理上件】	5 years ago
陈思洁	ddc00a617b	【冲突】	5 years ago
陈思洁	2de0d76af3	【2958 11 2.5.3 热处理上件】	5 years ago
许心洁	063ba20f74	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
许心洁	8e5c2f4b00	BUG#12170,12417,12166,12437,12452	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
汪云昊	8f899f2f46	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
王杰	b7e2ddd2c2	包装明细 增加索引	5 years ago
simon	faad8cf4c8	修复取消必填字段	5 years ago
汪云昊	fdec58c92a	feat(form):表单导入功能支持	5 years ago
钮海涛	4dd875a691	Merge remote-tracking branch 'origin/test' into test	5 years ago
钮海涛	156b515497	修复SWEB问题	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	13bd15d997	回滚PCN实体类	5 years ago
Dominic_Xiao	d8c52a0534	新增导包	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	785e8dbfe8	包装详情表新增容器位置字段	5 years ago
Dominic_Xiao	f1fedb53f4	增加卡斯马业务pojo	5 years ago
Dominic_Xiao	eb7ed898df	增加卡斯马业务pojo	5 years ago
Dominic_Xiao	8d0e2b942b	增加卡斯马业务pojo	5 years ago
钮海涛	e9ec997e05	Fix Bug #12413 查询库存条码错误	5 years ago
puxiao.liao	dc3e344f11	Fix bug#12401 ... 19048-发运单支持关联多个470单据号	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
simon	7d451dc136	Merge remote-tracking branch 'origin/test' into test	5 years ago
joke.wang	928c643031	看板自定义参数	5 years ago
许心洁	4300201f99	BUG#12430,12495	5 years ago
simon	4c1add6ba4	修改中文描述	5 years ago
许心洁	a5c78ae005	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
许心洁	cbd0b1f136	BUG#12496	5 years ago
王杰	fa01ec478a	Mes_Package 表加索引	5 years ago
许心洁	e59f67e84b	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
钮海涛	1842d1de7c	Merge remote-tracking branch 'origin/test' into test	5 years ago
钮海涛	e3e4e1fc84	修复坤泰问题	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
许心洁	ecdc5888a4	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
许心洁	e5aefee838	BUG#12166	5 years ago
Dominic_Xiao	de51b68790	新增表:产品缺陷位置	5 years ago
Dominic_Xiao	395039e901	新增三个字段	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
汪云昊	3af9790a9e	refactor(impp):调整描述注解	5 years ago
汪云昊	206e5f8d20	feat(form):支持导入数据	5 years ago
puxiao.liao	89bf22521a	Fix bug#12380 ... 19048-支持批量下发BOM的功能	5 years ago
王杰	86998e109e	总装 质量判定	5 years ago
puxiao.liao	5f6a7c9a98	Fix bug#12380 ... 19048-支持批量下发BOM的功能	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
许心洁	2d9521e412	BUG#12166	5 years ago
puxiao.liao	7b8597dde4	天津麦格纳看板BUG修复	5 years ago
puxiao.liao	b124db3383	天津麦格纳看板BUG修复	5 years ago
rock.yu	f87e4004fb	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
rock.yu	d226c27c2b	邮件推送增加获取附件的脚本功能 ... 增加发送附件功能	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
puxiao.liao	c6031c2f28	天津麦格纳看板BUG修复	5 years ago
rock.yu	65b26a0696	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
rock.yu	a300e6e2f8	idoc 记录表增加 erp 状态字段	5 years ago
宋军超	2df948207c	修改天津涂装看板	5 years ago
joke.wang	e18b6c727e	mgn-bj强制封箱完成后重置数据	5 years ago
Dominic_Xiao	46c0206d6a	卡斯马热处理翻包新增模块的dao	5 years ago
simon	915b86973d	Merge remote-tracking branch 'origin/test' into test	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
puxiao.liao	7ec1bc61b0	天津麦格纳看板BUG修复	5 years ago
simon	a6064a9a19	Merge remote-tracking branch 'origin/test' into test	5 years ago
simon	755d66dbce	中航-停线时根据工单删除当前“巡检项生成明细表”	5 years ago
puxiao.liao	71e70e9a94	天津麦格纳看板BUG修复	5 years ago
rock.yu	510845c185	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
rock.yu	d41d14b112	增加 erp doc no 字段	5 years ago
许心洁	97341bab27	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
许心洁	7dba4e7f32	BUG#12166	5 years ago
许心洁	4d5ffce7ac	任务#2933	5 years ago
汪云昊	f2a6ddd55a	Merge remote-tracking branch 'origin/dev' into test	5 years ago
汪云昊	426a6f2026	feat(ftp):ftp重试功能	5 years ago
陈思洁	2911abf193	【12324 20027-PCN端-工单管理-产线管控已经停线，但是在工单管理中点击暂停无法成功提示“90003:工单【1545】需要在停线时才允许暂停[请检查]”-20201109】	5 years ago
宋军超	5568a8fa47	Merge remote-tracking branch 'origin/test' into test	5 years ago
宋军超	39da900ae1	添加天津涂装看板	5 years ago
汪云昊	7a6137a667	Merge remote-tracking branch 'origin/dev' into test	5 years ago
汪云昊	26e1b39119	feat(core):邮件支持附件发送	5 years ago
宋军超	12074e24a8	添加天津涂装看板	5 years ago
wynne1005	5070fcc8fb	天津看板 员工矩阵model 新增领导	5 years ago
宋军超	e19d53de4a	添加天津涂装看板	5 years ago
宋军超	9aeecbac39	Merge remote-tracking branch 'origin/test' into test	5 years ago
宋军超	98fa35c8a0	添加天津涂装看板	5 years ago
puxiao.liao	679ef67457	天津麦格纳看板BUG修复	5 years ago
Aisiyu	79161c6703	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
Aisiyu	303fe5907d	[1211 天津麦格纳货运看板和asn看板修改 ]	5 years ago
rock.yu	7162664b79	通用接口增加SID记录	5 years ago
rock.yu	bc3e94923f	增加数据源的类型	5 years ago
Aisiyu	a2a4a85312	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
Aisiyu	1680314d49	[1211 天津麦格纳货运看板和asn看板修改 ]	5 years ago
puxiao.liao	274191aee2	天津麦格纳看板BUG修复	5 years ago
许心洁	82dc8eafbb	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
rock.yu	3a5e446e90	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
许心洁	b318abb4b8	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
rock.yu	77d8aa4bdd	修改天津工单拉动逻辑	5 years ago
Aisiyu	2ca398468f	[1211 天津麦格纳货运看板和asn看板修改 ]	5 years ago
许心洁	29a5d01620	BUG#2938	5 years ago
puxiao.liao	c0d52b93f7	天津麦格纳看板BUG修复	5 years ago
puxiao.liao	cd2076d66a	天津麦格纳看板BUG修复	5 years ago
puxiao.liao	08011a5722	天津麦格纳看板BUG修复	5 years ago
joke.wang	ae1bb43764	mgn-bj edi删除多余项	5 years ago
Aisiyu	128f97c88b	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
Aisiyu	0ea3354b70	[1211 天津麦格纳货运看板和asn看板时间和count ]	5 years ago
宋军超	6aeb6bddde	添加天津涂装看板	5 years ago
汪云昊	8d66424bf6	fix(form):分页错误	5 years ago
汪云昊	2121124f4b	Merge remote-tracking branch 'origin/dev' into test	5 years ago
汪云昊	faf9bd4b14	fix(form):分页失效	5 years ago
汪云昊	3b1c068290	Merge remote-tracking branch 'origin/dev' into test	5 years ago
汪云昊	eb9e520d76	fix(form):分页失效	5 years ago
puxiao.liao	85d2f03b55	修复麦格纳BUG	5 years ago
陈思洁	a9e8b7b010	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	0be2231995	【12238 19073-安灯报表-通知记录-工作中心查询条件失效】	5 years ago
王杰	e775db87fa	紧急插单	5 years ago
wynne1005	9e204224f0	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
wynne1005	48c1d2c1c8	feat(tj) 文件上传	5 years ago
许心洁	d1fb133839	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
许心洁	346a5088ff	BUG#12231	5 years ago
Aisiyu	d1c0a6ce8d	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
Aisiyu	d819821234	[1211 天津麦格纳货运看板和asn看板修改 ]	5 years ago
宋军超	9bf8018ac1	添加天津涂装看板	5 years ago
宋军超	06c3992b98	添加天津涂装看板	5 years ago
Aisiyu	be7f6a4a92	[1211 天津麦格纳货运看板和asn看板修改 ]	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
puxiao.liao	67419496cb	修复天津麦格纳BUG	5 years ago
陈思洁	250d2fbf14	【2932 11 2.3.3QMES产品追溯报表】	5 years ago
wynne1005	8a648eab74	新增mysql连接时区	5 years ago
simon	ece1ca4c01	调整中航看板返回，修复中航pcn原材料上线bug	5 years ago
王杰	b9fef07d7f	总装质量判定	5 years ago
王杰	12224ed8df	工单表加索引 ：workCenterCode workOrderStatus	5 years ago
wynne1005	c118aac425	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
wynne1005	a2cf356516	修改mysql驱动版本 兼容mysql8	5 years ago
王杰	46c22020bd	总装 质量判定缺陷增加类型代码	5 years ago
陈思洁	1ab0225f9c	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	c0abb5f994	【12077 19048-注塑，喷涂，组装计划生产报表导出无扩展字段内容-20201026】	5 years ago
Aisiyu	6b9fcb2da9	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
Aisiyu	ab0b8a2af1	[1211 天津麦格纳货运看板sql 修改 ]	5 years ago
汪云昊	1825cfbdf3	revert(pojo):还原pom版本	5 years ago
puxiao.liao	a844a4d59b	天津麦格纳修复BUG	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
joke.wang	f38e41f1ec	增加看板类型	5 years ago
宋军超	52c35877d8	添加天津涂装报表	5 years ago
Aisiyu	fd08cfd883	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	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
Aisiyu	219dd0ddd7	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
Aisiyu	47f464b01d	[1211 天津麦格纳货运看板 ]	5 years ago
曾贞一	143e2f1947	【12057 #20011-----影响流程是二维码收货和po收货和po收货，收货流程走完但是还没有提交，需要能够删除历史记录，重新操作后提交，然后不允许收货待提交的条码入库。期望解决日期2020/10/31】	5 years ago
puxiao.liao	23537e76e5	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
puxiao.liao	e68735be83	MOVE_SN 增加 left_code 属性	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
许心洁	08125e3b0f	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
汪云昊	c9b4b37c23	Merge remote-tracking branch 'origin/dev' into test	5 years ago
汪云昊	687de9d828	feat(form):支持存储过程参数	5 years ago
汪云昊	e87740e723	Merge remote-tracking branch 'origin/dev' into test	5 years ago
汪云昊	f47b699146	feat(form):支持存储过程参数	5 years ago
曾贞一	4ee1875097	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
曾贞一	8d91675109	【12155 20145+系统参数页面，参数编码也支持模糊查询】	5 years ago
puxiao.liao	e6e5982d73	Fix bug#12020 ... 19058-KT根据销售订单创建销售出库单（客户发运）	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
汪云昊	91b1a67f30	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
汪云昊	eb03280b2d	doc(sql):getStringLikePack方法标记不推荐	5 years ago
汪云昊	f1ab018d85	feat(softswitch):重试功能	5 years ago
曾贞一	b979a9471c	【11883 20021--北美领料需求变更--1023】	5 years ago
Aisiyu	3b5cd84e6e	Merge remote-tracking branch 'origin/test' into test	5 years ago
曾贞一	e55e8b6f74	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
曾贞一	5e8b023fd5	【11883 20021--北美领料需求变更--1023】	5 years ago
puxiao.liao	762f9d4a9b	Fix bug#12020 ... 19058-KT根据销售订单创建销售出库单（客户发运）	5 years ago
Aisiyu	8b94991408	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
Aisiyu	2db034a7f8	[1211 天津麦格纳WMS-ASN到货看板 ]	5 years ago
宋军超	692cd283f7	添加天津涂装看板-设备实时监控	5 years ago
puxiao.liao	6269ee358c	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
许心洁	2bc15b56ea	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
曾贞一	d8e5aa44bc	pom.xml	5 years ago
许心洁	92fec185b8	任务#28142909	5 years ago
陈思洁	8dfcb7f429	【合并冲突】	5 years ago
陈思洁	3dc951c34f	【11964 19048-喷涂抛光报表变更-20201021】	5 years ago
曾贞一	9a350912ea	Merge remote-tracking branch 'remotes/origin/dev' into test ... # Conflicts: # modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java	5 years ago
曾贞一	5487c165ff	【11883 20021--北美领料需求变更--1023】	5 years ago
puxiao.liao	87611856dd	天津麦格纳多级BOM	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
rock.yu	104fa0efa5	完成ERP库存差异报表	5 years ago
joke.wang	f57f4e25be	mgn-bj 总屏看板	5 years ago
汪云昊	a9520cecf7	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
汪云昊	31cdda5b33	feat(softswitch):适配记录,FTP文件支持SID	5 years ago
曾贞一	c9378a7d8c	【11959 19125+PDA物料拆分数量超过100部分，条码流水不增加。+1020】	5 years ago
许心洁	38ddd82ef9	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
许心洁	d7bad41b29	天津麦格纳BUG#12111，12110，12108，12105	5 years ago
Dominic_Xiao	df35a22aac	解决BUG#12121 生产工单- 新建完毕后页面查询不到:修改查询总数的SQL语句	5 years ago
Dominic_Xiao	5e1d0a75c9	解决BUG:19048-班次时间显示异常->修改查询总数的SQL语句	5 years ago
Dominic_Xiao	4684466e7e	解决BUG:19048-班次时间显示异常:修改查询的SQL语句	5 years ago
Dominic_Xiao	f57be38c2b	解决BUG:生产工单-新建完毕后页面查询不到->修改查询的SQL语句	5 years ago
puxiao.liao	760307910a	天津MGN系列BUG修复	5 years ago
宋军超	1b6264e80d	添加天津涂装看板	5 years ago
rock.yu	0fb04b8370	Merge remote-tracking branch 'origin/test' into test	5 years ago
rock.yu	3ad59884a8	增加计算工单的提前时间属性	5 years ago
songss	2ed5108699	Merge remote-tracking branch 'origin/test' into test	5 years ago
songss	36928196c1	中航看板-调整返回接口参数	5 years ago
rock.yu	330cede03e	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
rock.yu	b6a309bacf	增加 ERP 对账数据表	5 years ago
puxiao.liao	023811d0fa	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
puxiao.liao	6f239ee756	Fix bug#12019 ... 12019-KT根据销售订单创建销售出库单（客户发运）	5 years ago
joke.wang	5227540ecc	队列表添加索引	5 years ago
许心洁	586365dc69	任务#2893,#2894,#2901	5 years ago
陈思洁	4e013a7ef0	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	6fcf32aa80	【2890 10 2.3.8安灯作业优化】	5 years ago
songss	e0d315a1f8	Merge remote-tracking branch 'origin/test' into test	5 years ago
songss	d9040143f9	新增中航产线看板-每小时产量接口	5 years ago
puxiao.liao	24acb86dff	实时库存查询&导出优化	5 years ago
钮海涛	2b4ff2300d	Merge remote-tracking branch 'origin/test' into test	5 years ago
钮海涛	582ef23ca3	修复SWEB问题	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
puxiao.liao	62d5d62cef	北京MGN系列BUG修复	5 years ago
songss	95936d40fe	Merge remote-tracking branch 'origin/test' into test	5 years ago
songss	783022646c	新增中航产线状态图接口	5 years ago
rock.yu	a953523245	增加 ERP 快照相关表	5 years ago
钮海涛	a8cdba48c3	合并Master代码	5 years ago
钮海涛	7afd60073a	Merge remote-tracking branch 'remotes/origin/test'	5 years ago
钮海涛	1037ad6e68	修复问题	5 years ago
puxiao.liao	3de97d5b98	北京MGN系列BUG修复	5 years ago
王杰	f6ad2824b2	11984 19048-组装生产计划报表增加字段-20201020	5 years ago
王杰	7fcbf3f4e2	:wq ... erge remote-tracking branch 'i3plus-pojo/test' into test	5 years ago
puxiao.liao	6907ab6dc0	北京麦格纳看板需求	5 years ago
王杰	97be3f186a	工单生产时间变更定时任务实体	5 years ago
钮海涛	0e75cde494	Merge remote-tracking branch 'origin/test' into test	5 years ago
钮海涛	63a06fcc27	修改供应商端登录及供应商端代码重构	5 years ago
陈思洁	a6acf3d616	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	82a769cae1	【12040 19073-安灯BI界面中事件物料时长，解决时长为-3290，解决在横坐标的下方有问题-20201026】 ... 2887 10 2.3.7安灯通知优化	5 years ago
许心洁	8c4ae6ff34	任务#2893,2894	5 years ago
puxiao.liao	0216cf59c4	Merge remote-tracking branch 'origin/test' into test	5 years ago
puxiao.liao	051417c10e	北京麦格纳看板	5 years ago
钮海涛	ef7a20a719	Merge remote-tracking branch 'origin/test' into test	5 years ago
钮海涛	505de36ca5	修改SWeb供应商登录接口	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
汪云昊	15dc4b00c7	Merge remote-tracking branch 'origin/dev' into test	5 years ago
汪云昊	ed22bd6f64	feat(form):存储过程调用适配mysql,mssql	5 years ago
puxiao.liao	56deedeaf3	北京麦格纳看板	5 years ago
puxiao.liao	c965a34236	北京麦格纳看板	5 years ago
puxiao.liao	ba81af744b	北京麦格纳看板	5 years ago
宋军超	6826f04b97	天津看板添加设备状态逻辑	5 years ago
joke.wang	9002bdc936	预装队列显示列优化	5 years ago
王杰	bb3039d1f2	包装关系查询宝贝	5 years ago
songss	17d47fdc55	新增看板图片增删改查接口 ... 新增看板切换配置增删改查接口 新增中航-产线概况接口	5 years ago
贾文涛	9a4964222c	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
贾文涛	2301e03c85	增加呼叫不需要弹窗的枚举。	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
songss	3e629e63c5	控制计划-过程检验逻辑调整	5 years ago
wynne1005	9629823a79	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
wynne1005	b00bcf66b2	图片展示类型	5 years ago
贾文涛	00e27023c1	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
贾文涛	525cda2768	增加数量处理方法	5 years ago
puxiao.liao	ceb882cef4	天津MGN修复BUG	5 years ago
puxiao.liao	4ca43f81cc	北京麦格纳JIS发运看板	5 years ago
钮海涛	8346aa3fae	Merge remote-tracking branch 'origin/test' into test	5 years ago
钮海涛	66c55386ee	修复sweb的bug	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
汪云昊	72e25305bf	Merge remote-tracking branch 'origin/dev' into test	5 years ago
钮海涛	34a3c9553d	Merge remote-tracking branch 'origin/test' into test	5 years ago
钮海涛	bf41628114	修改物料的标准质检时间类型为浮点数，精度为2	5 years ago
wynne1005	d13c46e740	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
wynne1005	5d73afd17f	jisa小时接收报表完成	5 years ago
汪云昊	a4bc17b0a6	feat(form):sap_hana数据库支持	5 years ago
puxiao.liao	1aebc6761c	Fix bug#11878 ... 19081-增加库存交易推算报表-1016	5 years ago
wynne1005	05152538b2	合并冲突	5 years ago
wynne1005	fc36e55a38	新增mes 报表查询周期枚举	5 years ago
宋军超	9c1a9be165	优化天津麦格纳报表	5 years ago
joke.wang	df063af038	物料类型1增加枚举	5 years ago
wynne1005	e24bb4c39b	同步新增忽略字段	5 years ago
wynne1005	25ebe6838c	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
wynne1005	63c1cc479b	字段长度 model添加planCfgCode	5 years ago
joke.wang	6930fdfbe7	mgn-bj 产线枚举优化	5 years ago
钮海涛	49bf12e392	Merge remote-tracking branch 'origin/test' into test	5 years ago
钮海涛	3e89aa9425	乐观锁增加默认值设置	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
钮海涛	61d123cfc8	Merge remote-tracking branch 'origin/test' into test	5 years ago
钮海涛	93626dad0f	新增质检完成状态报表	5 years ago
songss	578e2c5155	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
songss	bfe4b4f069	社保故障自动获取任务完善，根据不同等级调用不同的安灯接口	5 years ago
joke.wang	cd32eee8ea	排程配置表增加冗余字段	5 years ago
宋军超	fcc66835b8	开发天津看板功能	5 years ago
汪云昊	ce054916b4	Merge remote-tracking branch 'origin/dev' into test	5 years ago
汪云昊	401fccd4dc	fix(impp):DdlPreparedPack类处理大于小于错误	5 years ago
宋军超	d372256a68	添加喷涂不良类型枚举	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
陈思洁	11b461f1d6	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	1706b7a684	【2856 10 2.3.8 20027-PCN端工位监控如果报错数据没有采集怎么报警提示】	5 years ago
rock.yu	269f072fb8	Merge remote-tracking branch 'origin/test' into test	5 years ago
puxiao.liao	8ed135734d	天津麦格纳BUG	5 years ago
joke.wang	cc2961d4b8	库存排产表增加字段	5 years ago
钮海涛	7bdecfe687	Merge remote-tracking branch 'origin/test' into test	5 years ago
钮海涛	07282396d2	ASN到货看板问题修复	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
rock.yu	9a2b6fe43a	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
rock.yu	c3bdf4a162	解决10330库存扣减不准的问题	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
puxiao.liao	ee700ab5b0	天津麦格纳多级BOM	5 years ago
wynne1005	a86a58fa6d	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
puxiao.liao	75520519de	修复天津麦格纳BUG	5 years ago
joke.wang	233853e1e6	库存排程	5 years ago
puxiao.liao	502427845e	Merge remote-tracking branch 'origin/test' into test	5 years ago
puxiao.liao	cfd0cb03ff	天津麦格纳BUG修复	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
rock.yu	7b8038d516	Merge remote-tracking branch 'origin/test' into test	5 years ago
rock.yu	8932108cd3	暂时去掉乐观锁	5 years ago
puxiao.liao	2689495372	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
rock.yu	7027f515e4	Merge remote-tracking branch 'origin/test' into test	5 years ago
rock.yu	df9474807c	库存条码表、库存表 增加版本号，用乐观锁控制并发问题	5 years ago
puxiao.liao	6d64c61848	修改FIFO推荐查询逻辑	5 years ago
贾文涛	0c34bce623	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
贾文涛	2cdb6af2f5	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
汪云昊	5d7397aa4e	Merge remote-tracking branch 'origin/dev' into test	5 years ago
汪云昊	ee3f9415a7	fix(core):组织，部门代码无唯一校验	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
钮海涛	bcf0d45000	Merge remote-tracking branch 'origin/test' into test	5 years ago
钮海涛	445821b803	sweb问题修复	5 years ago
puxiao.liao	08687a7e14	修复天津麦格纳BUG	5 years ago
joke.wang	c442845f94	跳序变更	5 years ago
汪云昊	911f96b60d	style(softswitch):调整代码样式	5 years ago
wynne1005	95646d6317	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
汪云昊	2b6ff6498c	Merge remote-tracking branch 'origin/dev' into test	5 years ago
汪云昊	b186af893c	feat(softswitch):ftp适配信息优化	5 years ago
汪云昊	05f493b80e	feat(softswitch):添加重试功能	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
songss	9c1965ea6c	11653 19073 安灯导入模板调整	5 years ago
puxiao.liao	7508796daa	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
puxiao.liao	44b5635e78	天津麦格纳PO生产任务增加关联行号	5 years ago
钮海涛	01d67fdd1f	Merge remote-tracking branch 'origin/test' into test	5 years ago
钮海涛	7a29b85848	Fix Bug #11733 新增采购订货进度可以编辑原因	5 years ago
宋军超	4b65842d6f	修改天津麦格纳项目问题	5 years ago
wynne1005	6750da1d37	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
wynne1005	ebf0392057	去除多余optionType枚举	5 years ago
puxiao.liao	6a42b517fc	Fix Task#2839 ... 武汉PRD-WMS&TMS装车明细接口	5 years ago
wynne1005	470775b527	备件生成冲突解决	5 years ago
wynne1005	f52f07fe77	备件导入	5 years ago
puxiao.liao	c7e5524a0a	修复无条码生产扣减增加扣减条码状态只能为入库，合格	5 years ago
汪云昊	e97a1193e1	Merge remote-tracking branch 'origin/dev' into test	5 years ago
汪云昊	27088d2db5	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
汪云昊	e97369585d	fix(core):在用户未登录时国际化无效	5 years ago
王杰	1dbb826235	19048-喷涂工单下发后未给打印状态赋值-20201012	5 years ago
陈思洁	e07829e4ea	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	33c59cf39e	【11654 MES管理端基础数据模块缺少导入功能 0928】	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
陈思洁	82ae09d2a8	Merge remote-tracking branch 'origin/test' into test	5 years ago
陈思洁	a3100a71e5	【9666 19073-安灯报表：工位统计报表-删除班次、设备。添加故障时长-20200721】	5 years ago
钮海涛	3d5729e28b	自动打印队列增加供应商	5 years ago
puxiao.liao	90d94f35c8	Fix bug#11683 ... 质检单-已收货数量-显示优化	5 years ago
钮海涛	e628fea5a6	Merge remote-tracking branch 'origin/test' into test	5 years ago
钮海涛	5a0178f5df	合并dev代码	5 years ago
songss	a5b81cb676	解决代码冲突	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
钮海涛	af4bb83f85	sweb合并test代码	5 years ago
钮海涛	401e38203a	Merge remote-tracking branch 'remotes/origin/test' into dev	5 years ago
钮海涛	5515f25b79	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
钮海涛	c202fa073b	修改sweb问题	5 years ago
钮海涛	1695d75ff2	合并dev代码	5 years ago
钮海涛	94568777fb	合并test代码	5 years ago
钮海涛	9c7d455998	Merge remote-tracking branch 'remotes/origin/test' into dev	5 years ago
钮海涛	55dfff206f	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
钮海涛	61ad20717b	合并sweb代码	5 years ago
曾贞一	944b853862	【代码优化】	5 years ago
曾贞一	84d5f84457	【11629 20021--北美看板需求变更--0930】	5 years ago
陈思洁	3d8d27d780	【11374 20027-管理端质量检测标准维护基础数据报错（附件是数据模板）-20200915】	5 years ago
puxiao.liao	79baaa4546	Fix bug#11661 ... 移库单界面增加来源存储区和目标库位的检索条件	5 years ago
puxiao.liao	5033c8dde0	Fix bug#11661 ... 移库单界面增加来源存储区和目标库位的检索条件	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
汪云昊	604b8821eb	Merge remote-tracking branch 'origin/dev' into test	5 years ago
汪云昊	815daba16d	feat(softswitch):ftp适配记录按文件名查询	5 years ago
汪云昊	21f77a0e7b	fix(softswitch):ftp适配器并发读取文件重复	5 years ago
宋军超	aa01153c4b	天津麦格纳更新看板子菜单pojo	5 years ago
宋军超	461780e0d0	天津麦格纳修改看板类型枚举	5 years ago
宋军超	ebb965f46d	天津麦格纳添加看板维护接口	5 years ago
Liquor	83bfaaceab	对SPC-KEY-TATA表的相关接口进行了相关优化。	5 years ago
汪云昊	0d20685a55	fix(softswitch):ftp适配器并发读取文件重复	5 years ago
贾文涛	72faca1092	添加索引	5 years ago
宋军超	2bd7650d48	天津麦格纳pojo中所有Double类型字段添加注解	5 years ago
Liquor	3d8842602d	增加了SPC-KEY-TATA表的相关接口。	5 years ago
puxiao.liao	65ea61fd70	增加昆泰其它出库业务类型	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
汪云昊	e11e833309	refactor(opcua):调整pojo位置	5 years ago
puxiao.liao	76725167f7	Merge remote-tracking branch 'origin/test' into test	5 years ago
puxiao.liao	f591139bed	修复TJ MGN BUG	5 years ago
joke.wang	f2177fdc1e	bypass数据采集bug修复	5 years ago
puxiao.liao	85feb7927a	修复TJ MGN BUG	5 years ago
rock.yu	68a079fa69	Merge remote-tracking branch 'origin/test' into test	5 years ago
rock.yu	14d2af59d6	增加多级BOM生效功能	5 years ago
王杰	d548660354	连续扫描	5 years ago
许心洁	a939c689f3	任务#2814	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
puxiao.liao	0f46a23c7a	Fix bug#11611 ... 19081-计划外入库-扫描条码后撤销	5 years ago
rock.yu	605b7e846a	增加虚零件属性	5 years ago
陈思洁	d5d4942eb6	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	604c1443ca	【三色灯控制信息基础页面增删改查】	5 years ago
wynne1005	ea6fc313c3	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
曾贞一	1975906ee5	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
曾贞一	4bd47e64c3	【接口映射-添加字段接口名称】	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
陈思洁	ad2f084287	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	b8e34a34b5	【11561 19081-安灯pushPLC控制三色灯-目前未控制具体工位-20200924】	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
wynne1005	708985be2a	中航 设备自动报警 #1	5 years ago
曾贞一	2f717fdd98	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
曾贞一	2d2ff0ddb1	【2801 武汉PRD-AMP-WMS2SAP回传TWD订单收货结果接口】	5 years ago
joke.wang	9fb8962e4e	客退件bug修复	5 years ago
宋军超	979e18c4a7	天津麦格纳修改涂装质检看板	5 years ago
puxiao.liao	4bfb903e54	修复麦格那发运提交事务重复&盘点提交sql异常	5 years ago
宋军超	ba6470baad	天津麦格纳修改组托获取托包规数量	5 years ago
rock.yu	d227fcedd4	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
rock.yu	11750e9bf1	修改库存快照的pojo，确保快照功能可以正常执行	5 years ago
汪云昊	ffdfd866e0	Merge remote-tracking branch 'origin/dev' into test	5 years ago
汪云昊	b2bc93abfe	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
汪云昊	816557085f	fix(base):修改当前页取值方法	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
puxiao.liao	fc351f5599	修复TJ MGN BUG	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
陈思洁	5fcdc2d4ea	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	053b609d88	【11559 19081-MESOP30料箱二次校验没有触发20200922】	5 years ago
汪云昊	25c195ba98	Merge remote-tracking branch 'remotes/origin/dev' into test	5 years ago
钮海涛	0ce944ec5f	Merge remote-tracking branch 'remotes/origin/test' into dev	5 years ago
钮海涛	73809df827	合并swebtest代码	5 years ago
songss	2f953ac223	新增获取中航DB复核项接口。新增修改生产数据接口	5 years ago
joke.wang	bc383d573b	生产工单增加特殊标示字段	5 years ago
钮海涛	ac4f217c9d	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
钮海涛	c4f161e958	Start Task #2795	5 years ago
puxiao.liao	ffb45cf3dd	修复TJ MGN BUG	5 years ago
songss	90a96444e7	Merge remote-tracking branch 'origin/test' into test	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
曾贞一	0f4a8c130c	【冲突解决】	5 years ago
曾贞一	41efdd4de8	【2798 武汉PRD-AMP-WMS2AMP同步拉动零件库存接口】	5 years ago
宋军超	61aabc957e	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
宋军超	735838e27f	天津麦格纳修改紧急问题	5 years ago
汪云昊	6ab0f17ac7	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
汪云昊	d6f4fa7f92	feat(softswitch):添加报文处理状态及处理结果	5 years ago
汪云昊	673c6d0fe2	fix(softswitch):ftp-linux系统中文件读取失败	5 years ago
puxiao.liao	667d80c37d	Merge remote-tracking branch 'origin/test' into test	5 years ago
puxiao.liao	0c044eed91	修复TJ MGN BUG	5 years ago
钮海涛	7b2c49f638	Merge remote-tracking branch 'origin/test' into test	5 years ago
钮海涛	0d0905c454	sweb合并dev代码	5 years ago
puxiao.liao	4ffe517015	修复TJ MGN BUG	5 years ago
宋军超	706d0fc43d	天津麦格纳问题修改	5 years ago
陈思洁	550713320f	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	d92c669f79	【11493 20042 标签条码模版需要显示客户名称 0921】	5 years ago
songss	f222395015	襄阳中航新增复核生产数据表数据工步。新增复核生产数据表异常数据	5 years ago
puxiao.liao	07f6aabd72	修复TJ MGN BUG	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
宋军超	cdd1f3eaba	Merge remote-tracking branch 'origin/test' into test	5 years ago
rock.yu	16a2d75a17	结果生产报工job的sqlserver不兼容问题	5 years ago
宋军超	0c93ee5877	天津麦格纳修改看板和条码补打问题	5 years ago
rock.yu	409cd02a8d	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
rock.yu	352db6a7fa	工单拉动的日志保存到数据库	5 years ago
joke.wang	72502a863b	Fix Bug #11490	5 years ago
puxiao.liao	10edb8ebae	Finish Task #2184 Cost:8h ... 2184 06 1.2.3.7.1物流路线检查	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
钮海涛	572e749bdb	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
钮海涛	b253a020b9	合并test代码	5 years ago
钮海涛	5c104e036f	合并test代码	5 years ago
puxiao.liao	cbc885748a	Merge remote-tracking branch 'origin/test' into test	5 years ago
puxiao.liao	2c3571b014	修复TJ MGN BUG	5 years ago
钮海涛	ea875c1a3b	SWEB功能开发	5 years ago
宋军超	998e87b61d	天津麦格纳修改过程条码补打	5 years ago
puxiao.liao	f14cc48243	修复TJ MGN BUG	5 years ago
songss	f2d6552f6b	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
songss	20b40ce294	添加 中航-DB复核项 枚举	5 years ago
宋军超	8a392814aa	天津麦格纳修改涂装展示组件添加字段展示	5 years ago
wynne1005	8c0ea0d52f	冲突解决	5 years ago
wynne1005	10d5276fbb	过程检测 演示修改	5 years ago
puxiao.liao	e6b5caa61c	修复TJ MGN BUG	5 years ago
joke.wang	cce1d91650	客退备件返修	5 years ago
宋军超	e18ad44c14	天津麦格纳修改返工返修	5 years ago
陈思洁	21ca0a9d0d	【11437 19081-半成品预装队列优化-20200917】	5 years ago
陈思洁	7029b75f27	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	a9b18733ec	【11218 19081-安灯系统增加PLC交互控制三色灯-20200910】	5 years ago
钮海涛	22e59a3800	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
钮海涛	f9db132861	坤泰SWEBU9接口	5 years ago
rock.yu	17dae82081	增加麦格纳工单的滑动窗口计算逻辑	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
puxiao.liao	5e0c0a4051	修复TJ MGN BUG	5 years ago
puxiao.liao	ae6ffa27f4	修复TJ MGN BUG	5 years ago
joke.wang	ba8022f9ca	生产队列明细增加条码字段	5 years ago
宋军超	f58e07fa33	天津麦格纳-添加总装质量检测弹框工步和返工返修接口	5 years ago
宋军超	ad5c122df8	天津麦格纳-添加总装质量检测弹框工步和返工返修接口	5 years ago
汪云昊	6156207369	Merge remote-tracking branch 'remotes/origin/dev' into test	5 years ago
汪云昊	d19fbe8cf1	fix(core):用户信息导出时，用户状态信息为空	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
汪云昊	4e8716f173	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
汪云昊	55a8bcad72	feat(core):系统更新记录功能	5 years ago
王杰	6dca5ccb09	异步任务	5 years ago
钮海涛	48443a57de	合并test代码	5 years ago
钮海涛	a3eb1e83f3	Fix Bug #11320,#11213	5 years ago
puxiao.liao	900fd5d5b7	MGN标准库存支持修改拆包	5 years ago
wynne1005	3858b2e3d9	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
wynne1005	dd1ece9be8	新增过程检测 检测结果枚举	5 years ago
钮海涛	6e803445d7	Fix Bug #11320,#11213	5 years ago
钮海涛	485c66aaf7	合并test代码	5 years ago
wynne1005	531fe743c2	过程检测 完成首检判断	5 years ago
宋军超	6fa35ad939	天津麦格纳取消条码补打校验逻辑	5 years ago
曾贞一	6e252705ab	Merge branch 'test' of helin.huang/i3plus-pojo-liquor into test	5 years ago
puxiao.liao	6e22be2d37	麦格纳ASN收货看板修改	5 years ago
liquor	e75745380e	【11324 20011--北美收货自动打印时批次字段为2020-09-11，需要后台在传给前端时将后三位字符去除，变为2020-09用于客户目视化-0914】	5 years ago
曾贞一	f7fcb1f530	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
曾贞一	3267a9b54f	【如东AGV接口】	5 years ago
puxiao.liao	92c2a49b90	麦格纳ASN新增异常	5 years ago
liquor	ddf9936d74	在看板中增加了一列“来源库位”。	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
puxiao.liao	039fc9106b	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
puxiao.liao	6765c58de2	Fix bug#11212 ... 生产报废的条码在条码状态中查询是入库状态 --20200914	5 years ago
王杰	cf26f7eadd	mespcn异步任务	5 years ago
wynne1005	1e9f1a5c47	质量检测 1	5 years ago
陈思洁	d3f754c8a6	【客户JIT生产队列增加字段】	5 years ago
钮海涛	31791ea8cc	Merge remote-tracking branch 'origin/test' into test	5 years ago
钮海涛	17c64fbf46	修改麦格纳最早批次问题	5 years ago
puxiao.liao	8ac53abe9e	麦格纳ASN新增异常	5 years ago
宋军超	0d5ade92a9	天津麦格纳添加工位缺陷导入功能	5 years ago
puxiao.liao	08f76c099e	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	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
puxiao.liao	9954b1e83a	麦格纳ASN新增异常	5 years ago
rock.yu	36dd266065	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
rock.yu	9a2a596094	增加条码操作类型-发运校验	5 years ago
宋军超	0c855ba2af	天津麦格纳问题修复	5 years ago
钮海涛	cb39559a3d	Merge remote-tracking branch 'origin/test' into test	5 years ago
曾贞一	6cc11a637d	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
曾贞一	c947df6c66	【坤泰接口优化】	5 years ago
puxiao.liao	15a259c8b2	修复MGN系列BUG	5 years ago
钮海涛	cfd507438e	天津麦格纳问题修复	5 years ago
宋军超	bd20bc1552	天津麦格纳修改涂装条码打印	5 years ago
joke.wang	b389da7c2f	Fix Bug #11260	5 years ago
puxiao.liao	c91511185a	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
puxiao.liao	3cf5c70774	修复MGN系列BUG	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
puxiao.liao	f1715db664	Finish Task #2184 Cost:8h ... 2184 06 1.2.3.7.1物流路线检查	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
王杰	5e229b7176	message pool	5 years ago
汪云昊	1ce2793faa	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
宋军超	799967bde5	修改天津麦格纳问题	5 years ago
汪云昊	7a4be36111	Merge remote-tracking branch 'remotes/origin/dev' into test	5 years ago
汪云昊	156dd53402	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
汪云昊	130d3a9792	feat:字典规则调整允许值为空	5 years ago
汪云昊	ab608c0919	feat:用户导出	5 years ago
宋军超	91aa6f61a0	删除预装区查询接口	5 years ago
陈思洁	2af946a4bf	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	9fde75101e	【11181 19048-组织模型新增数据和保存的数据不一致！-2020-09-09】	5 years ago
wynne1005	9bfd9ef279	Merge branch 'master' into test	5 years ago
wynne1005	beaeccf1ed	冲突合并	5 years ago
wynne1005	48b6634032	新增枚举 样本类型	5 years ago
宋军超	c5ebcaf2b5	天津麦格纳添加出入库事务表枚举	5 years ago
puxiao.liao	97a8a5a6ec	修复MGN系列BUG	5 years ago
puxiao.liao	698128aff5	MGN修复BUG	5 years ago
宋军超	7a6bda2994	天津麦格纳问题修复	5 years ago
陈思洁	2c91dfba60	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	e4dc2e1a46	【2637 08 ext 20042 PCN界面优化，log调整 0804】	5 years ago
joke.wang	d33dae14dc	jsp计算bug优化	5 years ago
曾贞一	99e63fea8c	【2741 北京麦格纳WMS-质检跳批】	5 years ago
宋军超	f73e826cd8	天津麦格纳问题修复	5 years ago
钮海涛	729a7b6990	合并冲突	5 years ago
钮海涛	5c9da87650	合并冲突	5 years ago
钮海涛	d47607880e	合并冲突	5 years ago
钮海涛	56b1ae99a9	Merge remote-tracking branch 'origin/test' into test	5 years ago
钮海涛	1b6bbed47c	Fix Bug #10974	5 years ago
曾贞一	193cff013f	【2737 09 1.2.1.9.1库位新增库位别名】	5 years ago
joke.wang	b8c743896d	拆解接口表优化	5 years ago
puxiao.liao	61b87d2d00	MGN修复BUG	5 years ago
puxiao.liao	15d915370e	MGN修复BUG	5 years ago
曾贞一	fe9a19c534	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
曾贞一	6ca0948a5d	【11026 20011--有关北美收货产生的需求变更--0910】	5 years ago
宋军超	b0aba21859	中航导入问题修复	5 years ago
曾贞一	5dc142ba34	【2719 06 1.1.10 数据库文档管理-导入模板生成功能新增】	5 years ago
songss	bdf708b73a	增加上传图片job	5 years ago
joke.wang	045babeee1	已生产队列查询修改	5 years ago
joke.wang	ba940f9a39	BYPASS项映射关系表	5 years ago
汪云昊	0a0727e2fa	fix:代码错误	5 years ago
汪云昊	f878e6b283	Merge remote-tracking branch 'remotes/origin/dev' into test	5 years ago
汪云昊	2e102f4189	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
汪云昊	1ccd4f3b65	feat:添加区间查询	5 years ago
puxiao.liao	48a6dec057	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
puxiao.liao	9a7bef44ac	MGN修复BUG	5 years ago
陈思洁	01fc8bb062	【条码履历增加字段】	5 years ago
陈思洁	75fe475b53	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	01eda59dd5	【11069 19048- 抛光质量待定扫描条码后，提示信息不明确！-2020-09-05】	5 years ago
王杰	396dcdf56c	涂装 一箱 优化	5 years ago
曾贞一	332e37ea94	【2719 06 1.1.10 数据库文档管理-导入模板生成功能新增】	5 years ago
宋军超	b7542f8db0	修改中航问题	5 years ago
wynne1005	38096fb04e	mes表名过长不兼容oracle	5 years ago
汪云昊	6457cac828	feat:去除非空校验	5 years ago
曾贞一	54dc09ff76	【冲突解决】	5 years ago
曾贞一	9ebe3c17b7	【枚举状态】	5 years ago
joke.wang	bd8cc364c1	jsp计算优化	5 years ago
汪云昊	1243607e0e	Merge remote-tracking branch 'remotes/origin/dev' into test	5 years ago
汪云昊	5fbd0fdd80	fix:单号生成记录	5 years ago
puxiao.liao	26367ea28d	Finish Task #2184 Cost:8h ... 2184 06 1.2.3.7.1物流路线检查	5 years ago
汪云昊	cf2bf8d291	企业微信适配	5 years ago
rock.yu	6e37cd934b	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
rock.yu	d7133b24f5	增加缺失的字段	5 years ago
陈思洁	decd0ae558	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	6c351c09b5	【11016 19048- 总装生产计划显示多条！-2020-09-03】	5 years ago
曾贞一	8ca16d7c68	【枚举状态】	5 years ago
许心洁	7f11e5b1d7	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
许心洁	1fe5b807c6	BUG#10826,11025,11024	5 years ago
曾贞一	92e8364b58	【1140 09 1.2.1.1.1客户发运车辆推荐】	5 years ago
曾贞一	62733aa799	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
曾贞一	a53e7c5724	【2712 子 09 1.2.1.1.1客户发运车辆推荐 / 09 1.2.1.1.1客户发运车辆推荐 -后端】	5 years ago
puxiao.liao	acbad1a637	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test ... Conflicts: modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java	5 years ago
puxiao.liao	df4e794a48	修复MGN系列BUG	5 years ago
rock.yu	1e5fe42702	完成了麦格纳质检录入不良数量的功能	5 years ago
曾贞一	a0b50da83e	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
曾贞一	c06c504805	【2712 子 09 1.2.1.1.1客户发运车辆推荐 / 09 1.2.1.1.1客户发运车辆推荐 -后端】	5 years ago
joke.wang	746a17bd75	bj-mgn辅助展示组件	5 years ago
songss	7243e20cc8	Merge remote-tracking branch 'origin/test' into test	5 years ago
songss	d5d6f2cfee	修改枚举值	5 years ago
陈思洁	5dd7cc44b2	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	fad811c2bc	【增加索引】	5 years ago
joke.wang	18ca368f3c	照片采集	5 years ago
puxiao.liao	679ad59b86	Fix bug#10977 ... 19128+MES工单生成WMS领料任务无法生成+20200901	5 years ago
wynne1005	4bdfebede1	中航打包PCR完成	5 years ago
puxiao.liao	0e89f89327	修复MGN系列BUG	5 years ago
puxiao.liao	137c45b5cc	修复MGN系列BUG	5 years ago
汪云昊	b2517a11b8	feat(用户登录日志):用户登录日志查询及导出功能	5 years ago
陈思洁	564fdb261b	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	03730fe13c	【[#2702::07 ext 虚拟工单关闭按钮（注塑、涂装、组装） ] 】	5 years ago
wynne1005	fa8beadc4f	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
wynne1005	191220442f	websocket错误提示音	5 years ago
rock.yu	3935bde8f6	同步 SAP 数据同步 JOB（从仪征同步）	5 years ago
wynne1005	89ec0cbd71	解决冲突	5 years ago
wynne1005	d86c84a39e	添加工步返回表格背景色	5 years ago
许心洁	73c0ae5d42	优化合并仪征代码	5 years ago
陈思洁	df2342e097	【2703 07 ext 虚拟工单关闭按钮（注塑、涂装、组装）】	5 years ago
puxiao.liao	1eb3622d19	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
alwaysfrin	8b6271cebc	1，数据源参数配置优化 ... 2，读写分离数据源切换优化 3，日志切面优化调整 4，登陆线程优化 5，对象新增、修改监听优化	5 years ago
songss	19f1cf85c4	Merge remote-tracking branch 'origin/test' into test	5 years ago
songss	fad439a5a0	增加MES状态机Repository类	5 years ago
puxiao.liao	b8a938df2e	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	23d8afd0ae	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	09c95d3542	【库存排程配置增加禁用启用接口】	5 years ago
joke.wang	3815c1c730	扭矩采集plc优化	5 years ago
puxiao.liao	2527fe0163	修复MGN系列BUG	5 years ago
陈思洁	381ff0c974	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	de248a944f	【2701 08 1.2.3.3.8 涂装检测工位，显示合格数、不良数】	5 years ago
钮海涛	51746154ba	合并dev到test	5 years ago
钮海涛	e6b472bcfd	合并test代码到dev	5 years ago
钮海涛	98b992408c	Merge remote-tracking branch 'remotes/origin/test' into dev	5 years ago
钮海涛	4144e12b5d	合并test代码到master	5 years ago
钮海涛	92f0158dab	合并master代码	5 years ago
曾贞一	57aae56345	【2690 ext新增委外库存查询报表 -后端】	5 years ago
wynne1005	f06f51cc7e	master merge test	5 years ago
rock.yu	f6b812aaf8	PDA组件原生支持脚本组件	5 years ago
joke.wang	b09aa27e0f	排程job	5 years ago
rock.yu	9be1dd70d5	盘点明细表 lotno 字段增加默认值	5 years ago
汪云昊	feace77fc3	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
puxiao.liao	7f91f1269c	修复MGN系列BUG	5 years ago
汪云昊	731a92fa2c	Merge remote-tracking branch 'remotes/origin/dev' into test	5 years ago
汪云昊	6dc0d94085	feat:适配器添加空报文保存开关	5 years ago
汪云昊	4dc40c79dd	fix:pager.startRow重复计算	5 years ago
钮海涛	3bca09c091	Merge remote-tracking branch 'origin/test' into test	5 years ago
钮海涛	8d38a297d2	三力士演示demo	5 years ago
汪云昊	7e678e747d	feat:移除mongo日志持久化方法	5 years ago
puxiao.liao	36e9000710	麦格纳BUG	5 years ago
joke.wang	a2eab983d9	缓存池订单池增加jit_seq字段	5 years ago
钮海涛	2133d0d7e4	Merge remote-tracking branch 'origin/test' into test	5 years ago
钮海涛	f0023a2232	三力士演示demo	5 years ago
曾贞一	c1cb461f36	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
曾贞一	a9e97d4e28	【2688 08 extPDA-查询查看零件对应库位】 ... 【2683 08 ext单据打印新增字段查询和显示】 【2682 08 ext单据打印新增模板选择】	5 years ago
钮海涛	0b6764e8fe	Merge remote-tracking branch 'origin/test' into test	5 years ago
钮海涛	6dd429d328	三力士演示demo	5 years ago
songss	a2f257e414	Merge remote-tracking branch 'origin/test' into test	5 years ago
songss	df6f0bb4f2	删除没用代码	5 years ago
songss	f4d7e55f05	喷涂过程条码批量打印报错bug修复	5 years ago
陈思洁	0325e3dc95	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	98afecf57b	【10877 19048-预组装看板及操作工位变更调整-20200828】	5 years ago
wynne1005	a580c70c04	添加正态分布数据总数	5 years ago
wynne1005	762b73dddf	添加StepResult的返回cmd CLEAR_CACHE	5 years ago
wynne1005	9563ebeb66	normalDistribution	5 years ago
wynne1005	b4b1c2f3f8	erge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
wynne1005	0fd5989864	新增帮助类型的busiType	5 years ago
rock.yu	42187ebadc	完善流程管家日志信息	5 years ago
钮海涛	85395e84fd	合并dev代码	5 years ago
钮海涛	2013d47353	合并dev代码	5 years ago
宋军超	940510ea5b	北京海纳川、北京麦格纳问题修复	5 years ago
陈思洁	d7f8796d36	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	ee1b0b5b67	【2674 预装区基础页面开发】	5 years ago
puxiao.liao	d63d07ad7e	麦格纳收货BUG	5 years ago
joke.wang	ac55ae1df1	库存排程配置增加物料名称	5 years ago
王杰	7a502c45c9	注塑上料 展示组件增加字段	5 years ago
陈思洁	baa7d144b7	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	daf0b94314	【10828 19048-10827-预装作业界面优化！-2020-08-25】	5 years ago
曾贞一	3f2232d741	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
曾贞一	ec7aee68a7	【10744 20011--二维码收货时，如果该零件号设置了特殊批次，则扫描系统自己生成的二维码时永远报错“条码未维护供应商批次 执行成功请扫描二维码”，实际批次已经存在与条码最后一个字段中--0830】	5 years ago
宋军超	53d392ebe1	海纳川问题修复枪头更换添加弹框校验	5 years ago
wynne1005	ebd12f7c65	去除ProductBiModel重复字段	5 years ago
wynne1005	f9fa5814f6	冲突解决	5 years ago
wynne1005	40ec96a390	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
wynne1005	bbcd0c8f69	去除多余枚举	5 years ago
许心洁	2cc6abb902	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
许心洁	291c0b2a40	BUG#10584,BUG#10784,BUG#10785	5 years ago
钮海涛	9a41c2e2e0	合并test到dev	5 years ago
钮海涛	025cc19f68	合并dev到test	5 years ago
钮海涛	347f6671f2	合并dev到test	5 years ago
钮海涛	99b8cb146c	Merge remote-tracking branch 'remotes/origin/master' into test	5 years ago
钮海涛	310da99743	合并master代码	5 years ago
wynne1005	3769a630fe	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
wynne1005	42a340d0c0	timeModuleInit	5 years ago
宋军超	f3cb06ba5a	Merge remote-tracking branch 'origin/test' into test	5 years ago
宋军超	030343f2ce	海纳川问题修复	5 years ago
王杰	43ad04818c	pom	5 years ago
王杰	0d256b3afd	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
钮海涛	b4a4c42fe0	合并master代码	5 years ago
wynne1005	b3aa6eef70	中航 均值极差	5 years ago
钮海涛	35d3a85b60	合并master代码	5 years ago
钮海涛	c7adb56b9c	Merge remote-tracking branch 'origin/test' into test	5 years ago
汪云昊	8d6b01c06e	Merge remote-tracking branch 'remotes/origin/dev' into test	5 years ago
钮海涛	3df3c89db9	Merge remote-tracking branch 'origin/test' into test	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
钮海涛	ea43d63d7e	Merge remote-tracking branch 'remotes/origin/master' into test	5 years ago
汪云昊	dd75e3729b	feat:添加条码解析校验模式	5 years ago
汪云昊	d02c73f431	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
汪云昊	26cf4c5e92	feat:mongo模块化	5 years ago
汪云昊	103137e2fc	feat:添加条码解析校验模式	5 years ago
汪云昊	a5d7ff1ef4	feat:添加条码解析校验模式	5 years ago
王杰	3b31f9fcc8	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
王杰	d0bfa965f7	类型信息 seq	5 years ago
陈思洁	b0c3b85378	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	68fef2b051	【2634 19048--涂装Unpack流程！-2020-08-05】	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
puxiao.liao	6d59e00fc5	Fix bug#10545 ... 10545 19081 -- 出入库界面更改 20200814	5 years ago
joke.wang	e3146c9fb4	Fix Bug #0776	5 years ago
王杰	4c9b5d087c	涂装 二箱 客户 查询工作逻辑变更	5 years ago
王杰	a2084204f0	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
王杰	41422d895e	涂装 客户 二箱 查询工单逻辑变更	5 years ago
puxiao.liao	ba5befe291	Finish Task #2645 Cost:8h ... 【PCR-20200525-003_委外出库条码变更】中的零件号转化	5 years ago
joke.wang	fd771bccf8	报功接口增加工单类型字段	5 years ago
joke.wang	6f2905de1a	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
joke.wang	f6460749db	jsp解析优化	5 years ago
曾贞一	d81a7bf22e	【接口映射优化】	5 years ago
joke.wang	84dcf36c86	Fix Bug #10708	5 years ago
陈思洁	d17161d359	【2658 LPS导入后端开发】	5 years ago
曾贞一	867ecc6d71	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
曾贞一	15314209ae	【2636 07 1.2.3.4.3坤泰ERP&WMS接口】	5 years ago
joke.wang	f275d70136	Fix Bug #10674	5 years ago
puxiao.liao	9299f17c3b	Fix bug#10671 ... 二维码收货扫描条码报错系统异常 --20200821	5 years ago
陈思洁	358d582209	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	b56cf991be	【2607 08 ext PCR-200623001需求变更-预组装】	5 years ago
王杰	5f495a1b98	产品工作中心配置	5 years ago
曾贞一	d3ae797ba0	【坤泰接口开发】 ... 【质保周期检查组件--优化代码】	5 years ago
joke.wang	9207f20b37	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
joke.wang	09b8ccd1e3	Fix Bug #10520	5 years ago
王杰	1d86ce6429	总装打包 展示组件 列表显示封箱状态名称	5 years ago
陈思洁	406c625974	【2634 19048--涂装Unpack流程！】	5 years ago
陈思洁	c937e2aa64	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	ee927b7056	【2607 08 ext PCR-200623001需求变更-预组装】	5 years ago
宋军超	6db85d596b	修改海纳川问题	5 years ago
王杰	72afe6891b	料箱显示工作中心名称	5 years ago
rock.yu	f1bbe0344b	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
rock.yu	5bfd542402	增加工单拉动	5 years ago
宋军超	5e81b1f448	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
宋军超	4d816de5da	修改海纳川问题,添加PTL新逻辑关联bug:10538	5 years ago
王杰	a7c3167eef	注塑上料	5 years ago
joke.wang	562ba3e339	增加按灯停机时长接口	5 years ago
曾贞一	0b09e410f5	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
曾贞一	fe2017fbe4	【622 08 1.2.2.2.6 BOM增加虚阶零件】	5 years ago
钮海涛	228d3dd2ab	Merge remote-tracking branch 'origin/test' into test	5 years ago
钮海涛	841742e474	托标签收货合并到二维码收货	5 years ago
宋军超	163c385842	修改海纳川问题	5 years ago
puxiao.liao	fde40074ce	BUG修复	5 years ago
joke.wang	85b6067133	BI优化1	5 years ago
wynne1005	a400bf5aa7	还原orderBy	5 years ago
wynne1005	8ee28db80b	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
wynne1005	887e1d04f7	baseBean sortParamMap 先注释	5 years ago
宋军超	ba7cdc84e5	修改海纳川问题	5 years ago
wynne1005	953e243fe8	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
wynne1005	ef83a7aa08	是否重选更换名称 大小枪与绑定支持并发	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	032a7e8126	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
wynne1005	d699e88984	StationRequestBean	5 years ago
joke.wang	1cf11c4500	Fix Bug #10477	5 years ago
joke.wang	3f03b5fab5	产线表增加序号字段	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
宋军超	44b90bf639	修改海纳川问题	5 years ago
钮海涛	2fb46609c3	sweb功能开发	5 years ago
钮海涛	ad4b59a700	Merge remote-tracking branch 'origin/test' into test	5 years ago
钮海涛	dd7347d352	Sweb功能开发	5 years ago
钮海涛	b437a78e31	Merge remote-tracking branch 'origin/test' into test	5 years ago
王杰	f45137db94	注塑上料	5 years ago
钮海涛	438dcacdce	Merge remote-tracking branch 'origin/test' into test	5 years ago
曾贞一	8f7a7fcc32	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
曾贞一	6ba2d2826a	【麦格纳问题】	5 years ago
汪云昊	2013ca569a	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
汪云昊	15aa885cf8	fix:定时任务空指针的问题	5 years ago
汪云昊	a45d1ed104	fix:分页结束行计算错误的问题	5 years ago
钮海涛	53151424b9	Merge remote-tracking branch 'remotes/origin/master' into test	5 years ago
陈思洁	a5ea72f593	【新增库位实体】	5 years ago
陈思洁	a093f06edc	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	38f9adc2dd	【10554 19048--喷涂条码打印功能不应该查询出其他车间的生产计划！-2020-08-13】	5 years ago
wynne1005	59aadc94ce	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
wynne1005	763b88b420	工位扫描添加工步触发条件	5 years ago
许心洁	9bbc387818	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
许心洁	4ec9858182	任务#2625	5 years ago
宋军超	19b1bfb9b6	修改海纳川打印	5 years ago
joke.wang	2d52fe0a40	Fix Bug #10535	5 years ago
wynne1005	3030a109b2	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
wynne1005	0d3a8a3af7	添加放行记录	5 years ago
joke.wang	89bd4f189a	项目表增加字段	5 years ago
joke.wang	74cc0c757d	成品标签打印	5 years ago
曾贞一	3c4239c66a	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
曾贞一	2bef33960c	【2617 08 1.2.2.2.4新增保质期检查组件】	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
joke.wang	bf902b8366	Fix Bug #10294	5 years ago
王杰	175052ebcc	报工表加质量状态 默认合格	5 years ago
王杰	1707f6b228	MesProdWorkCenter	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
joke.wang	a522db04a9	过程条码增加字段vinCode	5 years ago
宋军超	84f61e65fc	修改海纳川问题	5 years ago
王杰	18dd2cbcb2	zs	5 years ago
汪云昊	b4c90b01fa	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
汪云昊	8d17cfcec0	feat:用户定制化配置功能	5 years ago
王杰	772229b983	andon	5 years ago
王杰	9e8cb0b844	注塑	5 years ago
陈思洁	056d4390ca	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	4a99857248	【10414 19048 - 注塑产品消耗BOM报表！-2020-08-05】	5 years ago
joke.wang	8c2fd8a587	Fix Bug #10476	5 years ago
joke.wang	f495ffed54	Fix Bug #10477	5 years ago
joke.wang	4bdd2b770b	Fix Bug #10486	5 years ago
joke.wang	51f9d92d36	北京麦格纳esop展示组件修改	5 years ago
ypf	97a2bdd60e	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
ypf	523d2ffc80	关于欧洲领料看板逻辑实体的添加	5 years ago
joke.wang	7c3594a870	Fix Bug #9589	5 years ago
陈思洁	e4c8431a22	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	653b413623	【10334 19048-MES、WMS接口JIT02中增加内部工单号！-2020-08-03】	5 years ago
宋军超	e70192d3c2	添加日志查询问题	5 years ago
钮海涛	54b0af00cc	Sweb功能开发	5 years ago
宋军超	625b780aaf	添加海纳川数据复核工步和产线状态看板变更	5 years ago
wynne1005	5d9e055fe1	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
wynne1005	3af4d32a97	mes工位运行状态	5 years ago
汪云昊	a3e8caf085	fix:detachObject为空时报错	5 years ago
宋军超	6aaa26b192	修改海纳川问题	5 years ago
joke.wang	edb85b5ea6	桌面BI	5 years ago
汪云昊	55b047448b	fix:会话模式为默认时出现不能正常覆盖的问题	5 years ago
宋军超	6e60bee0dd	修改海纳川问题	5 years ago
宋军超	731b1c60ee	修改海纳川问题	5 years ago
wynne1005	3c004324b1	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
wynne1005	6e455f5d72	reqBean 添加productSn	5 years ago
王杰	5413fc259c	pcn 缺陷	5 years ago
许心洁	4a9e5cbb59	Merge remote-tracking branch 'origin/test' into test	5 years ago
钮海涛	3a4c143563	Merge remote-tracking branch 'origin/test' into test	5 years ago
钮海涛	14e68803df	增加根据物料号取库存地信息的微服务接口	5 years ago
许心洁	afeb22c8ec	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
许心洁	7dcd8a1627	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
许心洁	7482a6dd74	BUG#9928 和任务#2590	5 years ago
汪云昊	410f469450	Merge remote-tracking branch 'remotes/origin/dev' into test	5 years ago
汪云昊	7f291a26cd	会话模式配置-调整默认模式	5 years ago
puxiao.liao	f9061f5d27	BUG修复	5 years ago
宋军超	162e2d33d7	修改海纳川问题	5 years ago
宋军超	99787412cd	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
宋军超	8eade912c7	添加返工返修数据复核逻辑	5 years ago
陈思洁	ed343a8064	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	ba3f5fde4d	【总装、涂装、注塑计划报表】	5 years ago
qianhs	86c9bce2aa	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
宋军超	c4f40d215b	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
宋军超	fa4b1e09aa	修改海纳川问题	5 years ago
曾贞一	067a859e83	【10229 19081-- 在已有的二维码生产报工逻辑上加上原材料扣减逻辑 --20200802】	5 years ago
钮海涛	933f2014ad	Merge remote-tracking branch 'origin/test' into test	5 years ago
钮海涛	39f6819e9b	修复合并版本问题	5 years ago
钮海涛	59a1acdafc	修复合并版本问题	5 years ago
puxiao.liao	d5d16569bb	Fix bug#10283 ... 20089+库存移动统计报表查询增加项目代码查询项	5 years ago
钮海涛	f760b72094	Merge remote-tracking branch 'remotes/origin/test'	5 years ago
宋军超	fe79944778	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
王杰	5739ac27bb	缺陷	5 years ago
陈思洁	39ea32e37e	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	a01cd4d34b	【注塑计划导入功能数据优化】	5 years ago
宋军超	8bc0da924c	修改海纳川问题	5 years ago
rock.yu	f368ec88cc	修改流程管家组件调用日志表	5 years ago
joke.wang	33cace48ab	半成品打印增加字段	5 years ago
qianhs	c872663847	Finish Task #2080 Cost:8h	5 years ago
宋军超	0b3c53b4ca	修改海纳川问题	5 years ago
wynne1005	e35fdcbc2a	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
wynne1005	4c9cdcb6a0	tmp	5 years ago
rock.yu	71a2b68991	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
rock.yu	b928acae47	1. 流程管家增加记录组件执行耗时的功能	5 years ago
陈思洁	b662a6ebe5	Merge remote-tracking branch 'origin/test' into test	5 years ago
陈思洁	26fe63eb8a	【10278 19048-总装标记不良功能通过外部输入条码标记不良-2020-08-03】	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
汪云昊	18a09cc4b6	FTP多文件读取问题 ... 脚本解析功能初版	5 years ago
汪云昊	101a71970c	虚拟属性数据校验及参数赋值问题	5 years ago
汪云昊	5a6a7a77fc	平台功能优化，移除通用缓存服务	5 years ago
钮海涛	51bae8d1e6	Fix Bug #10312 修复动态搜索取不到列信息问题	5 years ago
王杰	9a959a5184	pcn enum	5 years ago
陈思洁	41cbe4f380	【10284 19048-注塑生产计划导入变更-20200803】	5 years ago
陈思洁	ce7ca48c4b	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
宋军超	394a332de2	修改展示组件逻辑	5 years ago
陈思洁	72c8e22433	【接口映射代码调试】	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
王杰	e8611616db	IPC	5 years ago
王杰	6c5e646d49	test merge master	5 years ago
joke.wang	c060377822	中航BI	5 years ago
wynne1005	5fad38392e	添加索引 脚本表更新	5 years ago
joke.wang	05fa7dba04	Fix Bug #10227	5 years ago
joke.wang	af539c85a7	mgn bug	5 years ago
宋军超	31f289e1be	修改展示组件和电检逻辑	5 years ago
曾贞一	f25a186d77	【2511 07 1.2.3.4.3坤泰ERP&WMS接口】	5 years ago
曾贞一	4ff84de904	【2557 sap指令锁定回传信息增加业务类型，交易类型，erp单号内容】	5 years ago
puxiao.liao	5990e56dfd	Finish Task #2540 Cost:8h ... 喜德WMS-新增“回传源材料扣减结果”的接口映射	5 years ago
王杰	bc9adf8ac0	ptl	5 years ago
王杰	784cd87c71	ptl	5 years ago
钮海涛	e239c89e63	Merge remote-tracking branch 'origin/test' into test ... # Conflicts: # modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java	5 years ago
钮海涛	7f55af4477	Finish Task #2560 Cost:8h	5 years ago
贾文涛	5d19c8876b	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	bc2d29c006	【2547 07 1.2.4.6.1.10 PCR-200617001需求变更-生产过程不良紧急拉料】	5 years ago
贾文涛	fd42a3292a	Fix Bug #10090,修复涂装二次箱条码作业完成后，一次箱条码工位数据会乱掉问题。	5 years ago
许心洁	f791b3f82f	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
许心洁	ffc70e158a	BUG#8696	5 years ago
钮海涛	5a64ce6021	Merge remote-tracking branch 'remotes/origin/dev' into test	5 years ago
joke.wang	13f7121610	海纳川看板	5 years ago
贾文涛	70693d5b63	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
joke.wang	01ac2e85da	Fix Bug #10087	5 years ago
宋军超	e007a52732	修改海纳川问题	5 years ago
王杰	4a59b5c913	bug: 10003 19073-安灯作业安灯类型自处理名称修改工装-20200728	5 years ago
贾文涛	8180795cd7	功能优化-打包时将工位代码存入包装表	5 years ago
王杰	7f5c1735ea	数据复核	5 years ago
joke.wang	ea922affba	Start Task #2522 Cost:8h Left:8h	5 years ago
qianhs	163d610265	Finish Task #2080 Cost:8h	5 years ago
puxiao.liao	937eac5e87	Finish Task #2549 Cost:4h ... 自动生成领料单增加默认来源存储区、自动获取默认目标库位	5 years ago
钮海涛	72c1363517	Merge remote-tracking branch 'origin/test' into test	5 years ago
钮海涛	f2cf6af1fe	Finish Task #2523 Cost:16h ... Fix Bug #10065 已增加数据权限控制	5 years ago
王杰	306b05b4d7	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
许心洁	46904c43d1	任务#2528，#2545	5 years ago
puxiao.liao	9b622a27fc	Merge remote-tracking branch 'origin/test' into test	5 years ago
puxiao.liao	3c3a5f6068	Fix bug#9902 ... 20089+物料拆分条码异常+0724	5 years ago
joke.wang	3223158529	Fix Bug #10108	5 years ago
王杰	47a155e1d1	git push	5 years ago
joke.wang	2a93bb2ca4	Finish Task #2521	5 years ago
rock.yu	0f8326d5f8	1. 修改扭矩枪采集部分因主数据变动引起的逻辑变动	5 years ago
wynne1005	7593b63cfc	重做枚举	5 years ago
joke.wang	47f7e24f57	Fix Bug #10060	5 years ago
puxiao.liao	47f466d1d6	Merge remote-tracking branch 'origin/test' into test	5 years ago
puxiao.liao	e85acdcfff	Fix bug#9994 ... 库存明细--显示重复	5 years ago
qianhs	958a45d3dd	Finish Task #2080 Cost:8h	5 years ago
钮海涛	fd0f079a6a	Merge remote-tracking branch 'origin/test' into test	5 years ago
钮海涛	34be0bde26	增加物料组功能	5 years ago
puxiao.liao	6cd46e07bc	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
宋军超	23f33a79d1	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
宋军超	c18c22a799	修改海纳川电检测问题	5 years ago
贾文涛	c7bba92741	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
rock.yu	35cdb1f257	完善脚本管理功能	5 years ago
贾文涛	aafb3d36fc	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
puxiao.liao	2e3f5bb2af	Fix bug#9994 ... 库存明细--显示重复	5 years ago
rock.yu	eef7ed9c32	调整 pojo 引用关系， mes-pcn-pojo 已废弃	5 years ago
rock.yu	1d02d45e61	增加脚本引擎缺失的DAO	5 years ago
rock.yu	9104f42d42	增加脚本引擎缺失的DAO	5 years ago
rock.yu	6fbb76b395	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
rock.yu	7d76a3ecc7	增加脚本持久化类	5 years ago
宋军超	3590ef4b68	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
宋军超	f0fd8da49c	修改海纳川问题	5 years ago
钮海涛	7a93a935cc	Merge remote-tracking branch 'origin/test' into test	5 years ago
puxiao.liao	5f90efe691	Fix bug#9982 ... 19125+条码打印页面，erpSrcNo字段数据错误，导致打印出的条码数据有误+0727	5 years ago
joke.wang	e5d54d8c0a	工位BOM增加预警字段	5 years ago
joke.wang	768e31e636	Fix Bug #9995	5 years ago
钮海涛	7ca3b43bfe	合并DEV分支代码	5 years ago
钮海涛	9b3bb48231	Merge remote-tracking branch 'remotes/origin/test' into dev	5 years ago
贾文涛	3e260a9b86	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
wynne1005	4d608dd4c3	扩展dispatcher model	5 years ago
宋军超	5fa18e05f1	修改中航问题	5 years ago
钮海涛	b04ef3caa4	合并TEST分支代码	5 years ago
钮海涛	ef40f20e1d	解决合并冲突	5 years ago
钮海涛	3c22c8e3f4	test版本合并到master	5 years ago
贾文涛	c10a7bae7e	增加方法代码字段	5 years ago
钮海涛	0eb571d717	Fix bug #9804	5 years ago
钮海涛	9bde10f13c	修复收货回执界面打不开问题	5 years ago
宋军超	457cb894db	添加工位队列信息功能	5 years ago
puxiao.liao	5006e0a938	Finish Task #2520 Cost:8h ... 2520 07 1.2.3.3.4北京麦格纳WMS-JIS生产报工与内部移库	5 years ago
陈思洁	2636e43b9b	【9914 天津】	5 years ago
joke.wang	c90a009e66	Fix Bug #9874	5 years ago
wynne1005	d0e1900a84	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
wynne1005	c1fd1f6eee	bypass redo release	5 years ago
王杰	03dbb18bb8	8832 PO-HJMGN-19073--TJX5没有设备信息，但是显示了新松线的设备信息。--20200609	5 years ago
王杰	41ff729f99	workorderlog	5 years ago
宋军超	13142b4ce1	修改电检逻辑	5 years ago
曾贞一	374e73128d	【坤泰流程测试】	5 years ago
汪云昊	1aa63db4d3	Merge remote-tracking branch 'remotes/origin/dev' into test	5 years ago
汪云昊	4b3470b1fd	定时任务日志优化 ... 邮件发送失败记录	5 years ago
宋军超	933e9efb3d	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
宋军超	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
宋军超	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
钮海涛	81266fbfb6	解决合并冲突	5 years ago
王杰	9a74188e55	master merge test	5 years ago
qianhs	9461057a07	Finish Task #2080 Cost:8h	5 years ago
陈思洁	1d799ed294	2447 中航 扣减错误信息保存	5 years ago
王杰	204da853c3	[任务：2442]	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
王杰	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
曾贞一	6dd0614533	【欧洲-定时悬挂链汇总更新库存数据JOB-优化】	5 years ago
wynne1005	bd3e32d39e	小枪调试完毕	5 years ago
宋军超	34a9cbe0ac	修改PTL数据同步逻辑	5 years ago
宋军超	e4384bd569	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago