5756 Commits (f392a13832b214c88e95bf3b1e7dc573a324bb95)

Author	SHA1	Message	Date
宋军超	af6b0ce0fd	任务：【1842】-添加海纳川5个基础数据模块的实体与枚举	5 years ago
joke.wang	0352980cde	bug: [8516] 重新计算bug修复	5 years ago
钮海涛	c1241bd6c5	修复版本问题	5 years ago
钮海涛	53a421b3b9	修复版本问题	5 years ago
钮海涛	5004f17037	修复版本问题	5 years ago
钮海涛	94e9b2ffec	Merge remote-tracking branch 'remotes/origin/master' into test	5 years ago
曾贞一	60dee04206	【8512 中航-BH检测结果管理-查询条件无效】	5 years ago
曾贞一	ecd888db6f	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
曾贞一	ec77182944	【BATCH录入检测值-查询优化】	5 years ago
王杰	029763feb1	pom	5 years ago
王杰	fc99ee8914	pojo 序列化	5 years ago
王杰	30fcf4f23f	pom冲突	5 years ago
王杰	716e1f7df1	Merge branch 'test' into dev	5 years ago
陈思洁	9cc193c12b	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
陈思洁	d2a31eac70	【1804 质检检测-来料检验功能】	5 years ago
qianhs	3ffa9d06fa	sweb pojo 序列化提交	5 years ago
汪云昊	069d477528	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
wei.peng	c288b54660	查询优化	5 years ago
宋军超	912ef81271	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
宋军超	373808e20d	任务：【1928】-添加检测单-检测类型枚举修改code描述	5 years ago
qianhs	8d61db5ed5	任务:1786,1787,1788,1789	5 years ago
joke.wang	25bd05348d	[serialVersionUID重复问题]	5 years ago
汪云昊	717f268c28	POJO版本号还原	5 years ago
汪云昊	8fe0244a20	POJO添加序列化id	5 years ago
钮海涛	281ef662b1	merge test	5 years ago
汪云昊	99b5048ef0	POJO添加序列化id	5 years ago
汪云昊	c27ebee3f9	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
汪云昊	7f2c372229	MDM POJO	5 years ago
汪云昊	9532489502	POJO添加序列化id	5 years ago
puxiao.liao	e74f3d6d99	BUG#8438【20011-- 六合一改数按钮逻辑错误，打开改数按钮时，输入数量后数量会累加在下方明细中并且让用户再次输入数量--0515】	5 years ago
qianhs	7778ce1afd	类序列号	5 years ago
袁津哲	44eef89b40	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
袁津哲	4b09d9fa8d	修改报错	5 years ago
qianhs	3462e33aac	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
qianhs	0e5bf3488b	盘点	5 years ago
袁津哲	486e655394	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
袁津哲	7b5736d717	Task1812:仓库健康度指标视图及相关指标自定义(#476)	5 years ago
qianhs	c38757de19	盘点	5 years ago
钮海涛	8b022cc736	Merge remote-tracking branch 'origin/test' into test	5 years ago
钮海涛	f1d14c9e3a	bug:【8385】-报工事务查询联调报表查询功能。	5 years ago
wynne1005	a4551a746a	[优化] 修改DdlPackBean查询 -> 工厂代码可以是英文或中文	5 years ago
宋军超	dfce22d654	任务：【1928】-添加检测单-检测类型枚举	5 years ago
陈思洁	9865558af3	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
陈思洁	6fbfea417f	【1804 质检检测-来料检验功能】	5 years ago
汪云昊	e8ea5a3c90	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
汪云昊	d86cdfe4ff	OPC UA 优化	5 years ago
陈思洁	c0f5709bb2	【合并冲突】	5 years ago
陈思洁	aef8841223	【合并冲突】	5 years ago
陈思洁	60973a3ee0	【1804 质检检测-来料检验功能】	5 years ago
puxiao.liao	e9873905ef	Merge remote-tracking branch 'origin/test' into test	5 years ago
puxiao.liao	6b9b2e8dd2	BUG#8438【20011-- 六合一改数按钮逻辑错误，打开改数按钮时，输入数量后数量会累加在下方明细中并且让用户再次输入数量--0515】	5 years ago
贾文涛	c4510fb121	BUG #8485,修复数据权限-查询启用禁用无效	5 years ago
宋军超	00df3134b2	任务：【1829】-更新检测单和检测单明细实体	5 years ago
puxiao.liao	8d386caa71	1776 工装初始化-新增箱条码与库位匹配检查组件	5 years ago
puxiao.liao	8e8744d3db	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test ... Conflicts: modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java	5 years ago
puxiao.liao	e8dd3ab12f	8481 基础数据-库位-导入。导出报错,提示cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil$LOCATE_TYPE.descriptionOfValue(java.lang.String)	5 years ago
曾贞一	c85fd2eff0	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
曾贞一	24ea607718	【8441 收货回执打印功能完善】	5 years ago
wei.peng	5e00f3b2c3	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
wei.peng	3669fbb4a4	本地版本库雪崩,有问题请排查此版本	5 years ago
袁津哲	f81b26bc3c	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
joke.wang	de9c901a3b	[任务：1826 库存排程配置]	5 years ago
袁津哲	0ddd92e4f8	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
袁津哲	0bafa0de52	开发调试回显组件模板功能	5 years ago
joke.wang	222ba4f8a4	[任务：1825 plc增加默认属性字段]	5 years ago
王杰	a6e9b90026	pom	5 years ago
许心洁	7e4fe5f945	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
许心洁	5d9f37ee33	根据作业类型分组查询流程组件SQL ：兼容SQLserver数据库优化	5 years ago
钮海涛	34a3598508	bug:8385	5 years ago
宋军超	1f97be3078	添加检测结果报表（5个界面）	5 years ago
宋军超	1f5052d679	添加检测过程类型枚举	5 years ago
宋军超	82af372fc0	添加检测过程类型枚举	5 years ago
qianhs	8d6ffbb012	bug:8268;8267;8266;8265	5 years ago
王杰	de9017ca5c	冲突	5 years ago
王杰	eaecf4b4b7	pom	5 years ago
王杰	c68d49880c	Merge branch 'dev' into test	5 years ago
王杰	7d192b36a6	pom冲突	5 years ago
qianhs	eb7511c39e	bug:8268;8267;8266;8265	5 years ago
joke.wang	1fec97f0c1	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
joke.wang	24806b9e2e	[oee优化]	5 years ago
袁津哲	80e572f07d	开发回显组件模板管理功能和优化实体生成数据库脚本逻辑	5 years ago
宋军超	78ff224fe4	删除查询供应商	5 years ago
宋军超	79e90298ef	添加供应商查询	5 years ago
宋军超	98091426f2	修改实体	5 years ago
puxiao.liao	a748fbd2f7	8426 中航-报表中心-采购计划更改查询-查询条件无效	5 years ago
puxiao.liao	f765493696	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test ... Conflicts: modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java	5 years ago
puxiao.liao	70aeae21d3	8426 中航-报表中心-采购计划更改查询-查询条件无效	5 years ago
曾贞一	d43935f88a	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
曾贞一	7ac98ffbc6	【1797 天津麦格纳WMS-定制业务-VDA标签防错验证】	5 years ago
宋军超	f302b4d5f1	修改MES_检验单实体字段	5 years ago
宋军超	e7335bb632	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
宋军超	4f5f9777a2	修改实体与model字段	5 years ago
贾文涛	f7b3250d70	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
贾文涛	abbab6bda4	数据权限-工单模块检索添加数据权限功能	5 years ago
钮海涛	8ae8383e79	Merge remote-tracking branch 'origin/test' into test	5 years ago
钮海涛	23b06a53af	bug:8404	5 years ago
袁津哲	1a01c44f84	Merge remote-tracking branch 'origin/test' into test	5 years ago
袁津哲	1dad60b129	修改pojo表字段查询页面--添加字段的详细注释，页面查询添加【系统】查询条件Bug：8420	5 years ago
joke.wang	664bf80434	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
joke.wang	23d1762b5b	[bug: 8422 半成品标签打印bug]	5 years ago
钮海涛	da8b4db890	修复pom版本问题	5 years ago
宋军超	a1579a2484	添加过程检测报表model	5 years ago
宋军超	6d7d8de7b3	添加MES_检验单和MES_检验单明细的实体和枚举	5 years ago
宋军超	32de58277a	添加MES_检验单和MES_检验单明细的实体和枚举	5 years ago
宋军超	7ef769268d	添加MES_检验单和检验单明细实体与枚举	5 years ago
袁津哲	bbbdfae633	开发根据系统分类实体信息	5 years ago
许心洁	75be7d5078	任务#1744：全局替换自定义搜索功能	5 years ago
joke.wang	5fb7eecee0	[任务：1752 oee看板]	5 years ago
许心洁	ef6330675c	任务#1744：全局替换自定义搜索功能	5 years ago
贾文涛	e668ef4b28	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
贾文涛	eadf0d67f8	添加数据权限处理方法	5 years ago
汪云昊	e487120301	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
汪云昊	0b3d2d6815	软适配REST 适配器调整优化	5 years ago
钮海涛	f87eeeb491	修复合并版本问题	5 years ago
钮海涛	ac268c1cbc	Merge branch 'test' into dev	5 years ago
钮海涛	917a101f20	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
钮海涛	df2e8601c4	task:1719	5 years ago
puxiao.liao	ba81a26700	1778 产品工装关系维护	5 years ago
joke.wang	f6e2a509f0	[任务：1751工厂小时OEE]	5 years ago
陈思洁	543f0f5c4c	【代码合并还原】	5 years ago
joke.wang	b450df5754	[任务：1752工厂oee]	5 years ago
joke.wang	142f8e79c6	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
joke.wang	f41cd22258	[bug: 8353 拍照采集]	5 years ago
wynne1005	63bc0b5928	merge test	5 years ago
wynne1005	46a91a13bc	jis 去除rule关键字	5 years ago
wynne1005	25b2fb8e21	jis pojo 去除rule 关键字	5 years ago
陈思洁	28de0251ea	【sonar bug修改】	5 years ago
曾贞一	1901cf6eb0	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
曾贞一	2dac15c248	【1709 BH-录入检测值】	5 years ago
puxiao.liao	1983602b3a	8060 AP-MGN-BJ-19081 --扫描查询输入零件号查询，查询出来的零件数量全部为0	5 years ago
钮海涛	bbe03cc6fd	解决合并冲突问题	5 years ago
钮海涛	1b88b20e13	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
钮海涛	40a87d83b3	修复合并问题	5 years ago
贾文涛	4c8f3c34a2	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
贾文涛	6760ed79dd	数据权限-修改启用禁用问题	5 years ago
钮海涛	05276bcf46	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
钮海涛	005d0f7f86	修复合并问题	5 years ago
钮海涛	d74d78353d	Merge branch 'test' into dev	5 years ago
钮海涛	bc269e1f71	Merge branch 'master' into test	5 years ago
王杰	1dff3327d7	任务：1733 条码模板逻辑调整	5 years ago
joke.wang	363ac22ade	[任务：1750 OEE运算JOB]	5 years ago
wynne1005	1cda7e902b	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
宋军超	345b261118	设备添加枚举EQU_DEFECT_CAUSE故障原因,EQU_DEFECT_METHOD故障处理措施,EQU_DEFECT_PHENOMENON故障现象;	5 years ago
宋军超	f9dfc8e0e2	plc地址清单添加plc类型字段(枚举)，设备台账添加作业校验模式字段(枚举)	5 years ago
wynne1005	27e4fb164b	Merge branch 'dev' into test	5 years ago
王杰	724e784fe3	Merge remote-tracking branch 'i3plus-pojo/dev' into dev	5 years ago
王杰	c5d4cd7dad	生产计划编制	5 years ago
钮海涛	2b85a05645	新增脚本WebSocket	5 years ago
wynne1005	d925ec62bf	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
wynne1005	888d87f12e	task edi	5 years ago