6874 Commits (6ab0f17ac7e6364d6901255578d1b5ea6eb3ab4a)

Author	SHA1	Message	Date
贾文涛	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
宋军超	2e5ab2cdcd	条码外上线添加赋值字段	5 years ago
钮海涛	9a516f893f	合并dev代码到test	5 years ago
钮海涛	37a12c0cdf	Merge remote-tracking branch 'remotes/origin/test' into dev	5 years ago
puxiao.liao	5d62ebf26f	Finish Task #2424 Cost:8h ... 2424 07 1.2.3.7.1新增检查容器包装关系	5 years ago
wynne1005	3f8789332f	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
wynne1005	1252027685	dl小枪	5 years ago
曾贞一	9bf2d5206c	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
曾贞一	6750f11459	【2388 07 1.2.3.6.2欧洲WMS-PCR-悬挂链库存同步】	5 years ago
曾贞一	791acf7ae8	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
曾贞一	dffdf88471	【9556 欧洲-RFID条码操作记录-操作类型显示问题】	5 years ago
joke.wang	b69fcdc0c6	Finish Task #2399 Cost:6h	5 years ago
宋军超	885d2c16a1	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
宋军超	300e308394	新增盲检规则导入功能	5 years ago
王杰	e1b3b14a36	test merge dev	5 years ago
王杰	6de2bc5472	Merge branch 'test' into dev	5 years ago
puxiao.liao	df125e71b9	泰国翻包	5 years ago
qianhs	860f6d11f0	Finish Task #2080 Cost:8h	5 years ago
王杰	ec87065eb5	if pick data	5 years ago
宋军超	448bd77b81	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
宋军超	538b224f67	新增计划外条码识别上线-PCR功能	5 years ago
wynne1005	cc4d17a81f	大枪ok bug 9492	5 years ago
曾贞一	354d1290f7	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
曾贞一	f99c5232be	【2388 07 1.2.3.6.2欧洲WMS-PCR-悬挂链库存同步】	5 years ago
宋军超	1c93d21815	修改字段BIN_NO	5 years ago
曾贞一	da9c698ea4	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
曾贞一	c0cf08fa19	【9556 欧洲-RFID条码操作记录-操作类型显示问题】	5 years ago
钮海涛	8ae3c65cb3	三力士演示demo	5 years ago
王杰	7e48674d9e	dev merge test	5 years ago
王杰	4260316f62	test merge dev	5 years ago
joke.wang	e5cd6692d4	Finish Task #2359	5 years ago
wynne1005	25382f0265	Fix Bug #2357,2358	5 years ago
钮海涛	8d29e72322	Merge remote-tracking branch 'origin/test' into test	5 years ago
钮海涛	dcc23e56cd	三力士演示demo	5 years ago
曾贞一	ef58d72067	【9514 欧洲-定制业务-RFID管理-查询条件无效】	5 years ago
puxiao.liao	9445989545	Finish Task #2338 Cost:4h ... 2338 07 1.2.3.5.1客户发往地新增维护目标存储区	5 years ago
曾贞一	000097a4c6	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
曾贞一	82e2366fa6	【2181 06 1.2.3.8 泰国WMS-容器包装关系接口-需求变更】	5 years ago
钮海涛	20a5443fa7	Merge remote-tracking branch 'origin/test' into test	5 years ago
钮海涛	c05e18db5b	合并源分支代码	5 years ago
joke.wang	52ad38fa9d	Finish Task #2238	5 years ago
王杰	a2f047553f	pom	5 years ago
王杰	c20f630402	Merge branch 'test' into dev	5 years ago
王杰	dc91809bb7	test merge dev	5 years ago
王杰	cff90316a5	ptl	5 years ago
钮海涛	2bbc0bea66	三力士演示demo	5 years ago
钮海涛	1581e8b86c	三力士演示demo	5 years ago
曾贞一	3620d2abd2	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
曾贞一	e9492a86b0	【2315 07 1.2.3.6.3欧洲WMS-RFID查询】	5 years ago
rock.yu	c4f8497dda	通用接口的字段映射关系 JSON 中增加 seq 属性，发出的接口报文会按照此属性生序 ... 如果未配置此属性，则默认为 0，即无序 增加此段代码的单元测试用例	5 years ago
钮海涛	f061ff7b73	Merge remote-tracking branch 'origin/test' into test	5 years ago
钮海涛	c980c6c87c	三力士演示demo	5 years ago
王杰	a452a71924	9461 北京海纳川-线边库拉动接口调整-0711	5 years ago
宋军超	3d7b43a7de	修改测试天津问题bug	5 years ago
陈思洁	4137fe1a80	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	ba35d0a24b	【新增客户标签模板字段】	5 years ago
曾贞一	5dfad71e39	【2292 子 07 1.2.3.6.3欧洲WMS-PCR-RFID入库 】 ... 【2310 07 1.2.3.6.3欧洲WMS-RFID发运】 【2312 07 1.2.3.6.3欧洲WMS-RFID空车回库】	5 years ago
许心洁	9a62fe0e06	BUG#9302	5 years ago
qianhs	e321ca3790	Merge remote-tracking branch 'origin/test' into test	5 years ago
宋军超	8e99ae38e6	修改测试天津bug	5 years ago
王杰	82158d8283	[bug 9238 9096]	5 years ago
qianhs	f0b8cee974	Merge remote-tracking branch 'origin/test' into test	5 years ago
qianhs	ba6be25390	Finish Task #2080 Cost:8h	5 years ago
joke.wang	cdf8c79cce	Fix Bug #9408	5 years ago
wynne1005	79fb42e149	MES_PROD_BIND_RECORD添加mdt索引	5 years ago
宋军超	a49b57229c	Merge remote-tracking branch 'origin/test' into test	5 years ago
puxiao.liao	595266f536	Fix bug#9343 ... 19125+条码打印页面后端传值新增一个字段值，传表wms_part 字段color +0709	5 years ago
陈思洁	ce4593c381	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
陈思洁	47ef0fa503	【2286 07 1.1.2.2 强制放行ByPass】	5 years ago
宋军超	bd251113a7	涂装展示组件添加显示实际包装数量	5 years ago
汪云昊	c35cd9c169	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
曾贞一	8891c38e66	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
曾贞一	0108649a73	【代码优化-优化】	5 years ago
宋军超	6440fd2dfe	首检、巡检报表新增工单号、产线和产品条码查询条件	5 years ago
wynne1005	a84186e023	中航审核发布	5 years ago
宋军超	716f0ac1f9	对象结构添加是否显示和显示顺序字段	5 years ago
宋军超	93d7b4dac8	首检、巡检查询添加产品条码、工单号、物料号、产线 搜索条件	5 years ago
宋军超	f032b6ddcd	首检、巡检查询添加产品条码、工单号、物料号、产线 搜索条件	5 years ago
汪云昊	0fa8981440	定时任务日志bug修改及优化 ... 资源内存清理方法	5 years ago
曾贞一	c20159da6a	【上架策略-功能优化】	5 years ago
钮海涛	6033695b99	修复合并版本问题	5 years ago
puxiao.liao	f385be1d7c	无锡喜德BUG	5 years ago
wynne1005	085f15427d	还原pom	5 years ago
wynne1005	cb4bf9f453	merge andon pom	5 years ago
wynne1005	dfa993b9e9	还原pom	5 years ago
宋军超	b2587f2288	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
宋军超	e5f3c553ec	bug 9122, 展示组件，配置产品位置参数，如果需要显示多个位置，使用逗号间隔。Fix Bug #9122 ... bug 9268, 工位BOM查询报错。Fix Bug #9268 bug 9270, 工位BOM查询报错。Fix Bug #9270 bug 9271, 工位BOM查询报错。Fix Bug #9271 所有展示组件添加工步区域缩进功能	5 years ago
王杰	08cce22dbb	dev merge test	5 years ago
王杰	02cb107672	Merge branch 'test' into dev	5 years ago
曾贞一	639ac8f223	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
曾贞一	50e2f18c0d	【9280 wms-202007-BH录值完成点击完成按钮系统响应时间过长-0705】	5 years ago
王杰	0e3614eb68	test merge dev	5 years ago
wynne1005	15f0a37508	还原pom	5 years ago
陈思洁	6bc9aa1f70	2092 MES202006-首检、巡检检验单据生成逻辑变更-20200615	5 years ago
汪云昊	39d6609a5f	Merge remote-tracking branch 'remotes/origin/dev' into test	5 years ago
汪云昊	a2f7642d53	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
汪云昊	cbf1c97c06	彭伟代码恢复 ... 定时任务日志过滤器	5 years ago
王杰	9b56c6d9bf	【任务2223】	5 years ago
陈思洁	556f112ef8	Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo	5 years ago
陈思洁	49f0c0c33a	2092 MES202006-首检、巡检检验单据生成逻辑变更-20200615	5 years ago
王杰	46261119d9	mes	5 years ago
钮海涛	24474b4704	Merge remote-tracking branch 'origin/test' into test	5 years ago
钮海涛	c3398a6cc9	修改中航BH问题	5 years ago
joke.wang	4bb5dbfac5	Finish Task #2236 Cost:8h	5 years ago
joke.wang	f8c6247137	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
joke.wang	44e3d667b3	订单池枚举	5 years ago
袁津哲	257fb6c515	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
袁津哲	315e3a266f	优化涂装上线功能	5 years ago
joke.wang	7457e27180	解决冲突	5 years ago
joke.wang	12478a6251	解决冲突	5 years ago
joke.wang	76e3fb0811	Finish Task #Finish Task #2236	5 years ago
wynne1005	445668a9b2	调整jitseq字段类型	5 years ago
wynne1005	1bc846454e	Merge branch 'test' into dev	5 years ago
wynne1005	98849d3131	调整jitseq类型	5 years ago
wynne1005	bcb4e5ad13	merge test	5 years ago
wynne1005	31b5f3e234	merge dev 还原pom	5 years ago
wynne1005	7b795c12fb	merge master	5 years ago
qianhs	b48d38ee62	Finish Task #2080 Cost:8h	5 years ago
宋军超	2d39282521	修改涂装逻辑	5 years ago
陈思洁	27ef6dc7f3	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
陈思洁	7f4c173105	【2250 总装条码打印,2228 06 1.2.4.6.1.7 总装上线工位】	5 years ago
joke.wang	ad6249f412	Finish Task #2235 Cost:8h	5 years ago
wynne1005	b18408b3bb	merge test	5 years ago
王杰	7517a11a90	[任务：2223]	5 years ago
puxiao.liao	1f6c613488	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
曾贞一	f4edb471c3	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
曾贞一	3d826c5edc	【智能化开发-日志记录优化】	5 years ago
puxiao.liao	1d2c2b7be2	海纳川智能化	5 years ago
汪云昊	517eef8e66	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
汪云昊	0c0eea561d	功能优化	5 years ago
joke.wang	ab0ae20d40	Finish Task #2234 客户JIT预装队列	5 years ago
puxiao.liao	559fc003c8	Finish Task #2184 Cost:8h ... 2184 06 1.2.3.7.1物流路线检查	5 years ago
宋军超	59c79b5134	TASK 2205, 开发对接涂装二次箱条码打印。Finish Task #2205 Cost:24h	5 years ago
袁津哲	bdde5bbb9a	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
袁津哲	c73ef2b93b	开发涂装检查工位和一次、二次箱条码Un-Pack-后端开发业务逻辑	5 years ago
wynne1005	b8239f6455	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
wynne1005	6956259496	EDI Finish Task #2215 Cost:48h Left:0h	5 years ago
钮海涛	32eb9dc797	修复合并版本问题	5 years ago
钮海涛	9dca27259e	Merge branch 'test' into dev	5 years ago
钮海涛	629817ddef	三力士数据排程	5 years ago
joke.wang	57a7ddad35	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
joke.wang	fff94902f7	Fix Bug #9203	5 years ago
puxiao.liao	37fb285aa9	海纳川智能化	5 years ago
王杰	5ccf659c94	[bug:9149]	5 years ago
wynne1005	614582ce36	条码表增加乐观锁	5 years ago
曾贞一	7dddac5113	【智能化开发-锁定库位】	5 years ago
wynne1005	aaf9f8a21b	添加乐观锁 日志	5 years ago
wynne1005	1fb2f07ca3	edi 添加队列字段	5 years ago
钮海涛	84698f3042	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
钮海涛	9475667e74	Finish Task #2134 Cost: 8h	5 years ago
袁津哲	9361512fb8	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
袁津哲	b1dddb62d3	开发涂装检查工位和一次、二次箱条码Un-Pack-后端开发业务逻辑	5 years ago
王杰	473ebd5ec8	[任务：2219]	5 years ago
王杰	31d7b71872	mes enum order type	5 years ago
曾贞一	0d7eb7ac67	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
曾贞一	aa09a31957	【智能化开发-锁定库存】	5 years ago
wynne1005	d2869dc31a	tmp	5 years ago
joke.wang	aabd7b5d1d	Fix Bug #9112	5 years ago
joke.wang	d44312c470	Fix Bug #9151	5 years ago
许心洁	54241ebf11	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
许心洁	9d79ed5376	3D仓库规则引擎优化	5 years ago
袁津哲	56a4edc4c0	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
袁津哲	295860683a	开发涂装检查工位和一次、二次箱条码Un-Pack-后端开发业务逻辑	5 years ago
王杰	472b2f1ee6	bug 9149	5 years ago
许心洁	38b154b0cb	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
许心洁	6cd70eb695	3D仓库规则引擎优化	5 years ago
钮海涛	0626d6f969	修复版本问题	5 years ago
钮海涛	e42ea19f37	修复版本问题	5 years ago
钮海涛	8d4c5f3cd4	Merge branch 'test' into dev	5 years ago
王杰	272d647073	【任务2219】	5 years ago
钮海涛	2478fc3b14	修复版本问题	5 years ago
钮海涛	0f2f56163e	Merge branch 'master' into test	5 years ago
puxiao.liao	5269cfb732	BH 需求修改	5 years ago
wynne1005	d9f619e1a0	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
puxiao.liao	e599a833f1	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
wynne1005	3b5142a1f8	edi	5 years ago
宋军超	6f454c95a4	Start Task #2212,2205 Cost:8h Left:16h	5 years ago
宋军超	c44e6ac965	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
袁津哲	e3a86fdbab	涂装条码打印、涂装上线功能联调	5 years ago
钮海涛	2b5f76caee	Merge remote-tracking branch 'origin/master'	5 years ago
钮海涛	62c9d8d27d	修复欧洲FIFO跳过未进行交易处理Bug	5 years ago
joke.wang	cf1020d82f	删除@Lob	5 years ago
王杰	08fe2de018	mes	5 years ago
joke.wang	2829bb5afb	pcn同步对象映射	5 years ago
wynne1005	8ae7ce53b7	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
宋军超	a757d2c339	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
puxiao.liao	84253d7562	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
puxiao.liao	b9ac27df19	无锡喜德BUG	5 years ago
joke.wang	2ce2e20c0b	包装扫描数量计算有误修复	5 years ago
袁津哲	f607860c57	Fix Bug #8845 ... 修改关键零部件绑定的数据列中增加带绑定条码的长度、特征码内容bug	5 years ago
袁津哲	aaaa591be4	优化关键条码绑定逻辑	5 years ago
曾贞一	3d79d73ff4	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
曾贞一	624e8d6461	【2193 06 1.2.3.7.4任务自动生成任务JOB】	5 years ago
曾贞一	b68f55b062	【2193 06 1.2.3.7.4任务自动生成任务JOB】	5 years ago
wynne1005	cf1edee02e	edi	5 years ago
王杰	15e7f2a0b5	pom	5 years ago
王杰	ea5a069eeb	pom	5 years ago
王杰	ed64d12875	pojo	5 years ago
宋军超	712f1e8d3d	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
宋军超	5be9081fc3	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
钮海涛	f464fd09c5	Merge branch 'test' into dev	5 years ago
宋军超	9218ca44a7	产品条码表添加生产批次lotNo	5 years ago
joke.wang	b32136f75d	Fix Bug #9078	5 years ago
puxiao.liao	fa383f6417	自动化策略主表	5 years ago
王杰	f3ffdc7d4c	dev merge test	5 years ago
puxiao.liao	84dbbcd9a8	自动化策略主表	5 years ago
puxiao.liao	2673b9164a	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
王杰	2c16efcb72	Merge branch 'test' into dev	5 years ago
王杰	7d5d36d084	test merge master	5 years ago
puxiao.liao	aea28cf6bb	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
puxiao.liao	e3513bddaa	自动化策略主表	5 years ago
王杰	70d58be136	pom	5 years ago
王杰	1e1f7cc1fb	pom	5 years ago
王杰	91d0ec1671	Merge branch 'master' into test	5 years ago
曾贞一	710c6aee3a	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
曾贞一	913991d30d	【2193 06 1.2.3.7.4任务自动生成任务JOB】	5 years ago
袁津哲	3247ef5ed7	优化涂装上线工位展示组件逻辑	5 years ago
宋军超	fe05a76f6f	添加涂装功能实体字段与model	5 years ago
qianhs	20cefbfec6	Finish Task #2080 Cost:8h	5 years ago
袁津哲	66b98dd6d5	1.开发涂装上线功能逻辑 ... 2.开发涂装工单条码打印逻辑	5 years ago
钮海涛	6c6fbf7e2c	新增收货回执显示收货时间功能	5 years ago
陈思洁	3f88a390e4	【8983 需求调整-泰国MES，工单下达逻辑调整】	5 years ago
宋军超	68fa329701	添加涂装打印实体	5 years ago
陈思洁	5431d09073	【8983 需求调整-泰国MES，工单下达逻辑调整】	5 years ago
wynne1005	c8178975af	StationRequestBean添加状态机代码	5 years ago
钮海涛	44ba68bb04	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
钮海涛	d08465dd38	修复版本问题	5 years ago
陈思洁	80e0ec63bb	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
陈思洁	498d6821a1	【2145 06 1.2.4.6.1.1 注塑计划排产】	5 years ago
钮海涛	800a954b7f	Merge branch 'test' into dev	5 years ago
qianhs	98b0110ff3	Finish Task #2080 Cost:8h	5 years ago
王杰	c2a6fb1684	[任务2186 涂装导入]	5 years ago
陈思洁	1f6af14316	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
陈思洁	0d81228ce7	【2145 06 1.2.4.6.1.1 注塑计划排产】	5 years ago
joke.wang	1f05cfca4c	Finish Task #2152 Cost:16h	5 years ago
puxiao.liao	9cd0823c34	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev ... Conflicts: modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java	5 years ago
曾贞一	9567d62195	【自动化策略】	5 years ago
puxiao.liao	17d3642fff	自动化策略主表	5 years ago
曾贞一	a8b2a0a618	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
曾贞一	e94e4ad189	【2180 06 1.2.3.8泰国WMS－生产报工接口】 ... 【2181 06 1.2.3.8 泰国WMS-容器包装关系接口】 【2180 06 1.2.3.8泰国WMS－生产报工接口】	5 years ago
袁津哲	a4820f236e	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
袁津哲	3d88913343	物料表中新增标准包规数量字段	5 years ago
汪云昊	6d71c01178	Merge remote-tracking branch 'origin/dev' into test	5 years ago
汪云昊	26b564f0be	FTP 文件编码类型	5 years ago
汪云昊	517f89ad58	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
汪云昊	6c5c726187	REST 服务端适配器支持JSON与XML ... FTP 支持增量写入 国际化资源内存缓存	5 years ago
陈思洁	9e9bb2fd03	【合并冲突】	5 years ago
陈思洁	f90371f632	【2144 06 1.2.4.6.1.3 装配计划排产】	5 years ago
puxiao.liao	ffc2d4d56c	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/WmsDocFgDetail.java	5 years ago
puxiao.liao	49f9d06d5f	Fix bug#9062 ... 无锡喜德-生产汇报（原材料/成品）用 函数取出来的父位置和子位置号可能会有多个-0620	5 years ago
钮海涛	ac7e69e51e	修复版本问题	5 years ago
钮海涛	34e63db56c	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
钮海涛	e340749f87	Finish Task #2196 Cost:4h	5 years ago
puxiao.liao	eeaaa74d1e	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
puxiao.liao	0818778346	自动化策略主表	5 years ago
宋军超	819bd7aba8	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
王杰	8cf6e99cf6	mes	5 years ago
宋军超	87dc9ab966	与前端联调修改	5 years ago
曾贞一	16271ea338	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
曾贞一	68c3f087dc	【2180 06 1.2.3.8泰国WMS－生产报工接口】	5 years ago
曾贞一	77e6ee3b98	【2180 06 1.2.3.8泰国WMS－生产报工接口】	5 years ago
宋军超	2ef42fdadd	Finish Task:2160,2175.北京麦格纳基础数据开发。 Finish Task #2160,2175 Cost:10h	5 years ago
钮海涛	9d64793a5f	Merge branch 'master' into test	5 years ago
joke.wang	3dda15e00a	Finish Task #2153 Cost:24h	5 years ago
袁津哲	edae2b00f6	Fix Bug #8996,#9033 ... 1.PCN同步配置界面同步方式及同步类型显示为空-0617 2.原材料上线扫描显示数量不正确	5 years ago
puxiao.liao	0c0d43cd96	北京海纳川：采购入库组件	5 years ago
wynne1005	64b00d6717	接口表添加产品条码	5 years ago
汪云昊	3c2462c1af	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
汪云昊	fdd5516a0f	FTP适配器优化 ... 表单功能优化 UA 适配 LONG类型	5 years ago
陈思洁	b65d9e0f3d	2171 首检生成逻辑调整	5 years ago
wynne1005	b0df686091	Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo	5 years ago
wynne1005	878acb869f	提交zh修改问题	5 years ago
袁津哲	c066820b18	Fix Bug #9001 ... 关键件绑定异常问题	5 years ago
曾贞一	a4fd88f237	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
曾贞一	a59fa1bf9b	【2078 06 1.2.3.9拣货策略-新增拣货推荐组价】	5 years ago
袁津哲	cb69f62c63	Fix Bug #8886 ... 原材料上线扫描，无法看到原材料已扣减数量和剩余数量	5 years ago
wei.peng	b0e752c65e	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
wei.peng	91f4edc83f	数据库读写分离 功能完善	5 years ago
wei.peng	d5051cabdb	数据库读写分离 功能完善	5 years ago
wei.peng	25b2109144	getByProperty 查询优化	5 years ago
王杰	0388c36c41	mes	5 years ago
wei.peng	fb65b042f0	getByProperty 查询优化	5 years ago
袁津哲	212dccad6c	同前端联调倒计时组件逻辑	5 years ago
wei.peng	ec3febfaa9	Merge remote-tracking branch 'remotes/origin/dev' into test	5 years ago
陈思洁	67a7904024	【泰国演示问题修复】	5 years ago
曾贞一	26e3053ecc	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
曾贞一	99f1ba98b6	【2077 06 1.2.3.8上架策略-4.5 新增上架推荐组件】	5 years ago
汪云昊	676ab32cd6	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
汪云昊	0ea80a0f63	删除无用代码 ... 测试环境开关回滚	5 years ago
袁津哲	2546395b8d	优化定时倒计时组件逻辑和前后端调用逻辑	5 years ago
wei.peng	4208d39e3f	feat(密码规则验证完成): 用户登录,密码修改	5 years ago
wei.peng	bdb5e6e27c	密码策略完成	5 years ago
袁津哲	089f655cfe	优化工位定时组件调用逻辑	5 years ago
袁津哲	638c032d95	优化工位定时组件调用逻辑	5 years ago
wynne1005	8ff96a0c3f	merge master 防止冲突更多	5 years ago
puxiao.liao	3fe454da39	Fix bug#8909	5 years ago
joke.wang	ab8ee21c66	Finish Task #2139 Cost:8h	5 years ago
钮海涛	e457b50145	中航需求变更	5 years ago
袁津哲	b114daed3f	优化代码	5 years ago
汪云昊	2888e5b510	错误注解	5 years ago
汪云昊	4ec71681de	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
汪云昊	4de301bf79	MDM 系统结构优化 ... 单元测试开关	5 years ago
王杰	6c47817bfe	mes enuk	5 years ago
joke.wang	6f375edf9a	类型信息枚举增加样本类型	5 years ago
joke.wang	26d7701a49	包装扫描需求变更	5 years ago
陈思洁	3924be2504	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
陈思洁	e7e13e53f4	【工艺流程设计-更新前端组件】	5 years ago
qianhs	53298f6b88	Finish Task #2080 Cost:8h	5 years ago
曾贞一	5c2dcf8e10	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
曾贞一	f3857116d1	【2074 06 1.2.3.8上架策略-计算COI值】	5 years ago
joke.wang	f5452667f6	Start Task #2139 Cost:16h Left:8h	5 years ago
joke.wang	672483245c	Fix #Bug 8904	5 years ago
袁津哲	764060bf20	Start Task #2118 Cost:8h Left:0h ... Finish Task #2118 Cost:8h	5 years ago
qianhs	7a60d37ddc	Finish Task #2080 Cost:8h	5 years ago
曾贞一	27cb1dddfe	【1603 委外扣减查询-需求变更】	5 years ago
袁津哲	5ee4fd6441	开发MES产线AGV停机记录报表功能	5 years ago
钮海涛	aeb347b1fb	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
钮海涛	ce020cc1ab	Start Task #2134 Cost: 8h	5 years ago
wynne1005	de08f2005e	还原hqlpack	5 years ago
joke.wang	cb4fd979e1	包装字段修改	5 years ago
wynne1005	60c1f6ecab	还原pom	5 years ago
wynne1005	47ae0b46ef	还原pom	5 years ago
wynne1005	ba1ba8bc0f	Merge branch 'dev' into test	5 years ago
wynne1005	8623a5a13d	还原pom	5 years ago
wynne1005	b75347ffc1	还原pom	5 years ago
wynne1005	d969c07317	解决冲突	5 years ago
wynne1005	4eef0f8c45	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
宋军超	c9114c9dae	Fix Bug #8688	5 years ago
王杰	a495d0b4ce	物料校验项]	5 years ago
钮海涛	9f349cd42c	Merge remote-tracking branch 'origin/test' into test	5 years ago
钮海涛	9dd7c54678	修复启动问题	5 years ago
宋军超	247589fc0d	Fix Bug #8884	5 years ago
袁津哲	adb974d874	合并test分支代码到dev分支	5 years ago
wynne1005	40d921ddd6	优化 新增状态点类型，发运自测1	5 years ago
袁津哲	142033f1ac	Merge remote-tracking branch 'origin/test' into test	5 years ago
袁津哲	0504e58f95	Fix Bug #8778	5 years ago
puxiao.liao	328967ff06	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
puxiao.liao	2194715705	Fix bug#8736	5 years ago
qianhs	f4ca720ce4	Finish Task #2080 Cost:8h	5 years ago
王杰	1d775acd69	ptl IF_拣货数据	5 years ago
joke.wang	28fe4a03f8	Finish Task#2108 Cost:12h	5 years ago
puxiao.liao	2b791901d2	Fix bug#8876	5 years ago
王杰	e063608cb1	ptl IF_拣货数据	5 years ago
王杰	be9f9e843d	Merge remote-tracking branch 'i3plus-pojo/dev' into dev	5 years ago
王杰	9675274a0d	ptl	5 years ago
钮海涛	93dd90363e	Merge remote-tracking branch 'origin/test' into test	5 years ago
钮海涛	ae805a6596	修复Bug	5 years ago
钮海涛	16574b6920	Merge remote-tracking branch 'origin/test' into test	5 years ago
钮海涛	da454b3921	领料单界面显示erp单号问题	5 years ago
袁津哲	42f43c58f5	Fix Bug #8778	5 years ago
袁津哲	32ddc567a0	Start Task #2021 Cost:24h Left:0h ... Finish Task #2021 Cost:24h	5 years ago
袁津哲	0067e31420	合并test分支代码到dev分支	5 years ago
袁津哲	a871d65e1f	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
袁津哲	0a5f45840a	Fix Bug #8778	5 years ago
宋军超	d18beff50c	Finish Task #2094 Cost:16h	5 years ago
钮海涛	7982cefc1e	Merge branch 'test' into dev	5 years ago
钮海涛	2f8b0ba5db	修复版本问题	5 years ago
qianhs	057439d050	Finish Task #2080 Cost:8h ... Finish Task #2081 Cost:12h Finish Task #2083 Cost:8h	5 years ago
puxiao.liao	3173e43245	Fix bug#8742	5 years ago
钮海涛	a71d7a31ce	Merge branch 'master' into test	5 years ago
钮海涛	8ec9f1b137	Merge remote-tracking branch 'origin/test' into test	5 years ago
钮海涛	471208d051	SWEB添加条码状态枚举	5 years ago
王杰	c39c9b6f70	ptl	5 years ago
袁津哲	12457efe93	Merge remote-tracking branch 'origin/test' into test	5 years ago
袁津哲	fb4bf4cbe2	Fix Bug #8778	5 years ago
钮海涛	97fb0bfd29	Fix Bug #8823	5 years ago
joke.wang	1afa60623c	Finish Task #2090 Cost:16h	5 years ago
陈思洁	1cedf2b75b	Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo	5 years ago
陈思洁	47904278c5	2092 MES202006-首检、巡检检验单据生成逻辑变更-20200615	5 years ago
汪云昊	2f71b79ed8	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
汪云昊	b9a619f4fe	REST调整添加requestBody支持	5 years ago
汪云昊	fb603db58e	表单拾取功能	5 years ago
汪云昊	2f01b41c1e	定时任务控制台日志	5 years ago
汪云昊	79429024cf	MDM基础功能	5 years ago
汪云昊	08c52dc09f	文件服务器优化扩展 ... 添加go-fastdfs支持	5 years ago
puxiao.liao	5c40073169	喜德BUG 修改	5 years ago
wynne1005	86363b2012	Finish Task #2098 Cost:8h	5 years ago
puxiao.liao	47a318f238	喜德BUG 修改	5 years ago
宋军超	1ce748eecb	Fix Bug #8771	5 years ago
puxiao.liao	bcb70400eb	Finish Task #2027 Cost:10h	5 years ago
puxiao.liao	2133908ff5	Finish Task #2024 Cost:8h	5 years ago
袁津哲	de48c90800	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
袁津哲	7f0b99297f	Start Task #2019 Cost:16h Left:0h ... Finish Task #2019 Cost:16h	5 years ago
宋军超	3c53d8a2f2	Finish Task #2064 Cost:24h	5 years ago
钮海涛	f301abbd04	Merge remote-tracking branch 'origin/test' into test	5 years ago
钮海涛	fd45d66968	解决合并冲突	5 years ago
陈思洁	01363fde23	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
陈思洁	9f6ecf72a0	【2002 泰国内饰生产作业-按生产工单，单件生产】	5 years ago
joke.wang	f357293ca5	plc数据类型修改	5 years ago
钮海涛	52e0d840af	Merge remote-tracking branch 'origin/test' into test	5 years ago
钮海涛	5a0fea01ca	修复版本问题	5 years ago
汪云昊	e416b032c2	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
汪云昊	4fc8c2a80d	软适配添加适配发送报文	5 years ago
曾贞一	8476ae75c9	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
曾贞一	a2ef35082e	【1794 天津麦格纳WMS-报表-库位利用率看板】	5 years ago
王杰	b946ca7fa1	[任务：2066，状态机异常处理]	5 years ago
puxiao.liao	e57acfacee	BH BUG 修改	5 years ago
钮海涛	414b811871	修复启动问题	5 years ago
puxiao.liao	454de274c7	Fix bug#8780	5 years ago
puxiao.liao	71d729b7f5	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
puxiao.liao	16f1ed34a5	Fix bug#8780	5 years ago
王杰	6232d14e61	[任务：2066，状态机异常处理]	5 years ago
qianhs	5c31f6c54e	Merge remote-tracking branch 'origin/test' into test	5 years ago
qianhs	6d4a1b6975	BH-CODE 出库，绑定	5 years ago
袁津哲	7aaa8bca6d	合并dev分支代码到test分支	5 years ago
puxiao.liao	9a65fc95fa	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
puxiao.liao	9975335acb	Finish Task #2033 Cost:8h	5 years ago
宋军超	3c1f8cf6b1	Finish Task #1889 Cost:24h	5 years ago
袁津哲	b0f3873aea	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
袁津哲	a8dd9831e0	Start Task #2021,2022 Cost:8h Left:8h	5 years ago
曾贞一	36f9068e4c	【冲突】	5 years ago
曾贞一	4c3571182c	【冲突】	5 years ago
曾贞一	523e4b7b3b	【2016 BH-回传检测结果至MES系统】	5 years ago
陈思洁	35fdc95250	Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo	5 years ago
陈思洁	0727370002	8660 MES-202005-PCN首检、巡检需要支持扫描产品条码录入检测值-20200527	5 years ago
wei.peng	d753bdc5b6	fix(数据层): 数据库操作根据AOP对DAO的方法进行分切数据源	5 years ago
wei.peng	adb95f100f	Ics 日志收集功能完成	5 years ago
wei.peng	1a079a1b89	feat(自定义报表): 自定义样式功能开发 ... 1. Pojo 实体创建 2. Service 实现唯一校验 3. 使用CRUD Controller 实现API 接口	5 years ago
陈思洁	2efab3b0cc	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
陈思洁	01e7224d1e	【合并冲突】	5 years ago
钮海涛	7414b76d85	修复合并版本问题	5 years ago
钮海涛	32a566be93	Merge branch 'test' into dev	5 years ago
钮海涛	6061f89d43	修复合并版本问题	5 years ago
宋军超	433a6cf744	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
宋军超	570be85b8d	Fix Bug #8744	5 years ago
puxiao.liao	d3f2434aa0	Fix bug#8752,8753	5 years ago
袁津哲	1e29445697	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
袁津哲	868e82d83a	Start Task #2019 Cost:16h Left:0h ... Finish Task #2019 Cost:16h	5 years ago
陈思洁	4950cc1067	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
陈思洁	1102513fb7	【1926 盲检工步】	5 years ago
曾贞一	7134bad17f	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
曾贞一	b2d9741453	【2009 天津麦格纳WMS-报表-库位利用率】	5 years ago
钮海涛	75e744e07e	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
钮海涛	7b83f8fa50	新增aps序列化id	5 years ago
汪云昊	a4ba058ee3	表单查询条件 ... Rest是适配器 requestBody	5 years ago
曾贞一	6e70e3257b	【2009 天津麦格纳WMS-报表-库位利用率】	5 years ago
曾贞一	faf8cced03	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
曾贞一	4346eb647b	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
曾贞一	31c26017c1	【2009 天津麦格纳WMS-报表-库位利用率】	5 years ago
王杰	215ffc080b	ptl	5 years ago
钮海涛	5643f1aab4	Merge remote-tracking branch 'origin/test' into test	5 years ago
陈思洁	76b96540ca	【1926 盲检工步】	5 years ago
陈思洁	dda5a4c7e9	【合并冲突】	5 years ago
陈思洁	55de940f7c	【1926 盲检工步】	5 years ago
陈思洁	bbef19ed71	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	f6cd0b6b0b	【8685 05 2.3.3.6 队列条码打印-管理端-查、打印】	5 years ago
wynne1005	85f99fcdfa	提测 还原pom	5 years ago
wynne1005	b43317c11a	还原pom	5 years ago
wynne1005	5f80cc4322	Merge branch 'dev' into test	5 years ago
wynne1005	ca080002a1	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
钮海涛	dea25ce166	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
钮海涛	3a40d278ac	修复平台登录问题	5 years ago
陈思洁	759cb39827	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	260899368d	【8685 05 2.3.3.6 队列条码打印-管理端-查、打印】	5 years ago
wynne1005	aa5c13dde1	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
钮海涛	2e434bc859	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
钮海涛	5610e5a455	完成SWEB任务	5 years ago
王杰	5ccc6c4408	andon	5 years ago
puxiao.liao	47a7a0a9a3	BH 需求报表的修改	5 years ago
袁津哲	00f07acd45	Fix Bug #1916,1917	5 years ago
wynne1005	2d69c3ab18	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
wynne1005	6b9d56f9e0	自测修改	5 years ago
joke.wang	00ca9bef40	Finish Task #1960 Cost:16h	5 years ago
宋军超	56dec41ad0	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
宋军超	f5074fba08	Finish Task #1898 Cost:16h	5 years ago
陈思洁	94c7526d65	【盲检工步】	5 years ago
puxiao.liao	7f76cf0ad3	BH 需求修改	5 years ago
陈思洁	4d4469ebc9	【合并冲突】	5 years ago
陈思洁	3848c6da14	【盲检工步】	5 years ago
宋军超	febbb549fc	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
宋军超	612d768999	Start Task #1932 Cost:5h Left:3h	5 years ago
qianhs	86f6fefd5b	BH-CODE 出库，绑定	5 years ago
钮海涛	d0eea0eb9a	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
钮海涛	470bceac6a	Start Task #1973 Cost:2h ... Start Task #1971 Cost:2h Start Task #1970 Cost:2h Effort Task #1968 Cost:4h	5 years ago
钮海涛	7286ce7ebb	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
钮海涛	f7c42ee90d	Start Task #1973 Cost:2h ... Start Task #1971 Cost:2h Start Task #1970 Cost:2h	5 years ago
joke.wang	ca0b92aa6a	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
joke.wang	a8241a1694	Start Task #1960 Cost:8h Left:8h	5 years ago
puxiao.liao	1b84b3aeee	Fix bug#8637,8697	5 years ago
宋军超	4d2f200677	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
宋军超	a47eb08a8e	Start Task #1934 Cost:8h Left:8h	5 years ago
袁津哲	399c9c828e	Fix Bug #1916,1917	5 years ago
袁津哲	271e7264a4	Merge remote-tracking branch 'origin/dev' into dev ... # Conflicts: # modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java	5 years ago
袁津哲	31bd8754df	Fix Bug #1916,1917	5 years ago
宋军超	6f1bba9997	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
宋军超	c2a5a17379	工步参数添加工步弹框参数字段	5 years ago
王杰	b0b276ba66	[任务：1938]	5 years ago
joke.wang	342e5f7ab2	Effort Task #1915 Cost:2h Left:0h	5 years ago
wynne1005	8ef3997038	还原pom	5 years ago
wynne1005	4150543cb4	Effort Task #1940 Cost:16h Left:8h	5 years ago
袁津哲	f4ff8205f6	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
袁津哲	a4bedf2354	Fix Bug #1916,1917	5 years ago
钮海涛	f1a6f66ccb	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
钮海涛	15a3d95c61	Start Task #1968 Cost:3h	5 years ago
puxiao.liao	b5aa990ea7	Fix bug#8633	5 years ago
钮海涛	bbde1ebc9c	Merge branch 'dev' into test	5 years ago
钮海涛	4d26c95639	Merge branch 'test' into dev	5 years ago
陈思洁	3d0524ec1f	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	a6ba3b6a5c	【8671 客户JIT队列，自动定时JOB-生成数据错误】	5 years ago
puxiao.liao	7353b79b9c	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
puxiao.liao	944b400f1e	Fix bug#8679	5 years ago
joke.wang	d4f0ef157a	Finish Task #1915 Cost:8h	5 years ago
qianhs	fcbaffa2b7	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
qianhs	b474ef1266	Finish Task #1813 Cost:32h ... Finish Task #1814 Cost:32h Finish Task #1815 Cost:16h	5 years ago
宋军超	659b893903	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
宋军超	b05113f63c	Finish Task #1887 Cost:16h	5 years ago
钮海涛	47131ff13f	修复版本问题	5 years ago
钮海涛	043e71649a	bh子检测项新增检测大类	5 years ago
钮海涛	da21795f7f	Merge branch 'test' into dev	5 years ago
钮海涛	f392a13832	Merge remote-tracking branch 'remotes/origin/master' into test	5 years ago
钮海涛	d65d9a5a1d	Merge remote-tracking branch 'origin/test' into test	5 years ago
puxiao.liao	91688ddab5	BH 需求变更	5 years ago
puxiao.liao	8bca38a17d	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	e793667812	BH 需求变更	5 years ago
钮海涛	e2e48f31bd	bh子检测项新增检测大类	5 years ago
qianhs	5d32b43e51	BH-CODE 出库，绑定	5 years ago
钮海涛	f4cccf5c9b	修改微服务model接口	5 years ago
钮海涛	898f9a061d	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
钮海涛	81b5262a24	修改微服务model接口	5 years ago
袁津哲	37092cf2c5	Task1917、1916:开发关键件绑定、扭矩二合一(PF)、关键件绑定、扭矩二合一(DL)功能	5 years ago
袁津哲	d65a5a3784	Merge remote-tracking branch 'origin/dev' into dev ... # Conflicts: # modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java	5 years ago
袁津哲	44f313abc4	Task1917、1916:开发关键件绑定、扭矩二合一(PF)、关键件绑定、扭矩二合一(DL)功能	5 years ago
曾贞一	45b5812cb1	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
曾贞一	cf507fdb48	【BATCH录入检测值-需要变更】	5 years ago
宋军超	9eda1f67b7	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
宋军超	40672559e4	修改sonar--BUG类型问题	5 years ago
钮海涛	c344f017a9	修复sonar上的问题	5 years ago
钮海涛	52f3758cee	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
wynne1005	8955fd2f4d	mes提测 还原pom	5 years ago
wynne1005	23754d3f18	mes提测 还原pom	5 years ago
wynne1005	81753d3260	Merge branch 'dev' into test	5 years ago
wynne1005	81b554fc8b	Merge branch 'test'	5 years ago
wynne1005	0636daed51	Finish Task:1896 Cost:8h	5 years ago
陈思洁	677cc85360	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
陈思洁	b2384619d4	【1891 队列条码打印-管理端】	5 years ago
曾贞一	9e236a06a1	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
曾贞一	6fc4641033	【BATCH录入检测值-需要变更】	5 years ago
puxiao.liao	c2942b8a0d	BH 需求变更	5 years ago
puxiao.liao	583c750055	BH 需求变更	5 years ago
宋军超	fd9a2e6d15	Start Task #1887 Cost:8h Left:8h	5 years ago
puxiao.liao	4f56baadef	Merge remote-tracking branch 'origin/test' into test	5 years ago
钮海涛	71d936cc56	Merge remote-tracking branch 'origin/test' into test	5 years ago
钮海涛	b060ba97aa	修改BH同步JOB逻辑	5 years ago
puxiao.liao	75308c8989	BH 需求变更	5 years ago
puxiao.liao	1dc9276e9a	BH 需求变更	5 years ago
钮海涛	e91a6821bc	Merge remote-tracking branch 'origin/test' into test ... # Conflicts: # modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartCheckType.java	5 years ago
钮海涛	efc30f713f	修改BH同步JOB逻辑	5 years ago
曾贞一	627b417256	【BATCH录入检测值-需要变更】	5 years ago
曾贞一	765e0619ca	【BATCH录入检测值-需要变更】	5 years ago
puxiao.liao	8c3f81292c	BH 需求变更	5 years ago
puxiao.liao	c06fee639d	BH 需求变更	5 years ago
qianhs	17b27da539	BH-CODE 出库，绑定	5 years ago
王杰	074093a46d	[任务：1850 ，安灯流程设计]	5 years ago
曾贞一	33c0ab4015	【BATCH录入检测值-需要变更】	5 years ago
曾贞一	a4fdf07b4b	【BATCH录入检测值-需要变更】	5 years ago
曾贞一	470e4986a9	Merge remote-tracking branch 'origin/test' into test ... # Conflicts: # modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QmsCheckType.java # modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSn.java # modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/QmsCheckTypeRepository.java # modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSerialSnRepository.java	5 years ago