1153 Commits (ac7b0415ba47eb500e79ffd1fca153c07e457327)

Author	SHA1	Message	Date
crish	b31162c5d6	安灯工位放行， 安灯任务管理界面数据权限控制 ... Signed-off-by: crish <570360737@qq.com>	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
汪云昊	564deb4d6b	适配记录及数据库适配器	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
汪云昊	f6c1eff0f1	excel通用导入优化	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
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	51974a46b9	WebService 调用发送邮件测试	6 years ago
crish	35beb0c60e	Merge branch 'dev' into test	6 years ago
wei.peng	377a875fec	软适配客户端代码结构调整。	6 years ago
wei.peng	fc1c7ab797	软适配添加-所有适配命令 接口	6 years ago
wei.peng	2c6b223628	软适配客户端代码结构调整。	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
汪云昊	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
汪云昊	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
刘敏	5144d15ac4	采购单报表开发	6 years ago
crish	4a1ad40dfa	Merge branch 'dev' into test	6 years ago
wei.peng	b899c5c8c5	软适配 WebService 功能接口开发	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
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
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
曾贞一	b7bd96fa44	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
曾贞一	64aed1f49c	开发 Restful 接口测试PDA	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
jimmy.zeng	0a3339ba8d	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
刘敏	ff462900b7	枚举描述添加	6 years ago
jimmy.zeng	2e8a70d8b4	pom版本还原--pojo	6 years ago
王杰	482159b322	mes-pcn定时任务枚举修改	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
汪云昊	3a1cf7a2b7	判断属性是否有final修饰	6 years ago
汪云昊	b4b095c970	判断属性是否有final修饰	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
汪云昊	eadb86ce60	excel通用导入优化	6 years ago
汪云昊	fb3b8a033d	excel通用导入优化	6 years ago
crish	7aec1fdb6a	添加工步类型枚举 ... Signed-off-by: crish <570360737@qq.com>	6 years ago
WYnneaoapc	7f3f39af06	提交	6 years ago
WYnneaoapc	63c0f02f32	提交	6 years ago
WYnneaoapc	146cf768d6	提交	6 years ago
刘敏	24a9d3ff2c	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
crish	8a5337daad	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
crish	235a728c0e	andon ... Signed-off-by: crish <570360737@qq.com>	6 years ago
刘敏	9c26f45cd5	明细状态枚举添加	6 years ago
王杰	2e86ff81d0	mes工作单元参数增加枚举	6 years ago
王杰	6929e88570	mes-pcn定时任务	6 years ago
许心洁	057fa88904	revert	6 years ago
crish	c6584a9437	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
crish	368a3a1c66	mes枚举 ... Signed-off-by: crish <570360737@qq.com>	6 years ago
许心洁	7740503a97	getByProperty查询到多条数据抛异常	6 years ago
王杰	5947f88da1	mes-pcn定时任务工作清单数据同步	6 years ago
汪云昊	b7e17c5451	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
汪云昊	2325d18660	软件适配器 认证参数接口	6 years ago
WYnneaoapc	3bedf8fb8d	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/repository/MesNumberRuleRepository.java	6 years ago
WYnneaoapc	953f593207	提交	6 years ago
刘敏	592cd15add	调试枚举删除、库位导入工厂字段添加	6 years ago
wei.peng	1f1a9c39fc	异常国际化功能开发完成	6 years ago
王杰	3b3ddd581a	mest条码生成规则最大值是否循环枚举	6 years ago
许心洁	a38347d2fb	revert	6 years ago
许心洁	34e2c13b38	getByProperty获取到多条数据报错	6 years ago
WYnneaoapc	c7842e63a1	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
wei.peng	884f3e1a96	合并代码	6 years ago
王杰	aebe742280	mes枚举增加关键件条码规则信息模块的绑定规则	6 years ago
wei.peng	d7b0f30d91	IMPP 平台功能功能优化 . 软适适配功能开发	6 years ago
WYnneaoapc	5e72d98ad8	提交	6 years ago
WYnneaoapc	4ff3677fba	Merge branch 'test' into dev	6 years ago
WYnneaoapc	0aef9adac9	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
WYnneaoapc	1328dc7ddd	#Merge branch 'dev' of http://git.estsh.com/i3-MES/i3plus-mes-pcn into dev ... # Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit.	6 years ago
曾贞一	acd1e6cfb6	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
曾贞一	ce70994a57	盘点 按照盘点差异类型汇总	6 years ago
汪云昊	e83efe76e0	软件适配器 测试	6 years ago
汪云昊	0b13c6dd70	order by 列类型装换	6 years ago
汪云昊	f10ff69ce0	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
王杰	4f37dc42ef	pojo-mes-time-update-wangjie	6 years ago
汪云昊	1d55cd22a6	order by 列类型装换	6 years ago
汪云昊	39a00d3a19	order by 列类型装换	6 years ago
wei.peng	1b30b927ce	自定义表单功能优化	6 years ago
WYnneaoapc	c34a369e93	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
WYnneaoapc	ef1450e912	Merge branch 'dev' of http://git.estsh.com/i3-MES/i3plus-mes-pcn into dev ... # Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit.	6 years ago
汪云昊	619251474d	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
汪云昊	f5c0ca9383	软适配模型调整	6 years ago
WYnneaoapc	c05e3b13c6	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
WYnneaoapc	63d86a4b0d	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
WYnneaoapc	ecba29948f	816 add method	6 years ago
汪云昊	69525fbaa9	表单菜单排序	6 years ago
曾贞一	cef48801df	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
汪云昊	7455c6c640	软适配配置文件初始化	6 years ago
wei.peng	aee54acafc	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
wei.peng	46c710e559	表单功能优化，虚拟属性连表查询，时间格式化对接	6 years ago
wei.peng	6d99080069	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
jimmy.zeng	c986f7b2a3	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
汪云昊	9ee2901346	添加字典分组 ... 优化redis资源键	6 years ago
wei.peng	66f49f3fdc	自定义表单功能调整	6 years ago
曾贞一	8b457c0618	DEV 合并 TEST pom.xml文件修改	6 years ago
于学杰	4235184afc	Merge branch 'Process' into dev	6 years ago
于学杰	e7913cfb26	1. 从 TEST 合并代码后 POM 文件中引用的版本不正确，修改为 DEV	6 years ago
于学杰	24da688384	Merge branch 'test' into dev	6 years ago
许心洁	31313baec9	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into Process	6 years ago
曾贞一	b3a0a71065	库存初始化信息	6 years ago
许心洁	476d943a69	流程管家：自定义按钮触发的时候不需要预先调用当前步骤的回显信息	6 years ago
许心洁	40fc36ef18	流程管家优化：快速提交流程手动提交校验	6 years ago
许心洁	af7b2404dd	Merge branch 'Process' of http://git.estsh.com/i3-IMPP/i3plus-pojo into Process	6 years ago
许心洁	d8786d8132	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
曾贞一	fb07628555	Merge branch 'dev' into test	6 years ago
汪云昊	c1cff11c7c	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
peter.pan	d45b7b77f3	Merge branch 'dev' into test	6 years ago
许心洁	bb8078cb94	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	7f3d902a30	流程管家：提交检验+预回显优化； ... 直送发运JOB:#5132	6 years ago
wei.peng	750e4d75dc	添加 XStream 插件	6 years ago
wei.peng	bda52f76c6	软适配 Json 请求适配完成	6 years ago
peter.pan	24bbd75c81	Merge branch 'dev' into test	6 years ago
曾贞一	c7571b4c66	IS_GENERAL_TASK 添加单据是否生成任务状态 撤销	6 years ago
许心洁	60e6d51d35	流程管家2.0	6 years ago
peter.pan	8f977719c0	Merge branch 'dev' into test	6 years ago
许心洁	5a7ce32761	冲突	6 years ago
wei.peng	b5c204f873	软适配接口制作完成	6 years ago
peter.pan	5c48b2eb79	Merge branch 'dev' into test	6 years ago
汪云昊	035a8b5924	定时任务日志信息优化	6 years ago
wei.peng	90439f55fd	添加 XStream 插件	6 years ago
wei.peng	c4db15db9b	添加 XStream 插件	6 years ago
peter.pan	8daa2789a4	Merge branch 'dev' into test	6 years ago
汪云昊	7181e85ba5	安灯导出实体注解 ... 定时任务日志添加字段	6 years ago
汪云昊	ccf0764ee6	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
jenkins	812be94ed3	Merge branch 'dev' into test	6 years ago
wei.peng	7f35883b08	登录会话添加设备ID ... 自定义表单添加数据表唯一教研 自定义表单添加映射类型	6 years ago
wei.peng	90fb9d3190	登录会话添加设备ID ... 自定义表单添加数据表唯一教研 自定义表单添加映射类型	6 years ago
wei.peng	fb743ebafc	登录会话添加设备ID ... 自定义表单添加数据表唯一教研 自定义表单添加映射类型	6 years ago
jenkins	409cbb8492	Merge branch 'dev' into test	6 years ago
许心洁	4a717ec544	直送发运JOB+交易处理程序（下线结算）逻辑变动	6 years ago
jenkins	f4141fd2c6	Merge branch 'dev' into test	6 years ago
曾贞一	60feef4bb5	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
曾贞一	2240819def	发泡打箱包装	6 years ago
刘敏	6e2cf70951	库位校验枚举添加	6 years ago
jenkins	49a936c660	Merge branch 'dev' into test	6 years ago
汪云昊	06bd10152c	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
wei.peng	7f1ef0bca7	自定义报表表单打通， 用户在线设置功能优化	6 years ago
汪云昊	d63974140d	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
汪云昊	af2e1a811c	andon组织模型导入功能 ... andon删除关联数据校验	6 years ago
jenkins	577e1372ab	Merge branch 'dev' into test	6 years ago
陈思洁	a064c6b84a	枚举新增条码类型 ... 库存条码表新增字段	6 years ago
peter.pan	ad09180809	Merge branch 'dev' into test	6 years ago
汪云昊	c1ca7cbcae	Andon组织模型操作接口 ... Andon班次计算调整	6 years ago
peter.pan	4149183450	Merge branch 'dev' into test	6 years ago
汪云昊	c11cc65e8f	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
曾贞一	d7b79c659c	WMS获取系统配置信息	6 years ago
peter.pan	0526fcf05c	Merge branch 'dev' into test	6 years ago
汪云昊	19afeb92b7	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
wei.peng	fea0d476a4	基础操作,数据补全	6 years ago
陈思洁	0e15934d16	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	6a3662283b	枚举修改赋值	6 years ago
汪云昊	0ed90485a6	安灯基础数据导入导出	6 years ago
于学杰	4350a82043	1. 完善脚本引擎	6 years ago
wei.peng	c858475bd2	用户权限调整 部门权限调整完成	6 years ago
wei.peng	3a19888ddf	用户权限调整 岗位功能调整完成	6 years ago
peter.pan	53d34096f7	Merge branch 'dev' into test	6 years ago
汪云昊	8e39e6d9fb	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
汪云昊	0041ce328e	定时删除日志	6 years ago
wei.peng	78cd5dc77e	用户权限调整	6 years ago
peter.pan	d9ef2677fb	Merge branch 'dev' into test	6 years ago
wei.peng	1b1bc67c90	用户权限调整	6 years ago
peter.pan	61ecc2a74f	Merge branch 'dev' into test	6 years ago
陈思洁	fba99de795	枚举修改	6 years ago
陈思洁	d47c9f8650	合并冲突pojo	6 years ago
陈思洁	f0e0867e2c	库存移动pojo新增字段	6 years ago
wei.peng	a1f8ca3096	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
刘敏	d2839f6cf2	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
刘敏	58b067e3cc	库存报表存储区级联子存储区查询	6 years ago
peter.pan	5bed1d27ec	Merge branch 'dev' into test	6 years ago
陈思洁	79b36a30a4	冲突合并	6 years ago
陈思洁	fe3d392e9b	新增枚举信息 ... 移库单明细表冗余主表临时字段 新增物料表字段	6 years ago
peter.pan	f3eb8d2356	Merge branch 'dev' into test	6 years ago
wei.peng	541b40d182	合并代码	6 years ago
peter.pan	b39d7038fa	Merge branch 'dev' into test	6 years ago
许心洁	dec3743911	流程管家推队列查询条件没有封装	6 years ago
wei.peng	2cbc082c7b	动态对象 空数据处理	6 years ago
peter.pan	37b8755485	Merge branch 'dev' into test	6 years ago
汪云昊	d3deaa6081	安灯bug解决 ... 1.操作详情中一直同一个工位同种呼叫同一个呼叫单任务有多条 2.PLC：安灯类型、标签地址、标签名字条件查询失效 3.通知对象：通知对象值不能修改 4.通知配置：页面数据显示不全。 5.事件原因：安灯类型条件查询失效	6 years ago
许心洁	e43c493463	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	994da92b4e	交易处理组件：冻结全部数量；stockQuan添加getVal方法；下线扣减BUG	6 years ago
peter.pan	b18d393fe0	Merge branch 'dev' into test	6 years ago
peter.pan	e95db40c23	123	6 years ago
peter.pan	543171dfbb	Merge branch 'dev' into test	6 years ago
wei.peng	1ac5542541	动态表单分页功能完成	6 years ago
peter.pan	e3354f52bd	Merge branch 'dev' into test	6 years ago
陈思洁	92daec97e3	枚举修改名字	6 years ago
peter.pan	b8730fac47	Merge branch 'dev' into test	6 years ago
wei.peng	ac5bf14d6b	动态表单动态操作　功能优化	6 years ago
许心洁	15386ae5c2	枚举	6 years ago
peter.pan	628f1db31c	Merge branch 'dev' into test	6 years ago
汪云昊	ff9a5dcd17	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
汪云昊	98de08ba4a	文件上传优化 ... 字段删除异常 日志添加索引	6 years ago
peter.pan	96264870c2	Merge branch 'dev' into test	6 years ago
许心洁	efbe9dac9e	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	bf02cbf8a4	PDA任务显示关联单据业务类型busiTypeDesc+交易处理组件：下线结算	6 years ago
peter.pan	9c38ed702a	Merge branch 'dev' into test	6 years ago
刘敏	97adebba21	枚举新增 实体字段新增	6 years ago
peter.pan	3b1d19bbab	Merge branch 'dev' into test	6 years ago
陈思洁	a8dee4713a	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	31f6f4deef	枚举字段新增AMP ... ASN主表、生产报工明细表新增属性 hql查询ASN主表信息	6 years ago
刘敏	1b569ff3a8	ERP同步标识枚举添加	6 years ago
wei.peng	ee5a4f1dfe	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
wei.peng	0962b810ce	Json 转换精度丢失	6 years ago
wei.peng	5d2695a5cb	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
peter.pan	a551249165	Merge branch 'dev' into test	6 years ago
wei.peng	2e5b7466c8	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
wei.peng	1b4e5143aa	用户单帐号多平台登录	6 years ago
许心洁	364efedc42	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	c783d9119c	任务列表查询查出了状态为30的任务+流程处理组件execute方法提升事务级别+枚举添加根据枚举名查找枚举详情的静态方法	6 years ago
peter.pan	49d35f264e	Merge branch 'dev' into test	6 years ago
于学杰	35f92b05e3	1. 修改ERP接口暂存表的字段，增加关联单据类型	6 years ago
wei.peng	1ee9cb24f2	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
陈思洁	2ce560b39f	生产报工明细实体修改和枚举新增	6 years ago
jenkins	470d319504	Merge branch 'dev' into test	6 years ago
sky.meng	3cc4aec00a	库存预警看板	6 years ago
sky.meng	2f1a3080ba	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
sky.meng	05c56e46b4	库存预警看板开发	6 years ago
于学杰	713503d7ff	Merge branch 'dev' into test	6 years ago