3056 Commits (eb7e63ffec5c22a228db3f0c30a809a2c2b46ac6)

Author	SHA1	Message	Date
钮海涛	89a45d326b	合并test代码	5 years ago
钮海涛	f63813d66d	合并master代码	5 years ago
钮海涛	ceebe541f2	Merge remote-tracking branch 'remotes/origin/master' into test	5 years ago
陈思洁	88376bb350	【2958 11 2.5.3 热处理上件】	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
钮海涛	4dd875a691	Merge remote-tracking branch 'origin/test' into test	5 years ago
钮海涛	156b515497	修复SWEB问题	5 years ago
simon	7d451dc136	Merge remote-tracking branch 'origin/test' into test	5 years ago
simon	4c1add6ba4	修改中文描述	5 years ago
joke.wang	058bd05b4a	mgn-bj esop展示组件优化	5 years ago
汪云昊	3af9790a9e	refactor(impp):调整描述注解	5 years ago
puxiao.liao	89bf22521a	Fix bug#12380 ... 19048-支持批量下发BOM的功能	5 years ago
puxiao.liao	b124db3383	天津麦格纳看板BUG修复	5 years ago
joke.wang	e18b6c727e	mgn-bj强制封箱完成后重置数据	5 years ago
simon	1ba56bc59a	调整过程检验返回结果	5 years ago
汪云昊	f2a6ddd55a	Merge remote-tracking branch 'origin/dev' into test	5 years ago
汪云昊	426a6f2026	feat(ftp):ftp重试功能	5 years ago
汪云昊	7a6137a667	Merge remote-tracking branch 'origin/dev' into test	5 years ago
puxiao.liao	679ef67457	天津麦格纳看板BUG修复	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
rock.yu	3a5e446e90	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
rock.yu	77d8aa4bdd	修改天津工单拉动逻辑	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
wynne1005	48c1d2c1c8	feat(tj) 文件上传	5 years ago
wynne1005	8a648eab74	新增mysql连接时区	5 years ago
simon	ece1ca4c01	调整中航看板返回，修复中航pcn原材料上线bug	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
汪云昊	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
joke.wang	f38e41f1ec	增加看板类型	5 years ago
汪云昊	e87740e723	Merge remote-tracking branch 'origin/dev' into test	5 years ago
汪云昊	f47b699146	feat(form):支持存储过程参数	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
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
曾贞一	d8e5aa44bc	pom.xml	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
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
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
许心洁	586365dc69	任务#2893,#2894,#2901	5 years ago
陈思洁	6fcf32aa80	【2890 10 2.3.8安灯作业优化】	5 years ago
puxiao.liao	62d5d62cef	北京MGN系列BUG修复	5 years ago
钮海涛	a8cdba48c3	合并Master代码	5 years ago
钮海涛	7afd60073a	Merge remote-tracking branch 'remotes/origin/test'	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
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	ba81af744b	北京麦格纳看板	5 years ago
王杰	bb3039d1f2	包装关系查询宝贝	5 years ago
贾文涛	2301e03c85	增加呼叫不需要弹窗的枚举。	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
汪云昊	72e25305bf	Merge remote-tracking branch 'origin/dev' into test	5 years ago
汪云昊	a4bc17b0a6	feat(form):sap_hana数据库支持	5 years ago
wynne1005	05152538b2	合并冲突	5 years ago
wynne1005	fc36e55a38	新增mes 报表查询周期枚举	5 years ago
joke.wang	df063af038	物料类型1增加枚举	5 years ago
joke.wang	6930fdfbe7	mgn-bj 产线枚举优化	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
宋军超	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
宋军超	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
joke.wang	233853e1e6	库存排程	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
汪云昊	2b6ff6498c	Merge remote-tracking branch 'origin/dev' into test	5 years ago
汪云昊	05f493b80e	feat(softswitch):添加重试功能	5 years ago
wynne1005	ebf0392057	去除多余optionType枚举	5 years ago
wynne1005	470775b527	备件生成冲突解决	5 years ago
wynne1005	f52f07fe77	备件导入	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
陈思洁	33c59cf39e	【11654 MES管理端基础数据模块缺少导入功能 0928】	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	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
钮海涛	1695d75ff2	合并dev代码	5 years ago
钮海涛	94568777fb	合并test代码	5 years ago
陈思洁	3d8d27d780	【11374 20027-管理端质量检测标准维护基础数据报错（附件是数据模板）-20200915】	5 years ago
宋军超	461780e0d0	天津麦格纳修改看板类型枚举	5 years ago
宋军超	ebb965f46d	天津麦格纳添加看板维护接口	5 years ago
Liquor	83bfaaceab	对SPC-KEY-TATA表的相关接口进行了相关优化。	5 years ago
Liquor	3d8842602d	增加了SPC-KEY-TATA表的相关接口。	5 years ago
puxiao.liao	65ea61fd70	增加昆泰其它出库业务类型	5 years ago
汪云昊	171f39cf01	revert:还原pojo pom.xml报表	5 years ago
汪云昊	56bd07dbf3	Merge remote-tracking branch 'origin/dev' into test	5 years ago
puxiao.liao	85feb7927a	修复TJ MGN BUG	5 years ago
puxiao.liao	0f46a23c7a	Fix bug#11611 ... 19081-计划外入库-扫描条码后撤销	5 years ago
钮海涛	543058b3a5	合并sweb代码	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
汪云昊	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
joke.wang	612c919e5f	bypass优化	5 years ago
wynne1005	114654dd99	冲突解决	5 years ago
wynne1005	696695ef0e	海纳川变更 10923 10894	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
joke.wang	bc383d573b	生产工单增加特殊标示字段	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
汪云昊	6ab0f17ac7	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
汪云昊	d6f4fa7f92	feat(softswitch):添加报文处理状态及处理结果	5 years ago
puxiao.liao	4ffe517015	修复TJ MGN BUG	5 years ago
joke.wang	72502a863b	Fix Bug #11490	5 years ago
王杰	895eb461ab	数据复核	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
钮海涛	ea875c1a3b	SWEB功能开发	5 years ago
宋军超	998e87b61d	天津麦格纳修改过程条码补打	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
wynne1005	8c0ea0d52f	冲突解决	5 years ago
wynne1005	10d5276fbb	过程检测 演示修改	5 years ago
joke.wang	cce1d91650	客退备件返修	5 years ago
puxiao.liao	ae6ffa27f4	修复TJ MGN BUG	5 years ago
陈思洁	50c2258f58	【增加查询参数条件】	5 years ago
汪云昊	163d0773a9	修改pom文件版本	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
钮海涛	485c66aaf7	合并test代码	5 years ago
wynne1005	531fe743c2	过程检测 完成首检判断	5 years ago
宋军超	6fa35ad939	天津麦格纳取消条码补打校验逻辑	5 years ago
wynne1005	d00dcd80eb	冲突解决	5 years ago
陈思洁	802c801013	【11310 19081-下达至下线时间预警-20200913】	5 years ago
wynne1005	1e9f1a5c47	质量检测 1	5 years ago
puxiao.liao	8ac53abe9e	麦格纳ASN新增异常	5 years ago
宋军超	0d5ade92a9	天津麦格纳添加工位缺陷导入功能	5 years ago
puxiao.liao	9954b1e83a	麦格纳ASN新增异常	5 years ago
rock.yu	9a2a596094	增加条码操作类型-发运校验	5 years ago
陈思洁	8a1f0c608e	【基础页面增加替代料功能】	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
wynne1005	9bfd9ef279	Merge branch 'master' into test	5 years ago
wynne1005	beaeccf1ed	冲突合并	5 years ago
wynne1005	48b6634032	新增枚举 样本类型	5 years ago
宋军超	c5ebcaf2b5	天津麦格纳添加出入库事务表枚举	5 years ago
joke.wang	d33dae14dc	jsp计算bug优化	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
曾贞一	5dc142ba34	【2719 06 1.1.10 数据库文档管理-导入模板生成功能新增】	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
陈思洁	01eda59dd5	【11069 19048- 抛光质量待定扫描条码后，提示信息不明确！-2020-09-05】	5 years ago
曾贞一	332e37ea94	【2719 06 1.1.10 数据库文档管理-导入模板生成功能新增】	5 years ago
汪云昊	6457cac828	feat:去除非空校验	5 years ago
汪云昊	1243607e0e	Merge remote-tracking branch 'remotes/origin/dev' into test	5 years ago
汪云昊	cf2bf8d291	企业微信适配	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
puxiao.liao	df4e794a48	修复MGN系列BUG	5 years ago
songss	7243e20cc8	Merge remote-tracking branch 'origin/test' into test	5 years ago
songss	d5d6f2cfee	修改枚举值	5 years ago
joke.wang	18ca368f3c	照片采集	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	191220442f	websocket错误提示音	5 years ago
wynne1005	89ec0cbd71	解决冲突	5 years ago
wynne1005	d86c84a39e	添加工步返回表格背景色	5 years ago
alwaysfrin	8b6271cebc	1，数据源参数配置优化 ... 2，读写分离数据源切换优化 3，日志切面优化调整 4，登陆线程优化 5，对象新增、修改监听优化	5 years ago
陈思洁	09c95d3542	【库存排程配置增加禁用启用接口】	5 years ago
钮海涛	51746154ba	合并dev到test	5 years ago
钮海涛	e6b472bcfd	合并test代码到dev	5 years ago
钮海涛	4144e12b5d	合并test代码到master	5 years ago
钮海涛	92f0158dab	合并master代码	5 years ago
wynne1005	f06f51cc7e	master merge test	5 years ago
joke.wang	b09aa27e0f	排程job	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
汪云昊	4dc40c79dd	fix:pager.startRow重复计算	5 years ago
汪云昊	7e678e747d	feat:移除mongo日志持久化方法	5 years ago
钮海涛	f0023a2232	三力士演示demo	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
钮海涛	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
陈思洁	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
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
钮海涛	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
钮海涛	b4a4c42fe0	合并master代码	5 years ago
wynne1005	b3aa6eef70	中航 均值极差	5 years ago
汪云昊	a52646a65d	Merge remote-tracking branch 'remotes/origin/dev' into test ... # Conflicts: # modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java	5 years ago
汪云昊	26cf4c5e92	feat:mongo模块化	5 years ago
汪云昊	103137e2fc	feat:添加条码解析校验模式	5 years ago
wynne1005	c3f30530a8	erge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
wynne1005	086c78f828	新增pcn页面的辅助展示组件	5 years ago
joke.wang	e3146c9fb4	Fix Bug #0776	5 years ago
puxiao.liao	ba5befe291	Finish Task #2645 Cost:8h ... 【PCR-20200525-003_委外出库条码变更】中的零件号转化	5 years ago
joke.wang	84dcf36c86	Fix Bug #10708	5 years ago
rock.yu	5bfd542402	增加工单拉动	5 years ago
曾贞一	fe2017fbe4	【622 08 1.2.2.2.6 BOM增加虚阶零件】	5 years ago
wynne1005	a400bf5aa7	还原orderBy	5 years ago
wynne1005	887e1d04f7	baseBean sortParamMap 先注释	5 years ago
钮海涛	9878547daa	合并dev分支代码	5 years ago
钮海涛	272c92dcb6	Merge remote-tracking branch 'origin/test' into test	5 years ago
钮海涛	f42ece4f6c	优化流程管家执行性能	5 years ago
wynne1005	a751d5a8a7	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
wynne1005	8d7b0fae6a	添加小枪日志 与不需要打枪绑定 自动跳过	5 years ago
钮海涛	ad4b59a700	Merge remote-tracking branch 'origin/test' into test	5 years ago
汪云昊	2013ca569a	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
汪云昊	a45d1ed104	fix:分页结束行计算错误的问题	5 years ago
wynne1005	0d3a8a3af7	添加放行记录	5 years ago
许心洁	c0629d52d1	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
许心洁	1c02cd6562	任务#2612，2613	5 years ago
wynne1005	ba558d640e	tmp	5 years ago
陈思洁	3baf748329	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	9b9871534a	【10493 19048-产品颜色无导入功能】	5 years ago
汪云昊	bda160ccec	Merge remote-tracking branch 'remotes/origin/dev' into test	5 years ago
汪云昊	8d17cfcec0	feat:用户定制化配置功能	5 years ago
钮海涛	54b0af00cc	Sweb功能开发	5 years ago
宋军超	625b780aaf	添加海纳川数据复核工步和产线状态看板变更	5 years ago
wynne1005	3af4d32a97	mes工位运行状态	5 years ago
汪云昊	a3e8caf085	fix:detachObject为空时报错	5 years ago
汪云昊	55b047448b	fix:会话模式为默认时出现不能正常覆盖的问题	5 years ago
宋军超	6e60bee0dd	修改海纳川问题	5 years ago
宋军超	731b1c60ee	修改海纳川问题	5 years ago
王杰	5413fc259c	pcn 缺陷	5 years ago
汪云昊	410f469450	Merge remote-tracking branch 'remotes/origin/dev' into test	5 years ago
汪云昊	7f291a26cd	会话模式配置-调整默认模式	5 years ago
qianhs	86c9bce2aa	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
钮海涛	39f6819e9b	修复合并版本问题	5 years ago
钮海涛	f760b72094	Merge remote-tracking branch 'remotes/origin/test'	5 years ago
qianhs	c872663847	Finish Task #2080 Cost:8h	5 years ago
汪云昊	e6ecd4f86f	Merge remote-tracking branch 'remotes/origin/dev' into test	5 years ago
汪云昊	0d40470059	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
汪云昊	101a71970c	虚拟属性数据校验及参数赋值问题	5 years ago
汪云昊	5a6a7a77fc	平台功能优化，移除通用缓存服务	5 years ago
王杰	9a959a5184	pcn enum	5 years ago
wynne1005	88233f080a	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
wynne1005	3ec8109e82	枪优化	5 years ago
王杰	e8611616db	IPC	5 years ago
王杰	6c5e646d49	test merge master	5 years ago
wynne1005	5fad38392e	添加索引 脚本表更新	5 years ago
joke.wang	af539c85a7	mgn bug	5 years ago
王杰	bc9adf8ac0	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
joke.wang	13f7121610	海纳川看板	5 years ago
joke.wang	01ac2e85da	Fix Bug #10087	5 years ago
宋军超	e007a52732	修改海纳川问题	5 years ago
王杰	4a59b5c913	bug: 10003 19073-安灯作业安灯类型自处理名称修改工装-20200728	5 years ago
joke.wang	ea922affba	Start Task #2522 Cost:8h Left:8h	5 years ago
puxiao.liao	937eac5e87	Finish Task #2549 Cost:4h ... 自动生成领料单增加默认来源存储区、自动获取默认目标库位	5 years ago
joke.wang	3223158529	Fix Bug #10108	5 years ago
wynne1005	7593b63cfc	重做枚举	5 years ago
joke.wang	47f7e24f57	Fix Bug #10060	5 years ago
puxiao.liao	2e3f5bb2af	Fix bug#9994 ... 库存明细--显示重复	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
wynne1005	4d608dd4c3	扩展dispatcher model	5 years ago
钮海涛	b04ef3caa4	合并TEST分支代码	5 years ago
钮海涛	ef40f20e1d	解决合并冲突	5 years ago
钮海涛	3c22c8e3f4	test版本合并到master	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
曾贞一	374e73128d	【坤泰流程测试】	5 years ago
汪云昊	1aa63db4d3	Merge remote-tracking branch 'remotes/origin/dev' into test	5 years ago
汪云昊	4b3470b1fd	定时任务日志优化 ... 邮件发送失败记录	5 years ago
wynne1005	f3a13522a1	解决冲突	5 years ago
wynne1005	3ba1c8ee62	新增组件类型枚举	5 years ago