6186 Commits (dfa993b9e97eb4ec8494d629f0ca4561d290d2a6)

Author	SHA1	Message	Date
wynne1005	614582ce36	条码表增加乐观锁	5 years ago
曾贞一	7dddac5113	【智能化开发-锁定库位】	5 years ago
wynne1005	aaf9f8a21b	添加乐观锁 日志	5 years ago
wynne1005	1fb2f07ca3	edi 添加队列字段	5 years ago
钮海涛	84698f3042	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
钮海涛	9475667e74	Finish Task #2134 Cost: 8h	5 years ago
袁津哲	9361512fb8	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
袁津哲	b1dddb62d3	开发涂装检查工位和一次、二次箱条码Un-Pack-后端开发业务逻辑	5 years ago
王杰	473ebd5ec8	[任务：2219]	5 years ago
王杰	31d7b71872	mes enum order type	5 years ago
曾贞一	0d7eb7ac67	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
曾贞一	aa09a31957	【智能化开发-锁定库存】	5 years ago
wynne1005	d2869dc31a	tmp	5 years ago
joke.wang	aabd7b5d1d	Fix Bug #9112	5 years ago
joke.wang	d44312c470	Fix Bug #9151	5 years ago
许心洁	54241ebf11	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
许心洁	9d79ed5376	3D仓库规则引擎优化	5 years ago
袁津哲	56a4edc4c0	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
袁津哲	295860683a	开发涂装检查工位和一次、二次箱条码Un-Pack-后端开发业务逻辑	5 years ago
王杰	472b2f1ee6	bug 9149	5 years ago
许心洁	38b154b0cb	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
许心洁	6cd70eb695	3D仓库规则引擎优化	5 years ago
钮海涛	0626d6f969	修复版本问题	5 years ago
钮海涛	e42ea19f37	修复版本问题	5 years ago
钮海涛	8d4c5f3cd4	Merge branch 'test' into dev	5 years ago
王杰	272d647073	【任务2219】	5 years ago
钮海涛	2478fc3b14	修复版本问题	5 years ago
钮海涛	0f2f56163e	Merge branch 'master' into test	5 years ago
puxiao.liao	5269cfb732	BH 需求修改	5 years ago
wynne1005	d9f619e1a0	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
puxiao.liao	e599a833f1	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
wynne1005	3b5142a1f8	edi	5 years ago
宋军超	6f454c95a4	Start Task #2212,2205 Cost:8h Left:16h	5 years ago
宋军超	c44e6ac965	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
袁津哲	e3a86fdbab	涂装条码打印、涂装上线功能联调	5 years ago
钮海涛	2b5f76caee	Merge remote-tracking branch 'origin/master'	5 years ago
钮海涛	62c9d8d27d	修复欧洲FIFO跳过未进行交易处理Bug	5 years ago
joke.wang	cf1020d82f	删除@Lob	5 years ago
王杰	08fe2de018	mes	5 years ago
joke.wang	2829bb5afb	pcn同步对象映射	5 years ago
wynne1005	8ae7ce53b7	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
宋军超	a757d2c339	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
puxiao.liao	84253d7562	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
puxiao.liao	b9ac27df19	无锡喜德BUG	5 years ago
joke.wang	2ce2e20c0b	包装扫描数量计算有误修复	5 years ago
袁津哲	f607860c57	Fix Bug #8845 ... 修改关键零部件绑定的数据列中增加带绑定条码的长度、特征码内容bug	5 years ago
袁津哲	aaaa591be4	优化关键条码绑定逻辑	5 years ago
曾贞一	3d79d73ff4	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
曾贞一	624e8d6461	【2193 06 1.2.3.7.4任务自动生成任务JOB】	5 years ago
曾贞一	b68f55b062	【2193 06 1.2.3.7.4任务自动生成任务JOB】	5 years ago
wynne1005	cf1edee02e	edi	5 years ago
王杰	15e7f2a0b5	pom	5 years ago
王杰	ea5a069eeb	pom	5 years ago
王杰	ed64d12875	pojo	5 years ago
宋军超	712f1e8d3d	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
宋军超	5be9081fc3	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
钮海涛	f464fd09c5	Merge branch 'test' into dev	5 years ago
宋军超	9218ca44a7	产品条码表添加生产批次lotNo	5 years ago
joke.wang	b32136f75d	Fix Bug #9078	5 years ago
puxiao.liao	fa383f6417	自动化策略主表	5 years ago
王杰	f3ffdc7d4c	dev merge test	5 years ago
puxiao.liao	84dbbcd9a8	自动化策略主表	5 years ago
puxiao.liao	2673b9164a	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
王杰	2c16efcb72	Merge branch 'test' into dev	5 years ago
王杰	7d5d36d084	test merge master	5 years ago
puxiao.liao	aea28cf6bb	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
puxiao.liao	e3513bddaa	自动化策略主表	5 years ago
王杰	70d58be136	pom	5 years ago
王杰	1e1f7cc1fb	pom	5 years ago
王杰	91d0ec1671	Merge branch 'master' into test	5 years ago
曾贞一	710c6aee3a	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
曾贞一	913991d30d	【2193 06 1.2.3.7.4任务自动生成任务JOB】	5 years ago
袁津哲	3247ef5ed7	优化涂装上线工位展示组件逻辑	5 years ago
宋军超	fe05a76f6f	添加涂装功能实体字段与model	5 years ago
qianhs	20cefbfec6	Finish Task #2080 Cost:8h	5 years ago
袁津哲	66b98dd6d5	1.开发涂装上线功能逻辑 ... 2.开发涂装工单条码打印逻辑	5 years ago
钮海涛	6c6fbf7e2c	新增收货回执显示收货时间功能	5 years ago
陈思洁	3f88a390e4	【8983 需求调整-泰国MES，工单下达逻辑调整】	5 years ago
宋军超	68fa329701	添加涂装打印实体	5 years ago
陈思洁	5431d09073	【8983 需求调整-泰国MES，工单下达逻辑调整】	5 years ago
wynne1005	c8178975af	StationRequestBean添加状态机代码	5 years ago
钮海涛	44ba68bb04	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
钮海涛	d08465dd38	修复版本问题	5 years ago
陈思洁	80e0ec63bb	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
陈思洁	498d6821a1	【2145 06 1.2.4.6.1.1 注塑计划排产】	5 years ago
钮海涛	800a954b7f	Merge branch 'test' into dev	5 years ago
qianhs	98b0110ff3	Finish Task #2080 Cost:8h	5 years ago
王杰	c2a6fb1684	[任务2186 涂装导入]	5 years ago
陈思洁	1f6af14316	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
陈思洁	0d81228ce7	【2145 06 1.2.4.6.1.1 注塑计划排产】	5 years ago
joke.wang	1f05cfca4c	Finish Task #2152 Cost:16h	5 years ago
puxiao.liao	9cd0823c34	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev ... Conflicts: modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java	5 years ago
曾贞一	9567d62195	【自动化策略】	5 years ago
puxiao.liao	17d3642fff	自动化策略主表	5 years ago
曾贞一	a8b2a0a618	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
曾贞一	e94e4ad189	【2180 06 1.2.3.8泰国WMS－生产报工接口】 ... 【2181 06 1.2.3.8 泰国WMS-容器包装关系接口】 【2180 06 1.2.3.8泰国WMS－生产报工接口】	5 years ago
袁津哲	a4820f236e	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
袁津哲	3d88913343	物料表中新增标准包规数量字段	5 years ago
汪云昊	6d71c01178	Merge remote-tracking branch 'origin/dev' into test	5 years ago
汪云昊	26b564f0be	FTP 文件编码类型	5 years ago