5997 Commits (ec3febfaa9caa66826e253f9a348cc5136568993)

Author	SHA1	Message	Date
贾文涛	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
joke.wang	f38a47cc68	[oee 定时任务]	5 years ago
钮海涛	dd70688754	新增脚本WebSocket	5 years ago
qianhs	dd3249fc12	Merge remote-tracking branch 'origin/test' into test	5 years ago
qianhs	fdaa4c1740	bug:8268;8267;8266;8265	5 years ago
贾文涛	a563537750	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
贾文涛	e63601716f	1736-MES数据权限模块开发	5 years ago
宋军超	e5e41f09e7	新增散件产品配置功能	5 years ago
qianhs	f03e119561	bug:8268;8267;8266;8265	5 years ago
钮海涛	6e2344b303	bug:8330	5 years ago
汪云昊	627257fc22	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
汪云昊	32460a3272	sqlserver 适配处理，in 参数类型不准确	5 years ago
陈思洁	ae156ad82f	【动态按钮--完成按钮修改mes和mespcn】	5 years ago
钮海涛	8f884a58cf	Merge remote-tracking branch 'origin/test' into test	5 years ago
钮海涛	90edd435e3	bug:8293;8297	5 years ago
joke.wang	3227cfa47e	[oee]	5 years ago
wynne1005	4ed1770189	Merge branch 'dev' into test	5 years ago
陈思洁	32f6215be7	【8309 产品配方导入-导入报错】	5 years ago
王杰	de200de372	mes	5 years ago
曾贞一	0a51c0e10c	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
曾贞一	97d7fdbf24	【8181 20011-- 条码打印界面增加一个打印组号按钮，用于现场母条码丢失或者损坏的场景来补打母条码】	5 years ago
钮海涛	a575b4eed4	bug:8287;8288;8290	5 years ago
王杰	da1c10dc4c	mes生产计划批量编制	5 years ago
曾贞一	fb15536a34	【8254 中航-出库单-客户发运-新增销售订单字段】	5 years ago
曾贞一	e6f8811f72	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
曾贞一	cf12f354ae	[8206 生产工单-导入失败]	5 years ago
钮海涛	7aaed8fb79	task:1735	5 years ago
joke.wang	de7d007ef1	[获取工步sql server分组函数问题修复]	5 years ago
钮海涛	ac9ffb1ac1	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
陈思洁	ad8255949a	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
陈思洁	be925fded9	【1693-设备状态监控看板】	5 years ago
袁津哲	000c2ad16c	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
袁津哲	745455c5bd	修改波次规则bug和对接导入模板接口	5 years ago
钮海涛	bf2cc9843f	Merge remote-tracking branch 'origin/dev' into dev ... # Conflicts: # modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java	5 years ago
puxiao.liao	b9af2c52f8	1713 BH-挑选，返修	5 years ago
钮海涛	81f380aec4	产品入库表新增	5 years ago
joke.wang	60428b5bad	[任务：1690 界面窗口]	5 years ago
钮海涛	b7dceccd71	Merge remote-tracking branch 'origin/test' into test	5 years ago
钮海涛	f414274aeb	供货追踪	5 years ago
陈思洁	22b42d710b	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	ff6e5ac926	【8239 生产作业-单产品扫描（数据写入有误）】	5 years ago
汪云昊	2ab9045d17	Merge remote-tracking branch 'remotes/origin/dev' into test	5 years ago
陈思洁	a8ae48b132	【7937 半成品箱条码绑定工步-数据写入缺少】	5 years ago
汪云昊	30c0b2e46a	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
汪云昊	d4a91b6d69	缺失资源接口优化	5 years ago
许心洁	1a7d9edd40	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
许心洁	3cd2fb02f4	宁德BUG-JIS发运汇总JOB:BUG#8246	5 years ago
汪云昊	241ea78cda	检测环境枚举数据调整	5 years ago
汪云昊	71d30c3232	表单-自定义按钮-添加是否需要选中数据校验及实现Http方式扩展 ... 表单-拦截器-实现Http方式扩展 表单-元素-工厂数据隔离功能 表单-动态表单-查询数据默认条件优先级优化 sonar代码优化	5 years ago
王杰	2b01efb15b	mes生产计划批量编制	5 years ago
wynne1005	d5f69eeefd	task 1565 发运修改	5 years ago
曾贞一	d29a26c73f	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
曾贞一	8e529f46d7	【1722 BH-Bacth条码查询】	5 years ago
宋军超	92c13e5bcd	添加人员技能功能	5 years ago
袁津哲	64daf36410	动态搜索修改人修改时间开窗处理,BUG:8097	5 years ago
袁津哲	633aef2d6e	动态搜索修改人修改时间开窗处理	5 years ago
wei.peng	37922cab29	POM 文件修改 ... Merge remote-tracking branch 'remotes/origin/test' # Conflicts: # modules/i3plus-icloud-report/pom.xml	5 years ago
wei.peng	fe94ad9bf3	Merge remote-tracking branch 'remotes/origin/test'	5 years ago
wei.peng	8aab106aa9	合并代码 pom 冲突 ... Merge remote-tracking branch 'remotes/origin/dev' into test # Conflicts: # modules/i3plus-ics-gateway/src/main/resources/application-docker.properties	5 years ago
wei.peng	279ec2d1fe	授权加密问题修复	5 years ago
宋军超	b96eb1b669	添加人员技能功能	5 years ago
陈思洁	2c50fceec9	【1693-设备状态监控看板】	5 years ago
陈思洁	87664b96cb	【合并冲突】	5 years ago
陈思洁	abd974f54f	【1693-设备状态监控看板】	5 years ago
钮海涛	724ba402bf	前端联调	5 years ago
曾贞一	bc82c85790	【1721 BH-BH检测结果管理】	5 years ago
袁津哲	5ba022c21a	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
袁津哲	b23915236b	开发根据实体动态生成数据库文档页面功能	5 years ago
钮海涛	60580e5ad9	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
钮海涛	cb8688105c	task:1727;1728;1729	5 years ago
王杰	cace95fbed	ptl	5 years ago
钮海涛	3fbf532c84	修复pom版本问题	5 years ago
钮海涛	a1eb3c3bc2	修复pom版本问题	5 years ago
钮海涛	2e2ee2cc6c	Merge branch 'test' into dev	5 years ago
钮海涛	2cc43af431	修复pom版本问题	5 years ago
钮海涛	c6d36af4c9	Merge branch 'master' into test	5 years ago
joke.wang	ce1dd45842	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
joke.wang	755fccb45e	[任务：1690 产能监控看板]	5 years ago
曾贞一	c3b6376934	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
曾贞一	f3e53ff1eb	【8150 20011-- 出库单明细界面，打印客户标签按钮，增加打印字段】 ... 【8151 20011-- 出库单明细界面，打印客户标签按钮，重打按钮，补打客户标签按钮，三个按钮牛均无法打出客户零件号。关联bug7501---0429】	5 years ago
钮海涛	7b2a4fdea7	合并dev代码	5 years ago
钮海涛	475bb9370f	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
qianhs	2303186fc4	【657】【中航WMS看板－成品发运率看板】 ... 【658】【中航WMS看板－发运窗口时间看板】 【656】【 中航WMS看板－收货完成率看板】 【655】【 中航WMS看板－仓库预警看板】 【654】【中航WMS看板－３０天供应商延期到货跟踪动态看板】	5 years ago
joke.wang	ee1c2131ff	[任务：1716 写入产品下线记录]	5 years ago
钮海涛	398207b875	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
曾贞一	6190a4f66d	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
曾贞一	156f0feedc	【1603 委外扣减查询】	5 years ago
joke.wang	aa9ee803b8	[任务：1683-看板管理 展示]	5 years ago
puxiao.liao	7c7691f583	bug8190【8190 中航-成品条码维护-批量修改客户代码-】	5 years ago
钮海涛	4d383dda1b	新增事务报工查询	5 years ago
joke.wang	795312637c	[任务：1683-看板管理 计划产能]	5 years ago
puxiao.liao	0a973c5dd1	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
puxiao.liao	f6988f36c8	1655 生产领料单增加替代料	5 years ago
wei.peng	3aa1afb0ce	对象历史记录 Pojo 创建	5 years ago
wei.peng	c8197f3290	1. 授权封装位置调整 ... 2. 日志控制台查询封装 3. 添加软适配 同步接口调用 4. pom.xml 引用错误修复	5 years ago
wei.peng	9d3a4db040	日志查询Bug 修复	5 years ago
wei.peng	fee90baf64	1. 关闭register , gateway , console 日志持久化技术 ... 2. Sonar Bug 修复 3. 自定义日志持久化	5 years ago
joke.wang	e6f3dd5c32	[任务：1683-看板管理]	5 years ago
袁津哲	7789883f9b	开发导入功能模块	5 years ago
曾贞一	509240126a	【1604 待入库数据查询】	5 years ago
钮海涛	a597d78100	Merge remote-tracking branch 'origin/test' into test	5 years ago
钮海涛	c57ca73a4a	bug:8169;8176;8177	5 years ago
王杰	9da9a568f5	mes	5 years ago
wei.peng	effae233bf	对象历史记录 Pojo 创建	5 years ago
wei.peng	fe46d8da29	1. 授权封装位置调整 ... 2. 日志控制台查询封装 3. 添加软适配 同步接口调用 4. pom.xml 引用错误修复	5 years ago
wei.peng	69346da06d	日志查询Bug 修复	5 years ago
wei.peng	dac1358009	1. 关闭register , gateway , console 日志持久化技术 ... 2. Sonar Bug 修复 3. 自定义日志持久化	5 years ago
曾贞一	312cf59f49	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
曾贞一	88ce1e59cf	【1604 待入库数据查询】	5 years ago
joke.wang	4e02acb9e3	[任务：1683-看板管理]	5 years ago
袁津哲	7696925c9f	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
袁津哲	8a6c9aadef	开发导入功能模块	5 years ago
wynne1005	fb60d75eea	还原test pom	5 years ago
wynne1005	d6fe718e4c	Merge branch 'dev' into test	5 years ago
wynne1005	109c4429ce	还原dev pom	5 years ago
qianhs	0a2d9a3d6d	【1432 工位扫描-ESOP展示组件开发，队列组件调整】【工位扫描-ESOP展示组件开发，队列组件调整】	5 years ago
joke.wang	fa8e4c1b55	[任务：1683 看板管理]	5 years ago
wynne1005	64f3dcf276	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
wynne1005	cfb5aab8ea	新增工步集合 repository	5 years ago
qianhs	62883c5cc0	【1432 工位扫描-ESOP展示组件开发，队列组件调整】【工位扫描-ESOP展示组件开发，队列组件调整】	5 years ago
puxiao.liao	e417e761c7	bug8124【8124 物料拆分-输入数量-系统异常】	5 years ago
joke.wang	43bc24340c	[料架条码打印优化]	5 years ago
袁津哲	9518628c12	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
袁津哲	533d8e55e8	开发导入模块功能	5 years ago
钮海涛	1a5f3e7325	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
钮海涛	eb85cc232f	task:1623	5 years ago
王杰	2bb2b2c828	Merge branch 'dev' of jhforever.wang/wangjie-i3plus-pojo into dev	5 years ago
王杰	d4bde19861	mes	5 years ago
wynne1005	430adb8d97	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
wynne1005	1c4050b71f	工步返回内容修改	5 years ago
王杰	74a4a1381c	mes	5 years ago
joke.wang	4c637b4e83	[写入JIT发运接口表]	5 years ago
joke.wang	48ee207a8a	[删除多余项]	5 years ago
joke.wang	d22bd22012	[任务：客户JIT自动下达]	5 years ago
汪云昊	ccf2f42840	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
汪云昊	edf0b66115	Sonar代码缺陷修复 ... 查询条件优化 拦截器，自定义按钮对外接口实现 表单-功能目录优化 软适配日志优化	5 years ago
袁津哲	df480bf11d	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
袁津哲	36b4e67020	导入模板功能建模	5 years ago
宋军超	8fe5574c67	part实体中@Column(name = "产品生产类型")改为@Column(name = "PPT_CODE")	5 years ago
汪云昊	baaf16ad56	国际化工具类异常处理优化	5 years ago
陈思洁	5d8fec4938	合并冲突	5 years ago
陈思洁	7505087392	【mes 产品配方导入功能和基础数据维护】	5 years ago
王杰	0a14b533d7	任务1659 返工返修	5 years ago
袁津哲	ec1d8a2ff3	开发导入模板功能	5 years ago
钮海涛	b25ff3cbba	bug:8137	5 years ago
曾贞一	9102a3691b	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
曾贞一	10fc6ded8d	【1558 生产工单管理-泰国需求】	5 years ago
joke.wang	280385eb20	[bug: 8092 SOP信息需求变更]	5 years ago
joke.wang	54ff0deb87	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
钮海涛	efe083a9da	修复版本号	5 years ago
宋军超	e464b4d699	删除设备备件管理相关实体	5 years ago
宋军超	38fa894817	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
宋军超	89a9946432	添加设备管理相关功能	5 years ago
钮海涛	100d8b0019	Merge branch 'test' into dev	5 years ago
钮海涛	c75a25b854	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
钮海涛	bd810c1c8c	task:1591	5 years ago
joke.wang	b17cf60ac6	[任务：1571 生成报功数据 需求变更]	5 years ago
王杰	cba7ee3d0d	[任务：1522，ptl流程设计]	5 years ago
qianhs	88279f9b8b	sonar bug修改	5 years ago
曾贞一	e5c275499c	【冲突解决】	5 years ago
曾贞一	255aefbcef	【1585 销售订单管理-销售订单维护】	5 years ago
钮海涛	e64134a821	修复合并问题	5 years ago
钮海涛	e9ec4cecfe	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
钮海涛	00fce0bded	新增客户物料发往地	5 years ago
wynne1005	0e934f9af6	task `1565` 发运enum	5 years ago
wynne1005	81f05c233a	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
wynne1005	93622f5dc7	中航 开线管控 提交	5 years ago
汪云昊	f09159dffa	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
汪云昊	34c77d6944	ICS 注册中心监控接口，Actuator对外端口调整	5 years ago
puxiao.liao	a2f7c3426e	bug7994【7994 麦格纳收货需求差异】	5 years ago
钮海涛	01d3eeea51	新增客户物料发往地	5 years ago
钮海涛	16f6861ecd	新增窗口时间	5 years ago
宋军超	aac4e24113	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
宋军超	b02d7372f6	添加散件bom批量导入功能	5 years ago
joke.wang	9e0fbef169	[按钮组件代码优化]	5 years ago
钮海涛	dd9ae231c8	与界面联调物料扩展属性	5 years ago
wynne1005	48f94c0369	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
wynne1005	cc739eac24	task `1565` 发运pojo	5 years ago
钮海涛	331fb73d28	新增供应商维护基础数据	5 years ago
joke.wang	99e055da3c	[现场问题：111 检测项报表]	5 years ago
袁津哲	30610476b9	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
袁津哲	1caea6bf36	修改实体数字字段	5 years ago
qianhs	214fbb8da2	【1613 装车单新增中航打印格式】	5 years ago
袁津哲	d289a58439	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
袁津哲	db7d86acc1	修改实体数字字段默认值0，不允许为空	5 years ago
wynne1005	035e77c0ab	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
wynne1005	5d6588b5af	task `1565` 增加发运字段	5 years ago
陈思洁	03d2ee9246	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
陈思洁	244270684d	【泰国项目】	5 years ago
袁津哲	a5a8130388	修改不兼容sqlserver数据库查询语句	5 years ago
wynne1005	86713a01f2	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
汪云昊	1051b22575	ICS 注册中心监控对象	5 years ago
joke.wang	4469d92344	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
joke.wang	f1baf4fdbe	[麦格纳问题：111 检测项报表]	5 years ago
宋军超	8109275630	添加散件BOM导入	5 years ago
宋军超	69b620336f	散件BOM导入	5 years ago
wynne1005	15c9e7111b	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
qianhs	ca85c59cdb	Merge remote-tracking branch 'origin/dev' into dev ... # Conflicts: # modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java	5 years ago
qianhs	20f5bfc9eb	wms数据同步迁移至mes	5 years ago
陈思洁	72563a4eb5	【1597 条码打印功能新增-管理端 / 条码打印功能新增-管理端】	5 years ago
王杰	c6aefc89e7	test合并dev解决ct	5 years ago
王杰	94fed3b9b2	Merge branch 'test' into dev	5 years ago
陈思洁	59cbfbf293	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
陈思洁	08ec98305b	【1581 工位扫描-记录换模时间 -校验逻辑调整】	5 years ago
joke.wang	3e33a7ac3a	[客户jit增加JIT排序号字段]	5 years ago
王杰	b1018dbd39	[平台；]	5 years ago
袁津哲	1a74363541	优化实体字段	5 years ago
puxiao.liao	4b3923a64d	bug8056【8056 car_no,driver_no这两个字段没有写在事务表中，导致wms_move_to_erp中没有】	5 years ago
wynne1005	b5ecb91399	中航四月十号 内容提交	5 years ago
joke.wang	4e8c4ae46f	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
joke.wang	caf8feb374	[采集工步存入生产数据格式修改]	5 years ago
joke.wang	11adb5ff09	[麦格纳问题：111 检测项数据报表]	5 years ago
钮海涛	05c1575e8f	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
钮海涛	01ae9caa8c	task:1496	5 years ago
alwaysfrin	f4e9a80d79	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
alwaysfrin	14660641ba	hibernate优化	5 years ago
wei.peng	fa42a25b96	异常处理优化	5 years ago
puxiao.liao	63c827d0de	bug8050【8050 运输规则配置页面--新增成功，数据库有数据，但是页面不显示】	5 years ago
joke.wang	1d50c135ac	[麦格纳问题：87 增加工单管理页面]	5 years ago
wei.peng	aa1f7a2845	Merge remote-tracking branch 'remotes/origin/test'	5 years ago
曾贞一	3bea17f2d7	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
曾贞一	b7e3aeef41	【8014 20011--报工记录表，查询数据重复---0415】 ... 【8015 20011--报工记录报表，增加两列显示】	5 years ago
钮海涛	4dee474c73	修改POM版本号	5 years ago
钮海涛	417120358c	Merge branch 'test' into dev	5 years ago
钮海涛	288fb4a16b	修改POM版本号	5 years ago
钮海涛	aff68cd087	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
陈思洁	cd810ce1fc	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
陈思洁	5a6c525d1f	【MES_生成条码模型增加时分秒字段】	5 years ago
王杰	e0a23b147e	mes enum	5 years ago
王杰	3f3d0038e8	【任务：1608 数据监听预警配置，定时任务】	5 years ago
qianhs	2e85d99380	联调测试	5 years ago
wynne1005	dbba31670d	增加条码生产	5 years ago
许心洁	4884f59072	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
许心洁	2bc62e2444	动态查询：#需求变更 创建用户和更新用户也需要做成可选的	5 years ago
wynne1005	17f6ac6609	删除重复字段	5 years ago
wynne1005	07d8e12216	commit stationrequestbean	5 years ago
wynne1005	2e177ba671	dev合并test test有修改	5 years ago
汪云昊	2772ea6a2f	Merge remote-tracking branch 'remotes/origin/dev' into test ... # Conflicts: # modules/i3plus-pojo-andon/pom.xml # modules/i3plus-pojo-aps/pom.xml # modules/i3plus-pojo-base/pom.xml # modules/i3plus-pojo-form/pom.xml # modules/i3plus-pojo-hardswitch/pom.xml # modules/i3plus-pojo-jobflow/pom.xml # modules/i3plus-pojo-lac/pom.xml # modules/i3plus-pojo-mes-pcn/pom.xml # modules/i3plus-pojo-mes/pom.xml # modules/i3plus-pojo-model/pom.xml # modules/i3plus-pojo-platform/pom.xml # modules/i3plus-pojo-ptl/pom.xml # modules/i3plus-pojo-report/pom.xml # modules/i3plus-pojo-softswitch/pom.xml # modules/i3plus-pojo-sweb/pom.xml # modules/i3plus-pojo-wms/pom.xml # modules/i3plus-pojo-workflow/pom.xml # pom.xml	5 years ago
汪云昊	8a8c3ee34d	pom版本调整	5 years ago
wynne1005	763d72b128	dev合并麦格纳的test	5 years ago
puxiao.liao	b8701bc398	Merge remote-tracking branch 'origin/test' into test	5 years ago
puxiao.liao	7062e7a383	bug7935【7935 二维码收货-供应商批次格式-校验不通过系统异常】	5 years ago
joke.wang	14bb71f9f2	[料架条码打印查询修改]	5 years ago
wynne1005	581d900123	状态机model提交	5 years ago
qianhs	ba4b450437	联调测试	5 years ago
wynne1005	12e31f630b	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
wynne1005	ba90a50621	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
qianhs	8c635c3557	联调测试	5 years ago
qianhs	7244fb38b1	联调测试	5 years ago
wynne1005	f8e0f5e37e	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
wynne1005	e289414363	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
曾贞一	46e0f502d0	【7988 20011--多级包装打印时母条码现在无法打印出来】	5 years ago
曾贞一	a59a5e532e	【7988 20011--多级包装打印时母条码现在无法打印出来】	5 years ago
曾贞一	35023af12c	【7988 20011--多级包装打印时母条码现在无法打印出来】	5 years ago
汪云昊	e7d176209e	Merge branch 'dev' of yunhao.wang/i3plus-pojo into dev	5 years ago
汪云昊	64d83d238f	Merge branch 'dev' of wei.peng/i3plus-pojo into dev	5 years ago
汪云昊	b4f14112b3	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
汪云昊	3fd17208e2	枚举更新	5 years ago
袁津哲	94f25541aa	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
袁津哲	4dc2996bdc	业务类型实体中新增是否启用波次字段	5 years ago
宋军超	b3032ca8e8	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
宋军超	45dda6ea57	添加散件配置报文关系和工装明细实体	5 years ago
袁津哲	cbe3094f2a	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
袁津哲	ea9457a191	修复WMS波次计划实体类字段	5 years ago
钮海涛	cfd3f8d58f	冲突解决	5 years ago
钮海涛	1d16e2d938	解决合并冲突	5 years ago
陈思洁	30608f886b	解决冲突	5 years ago
陈思洁	d9d2113f75	【MES_增加枚举】	5 years ago
贾文涛	492dfbff82	pom通过变量方式存在只能引用jar不能引用到项目文件的问题，暂时先还原为最初方式	5 years ago
钮海涛	53dc57a03e	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
钮海涛	df1cbc9449	新增供货追踪接口	5 years ago
qianhs	836a4f710d	联调测试	5 years ago
宋军超	b3cecc9481	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
宋军超	f64a543a4a	添加产品流程批量配置功能	5 years ago
袁津哲	bcec12cb38	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
袁津哲	3442fd4801	波次规则明细新增开窗查询字段	5 years ago
袁津哲	9f918b6664	修改波次规则和范围枚举类字段值名称	5 years ago
王杰	cd99a63233	mes	5 years ago
汪云昊	0d75c1eac7	Merge remote-tracking branch 'remotes/origin/dev' into test ... # Conflicts: # modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java	5 years ago
wynne1005	032fb350c8	queueordermodel添加构造函数	5 years ago
曾贞一	57f2177ef6	【波次合并规则--枚举查询错误】	5 years ago
袁津哲	ae1c6ef8fd	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
袁津哲	8a836e340a	优化枚举查询报错问题	5 years ago
puxiao.liao	d2fb33d888	bug1536【1536 PDA组件修改增加录入车牌信息功能】	5 years ago
puxiao.liao	053e81b861	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
puxiao.liao	a432b77ca0	任务1536【1536 PDA组件修改增加录入车牌信息功能】	5 years ago
曾贞一	c0e3f1cb4f	【找回文件】	5 years ago
曾贞一	e84d74d7be	【冲突文件找回】	5 years ago
王杰	5fc4c6c025	mes	5 years ago
曾贞一	c926992611	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
曾贞一	4dae2eea7d	【MES 导入】	5 years ago
钮海涛	52a5c1e2f8	Merge branch 'test' into dev	5 years ago
qianhs	851bd1feec	联调测试	5 years ago
wynne1005	4324457b61	merge	5 years ago
wynne1005	dce52df770	组件传参给工步	5 years ago
qianhs	241ec4974b	联调测试	5 years ago
wynne1005	351ea8755e	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
wynne1005	6a36ad7601	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
wei.peng	1d00303306	自定义报表-折线图,饼图,柱状图,矩形图 完成	5 years ago
袁津哲	15035d2851	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
袁津哲	3529d1b845	枚举类修改规则范围和规则值	5 years ago
钮海涛	8c4cb0748b	任务【1483】：LES-新增拉动规则表 ... 任务【1484】：LES-物料表属性变更 任务【1485】：LES-库位物料属性变更 任务【1486】：LES-存储区属性变更 任务【1487】：LES-生产计划属性变更 任务【1488】：LES-拉动任务属性变更 任务【1489】：LES-入场管理新增窗口时间表 任务【1490】：LES-巡线拉动 任务【1491】：LES-计划拉动 任务【1492】：LES-过点拉动 任务【1493】：LES-手工拉动 任务【1494】：LES-预留外部拉动接口	5 years ago
zcg	83d7a618bf	按钮组件model修改	5 years ago
zcg	9ab0d784dd	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
qianhs	3654d60214	【bug7947】PLC监听工步装队列无法显示	5 years ago
汪云昊	2a80a4c720	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
汪云昊	aeda8d8287	版本调整	5 years ago
zcg	73f647e3b4	枚举修改	5 years ago
zcg	078e1a77a4	【bug 7895 PLC信息-页面需修改】	5 years ago
puxiao.liao	f8405b87d9	bug7940【7940 推荐入库-未按最近距离推荐】	5 years ago
汪云昊	3069c5bf18	查询条件补充	5 years ago
钮海涛	82d5332861	修复POM文件问题	5 years ago
钮海涛	3b987436d8	新增LES管理功能	5 years ago
钮海涛	c3a5564652	任务【1483】：LES-新增拉动规则表 ... 任务【1484】：LES-物料表属性变更 任务【1485】：LES-库位物料属性变更 任务【1486】：LES-存储区属性变更 任务【1487】：LES-生产计划属性变更 任务【1488】：LES-拉动任务属性变更 任务【1489】：LES-入场管理新增窗口时间表 任务【1490】：LES-巡线拉动 任务【1491】：LES-计划拉动 任务【1492】：LES-过点拉动 任务【1493】：LES-手工拉动 任务【1494】：LES-预留外部拉动接口	5 years ago
钮海涛	6925ce3b18	任务【1483】：LES-新增拉动规则表 ... 任务【1484】：LES-物料表属性变更 任务【1485】：LES-库位物料属性变更 任务【1486】：LES-存储区属性变更 任务【1487】：LES-生产计划属性变更 任务【1488】：LES-拉动任务属性变更 任务【1489】：LES-入场管理新增窗口时间表 任务【1490】：LES-巡线拉动 任务【1491】：LES-计划拉动 任务【1492】：LES-过点拉动 任务【1493】：LES-手工拉动 任务【1494】：LES-预留外部拉动接口	5 years ago
袁津哲	a8d84b1043	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
袁津哲	5de3c0bd7b	移库单模型中添加创建时间字段	5 years ago
汪云昊	ec1d52e7dd	MAVEN 版本控制调整	5 years ago
贾文涛	7106c06221	统一修改pom文件的项目版本问题0331	5 years ago
joke.wang	05991b00d4	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
joke.wang	1b0d0f8c6b	[任务：1576 动态按钮加载]	5 years ago
袁津哲	a4d32d6612	开发波次计划根据规则生成计划功能	5 years ago
袁津哲	cb8a090aea	开发波次计划功能	5 years ago
袁津哲	ffbd512b89	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
袁津哲	14cfa5fa47	创建波次计划规则实体类和规则明细实体类	5 years ago
wynne1005	d1ff70adc4	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
wynne1005	44696061ee	修改pom文件为最新	5 years ago
zcg	75832427e8	【task 1539 工位扫描-按钮组件结构搭建】	5 years ago
曾贞一	bcb8dee045	【1558 生产工单管理-泰国需求】	5 years ago
wynne1005	3c08e7794f	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
贾文涛	eed24e0297	统一修改pom文件的项目版本问题	5 years ago
汪云昊	6ed34b9e5f	FTP服务端工具	5 years ago
汪云昊	b8abed43ca	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
汪云昊	a32d4b3b00	资源模块化 ... 资源工具类优化	5 years ago
qianhs	3b763b45cd	【1432 工位扫描-ESOP展示组件开发，队列组件调整】【工位扫描-ESOP展示组件开发，队列组件调整】	5 years ago
joke.wang	4cb3d89ad6	[bug: 7637 生产数据ees查询修改]	5 years ago
wei.peng	02b5fc715a	添加对象序列化	5 years ago
陈思洁	ee0c342cac	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
陈思洁	6e1961c9d8	【mes_增加工位BOM表中的匹配类型枚举】	5 years ago
钮海涛	c37809d5b7	合并源仓库的修改	5 years ago
puxiao.liao	9dea4f1206	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
puxiao.liao	a887aa1236	1454 基于责任区域和班次的任务推送	5 years ago
wei.peng	c8c7c73336	自定义报表 布局,元素,报表 功能优化完成	5 years ago
钮海涛	d98e84759c	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
wynne1005	f345ed2b2f	Merge branch 'dev' into test	5 years ago
wynne1005	286d605f09	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
wynne1005	d80b341620	还原test pom	5 years ago
陈思洁	f14f26a176	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
曾贞一	5e2c592bbd	【IOT测试修改】	5 years ago
曾贞一	1cf4943751	冲突解决	5 years ago
曾贞一	70ff1763b8	Merge remote-tracking branch 'origin/test' into test ... # Conflicts: # modules/i3plus-pojo-andon/pom.xml	5 years ago
王杰	0502f6d736	【任务：1529，料架分组队列展示组件】	5 years ago
puxiao.liao	bf427bbb31	bug7918【7918 条码操作记录表在更新后，缺少一行关联二维码字段，（更新后出现的问题）】	5 years ago
陈思洁	35351607f8	【MES_半成品箱条码绑定】	5 years ago
joke.wang	7a6e9b9e21	[任务：1479 料架打印]	5 years ago
曾贞一	77d7ac18ad	Merge remote-tracking branch 'remotes/origin/dev' into test ... # Conflicts: # modules/i3plus-pojo-andon/pom.xml # modules/i3plus-pojo-aps/pom.xml # modules/i3plus-pojo-base/pom.xml # modules/i3plus-pojo-form/pom.xml # modules/i3plus-pojo-hardswitch/pom.xml # modules/i3plus-pojo-jobflow/pom.xml # modules/i3plus-pojo-lac/pom.xml # modules/i3plus-pojo-mes-pcn/pom.xml # modules/i3plus-pojo-mes/pom.xml # modules/i3plus-pojo-model/pom.xml # modules/i3plus-pojo-platform/pom.xml # modules/i3plus-pojo-ptl/pom.xml # modules/i3plus-pojo-report/pom.xml # modules/i3plus-pojo-softswitch/pom.xml # modules/i3plus-pojo-sweb/pom.xml # modules/i3plus-pojo-wms/pom.xml # modules/i3plus-pojo-workflow/pom.xml # pom.xml	5 years ago
wynne1005	2a619f69f8	将新pom提交到test	5 years ago
陈思洁	c4032b8ed5	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
陈思洁	320969f2f0	【1527 半成品标签自动打印】	5 years ago
钮海涛	d8779f42fb	从dev拉取最新代码	5 years ago
廖普小	eb1c89e5e6	Merge branch 'dev' of puxiao.liao/i3plus-pojo-lpx into dev	5 years ago
贾文涛	abf5d3eeb9	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
贾文涛	048419d823	修改打包时版本号的定义，后续可以通过mvn clean install Pdev 命令进行打包,最后dev还可以更换为test、prod、docker。	5 years ago
puxiao.liao	b626989e63	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
puxiao.liao	3a7d7a7924	bug7754【7754 需要一个接收对方信息在我们系统中触发报工的接口，当接收到数据时，需要在系统中生成一个标签，然后自动对该标签进行报工操作，接口中包含了条码，零件信息。】	5 years ago
曾贞一	58053f4972	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
曾贞一	56c1bf8c44	【7648 在发运界面增加一个打开单据按钮。】	5 years ago
钮海涛	cf0db5b8da	Merge branch 'dev' of puxiao.liao/i3plus-pojo-lpx into dev	5 years ago
wynne1005	06551fdd66	还原pom	5 years ago
zcg	9ca3a819b4	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
wynne1005	4b4bf4e433	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
钮海涛	9d5567f4a6	Merge branch 'test' into dev	5 years ago
许心洁	a22d3d2333	动态查询：#任务1352(合并代码解决冲突)	5 years ago
许心洁	030f2948fb	动态查询：#任务1352	5 years ago
王杰	e3a9defdab	任务1528，生成并打印门锁标签	5 years ago
zcg	98787953ec	【MesPcnEnum 枚举修改】	5 years ago
wynne1005	6336ebd8e9	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
wynne1005	8b750e6a76	修改生产数据类型	5 years ago
puxiao.liao	8273a93520	Merge remote-tracking branch 'upstream/test' into test	5 years ago
puxiao.liao	f2c41fc0a6	bug7800【7800 移库单导出时报错导出失败】	5 years ago
王杰	0ca8502751	任务：1518	5 years ago
袁津哲	01b685a4c8	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
袁津哲	0c3d14a3f9	wms插件枚举新增按钮增强插件类型	5 years ago
王杰	f005489b61	ptl	5 years ago
王杰	a9a7d78bd5	解决冲突	5 years ago
joke.wang	9d55a2a8b3	[解决冲突1]	5 years ago
joke.wang	8b681af622	[解决冲突]	5 years ago
joke.wang	045dc01479	[任务：1479 料架条码打印]	5 years ago
王杰	f578311f55	数据复核	5 years ago
袁津哲	f3b7ae8bc5	优化WmsPDA插件实体，去掉本地文件夹维护	5 years ago
wei.peng	549f2ff797	授权拦截功能完成 .	5 years ago
袁津哲	ab794aab0b	开发WMS动态加载插件功能	5 years ago
袁津哲	35a4c9039a	Merge remote-tracking branch 'origin/dev' into dev ... # Conflicts: # modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java	5 years ago
袁津哲	2a0204ad99	开发WMS动态加载插件功能	5 years ago
qianhs	564ba1e116	【1472 工步-设备状态采集（原PLC采集【设备状态】）】	5 years ago
qianhs	c53999b0d2	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
曾贞一	99ecde38d2	【7874 盘点主表中这两个字段由于后台取值错误，导致界面上无显示，需要修改,目前的逻辑看第二个字段中取值为库区，需要取库区所对应的库存地】	5 years ago
曾贞一	a98f598acc	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
曾贞一	10b5885ede	【7874 盘点主表中这两个字段由于后台取值错误，导致界面上无显示，需要修改,目前的逻辑看第二个字段中取值为库区，需要取库区所对应的库存地】	5 years ago
joke.wang	79788daf8b	pom 修改	5 years ago
zcg	74e4aa953b	【任务 1480 照片采集】	5 years ago
joke lin	62cee148cd	[bug: 7875 客户JIT生产工单]	5 years ago
钮海涛	9da6628884	Merge branch 'master' into test	5 years ago
陈思洁	cc207240b4	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
陈思洁	bacab3fb88	【MES_新增设备工装关系和工装操作记录pojo】	5 years ago
puxiao.liao	4c199ce8ba	任务1470【 1470 504 北京麦格纳-采购收货--新增扫描二维码组件】 ... 任务1467【1467 506 北京麦格纳-推荐入库-新增推荐动态库位组件】	5 years ago
曾贞一	3d913456af	【7863 修改单据两步法操作后，单据条码明细直接变为已完成的问题】	5 years ago
宋军超	628b0ee081	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
宋军超	1690c9567b	添加调用MES接口发送完成信号 和 根据主任务编号生成区域任务组件	5 years ago
王杰	9f8e51830e	mes enum	5 years ago
qianhs	8d18c61d63	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
joke lin	126440c976	[任务：1435 客户JIT导入]	5 years ago
陈思洁	736b292d83	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
陈思洁	310bf49af6	【MES_校验是否换膜并推送换模信号 】	5 years ago
陈思洁	22788f1c44	还原POM文件TEST-DEV	5 years ago
宋军超	d094824c4f	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
宋军超	6bdf815329	区域组件调用参数实体添加(状态代码statusCode)字段	5 years ago
qianhs	a93882c881	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
许心洁	8178e90abd	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
许心洁	5bf7133ff1	动态查询：BUG#7845；BUG#7676；BUG#7675	5 years ago
袁津哲	df21c218cd	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
袁津哲	b08d20fdb6	开发WMS动态加载插件功能	5 years ago
王杰	f5e4bba761	ptlpcnenum	5 years ago
曾贞一	5291d5d13d	【7838 修改分组管理中的按钮名称】	5 years ago
曾贞一	779b9d209c	【修改 DEV-pom.xml】	5 years ago
袁津哲	c178540545	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
袁津哲	327af15040	开发WMS动态加载插件功能	5 years ago
qianhs	26bf62fbe7	设备状态采集工步	5 years ago
陈思洁	474bb995d6	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
王杰	608a1d1e51	ptl	5 years ago
汪云昊	41a39990f4	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
钮海涛	1eaacd1b28	Merge branch 'test' into dev	5 years ago
陈思洁	1a0000da40	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
钮海涛	333ef54c80	Merge branch 'dev' of puxiao.liao/i3plus-pojo-lpx into dev	5 years ago
钮海涛	2d5de4a29b	Merge branch 'dev' of gragon.xu/i3plus-pojo into dev	5 years ago
puxiao.liao	8a7c5fa1b5	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
puxiao.liao	e3b6f03dd8	北京麦格纳WMS#511【511 北京麦格纳-NC报废NC冻结-自动不良品标签打印】 ... 北京麦格纳WMS#510【510 北京麦格纳-拣货-领料任务监控看板】 北京麦格纳WMS#508【508 北京麦格纳-拣货-根据最短路径推荐条码】 北京麦格纳WMS#507【507 北京麦格纳-计划外入库（零星入库）新增，默认批次为生产日期】 北京麦格纳WMS#505【505 北京麦格纳-采购收货-推送收货差异邮件】 北京麦格纳WMS#509【509 北京麦格纳-过期品自动报警】	5 years ago
puxiao.liao	f5cd46f1f1	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
puxiao.liao	2da53135a8	bug7761【7761 发运配料界面，执行成功与无库存未做国际化，翻译资源已配置好】 ... bug【7766 拆分打印功能操作完成后下方需要回显，拆分出的条码的零件号，条码，数量，库位。】	5 years ago
王杰	7d743c2c7f	Merge branch 'dev' of jhforever.wang/wangjie-i3plus-pojo into test	5 years ago
王杰	6cfc2c5501	ptl	5 years ago
陈思洁	b3e38170e6	【1440 PLC采集工步【生产数据】】	5 years ago
汪云昊	6293bf352d	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
luweihao	e90ea98d1f	解决冲突	5 years ago
luweihao	03f1c4fddf	修改生产数据结构	5 years ago
汪云昊	081db93d0d	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
王杰	af4cb74392	Merge branch 'dev' of jhforever.wang/wangjie-i3plus-pojo into test	5 years ago
王杰	8881bafecf	ptl pcn	5 years ago
joke lin	3b928c6ddc	[bug: 7637 生产数据]	5 years ago
汪云昊	b0a4eccca4	禁用启用，软删	5 years ago
joke lin	e8f48bcb04	[bug: 7637 生产数据查询]	5 years ago
许心洁	313a0acfb8	test	5 years ago
王杰	b6a83fff5d	Merge branch 'dev' into test	5 years ago
王杰	0b8c3317b8	ptlpcn enum	5 years ago
zcg	3d28840bae	【新增枚举，pojo】	5 years ago
zcg	b28c092ade	【新增枚举】	5 years ago
王杰	9d23ec7720	Merge branch 'dev' into test	5 years ago
宋军超	8b9d8fd16d	添加界面、界面元素、界面元素属性、RFID、接口清单、区域观察者事件配置、区域流程组件调用参数实体	5 years ago
许心洁	c214561f3b	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
许心洁	5b92cae5d1	3D仓库：联调优化+收货看板BUG#7308	5 years ago