6060 Commits (62c9d8d27dc395fd4f4c63bcf8947f65924df63f)

Author	SHA1	Message	Date
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