3927 Commits (62800f757eaf21608a90ac2453fb5c056550ee02)

Author	SHA1	Message	Date
jokelone	7fc439319e	返厂返修	6 years ago
陆卫豪	413266293e	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
WYnneaoapc	030391a93c	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
WYnneaoapc	56d7457826	工位监控提交	6 years ago
曾贞一	5e7fb00d0c	【生产领料】	6 years ago
许心洁	1f1b4f7511	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
陈思洁	48a6cdc39c	作业任务：作业类型 枚举增加	6 years ago
crish	e260045c42	Merge remote-tracking branch 'origin/test' into test	6 years ago
crish	97763d6b53	安灯广播， 安灯管理显示不同界面， 添加操作来源字段	6 years ago
王杰	b561110e54	Merge branch 'dev' into test	6 years ago
王杰	9cc89f9397	mes设备周期计划	6 years ago
许心洁	2f843a8f5a	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
许心洁	88754f9a71	收货看板重写	6 years ago
许心洁	986157043d	流程设计：新增组件参数类型：可配字符串	6 years ago
于学杰	68a6c85068	Merge branch 'dev' into test	6 years ago
陈思洁	cd8bd3a68b	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	3828b4863c	添加保质期字段	6 years ago
曾贞一	dfdb6be4bb	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
曾贞一	6a9924eda6	【VDA生产领料】 FIFO推荐组件	6 years ago
crish	ce187f9720	安灯广播	6 years ago
钮海涛	8a316ff2d5	add mrp function to aps	6 years ago
王杰	ef3be61f66	Merge branch 'dev' into test	6 years ago
王杰	14123c008e	mes设备周期计划	6 years ago
jokelone	ffdb547dc7	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
jokelone	203b53d3b3	解决冲突	6 years ago
jokelone	da97adcbc7	更改db地址清单名称	6 years ago
wei.peng	e7e4a8587f	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
于学杰	75bb3f4780	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
于学杰	fcefe8de38	1. 通用接口增加调用软适配的功能（使用脚本引擎实现）	6 years ago
王杰	611b25abfd	Merge branch 'dev' into test	6 years ago
王杰	9a6b1c4bf1	mes设备作业周期计划	6 years ago
jokelone	2238bee7d4	增加查询结果设备名称	6 years ago
汪云昊	d91fa61c88	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
汪云昊	6c1891c193	软适配报文状态及微服务接口调整	6 years ago
wei.peng	05fd0fe686	WebService Server 优化完成	6 years ago
许心洁	7863325afd	本地误拉了测试的代码，还原后提交，在测试分支拉开发分支的代码也得还原	6 years ago
许心洁	b7b78b85ac	误拉了test分支的代码：还原	6 years ago
许心洁	d351c36ffc	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
WYnneaoapc	c681340355	工位监控添加枚举一字段	6 years ago
汪云昊	52a5fe74af	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
wei.peng	508bc3589b	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
汪云昊	74fb558135	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
汪云昊	95a354f537	解决无法处理bug	6 years ago
wei.peng	029f14d36f	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev ... Conflicts: modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDatasource.java	6 years ago
刘辉	83a7a9e988	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
wei.peng	d9dd10761e	WebService 欧洲对接完成	6 years ago
changjiang.gao	9e1b86eb2b	导出显示bug修改	6 years ago
王杰	2ed8ebdbd7	Merge branch 'dev' into test	6 years ago
changjiang.gao	0e7c7fbfb2	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
changjiang.gao	45b4264c67	导出显示bug修改	6 years ago
jokelone	1758a4e50e	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
jokelone	a79769d229	mes-pcn枚举	6 years ago
王杰	37f7e92d53	mes实体类	6 years ago
许心洁	8deff73454	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
jokelone	f15574fc9f	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
jokelone	5d730ed5c8	解决冲突	6 years ago
wei.peng	f35461ef57	WebService Server 优化完成	6 years ago
jokelone	72bdd253fa	解决冲突	6 years ago
changjiang.gao	ef08c52411	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
changjiang.gao	647508d92c	导出显示bug修改	6 years ago
wei.peng	508d4b5aba	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev ... Conflicts: modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java	6 years ago
汪云昊	d83de01d33	服务端适配日志bug解决	6 years ago
刘辉	722146acd8	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
汪云昊	624751a697	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
汪云昊	9ac327e622	细节调整	6 years ago
bleakney.liu	417b4a09db	代码格式优化增加枚举	6 years ago
bleakney.liu	29fee6b028	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
bleakney.liu	746a04f96d	代码格式优化	6 years ago
许心洁	d406532b37	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
wei.peng	1e5e35ee6f	Pojo 合并代码	6 years ago
wei.peng	babaf2f7d6	WebService 客户端Xml参数调试成功	6 years ago
汪云昊	fe1e83609e	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
汪云昊	f3867c64f4	软适配微服务接口	6 years ago
wei.peng	61a38c9acd	WebService Server 优化完成	6 years ago
许心洁	6fc4474699	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
lbwgithub	456657489f	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
lbwgithub	a4d873f36f	添加过滤条件	6 years ago
许心洁	a961da57ef	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
bleakney.liu	afe19bf6eb	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
bleakney.liu	778c1a79a7	【静态盘点】增加库存调整盘点	6 years ago
jokelone	9e2b13e3ad	解决冲突	6 years ago
crish	dc3fd624f2	Merge branch 'dev' into test	6 years ago
jokelone	219b2d2ad3	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
jokelone	104d308d30	PLC DB 设备故障 过程质量检测	6 years ago
crish	8148fc86e6	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
crish	c39462cd35	安灯广播	6 years ago
许心洁	b22c6fbcaf	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
王杰	d814887570	mes设备	6 years ago
许心洁	b43f4aef72	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
lbwgithub	73b8fd1de4	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
lbwgithub	09ea0929e4	枚举	6 years ago
陆卫豪	a791430fec	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
WYnneaoapc	df6f432534	1012 修改绑定关键件 和 工序bom添加isBindKey	6 years ago
许心洁	f778b15ea5	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
crish	40321ed7ec	Merge branch 'test'	6 years ago
crish	4e2373bdae	Merge branch 'dev' into test	6 years ago
WYnneaoapc	20843e06a6	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
WYnneaoapc	4654fad2bd	1011 生成条码工步	6 years ago
crish	e79ff6946a	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
crish	db26628d9f	安灯广播	6 years ago
王杰	096c02d42d	修改	6 years ago
王杰	24a3b0e2b0	mes字段	6 years ago
陈思洁	91fada5cc0	枚举修改	6 years ago
crish	672438f2c0	Merge branch 'test'	6 years ago
crish	b6179f9f71	Merge branch 'dev' into test	6 years ago
crish	be63f4eab9	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
crish	37e2a88ca7	物理安灯和软件安灯插入安灯附属表的逻辑	6 years ago
王杰	5debda474d	Merge branch 'dev' into test	6 years ago
王杰	2a1274df65	mes组织模型	6 years ago
许心洁	04cdf58aef	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
lbwgithub	abd2321850	格式化代码	6 years ago
lbwgithub	658b25bd65	格式化代码	6 years ago
lbwgithub	11676cb942	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
lbwgithub	3ebf17adb1	格式化代码	6 years ago
lbwgithub	926c9c3d60	方法移值	6 years ago
crish	0924810e64	Merge branch 'test'	6 years ago
王杰	921859f4de	Merge branch 'dev' into test	6 years ago
王杰	6c54f204b7	mes设备	6 years ago
王杰	982f8ad741	mes设置组织模型	6 years ago
lbwgithub	d11058019b	枚举	6 years ago
lbwgithub	cf3ee95623	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
lbwgithub	6596931124	枚举	6 years ago
许心洁	56f7048098	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
crish	4b032ac426	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
crish	16073eb7e5	安灯附属表插入时， 完整数据； 添加安灯来源接口	6 years ago
许心洁	89ab1816e3	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
lbwgithub	8d7c77d3ed	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
lbwgithub	71a68e8cf6	枚举	6 years ago
许心洁	c955047746	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
许心洁	1769e7765f	加了main方法发版报错	6 years ago
王杰	95cc0b433e	mes组织模型bug修复	6 years ago
王杰	18bc35f60d	Merge branch 'dev' into test	6 years ago
lbwgithub	c67fe92297	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
lbwgithub	3e8bcbeb84	枚举	6 years ago
钮海涛	5c68a15d0c	add mrp function to aps	6 years ago
WYnneaoapc	60f441e685	Merge branch 'dev' into test	6 years ago
WYnneaoapc	76149da904	提交	6 years ago
WYnneaoapc	a1525eae8b	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
wei.peng	d495046dcf	添加XML 工具实现	6 years ago
WYnneaoapc	18ec7d091a	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
WYnneaoapc	c9a572469c	同步限制解除	6 years ago
lbwgithub	473e2caea0	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
lbwgithub	2cf4759c21	枚举	6 years ago
刘辉	60d1798b9c	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
王杰	ddfb47e6ac	mes设备台账功能开发	6 years ago
陈思洁	0bdc3592e2	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	f67e7df17f	新增冗余字段	6 years ago
曾贞一	28af3c27e3	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
曾贞一	320c7f6b1f	【生产快速入库】生产快速入库导入接口	6 years ago
汪云昊	de685a0627	删除pojo数据默认值	6 years ago
许心洁	1e41ab2e39	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo	6 years ago
汪云昊	9553e962e3	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
汪云昊	bd55a18bf6	微服务接口 - 打印模板分页查询	6 years ago
曾贞一	9d3b45d2e2	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
曾贞一	ddd91f51b5	【生产快速入库】组件选择，任务编号1051	6 years ago
许心洁	232c675444	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
许心洁	d2c3045575	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	84a96a22fa	新加NotNumBiggerPackContainsZero方法	6 years ago
lbwgithub	4477820c1b	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
lbwgithub	68b0058e1b	枚举	6 years ago
许心洁	1b5df102e7	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
许心洁	ccd04804c0	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	95f156adf4	所有double类型的属性都要加上精度注解，否则数据库中自动生成的类型为double	6 years ago
陆卫豪	6c434e114d	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
WYnneaoapc	8cca6706b2	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
WYnneaoapc	4eada1c343	表同步	6 years ago
许心洁	1a7b4e3438	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
刘辉	1defd0d8be	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
陈思洁	113bb8755d	解决冲突	6 years ago
陈思洁	4ac7bae38b	新增hql	6 years ago
bleakney.liu	0fa1ffa23b	[物流线路修改]修改数据类型	6 years ago
bleakney.liu	f682d056be	[物流线路管理]修改查询条件	6 years ago
许心洁	653c8dca1f	直送发运扣减JOB过滤打印状态为线边退料生成的条码的代码逻辑错误	6 years ago
WYnneaoapc	a11eeae45c	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
WYnneaoapc	7ee11674ab	读取托盘	6 years ago
crish	7646e1fcfc	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
曾贞一	e24474fc8c	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
曾贞一	2b62357ab5	VDA收货【生产快速入库】组件，任务编号1051	6 years ago
wei.peng	cecd37a1e7	添加Xml 工具	6 years ago
许心洁	1d17198daf	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
WYnneaoapc	9b6887dd40	#1050 工位监控	6 years ago
王杰	72c9a5892d	修改注释	6 years ago
汪云昊	ac1c18581e	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
汪云昊	d8c740819c	FTP适配器	6 years ago
crish	01ea2f511c	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
crish	77a8cdebd5	安灯升级	6 years ago
许心洁	61804a27b3	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
钮海涛	16bb46df55	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
钮海涛	980cb2a56b	add product order spread to aps	6 years ago
lbwgithub	ddf1d2e6dc	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
lbwgithub	5a5b7b882e	条码模型	6 years ago
bleakney.liu	82ab39d559	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
bleakney.liu	4ceba7144c	【物流线路修改】 修改枚举值重复问题	6 years ago
许心洁	10fcc569bd	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
许心洁	dbb1341d6f	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	e90c59ccf2	生产报工当查询到多条子物料时查询的SQL没有返回itemQty	6 years ago
bleakney.liu	8beee972a9	【物流线路维护】 增加处理模式类型	6 years ago
bleakney.liu	e9f82d9259	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
bleakney.liu	692110b92b	【物流线路维护】增加前端处理模式枚举	6 years ago
许心洁	e35cf183da	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
WYnneaoapc	42a8fb357f	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
WYnneaoapc	82fe491bd3	#1050 工位监控	6 years ago
钮海涛	f55e65a227	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
钮海涛	10ce1e165e	add order spread to aps	6 years ago
lbwgithub	0dd15baa2f	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
lbwgithub	4fc72ca358	条码模型	6 years ago
crish	ff272afe2c	添加工厂条件	6 years ago
crish	e0c7822803	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
crish	864168def0	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
lbwgithub	81d86d1bd2	条码模型	6 years ago
许心洁	7a403a37da	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo	6 years ago
bleakney.liu	4409f34e0f	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
crish	aea18f89c6	安灯放行说明字段维护openInfo， 安灯响应通知标识字段signSendFlag维护	6 years ago
汪云昊	3ef7d24eab	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
陈思洁	3cc1997ae2	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	c2da7410eb	新增枚举提交	6 years ago
crish	d1d813614a	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
crish	e20ee7b1ff	安灯放行放行说明维护， 安灯响应响应标识， 用户经过工厂过滤	6 years ago
lbwgithub	ab6d6e695b	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
lbwgithub	9a21e2d99f	条码差异详情返回值	6 years ago
crish	fe174a47ee	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
crish	fb9340fc09	安灯呼叫，开线逻辑调整； 安灯附属表业务添加；工位工作中心显示对应状态； 增加物理安灯，软件安灯逻辑	6 years ago
jenkins	30eee05b1c	Merge branch 'dev' into test	6 years ago
WYnneaoapc	766d195088	开线合并代码	6 years ago
WYnneaoapc	183fd78eac	冲突解决	6 years ago
jenkins	99382a8fca	Merge branch 'dev' into test	6 years ago
曾贞一	3fb2e44eaa	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
曾贞一	c509f3c707	VDA 生产快速入库	6 years ago
wei.peng	eb70017396	Xml 解析添加重试机制	6 years ago
曾贞一	bc83b57f8e	合并代码	6 years ago
曾贞一	fb86682652	VDA 生产快速入库	6 years ago
jenkins	0982f01eb2	Merge branch 'dev' into test	6 years ago
陈思洁	26684524f1	生产报工组件和生产报工标签组件提交	6 years ago
jenkins	7e3edd06a0	Merge branch 'dev' into test	6 years ago
陈思洁	3ba6508b0c	新增打印机配置表	6 years ago
陈思洁	22fbbe2a91	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	edfc78995b	新增打印机配置表	6 years ago
汪云昊	3b46d242a7	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/BlockSoftSwitchEnumUtil.java	6 years ago
汪云昊	d830c78d03	FTP适配器	6 years ago
wei.peng	4e303413ff	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
wei.peng	c0fc2c36bf	Socket 适配器完成 ... MQ 适配器完成	6 years ago
刘敏	8a94b054d8	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
刘敏	c2a75d96da	实体字段get方法修改	6 years ago
jenkins	607d8202ae	Merge branch 'dev' into test	6 years ago
许心洁	bc5dfb2f4f	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	f1f712c997	流程管家关联查询流程明细BUG：导致流程错乱	6 years ago
王杰	80f50fe800	Merge branch 'dev' into test	6 years ago
王杰	804574090f	pcn生产工单	6 years ago
crish	a601d5ddf3	orderBy方法去掉为空判断	6 years ago
crish	9ae6ee5016	Merge branch 'test'	6 years ago
crish	51c21f2c22	Merge branch 'dev' into test	6 years ago
crish	d8824ab066	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
crish	4173f0637f	安灯正式环境发布	6 years ago
曾贞一	8a89b95ebf	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
曾贞一	cd8a5df991	VDA 生产快速入库组件开发	6 years ago
钮海涛	1d281da531	add order spread to aps	6 years ago
jenkins	d5349806c9	Merge branch 'dev' into test	6 years ago
许心洁	dcf326366e	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	8f7d3b371b	流程管家：回显给前端当前步骤参数类型	6 years ago
jenkins	829171f8a4	Merge branch 'dev' into test	6 years ago
刘敏	ef6c47dc35	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
刘敏	e42cd80b8b	条码打印枚举添加待退料状态	6 years ago
jenkins	9e12bb5da3	Merge branch 'dev' into test	6 years ago
crish	7ea051b42e	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
许心洁	49bdbacc2f	盘点差异回显样式需求（存储区：红色；库位，数量：黄色）	6 years ago
crish	87dfdc6471	增加方法notInPackArray（）， 修复工具类 notInPack() notInPackString()方法无效的问题	6 years ago
jenkins	479caf432d	Merge branch 'dev' into test	6 years ago
钮海涛	be30cecf13	add integration to aps	6 years ago
jenkins	f07764acda	Merge branch 'dev' into test	6 years ago
王杰	80bad03881	mes-pcn生产工单	6 years ago
jenkins	38f2716a76	Merge branch 'dev' into test	6 years ago
刘敏	bc1dea29ad	po、asn查询条件添加	6 years ago
WYnneaoapc	f96cbd1be3	Merge branch 'dev' into test	6 years ago
WYnneaoapc	033b23321f	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
WYnneaoapc	7c472b386a	提交	6 years ago
lbwgithub	3ba7719160	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
lbwgithub	31b32be60d	颜色状态	6 years ago
jenkins	6250794847	Merge branch 'dev' into test	6 years ago
许心洁	3fc42f03b5	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	750a216fd2	任务列表显示：添加创建时间和源存储区字段（盘点）	6 years ago
王杰	704d4f2098	mes生产工单	6 years ago
wei.peng	355cd49649	注释 WebService 发送邮件客户端	6 years ago
王杰	f24744a1f6	Merge branch 'dev' into test	6 years ago
王杰	e5a20d4733	生产工单	6 years ago
jenkins	e56a5b037c	Merge branch 'dev' into test	6 years ago
钮海涛	47054bf0c6	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
钮海涛	4a78dfa493	add integration to aps	6 years ago
jenkins	790c0b4ec6	Merge branch 'dev' into test	6 years ago
汪云昊	7131271edc	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
钮海涛	3e06a11cb3	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
钮海涛	f8b385d274	add integration to aps	6 years ago
jenkins	7ce12a9c85	Merge branch 'dev' into test	6 years ago
刘敏	522efe67b6	excel导出优化--单据状态显示枚举描述	6 years ago
jenkins	cbc5882bd5	Merge branch 'dev' into test	6 years ago
王杰	b1f5f4f073	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
王杰	d676bcf974	mes生产工单下达配置状态	6 years ago
钮海涛	34beff6cc7	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
钮海涛	153238d31a	add integration to aps	6 years ago
刘敏	0f82f3fbe5	导出状态添加	6 years ago
jenkins	c29c350ef8	Merge branch 'dev' into test	6 years ago
许心洁	e5591eafc5	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
汪云昊	c10bf2e3e1	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
钮海涛	33233ba80c	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
钮海涛	6b182cf4b5	add fix controller bugs	6 years ago
crish	4b17c6ca69	Merge branch 'dev' into test	6 years ago
王杰	310d0f0606	mes生产工单审批	6 years ago
刘敏	e02f2bfeee	单据条码实体临时字段增加	6 years ago
许心洁	ec3ef597e8	根据工厂代码调整库存	6 years ago
曾贞一	d07173bd64	Merge remote-tracking branch 'remotes/origin/test'	6 years ago
crish	dcc13e622b	Merge branch 'dev' into test	6 years ago
WYnneaoapc	5cb2e7994b	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
WYnneaoapc	cf64f0118a	提交	6 years ago
crish	f3f77e63b3	Merge branch 'test'	6 years ago
crish	4d5497929a	Merge branch 'dev' into test	6 years ago
刘敏	a9e369e716	任务枚举添加导出转换方法	6 years ago
刘敏	ed29263655	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
刘敏	adf699f618	移动单表是否快照临时字段新增	6 years ago
crish	9f0f6da4c7	安灯原因统计报表增加发生频次统计	6 years ago
汪云昊	0b8bc114bc	服务端调整	6 years ago
crish	1ca98cebf3	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
crish	2d911c4257	安灯优化	6 years ago
bleakney.liu	53dd9cface	add 物流路线pojo	6 years ago
WYnneaoapc	27a7aa960c	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
WYnneaoapc	37701bed62	提交	6 years ago
王杰	9b82b0be2a	mes班组维护	6 years ago
刘敏	f6e9dd03b4	库存快照job开发【任务1011】	6 years ago
刘敏	4e46760fb6	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
刘敏	f57dd8e999	库存信息表、库存条码、移动单三张表快照时间新增	6 years ago
crish	c47c617aab	Merge branch 'dev' into test	6 years ago
王杰	8570b88761	mes生产工单	6 years ago
crish	c17039ce4a	Merge branch 'dev' into test	6 years ago
WYnneaoapc	4e1635fe7e	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
WYnneaoapc	9b0c5de954	提交	6 years ago
曾贞一	6c8cfd8678	Merge remote-tracking branch 'remotes/origin/test'	6 years ago
曾贞一	a4262c5e1e	pom文件修改 dev改成test	6 years ago
crish	b473fd1b46	pojo开发环境 pom文件修改为dev	6 years ago
crish	87f8dc38a6	测试环境	6 years ago
crish	96fd66456e	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
crish	d82e025eb9	dev环境pom文件修改为dev	6 years ago
于学杰	c974cf1450	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
于学杰	d273159e3e	1. 增加目的质量状态（规则表）	6 years ago
crish	81128be4e7	安灯事件原因报表增加日发生频次， 周发生频次 ... Signed-off-by: crish <570360737@qq.com>	6 years ago
钮海涛	68da44de9e	add expression to aps	6 years ago
钮海涛	d187f8b3e1	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
crish	52a770ad45	Merge branch 'dev' into test	6 years ago
王杰	24a31c0bdf	生产工单实体	6 years ago
crish	03a5481210	Merge branch 'dev' into test	6 years ago
王杰	9ed873422e	mes生产计划	6 years ago
钮海涛	d3194ac4bc	add expression to aps	6 years ago
jenkins	541ea98d98	Merge branch 'dev' into test	6 years ago
crish	a9a318e354	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
wei.peng	8f58627838	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
wei.peng	1e01f62188	Bug 修复	6 years ago
wei.peng	61b0dfdc3b	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
曾贞一	cb5eb56fe4	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
曾贞一	5d1e6e8474	VDA收货 库位推荐入库规则	6 years ago
刘敏	baf39dc0ce	生产退料导入实体新增	6 years ago
刘敏	809478be44	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
刘敏	d8bc8d713d	条码打印model字段添加	6 years ago
wei.peng	41588f37d7	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
汪云昊	d1d7e65f97	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
汪云昊	c6badc59c6	适配记录添加id参数	6 years ago
wei.peng	c7ed8613d6	软适配添加WebService 默认处理	6 years ago
汪云昊	83f400a36b	sql 注入 删除斜杠	6 years ago
crish	b31162c5d6	安灯工位放行， 安灯任务管理界面数据权限控制 ... Signed-off-by: crish <570360737@qq.com>	6 years ago
bleakney.liu	2c146d39bf	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
bleakney.liu	e52c310d38	add 入库pojo 和response	6 years ago
jimmy.zeng	4bfa05698f	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
曾贞一	9e2169fa87	推荐入库 组件开发	6 years ago
曾贞一	15d399e4c7	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
曾贞一	512ebb495c	VDA收货 提交组件	6 years ago
wei.peng	6cbcea7c2c	系统菜单默认排序值改动	6 years ago
于学杰	f6bb2ee21f	Merge branch 'dev' into test	6 years ago
曾贞一	337e5f7084	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
曾贞一	f17c1d3d25	推荐入库 组件开发	6 years ago
王杰	2460fbc3b4	生产计划	6 years ago
汪云昊	baa23aab03	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
crish	23c59d4326	Merge branch 'dev' into test	6 years ago
汪云昊	564deb4d6b	适配记录及数据库适配器	6 years ago
WYnneaoapc	271a26d2b8	提交	6 years ago
jenkins	26179650f0	Merge branch 'dev' into test	6 years ago
许心洁	787f12387d	流程管家：关联单据类型为盘点时不需要查询其它移动单+移动单的业务类型为质检时查询关联移动单的逻辑特殊处理	6 years ago
jenkins	9033584a52	Merge branch 'dev' into test	6 years ago
钮海涛	70868503d4	add beans services controllers to aps	6 years ago
jenkins	bca4f7745f	Merge branch 'dev' into test	6 years ago
许心洁	90b731fde4	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	de6792426e	流程管家：单据完成提交所有待提交移动单；只推送当前移动单 ... PDA收货组件：改数后删除历史记录BUG修复	6 years ago
wei.peng	33473f9903	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
WYnneaoapc	f51ba09666	提交	6 years ago
钮海涛	30ecc48007	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
钮海涛	3c907fe88a	add material bean to aps	6 years ago
crish	989cbbdee8	安灯目录结构调整 ... Signed-off-by: crish <570360737@qq.com>	6 years ago
wei.peng	4ca0851386	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
曾贞一	d509e5755a	vda 收货超收处理	6 years ago
jenkins	603647bc82	Merge branch 'dev' into test	6 years ago
曾贞一	c5f43236a3	开口合同与po关系	6 years ago
汪云昊	3474bb82c6	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
汪云昊	f978ee39c8	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
汪云昊	6093ec0621	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
汪云昊	f6c1eff0f1	excel通用导入优化	6 years ago
于学杰	54db1929b1	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
于学杰	05dc432c57	1. 增加关联单位和关联数量字段	6 years ago
汪云昊	d120b1615a	国际化工具类	6 years ago
jenkins	ee979c6e02	Merge branch 'dev' into test	6 years ago
汪云昊	9caf9a4458	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
汪云昊	2f904f9eee	数据库适配器	6 years ago
汪云昊	c27449a185	异常信息国际化	6 years ago
王杰	f5164d82fb	通用查询方法	6 years ago
jimmy.zeng	bd466610d5	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
刘敏	72fec8146d	修改	6 years ago
jimmy.zeng	b5eb716a4e	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
钮海涛	46bde2804d	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
钮海涛	6008478aec	add customer field function	6 years ago
jimmy.zeng	d23045a667	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
刘敏	5b6477bba6	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
刘敏	510485d2f0	excel导出优化--单据状态显示枚举描述	6 years ago
wei.peng	a86f2e49c5	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
wei.peng	51974a46b9	WebService 调用发送邮件测试	6 years ago
许心洁	59569cef66	移动单主表去掉乐观锁（处理错误移动单JOB一个事务内对一个表进行了两次操作不行，导致程序直接挂掉，事务也没回滚）+ ... 交易处理组件（出入移库）：待入库的可能是不合格的+ 公共PDA组件抛异常获取值为空	6 years ago
crish	35beb0c60e	Merge branch 'dev' into test	6 years ago
汪云昊	40a2a789be	参数描述调整	6 years ago
wei.peng	377a875fec	软适配客户端代码结构调整。	6 years ago
wei.peng	1661e4e0a9	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev ... Conflicts: modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java	6 years ago
wei.peng	fc1c7ab797	软适配添加-所有适配命令 接口	6 years ago
汪云昊	ca7d5a2896	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
汪云昊	8b0e851eb8	数据源适配套件相关接口	6 years ago
wei.peng	2c6b223628	软适配客户端代码结构调整。	6 years ago
陈思洁	02270ea6e8	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	f5d2398e0e	VDA收货--开口合同增加字段 ... 供应商增加字段	6 years ago
于学杰	01c58e8653	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
于学杰	3454712bd2	1. 增加库存快照的类文件	6 years ago
汪云昊	873f91a2eb	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
汪云昊	f718a5dac5	excel通用导入优化	6 years ago
刘敏	f777c82ea7	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
刘敏	5b7ac2c344	ASN字段修改	6 years ago
wei.peng	212cfb02af	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
wei.peng	71798e9f51	软适配功能配置优化	6 years ago
汪云昊	21240ffa53	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
汪云昊	eeff3517c6	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev ... # Conflicts: # modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java # modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java # modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java	6 years ago
许心洁	e8b9f58f43	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	262f7efe05	如果有异常信息需要叠加在提示信息前一起返回给前端	6 years ago
汪云昊	07688db533	软适配实体	6 years ago
陈思洁	74bdaccfbd	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	8ed0d4d60e	枚举维护业务类型数据	6 years ago
汪云昊	f2e2dd1670	软件适配器 数据源适配器 ... 单号生成高并发优化	6 years ago
wei.peng	21241e45ca	软适配功能配置优化	6 years ago
王杰	58d6305bd3	mes动作	6 years ago
刘敏	c7734b7e26	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
刘敏	5144d15ac4	采购单报表开发	6 years ago
crish	bbfc9b320f	Merge branch 'test'	6 years ago
crish	4a1ad40dfa	Merge branch 'dev' into test	6 years ago
crish	726600fccd	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
crish	f205373964	安灯事件报表安灯类型导出 ... Signed-off-by: crish <570360737@qq.com>	6 years ago
许心洁	03ef38f853	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	315787197a	交易处理组件（收货）：免检写入收货事务取目的库位的值+乐观锁去掉临时属性	6 years ago
曾贞一	b5dfa7dbd2	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
曾贞一	8d6e4fdfa5	盘点实盘导入功能	6 years ago
陈思洁	677632748d	VDA收货逻辑组件修改--修改sql中增加库存地字段显示	6 years ago
刘敏	4c39e84094	asn主表添加	6 years ago
wei.peng	ca28ae6cad	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
wei.peng	0ac5232eb0	自定义表单 默认值取值方式修改	6 years ago
wei.peng	b899c5c8c5	软适配 WebService 功能接口开发	6 years ago
王杰	c950019077	pcn定时任务	6 years ago
陈思洁	3b174fc782	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	f63cd5071b	新增开口合同实体	6 years ago
许心洁	8fc5788f64	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
wei.peng	e921bb72d2	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/BlockSoftSwitchEnumUtil.java	6 years ago
wei.peng	9ec5e63da6	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
wei.peng	5b200f824f	软适配 WebService 功能开发	6 years ago
汪云昊	3eef8ea750	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
汪云昊	029d7eac62	软适配model	6 years ago
许心洁	a959964950	移动单三张表加上乐观锁	6 years ago
crish	39e0fbca80	Merge branch 'dev' into test	6 years ago
crish	3266c9b1e0	安灯状态导出 ... Signed-off-by: crish <570360737@qq.com>	6 years ago
wei.peng	e58aaf95b9	软适配 WebService 功能开发	6 years ago
jimmy.zeng	2d376575a3	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
陈思洁	3c6d17a283	修改pojo数据类型	6 years ago
jimmy.zeng	ccffe9b7bd	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
曾贞一	229587fcf3	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
曾贞一	ceced4c4b6	欧洲项目 检查数量 批次格式组件编写	6 years ago
WYnneaoapc	c44a99eb40	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
WYnneaoapc	61a7985afc	提交 0905	6 years ago
刘敏	5b97a9e0cb	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
刘敏	241a478f65	excel导出优化--单据状态显示枚举描述	6 years ago
crish	8d8752b8b4	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
crish	89b0a4a68a	条码打印调试 ... Signed-off-by: crish <570360737@qq.com>	6 years ago
刘敏	f0fba5e23a	盘点枚举添加--excel导出	6 years ago
刘敏	b3b913d768	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
刘敏	8ac4f214b3	#5596	6 years ago
王杰	fe455a7147	pcn离线登陆	6 years ago
jimmy.zeng	836b0e933e	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
曾贞一	09aab6d87a	盘点添加 存储区多个查询	6 years ago
jimmy.zeng	a4725e20c6	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
wei.peng	a59f95080c	自定义表单-同步对象功能优化 ... 自定义表单-动态页面数据导出	6 years ago
曾贞一	a12a008713	盘点库位添加查询条件	6 years ago
曾贞一	b7bd96fa44	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
WYnneaoapc	546d9dc7a5	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
WYnneaoapc	61ed3d821d	提交 0905	6 years ago
曾贞一	d4007f6ca5	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
曾贞一	64aed1f49c	开发 Restful 接口测试PDA	6 years ago
jimmy.zeng	fd76f08af4	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
王杰	d2995520d4	mes-pcn定时任务增加字段	6 years ago
曾贞一	8b9a4fb109	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
曾贞一	575aa6ea2f	库存移动单报表 添加修改人，修改时间的查询条件和列表	6 years ago
刘敏	20bd7994a3	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
刘敏	e4cf678000	构造新增字段	6 years ago
WYnneaoapc	4b982fc4fe	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
WYnneaoapc	1332f11a23	提交	6 years ago
jimmy.zeng	8f1ac3fdae	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
crish	f370f377d4	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
crish	7ce78b170f	工作参数枚举 ... Signed-off-by: crish <570360737@qq.com>	6 years ago
刘敏	c05b22668f	字段修改	6 years ago
jimmy.zeng	835245f8f4	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
刘敏	2108a7f8e7	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
刘敏	4852a4754c	字段枚举值添加	6 years ago
crish	65cb39d7ba	工作中心代码修改 ... Signed-off-by: crish <570360737@qq.com>	6 years ago
许心洁	7da95b1ad2	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	876571e877	任务：994；BUG：5498	6 years ago
jimmy.zeng	0a3339ba8d	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
刘敏	67b1e5d4f6	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
刘敏	ff462900b7	枚举描述添加	6 years ago
jimmy.zeng	6e48f0a677	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
曾贞一	d8568e6d22	盘点优化代码。	6 years ago
曾贞一	5290ba6f63	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
曾贞一	01cb76da6d	指令移库 根据目标存储区扫描库位	6 years ago
刘敏	836f1bf870	字段修改	6 years ago
陈思洁	2af903f029	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	254f08da32	物料描述修改	6 years ago
jimmy.zeng	2e8a70d8b4	pom版本还原--pojo	6 years ago
刘敏	5fb7ffc40b	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
刘敏	0faeaa6047	导出枚举添加	6 years ago
王杰	482159b322	mes-pcn定时任务枚举修改	6 years ago
刘敏	193eba75d8	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
刘敏	5b735fe3a2	移动单枚举导出	6 years ago
许心洁	71b6c64ed0	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
刘敏	3b86092577	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
刘敏	5f539afd6d	移动单明细注解添加	6 years ago
许心洁	53a08621fd	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	db4f6bcdb1	流程管家：添加作业记录明细（快速流程每一次扫条码都会生成一个新的移动单）	6 years ago
汪云昊	b760543b3b	excel通用导入优化	6 years ago
crish	a5b01bbaae	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
crish	69d2932ca4	http请求增加不需要设置请求内容枚举 ... Signed-off-by: crish <570360737@qq.com>	6 years ago
许心洁	fe793f0431	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
汪云昊	3a1cf7a2b7	判断属性是否有final修饰	6 years ago
许心洁	d87cbd9c4f	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
汪云昊	b4b095c970	判断属性是否有final修饰	6 years ago
许心洁	5db4307fa5	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
汪云昊	4d5c92df78	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
王杰	d5cfe77ac5	mes定时任务枚举	6 years ago
汪云昊	32502582c1	新增属性初始化	6 years ago