i3plus-pojo

Commit Graph

Author	SHA1	Message	Date
钮海涛	7b83f8fa50	新增aps序列化id	5 years ago
汪云昊	a4ba058ee3	表单查询条件 Rest是适配器 requestBody	5 years ago
曾贞一	6e70e3257b	【2009 天津麦格纳WMS-报表-库位利用率】	5 years ago
曾贞一	faf8cced03	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
曾贞一	4346eb647b	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
曾贞一	31c26017c1	【2009 天津麦格纳WMS-报表-库位利用率】	5 years ago
王杰	215ffc080b	ptl	5 years ago
钮海涛	5643f1aab4	Merge remote-tracking branch 'origin/test' into test	5 years ago
陈思洁	76b96540ca	【1926 盲检工步】	5 years ago
陈思洁	dda5a4c7e9	【合并冲突】	5 years ago
陈思洁	55de940f7c	【1926 盲检工步】	5 years ago
陈思洁	bbef19ed71	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	f6cd0b6b0b	【8685 05 2.3.3.6 队列条码打印-管理端-查、打印】	5 years ago
wynne1005	85f99fcdfa	提测还原pom	5 years ago
wynne1005	b43317c11a	还原pom	5 years ago
wynne1005	5f80cc4322	Merge branch 'dev' into test	5 years ago
wynne1005	ca080002a1	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
钮海涛	dea25ce166	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
钮海涛	3a40d278ac	修复平台登录问题	5 years ago
陈思洁	759cb39827	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	260899368d	【8685 05 2.3.3.6 队列条码打印-管理端-查、打印】	5 years ago
wynne1005	aa5c13dde1	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
钮海涛	2e434bc859	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
钮海涛	5610e5a455	完成SWEB任务	5 years ago
王杰	5ccc6c4408	andon	5 years ago
puxiao.liao	47a7a0a9a3	BH 需求报表的修改	5 years ago
袁津哲	00f07acd45	Fix Bug #1916,1917	5 years ago
wynne1005	2d69c3ab18	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
wynne1005	6b9d56f9e0	自测修改	5 years ago
joke.wang	00ca9bef40	Finish Task #1960 Cost:16h	5 years ago
宋军超	56dec41ad0	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
宋军超	f5074fba08	Finish Task #1898 Cost:16h	5 years ago
陈思洁	94c7526d65	【盲检工步】	5 years ago
puxiao.liao	7f76cf0ad3	BH 需求修改	5 years ago
陈思洁	4d4469ebc9	【合并冲突】	5 years ago
陈思洁	3848c6da14	【盲检工步】	5 years ago
宋军超	febbb549fc	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
宋军超	612d768999	Start Task #1932 Cost:5h Left:3h	5 years ago
qianhs	86f6fefd5b	BH-CODE 出库，绑定	5 years ago
钮海涛	d0eea0eb9a	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
钮海涛	470bceac6a	Start Task #1973 Cost:2h Start Task #1971 Cost:2h Start Task #1970 Cost:2h Effort Task #1968 Cost:4h	5 years ago
钮海涛	7286ce7ebb	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
钮海涛	f7c42ee90d	Start Task #1973 Cost:2h Start Task #1971 Cost:2h Start Task #1970 Cost:2h	5 years ago
joke.wang	ca0b92aa6a	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
joke.wang	a8241a1694	Start Task #1960 Cost:8h Left:8h	5 years ago
puxiao.liao	1b84b3aeee	Fix bug#8637,8697	5 years ago
宋军超	4d2f200677	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
宋军超	a47eb08a8e	Start Task #1934 Cost:8h Left:8h	5 years ago
袁津哲	399c9c828e	Fix Bug #1916,1917	5 years ago
袁津哲	271e7264a4	Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java	5 years ago
袁津哲	31bd8754df	Fix Bug #1916,1917	5 years ago
宋军超	6f1bba9997	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
宋军超	c2a5a17379	工步参数添加工步弹框参数字段	5 years ago
王杰	b0b276ba66	[任务：1938]	5 years ago
joke.wang	342e5f7ab2	Effort Task #1915 Cost:2h Left:0h	5 years ago
wynne1005	8ef3997038	还原pom	5 years ago
wynne1005	4150543cb4	Effort Task #1940 Cost:16h Left:8h	5 years ago
袁津哲	f4ff8205f6	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
袁津哲	a4bedf2354	Fix Bug #1916,1917	5 years ago
钮海涛	f1a6f66ccb	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
钮海涛	15a3d95c61	Start Task #1968 Cost:3h	5 years ago
puxiao.liao	b5aa990ea7	Fix bug#8633	5 years ago
钮海涛	bbde1ebc9c	Merge branch 'dev' into test	5 years ago
钮海涛	4d26c95639	Merge branch 'test' into dev	5 years ago
陈思洁	3d0524ec1f	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	a6ba3b6a5c	【8671 客户JIT队列，自动定时JOB-生成数据错误】	5 years ago
puxiao.liao	7353b79b9c	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
puxiao.liao	944b400f1e	Fix bug#8679	5 years ago
joke.wang	d4f0ef157a	Finish Task #1915 Cost:8h	5 years ago
qianhs	fcbaffa2b7	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
qianhs	b474ef1266	Finish Task #1813 Cost:32h Finish Task #1814 Cost:32h Finish Task #1815 Cost:16h	5 years ago
宋军超	659b893903	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
宋军超	b05113f63c	Finish Task #1887 Cost:16h	5 years ago
钮海涛	47131ff13f	修复版本问题	5 years ago
钮海涛	043e71649a	bh子检测项新增检测大类	5 years ago
钮海涛	da21795f7f	Merge branch 'test' into dev	5 years ago
钮海涛	f392a13832	Merge remote-tracking branch 'remotes/origin/master' into test	5 years ago
钮海涛	d65d9a5a1d	Merge remote-tracking branch 'origin/test' into test	5 years ago
puxiao.liao	91688ddab5	BH 需求变更	5 years ago
puxiao.liao	8bca38a17d	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test Conflicts: modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java	5 years ago
puxiao.liao	e793667812	BH 需求变更	5 years ago
钮海涛	e2e48f31bd	bh子检测项新增检测大类	5 years ago
qianhs	5d32b43e51	BH-CODE 出库，绑定	5 years ago
钮海涛	f4cccf5c9b	修改微服务model接口	5 years ago
钮海涛	898f9a061d	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
钮海涛	81b5262a24	修改微服务model接口	5 years ago
袁津哲	37092cf2c5	Task1917、1916:开发关键件绑定、扭矩二合一(PF)、关键件绑定、扭矩二合一(DL)功能	5 years ago
袁津哲	d65a5a3784	Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java	5 years ago
袁津哲	44f313abc4	Task1917、1916:开发关键件绑定、扭矩二合一(PF)、关键件绑定、扭矩二合一(DL)功能	5 years ago
曾贞一	45b5812cb1	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
曾贞一	cf507fdb48	【BATCH录入检测值-需要变更】	5 years ago
宋军超	9eda1f67b7	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
宋军超	40672559e4	修改sonar--BUG类型问题	5 years ago
钮海涛	c344f017a9	修复sonar上的问题	5 years ago
钮海涛	52f3758cee	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
wynne1005	8955fd2f4d	mes提测还原pom	5 years ago
wynne1005	23754d3f18	mes提测还原pom	5 years ago
wynne1005	81753d3260	Merge branch 'dev' into test	5 years ago
wynne1005	81b554fc8b	Merge branch 'test'	5 years ago
wynne1005	0636daed51	Finish Task:1896 Cost:8h	5 years ago
陈思洁	677cc85360	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
陈思洁	b2384619d4	【1891 队列条码打印-管理端】	5 years ago
曾贞一	9e236a06a1	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
曾贞一	6fc4641033	【BATCH录入检测值-需要变更】	5 years ago
puxiao.liao	c2942b8a0d	BH 需求变更	5 years ago
puxiao.liao	583c750055	BH 需求变更	5 years ago
宋军超	fd9a2e6d15	Start Task #1887 Cost:8h Left:8h	5 years ago
puxiao.liao	4f56baadef	Merge remote-tracking branch 'origin/test' into test	5 years ago
钮海涛	71d936cc56	Merge remote-tracking branch 'origin/test' into test	5 years ago
钮海涛	b060ba97aa	修改BH同步JOB逻辑	5 years ago
puxiao.liao	75308c8989	BH 需求变更	5 years ago
puxiao.liao	1dc9276e9a	BH 需求变更	5 years ago
钮海涛	e91a6821bc	Merge remote-tracking branch 'origin/test' into test # Conflicts: # modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartCheckType.java	5 years ago
钮海涛	efc30f713f	修改BH同步JOB逻辑	5 years ago
曾贞一	627b417256	【BATCH录入检测值-需要变更】	5 years ago
曾贞一	765e0619ca	【BATCH录入检测值-需要变更】	5 years ago
puxiao.liao	8c3f81292c	BH 需求变更	5 years ago
puxiao.liao	c06fee639d	BH 需求变更	5 years ago
qianhs	17b27da539	BH-CODE 出库，绑定	5 years ago
王杰	074093a46d	[任务：1850 ，安灯流程设计]	5 years ago
曾贞一	33c0ab4015	【BATCH录入检测值-需要变更】	5 years ago
曾贞一	a4fdf07b4b	【BATCH录入检测值-需要变更】	5 years ago
曾贞一	470e4986a9	Merge remote-tracking branch 'origin/test' into test # Conflicts: # modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QmsCheckType.java # modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSn.java # modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/QmsCheckTypeRepository.java # modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSerialSnRepository.java	5 years ago
曾贞一	72817fca4a	【BATCH录入检测值-需要变更】	5 years ago
钮海涛	6d1c0bb46d	修改BH基础数据	5 years ago
钮海涛	ad79c9fd7b	修改BH基础数据	5 years ago
puxiao.liao	99955a70ff	bug7940【7940 推荐入库-未按最近距离推荐】	5 years ago
puxiao.liao	443486a8cf	BH 需求变更-增加产品条码信息	5 years ago
qianhs	f4c4b4a1f6	1,产品条码事务实体类提交	5 years ago
qianhs	1a018d4af5	1,产品条码事务实体类提交	5 years ago
joke.wang	dd179a6d89	Fix Bug #8636	5 years ago
joke.wang	1a72c16f14	Finish Task #1890 Cost:8h	5 years ago
wynne1005	b48ba8c481	Finish Task #1876 Cost:32h	5 years ago
wynne1005	8aef23e4ad	Finish Task #1876 edi webservice解析 Cost:32h	5 years ago
陈思洁	4d63f9817e	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
陈思洁	9b8342b7f5	【1865 客户JIT生产队列，自动下达定时JOB】	5 years ago
王杰	648d8662b5	[任务：1851 安灯升级配置变更]	5 years ago
钮海涛	999a415d27	修复版本问题	5 years ago
钮海涛	b9cbf9684b	Merge branch 'test' into dev	5 years ago
钮海涛	4921d55bda	修复版本问题	5 years ago
钮海涛	b303cf9a14	修复合并问题	5 years ago
钮海涛	a5a032debe	解决model生成数据库表问题	5 years ago
钮海涛	96fdbe0e07	Merge branch 'master' into test	5 years ago
puxiao.liao	491bc32325	Fix Bug#8345	5 years ago
贾文涛	a68475d3d0	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
贾文涛	a8efa90089	bug 7461,count时去掉distinct。Fix Bug #7461	5 years ago
钮海涛	27c62aa7d1	合并冲突	5 years ago
袁津哲	cad6b7ad89	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
袁津哲	e578cb882a	优化通用模板代码模糊查询功能	5 years ago
袁津哲	f50b76cd1f	Task1858:电枪枪头更换计数	5 years ago
陈思洁	5b167546e4	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	e42641855d	【8528 收货检验-图片上传】	5 years ago
wynne1005	608aa6be90	还原pom	5 years ago
wynne1005	99d3c9d721	提测合并还原pom	5 years ago
wynne1005	6dd2f12a2a	Merge branch 'dev' into test	5 years ago
wynne1005	5ef88c80c0	提测合并还原pom	5 years ago
王杰	56ae714283	【任务：1845，安灯】	5 years ago
wei.peng	6169542dbb	合并代码有代码丢失或者文件丢失请排查此处 Merge remote-tracking branch 'remotes/origin/dev' into test # Conflicts: # modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java	5 years ago
wei.peng	9ee8acae91	合并代码有代码丢失或者文件丢失请排查此处	5 years ago
wei.peng	f161270af8	版本发布	5 years ago
钮海涛	c0303cc247	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
钮海涛	281a2dccb5	新增零件自动采购单	5 years ago
王杰	8e94cbb8fa	pojo 序列号	5 years ago
袁津哲	8b63dea809	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
袁津哲	08b03c9eb8	Task1858:电枪枪头更换计数	5 years ago
钮海涛	8059342b8f	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
钮海涛	4ba0e6b264	自动生成采购订单功能	5 years ago
宋军超	8d2f6fb8d1	任务：【1842】-海纳川基础数据修改字段类型	5 years ago
钮海涛	8a2d54ce61	临时保存	5 years ago
曾贞一	e3accbf24e	【8441 收货回执打印功能完善】	5 years ago
曾贞一	d0e4af979e	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
曾贞一	6a28329d75	【8441 收货回执打印功能完善】	5 years ago
puxiao.liao	f8ccd0166e	BUG【8554】中航-工装初始化导入后，一个excel应该产生一笔事物，明细按物料分	5 years ago
袁津哲	e47f050ff3	优化通用导入工具类和导入逻辑	5 years ago
joke.wang	e2ce63a9cd	bug: [8533] plc数据类型改为枚举	5 years ago
钮海涛	6c7a88b962	bug:【8520】	5 years ago
joke.wang	88a0d6d02f	任务:[1828] 半成品绑定工步增加逻辑	5 years ago
宋军超	0ccadab4be	任务：【1842】-海纳川通用导入修改对应工具类、实体和model	5 years ago
陈思洁	8ab6e77620	【8528 收货检验-图片上传未开发】	5 years ago
宋军超	1f55c06368	任务：【1842】-海纳川通用导入添加对应工具类、实体和model	5 years ago
袁津哲	5d1c79ef13	Task1812:仓库健康度指标视图及相关指标自定义(#476 )	5 years ago
袁津哲	6e3da00fda	Task1812:仓库健康度指标视图及相关指标自定义(#476 )	5 years ago
陈思洁	7eb72ee5d1	【调试接口回传和同步】	5 years ago
袁津哲	3e65986585	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
袁津哲	0e2f50e562	Task1812:仓库健康度指标视图及相关指标自定义(#476 )	5 years ago
宋军超	9778561725	任务：【1842】-添加海纳川基础数据维护模块	5 years ago
陈思洁	a1c0b6ff26	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	1ea5b54052	【生成质检单增加是否让步字段】	5 years ago
joke.wang	b741b6950b	bug: [8516] 重新计算bug 1	5 years ago
王杰	786c442d55	解决冲突	5 years ago
宋军超	18e037da7f	任务：【1842】-添加海纳川基础数据的Repository	5 years ago
宋军超	af6b0ce0fd	任务：【1842】-添加海纳川5个基础数据模块的实体与枚举	5 years ago
joke.wang	0352980cde	bug: [8516] 重新计算bug修复	5 years ago
钮海涛	c1241bd6c5	修复版本问题	5 years ago
钮海涛	53a421b3b9	修复版本问题	5 years ago
钮海涛	5004f17037	修复版本问题	5 years ago
钮海涛	94e9b2ffec	Merge remote-tracking branch 'remotes/origin/master' into test	5 years ago
曾贞一	60dee04206	【8512 中航-BH检测结果管理-查询条件无效】	5 years ago
曾贞一	ecd888db6f	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
曾贞一	ec77182944	【BATCH录入检测值-查询优化】	5 years ago
王杰	029763feb1	pom	5 years ago
王杰	fc99ee8914	pojo 序列化	5 years ago
王杰	30fcf4f23f	pom冲突	5 years ago
王杰	716e1f7df1	Merge branch 'test' into dev	5 years ago
陈思洁	9cc193c12b	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
陈思洁	d2a31eac70	【1804 质检检测-来料检验功能】	5 years ago
qianhs	3ffa9d06fa	sweb pojo 序列化提交	5 years ago
汪云昊	069d477528	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
wei.peng	c288b54660	查询优化	5 years ago
宋军超	912ef81271	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
宋军超	373808e20d	任务：【1928】-添加检测单-检测类型枚举修改code描述	5 years ago
qianhs	8d61db5ed5	任务:1786,1787,1788,1789	5 years ago
joke.wang	25bd05348d	[serialVersionUID重复问题]	5 years ago
汪云昊	717f268c28	POJO版本号还原	5 years ago
汪云昊	8fe0244a20	POJO添加序列化id	5 years ago
钮海涛	281ef662b1	merge test	5 years ago
汪云昊	99b5048ef0	POJO添加序列化id	5 years ago
汪云昊	c27ebee3f9	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
汪云昊	7f2c372229	MDM POJO	5 years ago
汪云昊	9532489502	POJO添加序列化id	5 years ago
puxiao.liao	e74f3d6d99	BUG#8438【20011-- 六合一改数按钮逻辑错误，打开改数按钮时，输入数量后数量会累加在下方明细中并且让用户再次输入数量--0515】	5 years ago
qianhs	7778ce1afd	类序列号	5 years ago
袁津哲	44eef89b40	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
袁津哲	4b09d9fa8d	修改报错	5 years ago
qianhs	3462e33aac	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
qianhs	0e5bf3488b	盘点	5 years ago
袁津哲	486e655394	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
袁津哲	7b5736d717	Task1812:仓库健康度指标视图及相关指标自定义(#476 )	5 years ago
qianhs	c38757de19	盘点	5 years ago
钮海涛	8b022cc736	Merge remote-tracking branch 'origin/test' into test	5 years ago
钮海涛	f1d14c9e3a	bug:【8385】-报工事务查询联调报表查询功能。	5 years ago
wynne1005	a4551a746a	[优化] 修改DdlPackBean查询 -> 工厂代码可以是英文或中文	5 years ago
宋军超	dfce22d654	任务：【1928】-添加检测单-检测类型枚举	5 years ago
陈思洁	9865558af3	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
陈思洁	6fbfea417f	【1804 质检检测-来料检验功能】	5 years ago
汪云昊	e8ea5a3c90	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
汪云昊	d86cdfe4ff	OPC UA 优化	5 years ago
陈思洁	c0f5709bb2	【合并冲突】	5 years ago
陈思洁	aef8841223	【合并冲突】	5 years ago
陈思洁	60973a3ee0	【1804 质检检测-来料检验功能】	5 years ago
puxiao.liao	e9873905ef	Merge remote-tracking branch 'origin/test' into test	5 years ago
puxiao.liao	6b9b2e8dd2	BUG#8438【20011-- 六合一改数按钮逻辑错误，打开改数按钮时，输入数量后数量会累加在下方明细中并且让用户再次输入数量--0515】	5 years ago
贾文涛	c4510fb121	BUG #8485,修复数据权限-查询启用禁用无效	5 years ago
宋军超	00df3134b2	任务：【1829】-更新检测单和检测单明细实体	5 years ago
puxiao.liao	8d386caa71	1776 工装初始化-新增箱条码与库位匹配检查组件	5 years ago
puxiao.liao	8e8744d3db	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test Conflicts: modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java	5 years ago
puxiao.liao	e8dd3ab12f	8481 基础数据-库位-导入。导出报错,提示cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil$LOCATE_TYPE.descriptionOfValue(java.lang.String)	5 years ago
曾贞一	c85fd2eff0	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
曾贞一	24ea607718	【8441 收货回执打印功能完善】	5 years ago
wei.peng	5e00f3b2c3	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
wei.peng	3669fbb4a4	本地版本库雪崩,有问题请排查此版本	5 years ago
袁津哲	f81b26bc3c	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
joke.wang	de9c901a3b	[任务：1826 库存排程配置]	5 years ago
袁津哲	0ddd92e4f8	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
袁津哲	0bafa0de52	开发调试回显组件模板功能	5 years ago
joke.wang	222ba4f8a4	[任务：1825 plc增加默认属性字段]	5 years ago
王杰	a6e9b90026	pom	5 years ago
许心洁	7e4fe5f945	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
许心洁	5d9f37ee33	根据作业类型分组查询流程组件SQL ：兼容SQLserver数据库优化	5 years ago
钮海涛	34a3598508	bug:8385	5 years ago
宋军超	1f97be3078	添加检测结果报表（5个界面）	5 years ago
宋军超	1f5052d679	添加检测过程类型枚举	5 years ago
宋军超	82af372fc0	添加检测过程类型枚举	5 years ago
qianhs	8d6ffbb012	bug:8268;8267;8266;8265	5 years ago
王杰	de9017ca5c	冲突	5 years ago
王杰	eaecf4b4b7	pom	5 years ago
王杰	c68d49880c	Merge branch 'dev' into test	5 years ago
王杰	7d192b36a6	pom冲突	5 years ago
qianhs	eb7511c39e	bug:8268;8267;8266;8265	5 years ago
joke.wang	1fec97f0c1	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
joke.wang	24806b9e2e	[oee优化]	5 years ago
袁津哲	80e572f07d	开发回显组件模板管理功能和优化实体生成数据库脚本逻辑	5 years ago
宋军超	78ff224fe4	删除查询供应商	5 years ago
宋军超	79e90298ef	添加供应商查询	5 years ago
宋军超	98091426f2	修改实体	5 years ago
puxiao.liao	a748fbd2f7	8426 中航-报表中心-采购计划更改查询-查询条件无效	5 years ago
puxiao.liao	f765493696	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test Conflicts: modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java	5 years ago
puxiao.liao	70aeae21d3	8426 中航-报表中心-采购计划更改查询-查询条件无效	5 years ago
曾贞一	d43935f88a	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
曾贞一	7ac98ffbc6	【1797 天津麦格纳WMS-定制业务-VDA标签防错验证】	5 years ago
宋军超	f302b4d5f1	修改MES_检验单实体字段	5 years ago
宋军超	e7335bb632	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
宋军超	4f5f9777a2	修改实体与model字段	5 years ago
贾文涛	f7b3250d70	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
贾文涛	abbab6bda4	数据权限-工单模块检索添加数据权限功能	5 years ago
钮海涛	8ae8383e79	Merge remote-tracking branch 'origin/test' into test	5 years ago
钮海涛	23b06a53af	bug:8404	5 years ago
袁津哲	1a01c44f84	Merge remote-tracking branch 'origin/test' into test	5 years ago
袁津哲	1dad60b129	修改pojo表字段查询页面--添加字段的详细注释，页面查询添加【系统】查询条件Bug：8420	5 years ago
joke.wang	664bf80434	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
joke.wang	23d1762b5b	[bug: 8422 半成品标签打印bug]	5 years ago
钮海涛	da8b4db890	修复pom版本问题	5 years ago
宋军超	a1579a2484	添加过程检测报表model	5 years ago
宋军超	6d7d8de7b3	添加MES_检验单和MES_检验单明细的实体和枚举	5 years ago
宋军超	32de58277a	添加MES_检验单和MES_检验单明细的实体和枚举	5 years ago
宋军超	7ef769268d	添加MES_检验单和检验单明细实体与枚举	5 years ago
袁津哲	bbbdfae633	开发根据系统分类实体信息	5 years ago
许心洁	75be7d5078	任务#1744：全局替换自定义搜索功能	5 years ago
joke.wang	5fb7eecee0	[任务：1752 oee看板]	5 years ago
许心洁	ef6330675c	任务#1744：全局替换自定义搜索功能	5 years ago
贾文涛	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
puxiao.liao	9edfe18aec	【7565 收货分组功能要求。】bug7565	5 years ago
puxiao.liao	9ca00bee68	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
luweihao	d1d52ce389	Merge branch 'dev' into test	5 years ago
luweihao	8148b1654f	补上mes枚举	5 years ago
luweihao	16879a4f20	Merge branch 'dev' into test	5 years ago
陆卫豪	a65350bbf8	Merge branch 'dev' of chungui.zhou/i3plus-pojo into dev	5 years ago
luweihao	12579c7a14	还原pom	5 years ago
luweihao	b52bb02d73	task `1430` 工位扫描，产品信号监听，队列监听	5 years ago
zcg	416c2ceffc	【任务 1443 excel模板导入功能修改】	5 years ago
zcg	9388e3b4f2	【pojo 冲突提交】	5 years ago
puxiao.liao	0b1e812f7b	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
luweihao	679319635a	task `1430` 工位扫描，产品信号监听，队列监听	5 years ago
陈思洁	4fec84f810	【PTL_PLC配置表增加字段】	5 years ago
陆卫豪	60ab731ffd	Merge branch 'dev' of huasheng.qian/i3plus-pojo into dev	5 years ago
陆卫豪	d8d48bd913	Merge branch 'dev' of gragon.xu/i3plus-pojo into dev	5 years ago
joke lin	d4e1e854c5	[任务：1441 plc推送数据]	5 years ago
joke lin	5ec9c55784	Merge remote-tracking branch 'pojo/dev' into dev	5 years ago
qianhs	65572b34a0	【1432 工位扫描-ESOP展示组件开发，队列组件调整】【工位扫描-ESOP展示组件开发，队列组件调整】	5 years ago
王杰	999aae6fc0	解决冲突	5 years ago
王杰	78d7861b44	Merge branch 'test' of jhforever.wang/wangjie-i3plus-pojo into dev	5 years ago
王杰	4b8cd0da38	ptlpcn enum	5 years ago
wei.peng	262edb9fec	日志查询优化, Es Tool 添加聚合函数	5 years ago
puxiao.liao	8f584f250b	【7633 条码明细中，点击导出，日生产计划产生的条码无法被导出，界面上的导出应该是查到什么就导出什么，不需要再加其他额外的条件】bug7633	5 years ago
puxiao.liao	be479c2e76	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
许心洁	46273325d3	动态查询：新增isQuery字段用于控制是否可作为查询条件（BUG#7675）	5 years ago
许心洁	8a98efa9a6	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
许心洁	eaed7962ab	动态查询：工厂代码可以展示在表格中但是不能作为可选查询条件（BUG#7675）+ 3D仓库：库位和存储区新增修改的长宽高校验都去掉（BUG#7723）	5 years ago
zcg	bd82a0fba7	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
joke lin	6b9b44995e	Merge remote-tracking branch 'pojo/dev' into dev	5 years ago
曾贞一	38f1bd3b01	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
曾贞一	c0ce05e07c	【7648 在发运界面增加一个打开单据按钮】	5 years ago
曾贞一	2625c2cb0f	【修改 TSET-pom.xml】	5 years ago
puxiao.liao	4c0b2a1961	【 7603 单个零件标签打印功能修改。】bug7603	5 years ago
joke lin	4823660070	[任务：1435 计划管理]	5 years ago
汪云昊	f2ccb20095	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
汪云昊	a3ecc3132f	表单约束管理	5 years ago
王杰	80ca438ce3	test合并到dev解决pom冲突	5 years ago
王杰	d9e4ea8ea9	Merge branch 'test' into dev	5 years ago
王杰	8ace0c363d	ptl enum	5 years ago
宋军超	fd79008df6	ptl同步配置表添加是否区分工厂字段isIgnoreOrg	5 years ago
宋军超	d34f3b8215	2020-03-12/14:59 -- 数据清除定时任务出异常时，将异常信息存进数据库syncErrLog表中	5 years ago
钮海涛	669874cb9b	Merge branch 'dev' into test	5 years ago
许心洁	368986e9d8	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
许心洁	1d90195de6	3D仓库	5 years ago
曾贞一	5ebb5cbf20	【修改 TSET-pom.xml】	5 years ago
贾文涛	30722b130c	Merge branch 'test' of i3-IMPP/i3plus-pojo into master	5 years ago
王杰	068a0956db	解决冲突	5 years ago
王杰	b77d3065a4	Merge branch 'test' into dev	5 years ago
曾贞一	0368152e71	Merge branch 'dev' of puxiao.liao/i3plus-pojo-lpx into dev	5 years ago
曾贞一	4fcd7cbc3f	Merge branch 'dev' of joke.wang/joke-i3plus-pojo into dev	5 years ago
王杰	cd19bfb429	ptlpcn	5 years ago
汪云昊	e0bfb4c660	Merge branch 'dev' of yunhao.wang/i3plus-pojo into dev	5 years ago
汪云昊	a510196022	软删合同禁用启用功能	5 years ago
曾贞一	f16ac4a1d2	Merge branch 'dev' of gragon.xu/i3plus-pojo into dev	5 years ago
puxiao.liao	277d2c851c	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
joke lin	cb09776bdb	[任务：1435 计划管理]	5 years ago
陈思洁	102af98a75	【PTL_增加主任务编号字段和组内编号字段】	5 years ago
宋军超	ac4a8b0ab4	修改ptl数据清除功能	5 years ago
许心洁	d815ca9b12	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
许心洁	2c0ef55e85	解决动态查询BUG#7674,#7676+ 流程导入BUG#7682	5 years ago
wei.peng	d7c9647ca5	表格查询功能完成	5 years ago
陆卫豪	e43aee2e82	Merge branch 'dev' of joke.wang/joke-i3plus-pojo into dev	5 years ago
王杰	01c5bb59e1	Merge branch 'dev' into test	5 years ago
宋军超	4d701aa9c4	添加ptl数据删除定时任务	5 years ago
宋军超	5b17289c4f	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
puxiao.liao	61d3be19cb	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev Conflicts: modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java	5 years ago
puxiao.liao	0968cdc49e	【7601 发运单明细生成条码后，由于生成的客户条码不存在于条码表中。需要有一个界面可以查到这些条码，并且打印出来，目前的话如果生成那次的打印失败了，那就无法再次打印改条码。】BUG#7601 【7567 条码状态报表希望增加一个ASN组号查询按钮，不需要增加显示字段，只是希望可以按照ASN组号查询条码】bug#7567 【7520 盘点单主界面增加库区与零件号，可以从盘点范围里取，如果有多个库区或者多个零件号，则显示为空就行,查询框增加零件号与库区字段查询】bug#7520	5 years ago
zcg	5e78985247	【task 1436 工步-关键件绑定校验并转过程条码】解决冲突	5 years ago
zcg	7aecf9dcc0	【task 1436 工步-关键件绑定校验并转过程条码】	5 years ago
曾贞一	eefb472117	【7650 客户标签扫描】	5 years ago
曾贞一	a9c9915a4f	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
曾贞一	5cc5844e45	【库存条码实体-添加字段包装零件号】	5 years ago
joke lin	ccf2817788	[计划管理]	5 years ago
汪云昊	dd991b44fc	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
许心洁	3d3f134d7f	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
许心洁	c9f6f336af	动态查询：解决了BUG#7658,7660,7661,7663,7664 3D仓库：联调优化逻辑	5 years ago
曾贞一	0acf2dc0ae	Merge remote-tracking branch 'remotes/origin/dev' into test	5 years ago
钮海涛	35c1114230	Merge branch 'dev' of puxiao.liao/i3plus-pojo-lpx into dev	5 years ago
钮海涛	ca6e094271	Merge branch 'dev' of joke.wang/joke-i3plus-pojo into dev	5 years ago
luweihao	196e5c87a4	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
luweihao	00252caa0c	移动mespcn公用model	5 years ago
puxiao.liao	50d3de9b77	7600 二维码零件标签打印功能修改。 7565 收货分组功能要求。 7633 条码明细中，点击导出，日生产计划产生的条码无法被导出，界面上的导出应该是查到什么就导出什么，不需要再加其他额外的条件 7628 库存调整盘点时，扫描库位后的提示增加一个库位 7640 解冻扫描条码后的提示没有显示条码，冻结是有的。需要统一都显示 7536 没库存时领料与发运的提示修改为下列 7659 创建盘点单冻结条码时条码is_vaild=2 7617 出库单明细中的打印客户标签按钮，需要检测单据明细有没有提交，状态为创建的才可以打印，并且只能打印一次。 7652 在条码状态报表中增加组号字段显示，查询框也需要增加 7454 需要一个配料撤销（针对单个条码，而不是单据）的功能，已经配料的条码需要被撤回到仓库中，需要考虑各种库存移动单状态。 7631 在盘点明细中的盘点范围界面增加一个字段，把数据库中的src_order_no显示出来，字段取名为原始单号 7526 发运单接收时，在主表中增加一个字段，在讲单据信息写入数据库时，如果该单据条码中只存在一步法的零件号，则该字段需要在前台显示为一步法，如果存在两步法的零件号，则显示为两步法。 7617 出库单明细中的打印客户标签按钮，需要检测单据明细有没有提交，状态为创建的才可以打印，并且只能打印一次。	5 years ago
宋军超	380fded580	添加数据清理实体和死信数据定时任务	5 years ago
王杰	880d449dfb	Merge branch 'dev' into test	5 years ago
王杰	b10ddbc958	ptl enum	5 years ago
luweihao	005db6ac5b	Merge branch 'dev' into test	5 years ago
luweihao	4e70422bec	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
luweihao	7beaa515c8	task `1428` 作业流程	5 years ago
joke	531596d2d4	[mes: 49 JIT计划与管理]	5 years ago
王杰	e0a018b871	Merge branch 'dev' into test	5 years ago
qianhs	027470cb07	1,重试 2，流程优化	5 years ago
陈思洁	fcb56e09e5	【PTL_控制器反馈信号逻辑修改】	5 years ago
王杰	03874359ac	Merge branch 'dev' of adair.song/i3plus-pojo into dev	5 years ago
王杰	dd1e5778a9	ptl enum	5 years ago
宋军超	d156ffb85a	修改数据同步，添加死信数据界面	5 years ago
王杰	fa9c02705b	ptl enum	5 years ago
王杰	269d325549	ptl	5 years ago
王杰	cd8dea1814	ptl	5 years ago
Administrator	797f3b3433	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	5 years ago
许心洁	906576cb52	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
许心洁	1e0d88fb0e	动态查询：开窗和时间查询优化+3D仓库基础数据校验优化	5 years ago
钮海涛	de73821fc7	Merge branch 'dev' of puxiao.liao/i3plus-pojo-lpx into test	5 years ago
王杰	3fe76d1713	Merge branch 'dev' of joke.wang/joke-i3plus-pojo into dev	5 years ago
qianhs	0c85d7132b	1,回退代码	5 years ago
joke	a7e8e1095d	Merge remote-tracking branch 'i3plus-pojo/dev' into dev	5 years ago
joke	aa403e9691	[ptl-pcn:39 校验物料号]	5 years ago
qianhs	1fc4ae1ff9	1,回退代码	5 years ago
qianhs	d87f5653a9	1,任务呢管理 2，生成任务	5 years ago
王杰	68299bf421	Merge branch 'dev' of adair.song/i3plus-pojo into dev	5 years ago
宋军超	e15c2b6065	添加PTL数据同步功能	5 years ago
陈思洁	21c9af2007	【PTL_区段亮灯任务新增实体】	5 years ago
汪云昊	cb1e8d5310	任务检查校验优化 lac适配异常处理优化	5 years ago
王杰	1428b5f0aa	ptl	5 years ago
luweihao	9f95e97ec3	Merge branch 'test'	5 years ago
luweihao	7c77c90a3c	task 作业流程	5 years ago
曾贞一	9cc001fd17	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
曾贞一	fe72dc26d9	【 bug 7581 1.在同批次条码提示中增加一个库位。2.同批次按钮做全局变量属性'单库位'，'单人'，如果为'单库位'保持现在逻辑不变，如果为'单人'则显示当前用户责任区下所有同批次条码(不限制库位)】	5 years ago
luweihao	dd6007656c	Merge branch 'dev' into test	5 years ago
luweihao	23874d67e3	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
luweihao	4918707fc8	bug `7626` 开线管控-数据存入数据库错误	5 years ago
王杰	abb737f265	ptl	5 years ago
王杰	cde65d0e7a	Merge branch 'dev' of gragon.xu/i3plus-pojo into dev	5 years ago
王杰	cfaa7c38bc	Merge branch 'dev' of jessica.chen/i3plus-pojo into dev	5 years ago
王杰	37d032ca24	ptl反馈信息枚举	5 years ago
王杰	5610a25ab7	ptl反馈信息枚举	5 years ago
汪云昊	31a8a7705a	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
汪云昊	0471038b9b	sqlserver数据库适配	5 years ago
许心洁	df03827264	动态查询：注解enumName属性名称改为entityName	5 years ago
许心洁	a49b747c18	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
许心洁	cc98e84ba4	动态查询：增加开窗功能	5 years ago
陈思洁	83464294bb	【PTL_枚举引用修改】	5 years ago
宋军超	80d9852dd6	添加数据同步和定时任务功能	5 years ago
钮海涛	85dff1fde9	Merge remote-tracking branch 'origin/dev' into test	5 years ago
钮海涛	089a753be6	Merge branch 'dev' of huasheng.qian/i3plus-pojo into dev	5 years ago
王杰	e1d133de61	ptl enum	5 years ago
qianhs	83ed87a769	【盘点时，能否盘点待质检的条码，欧洲方面不需要对质检条码进行卡控】【bug7542】	5 years ago
曾贞一	145fcac065	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
曾贞一	767a9b98cd	【7568 PDA收货界面增加一个搜索框，让员工可以选择ASN单据收货】	5 years ago
王杰	8c334d2ffd	平台；	5 years ago
宋军超	96c5b35f83	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
王杰	0a0318d639	ptl	5 years ago
宋军超	51d666b5bc	开发PTL--PCN节点维护,同步配置和对象映射功能	5 years ago
luweihao	f67dd06cd4	Merge branch 'dev' into test	5 years ago
luweihao	5a5854e0b6	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
luweihao	5892f87bdc	task `1425` pcn pojo 迁移	5 years ago
王杰	34e76f59ce	ptl	5 years ago
王杰	3a88bd7a78	ptl	5 years ago
王杰	51ca581f29	ptl	5 years ago
王杰	b64872fc53	ptl	5 years ago
puxiao.liao	05d0a0a375	【 1423 拣货-更新FIFO推荐组件、更新FIFO检查组件】拣货-更新FIFO推荐组件、更新FIFO检查组件	5 years ago
王杰	644af42dfe	ptl enum	5 years ago
王杰	7d13140a33	ptltag	5 years ago
joke	ada46c9626	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
joke	d871869f3a	[ptl-pcn: 32 亮灯作业]	5 years ago
曾贞一	0a433f1ecf	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
曾贞一	453226d6ec	【7555 需要在条码状态报表中可以搜索保质期时间，查询在选中区间内过期的条码--修改按所有时间都可以查询出来】	5 years ago
陈思洁	0f9f3c31e6	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
陈思洁	1fd3cd3329	【PTL_增加主任务状态的枚举】	5 years ago
许心洁	309eea6f5d	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
许心洁	b8d7feb413	动态查询：添加固定查询条件：isValid，isDeleted + 给WmsLocate,WmsBom,WmsZones,WareHouse实体添加动态查询注解 + 字段无需区分工厂	5 years ago
joke	ccd62f8d31	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
joke	d212b5cd30	[ptl-pcn: 32 亮灯作业]	5 years ago
luweihao	6263c56c1d	Merge branch 'test'	5 years ago
luweihao	66f7121975	Merge branch 'dev' into test	5 years ago
陈思洁	d0cda06343	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
陈思洁	f8d4e7f1fd	【PTL_标签打印pojo新增】	5 years ago
许心洁	7e20104c52	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
钮海涛	377391abaf	修改导入导出进度明细。	5 years ago
许心洁	7ffb5d2c98	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
许心洁	632ad62c45	动态查询：查询类名需作为动态入参	5 years ago
曾贞一	1aec8a2f5f	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
曾贞一	a620828956	【7555 需要在条码状态报表中可以搜索保质期时间，查询在选中区间内过期的条码】	5 years ago
宋军超	d056a04403	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
宋军超	85f157c6a6	设置PTL_BOM中父物料描述默认值为1	5 years ago
陈思洁	720449cd09	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
陈思洁	faaf184e01	【PTL_增加主任务状态的枚举】	5 years ago
宋军超	2c06163f88	添加PTL_主任务明细实体	5 years ago
qianhs	d3c30fa9be	【盘点时，能否盘点待质检的条码，欧洲方面不需要对质检条码进行卡控】【bug7542】	5 years ago
luweihao	b0d214f204	Merge branch 'test'	5 years ago
luweihao	51152656cc	Merge branch 'dev' into test	5 years ago
luweihao	a0a9e6b7b3	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
luweihao	e2d63434db	bug `7570` `7561` 生产扣减代码去除测试代码	5 years ago
joke	3c408dd194	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
joke	ab9e9a8638	解决冲突	5 years ago
王杰	35efadd243	ptl枚举	5 years ago
joke	6964d4cf4e	[ptl-pcn: 32 亮灯作业]	5 years ago
陈思洁	686012563f	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
陈思洁	40094365ce	【PTL_区段亮灯任务明细状态】	5 years ago
joke	f362f9931f	[ptl:32 亮灯作业]	5 years ago
joke	c73cd26574	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
joke	f01b3664c2	[ptl: 32 亮灯作业程序]	5 years ago
宋军超	464c8b68cc	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
宋军超	d56756e9e5	添加主任务、区域、区段枚举	5 years ago
陈思洁	e4ba6e21c8	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
宋军超	cac0f91150	添加BOM中父物料描述默认值	5 years ago
陈思洁	728f46b43d	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
陈思洁	2c305e0ca6	【修改枚举类名大写（部分）】	5 years ago
许心洁	2a09c009f3	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
宋军超	0fe0abff63	新增区域、区段、标签控制器、标签信息、BOM和物料基础数据	5 years ago
宋军超	896bd9b35b	添加基础数据枚举	5 years ago
宋军超	60ad38649d	新增区域、区段、标签控制器、标签信息、BOM和物料基础数据	5 years ago
luweihao	43a471d996	修改ptl项目pom	5 years ago
王杰	7662905caa	Merge branch 'test'	5 years ago
王杰	b516ca254c	解决冲突	5 years ago
王杰	39a454f89b	ptl	5 years ago
luweihao	1f4e7c5d45	Merge branch 'dev' into test	5 years ago
luweihao	b556051295	task 修改监控类位置	5 years ago
luweihao	246dd85721	Merge branch 'dev' into test	5 years ago
陈思洁	658885ade5	合并冲突	5 years ago
陈思洁	1e431aef58	【1418 新增固化看板】	5 years ago
许心洁	55e3f212ce	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
许心洁	7f161e3bae	3D可视化仓库	5 years ago
jenkins	1ada447069	Jenkins自动合并	5 years ago
luweihao	1b727f1721	task 任务重试测试	5 years ago
luweihao	68cbd54f37	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
luweihao	5fd51f6b1d	task 任务重试测试	5 years ago
qianhs	91b43823c9	【日生产计划生成的条码在条码打印界面只能补打，不能打印】【bug7514】	5 years ago
puxiao.liao	58fe5f61d8	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
puxiao.liao	53a2152ff1	【 7531 在网页的条码打印界面增加一个按钮，可以修改部分条码数量，修改条件，库位为空，库区有值，条码状态为待入库。此部分条码为日生产计划生成的条码。】bug7531	5 years ago
joke	d42b7ebbb6	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
joke	2b84f93950	任务: 1424 DT通信	5 years ago
jenkins	b56d9cb824	Jenkins自动合并	5 years ago
陈思洁	970d8a3506	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
陈思洁	c40d3360d3	【1416 新增固化时间维护】	5 years ago
汪云昊	c4149a2d11	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
luweihao	be2f1cb146	Merge branch 'dev' into test	5 years ago
luweihao	5eb7cf03ed	task 数据同步添加错误信息字段	5 years ago
jenkins	9f0a0852e7	Jenkins自动合并	5 years ago
puxiao.liao	709db0b573	【 7526 发运单接收时，在主表中增加一个字段，在讲单据信息写入数据库时，如果该单据条码中只存在一步法的零件号，则该字段需要在前台显示为一步法，如果存在两步法的零件号，则显示为两步法。】bug7526	5 years ago
jenkins	1ee4a53d64	Jenkins自动合并	5 years ago
puxiao.liao	f2586f846a	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
puxiao.liao	37ee72adaf	【 7523 条码拆箱功能输入数量时，此处提示改为“扫描成功，请输入新条码数量” 】bug7523	5 years ago
jenkins	9fc85191fe	Jenkins自动合并	5 years ago
王杰	748ef11ccf	ptl-pcn标签控制器枚举	5 years ago
puxiao.liao	759fda55b9	【 7527 1.推荐入库（推荐生产入库），如果扫描加密码错，报错有问题，2.如果扫描库位时，检查条码某项条件不符合入库规范则需要回到请扫描条码那一步。】bug7527	5 years ago
luweihao	03a139e435	Merge branch 'dev' into test	5 years ago
luweihao	e38839db6c	task `1408` 数据同步修改	5 years ago
jenkins	499a5ed894	Jenkins自动合并	5 years ago
luweihao	846001c7a9	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
luweihao	1a2f00afc3	task `1408` 添加数据同步存储	5 years ago
luweihao	1ec56edcdc	task `1295` mes添加索引	5 years ago
汪云昊	f7d6192794	资源唯一校验调整为key+languageCode+softType	5 years ago
jenkins	ec0b3528f4	Jenkins自动合并	5 years ago
qianhs	243c38793b	【日生产计划生成的条码在条码打印界面只能补打，不能打印】【bug7514】	5 years ago
jenkins	1e2029fbbb	Jenkins自动合并	5 years ago
luweihao	0d212df73a	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
luweihao	b6477202e7	新增枚举调用类	5 years ago
jenkins	83a9b74c43	Jenkins自动合并	5 years ago
汪云昊	6d1d41a4a7	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
jenkins	7decc606cb	Jenkins自动合并	5 years ago
luweihao	5afcf20a9e	ptlpcn 添加界面信号枚举	5 years ago
汪云昊	05d6f132ce	表单拾取任务检查功能优化	5 years ago
luweihao	f358c13b04	ptl迁移4	5 years ago
jenkins	0961a7ce14	Jenkins自动合并	5 years ago
qianhs	9fe977e8c0	【日生产计划生成的条码在条码打印界面只能补打，不能打印】【bug7514】	5 years ago
jenkins	106703a2be	Jenkins自动合并	5 years ago
qianhs	8477526bf5	【日生产计划生成的条码在条码打印界面只能补打，不能打印】【bug7514】	5 years ago
jenkins	a9d94ecff7	Jenkins自动合并	5 years ago
luweihao	bbfcdfdd64	ptl pojo 提交	5 years ago
luweihao	717b72e086	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
luweihao	bc007c3d2b	pojo提交	5 years ago
jenkins	6a91ce5c50	Jenkins自动合并	5 years ago
qianhs	8a9c8273d8	【发运流程 20300， 20390 没有往 ref_item 字段填写对应的值】【bug7506】	5 years ago
jenkins	1a2b706e24	Jenkins自动合并	5 years ago
luweihao	a2bf78c87e	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
luweihao	3bed5974f6	ptl pojo init	5 years ago
luweihao	73af305576	迁移20200213 2	5 years ago
jenkins	594577cc69	Jenkins自动合并	5 years ago
汪云昊	821d69bd06	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
汪云昊	8093290bad	lac任务检查	5 years ago
puxiao.liao	901623b254	【 7510 领料，发运一步法做完之后在单据子表详情中条码状态任然为待处理。】bug7510	5 years ago
jenkins	218899aae9	Jenkins自动合并	5 years ago
汪云昊	4708f43149	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
puxiao.liao	f9cb6be454	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
puxiao.liao	54b167256f	【 7510 领料，发运一步法做完之后在单据子表详情中条码状态任然为待处理。】bug7510	5 years ago
jenkins	67a016b261	Jenkins自动合并	5 years ago
luweihao	d750a88aad	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
luweihao	1c144eca4d	移除mespcn乐观锁	5 years ago
jenkins	f8fa1cd957	Jenkins自动合并	5 years ago
qianhs	9c754e5816	【发运流程 20300， 20390 没有往 ref_item 字段填写对应的值】【bug7506】	5 years ago
jenkins	26fd59e5c7	Jenkins自动合并	5 years ago
puxiao.liao	96e0e3756f	【 7507 发运单接收接口新增字段】bug7507	5 years ago
jenkins	24d834cd6d	Jenkins自动合并	5 years ago
qianhs	e1114d67d2	【静态盘点解冻调差时，如果勾选了所有盘点单，现在需要一个单子一个单子点击确认调差，需要在点击时将所有盘点单的调差范围都显示出来，然后一次性调差所有功能】【bug7485】	5 years ago
jenkins	7c422cad79	Jenkins自动合并	5 years ago
qianhs	591f865bf3	【成品打印需要带出客户零件号，先用单据所属的客户发往地+零件号去WMS_CUSTOMER_PART表中找客户零件号，如果找不到再用客户+零件号去找。】【bug7501】	5 years ago
jenkins	335c725bca	Jenkins自动合并	5 years ago
qianhs	4ccda48061	【 PDA所有流程中，扫描后默认提示的组件去除】【bug7409】	5 years ago
jenkins	af860ff688	Jenkins自动合并	5 years ago
钮海涛	03de37cf7c	修改导入导出进度明细。	5 years ago
钮海涛	4583b87bf5	添加导入导出进度明细。	5 years ago
jenkins	8c5020b098	Jenkins自动合并	5 years ago
曾贞一	9607c91582	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
曾贞一	44648e4218	【1396 亚太-领料任务明细看板】	5 years ago
jenkins	f45a0d69b0	Jenkins自动合并	5 years ago
jokelone	af31ba4884	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
jokelone	54cd3cfc45	业务表增加唯一索引	5 years ago
钮海涛	e1225bbccd	添加执行命令组进度明细。	5 years ago
王杰	01e896a752	Merge branch 'dev' into test	5 years ago
曾贞一	60ab897195	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
曾贞一	e14e813230	【7476 发运的新老标签对应报表】	5 years ago
luweihao	d601ef9a32	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
luweihao	acc907dd28	task `1295` mes添加索引	5 years ago
jenkins	27b1f5ca21	Jenkins自动合并	5 years ago
qianhs	22eaa30dab	【收货时，如果多收了零件号，点击重置后再扫描单号，该零件号明细无法显示在下方提示中。】【bug7423】	5 years ago
汪云昊	0bd38e8e9a	打印模板查询优化	5 years ago
王杰	cd93680349	Merge branch 'dev' into test	5 years ago
jokelone	799b691aaf	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
jokelone	5fc59129bd	【mes-pojo 继承Serializable】	5 years ago
luweihao	5f25e311bb	mes-pcn pojo添加serializable	5 years ago
luweihao	6b66c15c72	Merge branch 'dev' into test	5 years ago
luweihao	ab3ad4c2d5	task 去除生产数据注解	5 years ago
luweihao	b27bbb6158	Merge branch 'dev' into test	5 years ago
王杰	3f77135a17	枚举	5 years ago
jenkins	138b2cf7b7	Jenkins自动合并	5 years ago
jokelone	2d807ea47a	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
jokelone	30cb7f7b9d	工单类型去除JIT类型	5 years ago
jenkins	1ae61084c5	Jenkins自动合并	5 years ago
曾贞一	c075875f28	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
曾贞一	415ae5a45b	【7457 1.发运时，如果是两步发运，客户标签打印后，在做第二步发运出库时，需要扫描已经绑定的客户标签。】	5 years ago
jenkins	770d7175aa	Jenkins自动合并	5 years ago
钮海涛	cf203390b8	修正时间段编辑类型	5 years ago
jenkins	6e545a7ec1	Jenkins自动合并	5 years ago
袁津哲	db6522fba3	优化动态搜索与自定义列表代码	5 years ago
luweihao	2c6a4464c3	Merge branch 'dev' into test	5 years ago
luweihao	667847afe7	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
luweihao	d3c817529f	task `1408` 生产数据结构化	5 years ago
jenkins	521973a2f5	Jenkins自动合并	5 years ago
zcg	db3b06071d	【枚举修改】	5 years ago
zcg	8a04ca4e3d	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
zcg	bc1825fd35	【mes枚举修改，mesModel修改,pcn枚举修改】	5 years ago
luweihao	503f528e78	Merge branch 'dev' into test	5 years ago
luweihao	a094473333	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
luweihao	4ae13f8270	task `1408` 生产数据结构化	5 years ago
jenkins	cf44b8866a	Jenkins自动合并	5 years ago
钮海涛	9e0158e749	修改test分支POM配置	5 years ago
jenkins	c90df4e96a	Jenkins自动合并	5 years ago
许心洁	28ce8615fd	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
许心洁	51d60a107a	SAP指令锁定逻辑修改：根据单号查询(之前：任务明细;现在：单据明细)获取行号记录到sap_order_lock表；原因：SAP要的是单据的行号，任务明细可能是单据明细的拆分或者合并所得，行号不一定准；	5 years ago
jenkins	f927ee21ac	Jenkins自动合并	5 years ago
王杰	bf71cd07d0	JIS发运	5 years ago
jenkins	7e6f83a974	Jenkins自动合并	5 years ago
陈思洁	babc158ed6	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
陈思洁	5feae0dd1a	【1405 物流路线在物品分类及仓库级别的应用】	5 years ago
陈思洁	09339a6e1f	【1405 物流路线在物品分类及仓库级别的应用】	5 years ago
jenkins	a3823f4a16	Jenkins自动合并	5 years ago
袁津哲	2d30f2da0f	Wms动态搜索与自定义列表，表单开发	5 years ago
wei.peng	b199c5995f	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-ics into test # Conflicts: # modules/i3plus-ics-console/src/main/resources/application.properties # modules/i3plus-ics-gateway/src/main/resources/application.properties # modules/i3plus-ics-regist/src/main/resources/application.properties	5 years ago
jenkins	134757c92b	Jenkins自动合并	5 years ago
wei.peng	32d715a29c	APS 调用失败bug 修复动态报表下拉问题修复	5 years ago
宋军超	964afe73cd	2020-01-16 16:42 添加自定义列枚举	5 years ago
宋军超	ed5a3b5acd	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
宋军超	851067b8d2	2020-01-16 16:37 自定义列表优化	5 years ago
jenkins	d790bcf355	Jenkins自动合并	5 years ago
luweihao	4275e1d537	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
luweihao	6ec43ea151	task `1392` 修正索引	5 years ago
袁津哲	67ef5c5516	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
袁津哲	89a7cafee4	Wms动态搜索与自定义列表，表单开发	5 years ago
luweihao	85675cdad6	Merge branch 'dev' into test	5 years ago
luweihao	88d1e39578	压测计时	5 years ago
jenkins	33e68b7e9f	Jenkins自动合并	5 years ago
wei.peng	cb68f62e46	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
wei.peng	8a4974f369	自定义报表调用调整	5 years ago
jenkins	6371e8df60	Jenkins自动合并	5 years ago
袁津哲	f7c98e3982	Wms动态搜索与自定义列表，表单开发	5 years ago
jenkins	a19cace3b1	Jenkins自动合并	5 years ago
puxiao.liao	86b73d43f9	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
jenkins	6f82fa17fd	Jenkins自动合并	5 years ago
许心洁	889c6ac548	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
许心洁	7f7c9ebf6e	SAP指令锁定组件逻辑修改：若根据单据号查询到了记录则不再新增了，并且调用此组件时缓存中一定得存在ORDER_NO; 定时重推待处理移动单入JOB容错结构修改+留个SWAGGER接口	5 years ago
qianhs	a1ec8d7293	【盘点--调差后库存对不上(C202001070020，C202001070021)】【bug7314 】	5 years ago
jenkins	da70df25ac	Jenkins自动合并	5 years ago
puxiao.liao	347197f305	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
puxiao.liao	b64327831a	【 7402 收货回执界面，查询条件增加一个ASN组号，显示列表中也增加一个ASN组号】bug7402	5 years ago
jokelone	3f0646403f	【bug：7408报表优化1】	5 years ago
王杰	2f5b9954d0	Merge branch 'dev' into test	5 years ago
jokelone	68e7dc8906	【bug：7408报表优化】	5 years ago
luweihao	55fad978a6	Merge branch 'dev' into test	5 years ago
钮海涛	9e34d99d9e	修复资源甘特图拖拽问题	5 years ago
jenkins	69ff58a67e	Jenkins自动合并	5 years ago
qianhs	61303a9f38	【盘点--调差后库存对不上(C202001070020，C202001070021)】【bug7314 】	5 years ago
jenkins	002ce795f4	Jenkins自动合并	5 years ago
luweihao	01a694be70	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
luweihao	6baeeee71e	task `1392` 调整工步错误处理实现	5 years ago
jenkins	458137d216	Jenkins自动合并	5 years ago
许心洁	c2ba0a5663	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
许心洁	fff79a7846	GROUP_COMMIT_MODE枚举漏提交	5 years ago
jenkins	e967001c75	Jenkins自动合并	5 years ago
许心洁	cb7f868d64	任务#1403 流程isCommitRefMove属性改为commitMode	5 years ago
许心洁	0e54d9a5b6	任务#1403 流程isCommitRefMove属性改为commitMode	5 years ago
袁津哲	ad8e51dfae	Wms动态搜索与自定义列表，表单开发	5 years ago
jenkins	c1609539cf	Jenkins自动合并	5 years ago
许心洁	8eb74cef4d	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
jokelone	8c0b298cfe	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
jokelone	fd1a0ebdb8	【任务：1404 过程质量检查项类型分组展示】	5 years ago
许心洁	de0d57179c	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
许心洁	35839db806	BUG#7359 任务列表分组字段和移动单赋值逻辑更改	5 years ago
jenkins	006fd3aef3	Jenkins自动合并	5 years ago
曾贞一	3a9e719005	【vda收货时，是否分组提交】	5 years ago
jenkins	8f6b53c5ea	Jenkins自动合并	5 years ago
wei.peng	3e31641b20	PTL 项目初始化 PTL PCN 项目初始化	5 years ago
wei.peng	e1dd7c3cdd	PTL 项目初始化	5 years ago
jenkins	274011537c	Jenkins自动合并	5 years ago
luweihao	325399127e	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
luweihao	28587fbb98	task `1392` 调整工步错误处理实现	5 years ago
qianhs	f1afdf92e9	【盘点--调差后库存对不上(C202001070020，C202001070021)】【bug7314 】	5 years ago
jenkins	24f9ed25c2	Jenkins自动合并	5 years ago
qianhs	9d744318cd	【盘点--调差后库存对不上(C202001070020，C202001070021)】【bug7314 】	5 years ago
jenkins	a0b67a3723	Jenkins自动合并	5 years ago
袁津哲	8285c87624	Wms动态搜索与自定义列表，表单开发	5 years ago
jokelone	2d8b55b61a	【现场优化：59 过程质量】	5 years ago
jokelone	64f4486924	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
jokelone	8ef70ed627	【现场优化：59 过程质量优化】	5 years ago
jenkins	16a414192f	Jenkins自动合并	5 years ago
曾贞一	c543043da5	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
曾贞一	328f2e64c5	【同批次修改】	5 years ago
qianhs	2eb14492d4	【盘点--调差后库存对不上(C202001070020，C202001070021)】【bug7314 】	5 years ago
jenkins	7057c685cc	Jenkins自动合并	5 years ago
zcg	2396863bab	【任务:1383 数据监听定时数据抓取】	5 years ago
E	c7a2c79f26	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
jenkins	64438ac61c	Jenkins自动合并	5 years ago
qianhs	41047a17c1	【盘点--调差后库存对不上(C202001070020，C202001070021)】【bug7314 】	5 years ago
jenkins	8e168c5109	Jenkins自动合并	5 years ago
袁津哲	ff4cd68e89	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
袁津哲	c2e66de638	Wms动态搜索与自定义列表，表单开发	5 years ago
袁津哲	86694d3ceb	Wms动态搜索与自定义列表，表单开发	5 years ago
wei.peng	503f3cd7a3	自定义表单功能优化	5 years ago
曾贞一	582115f999	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
曾贞一	5c841c706b	【7201 收货BOP移库流程图】	5 years ago
jenkins	e88b93a22c	Jenkins自动合并	5 years ago
gcj	8245950fd3	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
gcj	51c66e9279	【宁德问题清单】	5 years ago
jenkins	8d614aef8d	Jenkins自动合并	5 years ago
陈思洁	1e0a0ff4fc	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
陈思洁	c24de431d4	【6853 数据迁移：产品报工明细表、产品发运表、产品入库表。定期迁移。】	5 years ago
曾贞一	c3ad3d260a	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
曾贞一	3d7f88d2ee	【7201 收货BOP移库流程图】	5 years ago
gcj	8414af2011	【按规则推送邮件】	5 years ago
gcj	890b094e15	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
gcj	7090f30b94	【按规则推送邮件】	5 years ago
jenkins	782574c73d	Jenkins自动合并	5 years ago
袁津哲	29220002b1	Wms动态搜索与自定义列表，表单开发	5 years ago
jenkins	56e53906ec	Jenkins自动合并	5 years ago
袁津哲	73e8287e1f	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
袁津哲	cf92fb2b23	Wms动态搜索与自定义列表，表单开发	5 years ago
jokelone	f1096e9ec5	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
jokelone	51839d7be5	【任务：1381】	5 years ago
zcg	0a8385495e	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
zcg	add40a27e3	【任务：1382，数据监听基础模块开发】	5 years ago
qianhs	241350ae83	【盘点--调差后库存对不上(C202001070020，C202001070021)】【bug7314 】	5 years ago
E	0cc70fe2d0	【#1390 基础数据-客户信息增加导入功能】	5 years ago
jenkins	b71be613fc	Jenkins自动合并	5 years ago
WYnneaoapc	ded27853a8	task 修改生产数据	5 years ago
jenkins	3db9a86504	Jenkins自动合并	5 years ago
袁津哲	fc19275ef0	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
袁津哲	4e0f40042a	Wms动态搜索与自定义列表，表单开发	5 years ago
陈思洁	b0065bd650	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
陈思洁	fa576d7a6d	【6847 开发执行异常的预警报表。存在处理异常数据时，提供报表展示。盘点前所有异常数据均需处理完成】	5 years ago
王杰	031d57e081	JIS	5 years ago
jenkins	ebcde1d16b	Jenkins自动合并	5 years ago
jokelone	c905343349	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
jokelone	0a70a42336	【任务：1381 兼容Sql server】	5 years ago
许心洁	46b8c6babb	Merge branches 'master' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo	5 years ago
jenkins	fe71007a5c	Jenkins自动合并	5 years ago
袁津哲	42bbb852c4	Wms初始化扫描实体字段新增逻辑优化	5 years ago
汪云昊	536200cf2b	Merge remote-tracking branch 'remotes/origin/dev' into test	5 years ago
袁津哲	2f2f24356c	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
袁津哲	daf3365ce3	Wms初始化扫描实体字段新增逻辑优化	5 years ago
gcj	cbe87c6bd7	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
gcj	c14d6c6916	【宁德问题清单】	5 years ago
宋军超	d05fd542b3	2020-01-08添加列表菜单与对应和关系逻辑	5 years ago
袁津哲	e5138ac4e9	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
袁津哲	e1386275d0	Wms初始化扫描实体字段新增逻辑优化	5 years ago
宋军超	b9f3ea144f	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
宋军超	bca93691ba	2020-01-08添加列表菜单与对应和关系逻辑	5 years ago
陈思洁	99f79ee5db	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
陈思洁	25606ea25a	【6847 开发执行异常的预警报表。存在处理异常数据时，提供报表展示。盘点前所有异常数据均需处理完成】	5 years ago
袁津哲	29f785ed35	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
袁津哲	7d4ba10449	Wms初始化扫描实体字段新增逻辑优化	5 years ago
jenkins	ae8475de5d	Jenkins自动合并	5 years ago
许心洁	2f90982e68	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
许心洁	c53c8c04e3	BUG#7186	5 years ago
jenkins	852be5a130	Jenkins自动合并	5 years ago
袁津哲	76b5087e60	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
袁津哲	f323637c94	Wms初始化扫描实体字段新增逻辑优化	5 years ago
jenkins	b0bbf43a9b	Jenkins自动合并	5 years ago
宋军超	5a24a08c00	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
宋军超	b0f60a9176	2020-01-08创建动态列表与查询model	5 years ago
钮海涛	68fc275565	修复资源甘特图拖拽问题	5 years ago
jenkins	75dc17f4c4	Jenkins自动合并	5 years ago
jokelone	d0cd9d03b9	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
jokelone	0d7aca73a8	【需求：7315 生产工单变更】	5 years ago
王杰	54bdf8f6a0	JIS	5 years ago
e-jiawentao1	7b696d7e73	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
e-jiawentao1	a92090a3ab	2020-01-07创建动态查询与表单各层	5 years ago
e-jiawentao1	c51453a856	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
e-jiawentao1	9fbc120666	动态搜索与自定义列表初始化扫描Bean字段	5 years ago
jenkins	54d6d1f340	Jenkins自动合并	5 years ago
WYnneaoapc	b1d030e0dd	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
jenkins	189bece3f7	Jenkins自动合并	5 years ago
e-jiawentao1	b2edab4ef4	2020-01-07创建动态查询与表单dao	5 years ago
e-jiawentao1	1dba90f768	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
e-jiawentao1	b939ce6625	2020-01-07创建动态查询实体	5 years ago
王杰	685d7949bf	Merge branch 'dev' into test	5 years ago
zcg	d8f6a5273c	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
许心洁	a2041a4900	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
许心洁	7d63a933c0	生产报工JOB出错没有更新状态+流程修改初始化组件没有重新加载组件+流程管家：加上可设置是否提交逻辑	5 years ago
zcg	b84a305b26	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
jenkins	497b963f60	Jenkins自动合并	5 years ago
王杰	bf62494236	JIS	5 years ago
jenkins	fa4cc8610f	Jenkins自动合并	5 years ago
puxiao.liao	8584946ce5	【条码状态报表，导出时下列三个字段为中文】bug7196	5 years ago
WYnneaoapc	a9f2cf2501	task 1309 大数据检索	5 years ago
zcg	c86f3e280e	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
王杰	0a0124cd2b	Merge branch 'dev' into test	5 years ago
jokelone	c3a7e0057b	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
jokelone	fea1811191	【bug：7153 JIT排序】	5 years ago
王杰	4f8898d57a	Merge branch 'dev' into test	5 years ago
王杰	bcec1d7e62	JIS	5 years ago
王杰	f88041df1e	Merge branch 'dev' into test	5 years ago
王杰	3fe50125ae	JIS	5 years ago
jokelone	c226e61acf	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
zcg	d9990f0cb8	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
jenkins	a685cd208d	Jenkins自动合并	5 years ago
许心洁	267ec6c647	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
wei.peng	823f818abf	Merge remote-tracking branch 'remotes/origin/dev' into test	5 years ago
许心洁	fe809e2eff	定时处理遗漏的待处理移动单JOB：处理周期改为可配置的JOB参数+流程管家：在放入“IS_COMMIT_REF_MOVE”缓存时需要判断是否为空+交易类型添加属性“是否推送异常邮件”用于第一次处理移动单出错	5 years ago
wei.peng	44af186f2f	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
zcg	f2d73a0687	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
曾贞一	1995e55b40	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
曾贞一	989e05c64c	【7168 对于发运单标签补打功能，根据发运单中的ship-to获取标签模板进行打印】	5 years ago
wei.peng	d8d47541df	自定义报表调整	5 years ago
wei.peng	af6083ddff	日志存储优化	5 years ago
WYnneaoapc	227354923e	Merge branch 'test'	5 years ago
jenkins	c14ef88ea8	Jenkins自动合并	5 years ago
jokelone	68eb60c6cb	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
钮海涛	74be235a26	修复资源甘特图拖拽问题	5 years ago
钮海涛	b0bbd132c6	修复资源甘特图拖拽问题	5 years ago
zcg	f38e54e496	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
jenkins	422aa1835f	Jenkins自动合并	5 years ago
钮海涛	4013ed776b	修复炉资源排程问题	5 years ago
jenkins	dfb06def2b	Jenkins自动合并	5 years ago
曾贞一	9e9d3e2afa	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
曾贞一	5a4510cedb	【7168 对于发运单标签补打功能，根据发运单中的ship-to获取标签模板进行打印】	5 years ago
qianhs	81bab75132	【库存调整盘点需要修改为，扫描新的库位时就对上一个库位中的数据做调整（更新条码状态），每个库位的扫描数据还是存在同一张盘点单内，点击提交时该张盘点单关闭。去除页面上的未盘移库按钮，未盘条码直接做移库。】【bug7148 】	5 years ago
陈思洁	bae2130d72	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
陈思洁	1f1f6ec825	【KT-1346 增加拉动任务的暂停和开启】	5 years ago
WYnneaoapc	3425a57669	Merge branch 'test'	5 years ago
WYnneaoapc	430e5ad6dd	Merge branch 'dev' into test	5 years ago
WYnneaoapc	76c84631ab	revise class name	5 years ago
WYnneaoapc	adb4bd2a1c	Merge branch 'dev' into test	5 years ago
puxiao.liao	0d2df2ec43	【 7194 Po明细导出，单据状态为中文】bug7194	5 years ago
puxiao.liao	a3a5e63baa	【 7194 Po明细导出，单据状态为中文】bug7194	5 years ago
王杰	42a22d14d3	安灯导出字=字段冗余	5 years ago
许心洁	861f46323b	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
许心洁	7594b3d515	SAP取消指令：按行取消函数逻辑从软删明细和条码变为更新单据明细和条码的状态为行取消	5 years ago
许心洁	95c01ba24e	Merge branches 'master' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo	5 years ago
jenkins	24c191a44b	Jenkins自动合并	5 years ago
E	a1276b5542	【#1338 库位物料中需要增加批量导入】	5 years ago
jenkins	f4188e8361	Jenkins自动合并	5 years ago
许心洁	a231651315	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
WYnneaoapc	372cc438f2	Merge branch 'test'	5 years ago
WYnneaoapc	0a7f6ebf24	Merge branch 'dev' into test	5 years ago
WYnneaoapc	cb7a1dea2a	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
WYnneaoapc	011b4d2205	zh20200101 现场问题修改 BI all	5 years ago
gcj	b29347c409	【坤泰运输管理】	5 years ago
钮海涛	9627b6cf9e	修改资源甘特图侧边栏显示内容	5 years ago
jenkins	774e5015c6	Jenkins自动合并	5 years ago
钮海涛	2eb244c41c	修改资源甘特图侧边栏显示内容	5 years ago
许心洁	9a272f8b6a	BUG#6755：移动单监听队列新增逻辑：如果当前处理的移动单的交易类型配置成需要推送异常邮件，并且全局参数“系统管理员”也有配置，则随送异常邮件	5 years ago
jenkins	a104276c01	Jenkins自动合并	5 years ago
汪云昊	1cc4cacb5f	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
汪云昊	b0b671aac0	软适配数据源适配器优化	5 years ago
jenkins	688d976683	Jenkins自动合并	5 years ago
陈思洁	9f0a1e8ce0	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
陈思洁	05efdbb568	【KT-1339 安全库存拉动，新增低于起订量概念】	5 years ago
王杰	8a4aa9fed2	jis发运	5 years ago
陈思洁	1e1e5e907e	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
陈思洁	472adfd03c	【KT-1339 安全库存拉动，新增低于起订量概念】	5 years ago
jokelone	ebe34e4ba9	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
汪云昊	a76d70851d	软适配适配记录参数分页查询	5 years ago
zcg	ad08ff21bb	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
WYnneaoapc	92a657a874	Merge branch 'test'	5 years ago
WYnneaoapc	569c2613fe	Merge branch 'dev' into test	5 years ago
puxiao.liao	f8e3edabc3	【 7159 线边退料逻辑错误，应该为：扫描A条码，输入原条码的剩余数量，拆包生成的新条码留在线边，原条码退回仓库。若数量与原条码相等，则不做拆包。】bug7159	5 years ago
wei.peng	391d4005ad	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
jenkins	028ae09f9c	Jenkins自动合并	5 years ago
wei.peng	f768247c4f	代码合并 2019-12-30 15:59:52	5 years ago
曾贞一	8b90b33e28	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
曾贞一	2da366630f	【VDA波次配料--物料汇总优化】	5 years ago
钮海涛	14f47f1ab4	修改字段编辑弹出框	5 years ago
jokelone	39790fd50b	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
jokelone	d47a097c53	【任务：1344 通用接口增加批量数据处理】	5 years ago
曾贞一	ed25a6f7d6	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
曾贞一	46bf93f410	【VDA波次配料--物料汇总优化】	5 years ago
zcg	1230906c3e	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
许心洁	ef5013cbe0	Merge branches 'master' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo	5 years ago
jenkins	d98b05e479	Jenkins自动合并	5 years ago
钮海涛	6afa007224	新增拖拽接口	5 years ago
jenkins	d32900413a	Jenkins自动合并	5 years ago
许心洁	ae83a432d9	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
许心洁	8143afeea9	拣货：条码的数量不能小于0+定时处理遗漏的待处理移动单JOB+closeTaskDetails函数还需要软删单据明细的状态	5 years ago
wei.peng	3b7b374b23	自定报表对象模型调整	5 years ago
汪云昊	b12f67e34b	Merge remote-tracking branch 'remotes/origin/dev' into test	5 years ago
汪云昊	ec1dbc5212	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
汪云昊	6b02d9969a	数据源批量写入优化	5 years ago
王杰	9034418b7e	解决冲突	5 years ago
jenkins	9ee137a5c3	Jenkins自动合并	5 years ago
gcj	5c838ebcf1	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
gcj	62c50e04cc	【宁德问题清单】	5 years ago
jenkins	c830600235	Jenkins自动合并	5 years ago
E	b175de4635	【#1335 基础数据-包装规格管理-增加导入导出】"默认容器类型"改为"容器类型"	5 years ago
E	e962a1d22a	【#1331 KT-基础数据-物料信息】“标准包装”改为“标包”	5 years ago
许心洁	d5efd000b0	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
许心洁	d94ccd5ac5	下线扣减交易处理组件BUG：获取双精度类型数值时应该判断是否为空getHandledQtyVal	5 years ago
钮海涛	8b1ae09885	修改订单甘特图	5 years ago
王杰	7287aaeb77	其他组未提交的代码	5 years ago
汪云昊	2f3e680fac	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
E	9e47c4ac5a	【#1332 基础数据-容器类型管理】新增期限单位字段	5 years ago
jenkins	471016b345	Jenkins自动合并	5 years ago
汪云昊	20ccf65c5c	资源加载优化	5 years ago
汪云昊	d89ed44bcc	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
汪云昊	1d9ab80ae8	数据源适配器 - 批量写入优化	5 years ago
zcg	192034152b	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
jenkins	b96d22b011	Jenkins自动合并	5 years ago
许心洁	018908d3cb	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
许心洁	032bd61b87	物料拆分新增等份拆分功能+ 快速移库写入移动单明细的行号写入规则不对，优化性能+ 下线扣减交易处理组件修改逻辑：有条码就扣减，移动单明细表新增已处理数量，处理完毕才更新移动单的状态为已处理并传给MOVE_TO_ERP处理程序+ 实时库存明细报表新增列“处理中数量”（待过账的数量）	5 years ago
puxiao.liao	d34ba5e114	【经讨论六合一允许扫描来源或目标不同的零件号，但是提交时需要按照目标来源拆分成不同的单据】bug7068	5 years ago
jenkins	e306cc6cdc	Jenkins自动合并	5 years ago
qianhs	7f69df95df	【存调整盘点，扫描库位后，提示内容“零件号，条码，数量”】【bug7060 】	5 years ago
jenkins	1163faaac1	Jenkins自动合并	5 years ago
曾贞一	0493feaf80	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
曾贞一	1f8885779f	【6714 FIFO重新变化时需要有提示信息，加组件，用通用变量设置组件保存上次的FIFO信息。】	5 years ago
陆卫豪	56fe97e200	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	5 years ago
WYnneaoapc	32c9bbbe85	task `1308` 4 同步国际化资源	5 years ago
陈思洁	9d5eac441e	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
陈思洁	b5d50af250	【KT-1284 计划拉动-生产计划管理】	5 years ago
钮海涛	629e2f8270	新增新增或保存字段信息接口	5 years ago
曾贞一	6eafdb1d7e	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
曾贞一	5ea55135dc	【6714 FIFO重新变化时需要有提示信息，加组件，用通用变量设置组件保存上次的FIFO信息。】	5 years ago
王杰	3ddadad142	Merge branch 'dev' into test	5 years ago
王杰	fb8b07b227	【需求：1329】	5 years ago
王杰	019cb91a4c	【需求：1329】	5 years ago
jenkins	320607590b	Jenkins自动合并	5 years ago
gcj	c199b977e5	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
gcj	cfa465817f	【修改模糊查询】	5 years ago
zcg	dbe2d32bb6	[需求：1322，枚举修改]	5 years ago
王杰	91ab421d5e	Merge branch 'dev' into test	5 years ago
jokelone	f857a4065d	【任务：1327JIT生产】	5 years ago
E	e5452056b6	【bug7083 KT器具管理】新增业务类型和作业类型	5 years ago
puxiao.liao	794992d687	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
puxiao.liao	734b54d1b2	【领料上线扫描时，在扫描完条码后将目标库位带出。】bug7024	5 years ago
王杰	06afd98334	Merge branch 'dev' into test	5 years ago
钮海涛	04b02c084b	新增甘特图可拖拽资源提示功能	5 years ago
jokelone	0e84990f3c	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
jokelone	20f6961daf	【任务：1327JIT生产】	5 years ago
qianhs	34e4d837af	【存调整盘点，扫描库位后，提示内容“零件号，条码，数量”】【bug7060 】	5 years ago
jenkins	6a19a07fce	Jenkins自动合并	5 years ago
汪云昊	192f861591	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
gcj	7e41cde458	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
gcj	894dbed46c	【宁德问题清单】	5 years ago
汪云昊	d5c1f7a7a3	资源模块数据模板软删除软适配list传参	5 years ago
王杰	2655fdc87f	Merge branch 'dev' into test	6 years ago
zcg	9175fc028f	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
zcg	c7d494c31e	[需求：1324，导出excel]	6 years ago
jenkins	f39163513c	Jenkins自动合并	6 years ago
曾贞一	4bd0aa8d57	【系统配置-模糊查询】	6 years ago
jenkins	1fbd9c4357	Jenkins自动合并	6 years ago
gcj	c51de088d6	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
gcj	9c2dcba09d	【运输管理】添加查询关联单号	6 years ago
zcg	dccd104fdd	[需求：1324，excel导出]	6 years ago
jenkins	4e8ee475b4	Jenkins自动合并	6 years ago
gcj	99eaa8b8ca	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/wms/WmsStockFifoModel.java	6 years ago
gcj	fc9b8629ab	【采购收货】	6 years ago
jenkins	cc45dbc2cb	Jenkins自动合并	6 years ago
曾贞一	91716272a6	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
曾贞一	393d3f12b8	【7055 新增波次拣货流程】	6 years ago
E	996526ac7c	【bug7088 物料信息中的导入功能】	6 years ago
王杰	90de0f7df6	Merge branch 'dev' into test	6 years ago
王杰	b0709aca97	枚举	6 years ago
jenkins	695a9b2e63	Jenkins自动合并	6 years ago
陈思洁	03982ad2e0	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	03eeacd273	【KT-1298 物流路线【处理模式】优化】	6 years ago
钮海涛	335ab2ce51	新增KPI接口	6 years ago
王杰	ab68895760	test分支修改pom	6 years ago
王杰	c87b00756f	dev分支修改pom	6 years ago
WYnneaoapc	9de807ab24	Merge branch 'test'	6 years ago
qianhs	1d7cf41653	【VDA静态盘点-盘点调差-实时库存未解冻】【bug7009】后期待优化	6 years ago
qianhs	4c8a94bdfa	【VDA静态盘点-盘点调差-实时库存未解冻】【bug7009】	6 years ago
qianhs	a2ac02aa47	【VDA静态盘点-盘点调差-实时库存未解冻】【bug7009】	6 years ago
E	69e20029e8	【1320 KT物料信息--需要维护物料的类型：器具】增加描述：90=器具库	6 years ago
E	7ef04dd824	【1320 KT物料信息--需要维护物料的类型：器具】	6 years ago
gcj	a7d1ec785b	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	eb084d3904	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	0d7e64b160	在调用交易处理组件之前把交易处理组件类型名称一并赋值到MOVEMASTER对象中，省去每个组件中再去循环查询。	6 years ago
qianhs	5c28c8344c	【VDA静态盘点-盘点调差-实时库存未解冻】【bug7009】	6 years ago
汪云昊	4705b77a7e	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
汪云昊	b674087ffc	资源导入优化	6 years ago
王杰	339f1a86c2	删除枚举代码中间的注释	6 years ago
puxiao.liao	0453363336	【发运配料界面显示将单据数量改为剩余配料数量。】bug7063	6 years ago
王杰	423b81609a	【需求：1198】	6 years ago
qianhs	fdfc5884c5	【库存调整盘点（两个界面）需要可以扫描库位以后立刻提交。】【bug7040】	6 years ago
jokelone	e2c9d9e569	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
jokelone	54fe0ce760	【bug：6360 工厂初始化】	6 years ago
zcg	b06ecdd3f3	[bug：7043，PCN节点-模块修改]	6 years ago
gcj	49134cc5b3	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
钮海涛	81b84d86e5	新增KPI接口	6 years ago
WYnneaoapc	51623754c7	Merge branch 'test'	6 years ago
WYnneaoapc	0191a17a4d	Merge branch 'dev' into test	6 years ago
WYnneaoapc	0103c64247	task `1316` 1 拆分job任务	6 years ago
WYnneaoapc	9157020997	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
gcj	b29d84bbad	【运输管理】	6 years ago
WYnneaoapc	e206057aba	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
gcj	ba355aab55	【运输管理】	6 years ago
jenkins	5513e95884	Jenkins自动合并	6 years ago
gcj	01e5919349	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
E	b5006a88f1	【#1302 器具管理-新增器具规则检查组件】【#1303 器具管理-修改更新箱条码组件】	6 years ago
jenkins	78d80f03cf	Jenkins自动合并	6 years ago
qianhs	15d3d3b5e1	【库存调整盘点（两个界面）需要可以扫描库位以后立刻提交。】【bug7040】	6 years ago
jenkins	34b843bd1f	Jenkins自动合并	6 years ago
puxiao.liao	4f1455012f	【领料上线扫描时，在扫描完条码后将目标库位带出。】bug7024	6 years ago
曾贞一	f800d3dd7b	【成品发运，获取在途库位逻辑修改】	6 years ago
WYnneaoapc	50f77a5081	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
gcj	0e1599789d	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
gcj	d92850c1a4	【运输管理】	6 years ago
WYnneaoapc	a38dc051ac	task `1308` 1 PCN国际化资源	6 years ago
汪云昊	38fc49f053	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
汪云昊	2fb79b8354	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
汪云昊	14f1ced301	会话文件展示地址封装	6 years ago
jenkins	03051f4fd1	Jenkins自动合并	6 years ago
puxiao.liao	0c01ffb230	【在配料时，点击右上角放大镜，输入单号无法查询，并且显示的内容需要有来源，目标，是否紧急】6978	6 years ago
许心洁	4b340e6954	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	773f56b577	TASK_INO_STATUS 20和30的枚举类名严重错误，容易误导开发	6 years ago
jenkins	8efcd210aa	Jenkins自动合并	6 years ago
陈思洁	d0ddf208c3	【KT-1297 物流路线的【适用范围】优化】	6 years ago
jenkins	95048bce44	Jenkins自动合并	6 years ago
qianhs	d4d30bf634	【零件号条码打印，扫描后需要提示当前扫描零件，当前扫描数量，剩余扫描数量（标包减去扫描数量）。】【bug7020】	6 years ago
jenkins	cd1696c787	Jenkins自动合并	6 years ago
汪云昊	4632c7572c	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
汪云昊	1318c6ef56	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
汪云昊	3dd247491a	软件适配器异常信息优化	6 years ago
WYnneaoapc	129c84d4a8	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
WYnneaoapc	bc21d0b461	task `1308` 1 PCN国际化资源	6 years ago
陈思洁	5d4e8a94c4	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	c5ae91b41e	【KT-1286 计划拉动-计划拉动JOB】	6 years ago
jenkins	55dcb795c9	Jenkins自动合并	6 years ago
许心洁	e816c2fd6a	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	258c1ccbe8	流程导入：优化数字类型CELL为空字符串时的校验+有些SHEET没有数据时无需校验+快速移库：只能移入库状态的条码；不可多人操作同一个库位进行整库移库	6 years ago
WYnneaoapc	7ecae4d56b	Merge branch 'test'	6 years ago
WYnneaoapc	2a3499de65	Merge branch 'dev' into test	6 years ago
WYnneaoapc	4182b4d852	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
WYnneaoapc	6d357abe9f	task `1304` 2 活化开线管控	6 years ago
jenkins	1594c49ca9	Jenkins自动合并	6 years ago
zcg	f23b0f7bfe	解决冲突	6 years ago
陆卫豪	3e9c1aaa76	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
WYnneaoapc	7451bc9460	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into wynne_temp_wc	6 years ago
WYnneaoapc	99fd4221e2	task `1304` 1 活化开线管控	6 years ago
jenkins	0e35bd1d6b	Jenkins自动合并	6 years ago
钮海涛	e0f81a73d7	修改甘特图日历接口	6 years ago
jenkins	cfebb937fb	Jenkins自动合并	6 years ago
gcj	4c2d922ed9	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
gcj	2c63820f98	【运输管理】	6 years ago
jenkins	350f7101d2	Jenkins自动合并	6 years ago
jokelone	f3756e6b34	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
jokelone	b9b30cf19c	【任务：1306质量标准配置】	6 years ago
puxiao.liao	da4f32f0b4	【在配料时，点击右上角放大镜，输入单号无法查询，并且显示的内容需要有来源，目标，是否紧急】6978	6 years ago
gcj	59e7704f67	【运输管理】装车单	6 years ago
王杰	7bc434ed15	安灯组装模型优化	6 years ago
WYnneaoapc	84227c9b8a	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
WYnneaoapc	b3a04911b6	task `1300` 5 BI 产线运行情况	6 years ago
汪云昊	8e3c1b750a	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
汪云昊	35fd2f7952	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
汪云昊	3902fb6309	资源增量导入优化	6 years ago
王杰	0dac1a6d84	Merge branch 'test'	6 years ago
王杰	dfb23bab1d	Merge branch 'dev' into test	6 years ago
王杰	bc61b43e8d	安灯人员统计报表工位代码不显示问题修复	6 years ago
陆卫豪	5393d6e034	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
zcg	586dfb416b	[mes枚举修改]	6 years ago
陈思洁	40c64db0b1	冲突	6 years ago
陈思洁	ee14ce1d4b	【KT-快速入库功能】	6 years ago
jenkins	015d284239	Jenkins自动合并	6 years ago
puxiao.liao	99a1ec309d	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
puxiao.liao	3bfb0995d5	【物料基础信息增加【贵重物料】属性，领料上线流程根据此属性判断是否需要扫描目标库位】bug1299	6 years ago
WYnneaoapc	168edce5bd	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
WYnneaoapc	48338fec28	task `1300` 5 BI 产线运行情况	6 years ago
jenkins	39f4c733a4	Jenkins自动合并	6 years ago
gcj	304677e7da	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
gcj	91e3209ef9	【运输管理】	6 years ago
王杰	c4c615bd15	Merge branch 'dev' into test	6 years ago
王杰	3ff9fbc140	安灯图表	6 years ago
WYnneaoapc	b088b40fd1	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
WYnneaoapc	a1a602e457	task `1300` 5 BI 产线运行情况	6 years ago
jokelone	6995189893	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
jokelone	46ec9e51b0	【任务：1211报表导出冗余字段】	6 years ago
jenkins	6be1ef7dbd	Jenkins自动合并	6 years ago
WYnneaoapc	ba0a857dd5	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
WYnneaoapc	b52d5b392d	task `1300` 4 BI 产线运行情况	6 years ago
许心洁	5a1dc6dc7d	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	67f7d66782	宁德现场问题#330	6 years ago
jokelone	874fd139dc	Merge branch 'dev' into test	6 years ago
E	59bdec9c6f	【6933 收货看板容器未收货时，看板收货状态为收货完成】修改收货看板枚举	6 years ago
WYnneaoapc	73cb6a7229	merge	6 years ago
陆卫豪	0002f19d69	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
E	cc95fad3e8	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
E	ef9293867f	【bug6929 收货道口数量长度没有限制】【bug6928 收货道口为0时没有默认为1】	6 years ago
WYnneaoapc	ef34a13313	task `1300` 2 BI 产线运行情况	6 years ago
WYnneaoapc	e3d84dd48f	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/MesEnumUtil.java	6 years ago
WYnneaoapc	b2daf9fd9c	task `1300` 1 BI 产线运行情况	6 years ago
zcg	d6975bf5de	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
zcg	ccfba0fe56	mes枚举修改	6 years ago
jokelone	0dfb948810	Merge branch 'dev' into test	6 years ago
jokelone	519d985838	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
jokelone	0acf17ddd7	【1211：报表1】	6 years ago
许心洁	927579aca5	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	fc663ee283	作业流程导入导出BUG#6189	6 years ago
汪云昊	6b11375a01	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
汪云昊	79377f2da6	任务检查相关接口	6 years ago
陈思洁	45c1fc6571	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	129e60a6df	【KT-1284 计划拉动-生产计划管理】	6 years ago
WYnneaoapc	8694cb1f5a	Merge branch 'test'	6 years ago
WYnneaoapc	8e6349b9f2	Merge branch 'dev' into test	6 years ago
gcj	a6bb80a5a4	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
gcj	2e98e17a05	【运输管理】	6 years ago
zcg	7016f20282	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
zcg	7bf8534c16	mes枚举	6 years ago
汪云昊	f002a0fe5a	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
汪云昊	03d432993a	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
汪云昊	47fb080742	lac线程超时监控优化 Session超时时间参数化 lac添加TaskCheck 日志添加索引	6 years ago
jenkins	c41026a6b2	Jenkins自动合并	6 years ago
WYnneaoapc	f57f1087d9	task `1295` 1 添加数据库索引	6 years ago
钮海涛	8385038290	修改甘特图日历接口	6 years ago
jenkins	059f14f997	Jenkins自动合并	6 years ago
qianhs	da2cfd77b0	【增加一个扫描零件上的条码，累计数量达到零件标包后自动打印条码+按照主数据自动报工的界面】【bug6704】	6 years ago
jenkins	5748480dc4	Jenkins自动合并	6 years ago
陈思洁	7d07580a78	合并冲突	6 years ago
陈思洁	b9844c255b	生产计划表结构增加	6 years ago
jenkins	3f1758785c	Jenkins自动合并	6 years ago
WYnneaoapc	2ede8c9dfe	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
WYnneaoapc	c6c57dd829	task `1294-1` 查找workcell的时候需要带上产线	6 years ago
王杰	571ab9bd3e	获取打印模版参数修改	6 years ago
gcj	3e6ca8d039	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
gcj	a1a3d1e838	【Bug清单】------------------------------	6 years ago
jenkins	7d3ff10acb	Jenkins自动合并	6 years ago
钮海涛	06125eab20	Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEsop.java # modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEsopRepository.java # modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEsop.java # modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEsopRepository.java	6 years ago
钮海涛	f5181072b5	新增表达式录入界面接口	6 years ago
钮海涛	68bba613e3	新增表达式录入界面接口	6 years ago
jenkins	af9bb85377	Jenkins自动合并	6 years ago
WYnneaoapc	238d0aea3b	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
WYnneaoapc	efb29aa8f4	task `1294-1` 查找workcell的时候需要带上产线	6 years ago
钮海涛	222e1b020d	新增表达式录入界面接口	6 years ago
王杰	e636bfaa83	Merge branch 'test'	6 years ago
王杰	7ca0ac3e5a	解决冲突	6 years ago
王杰	bba25ad2de	批量打包model修改	6 years ago
E	c7d4253e5e	【bug 6872 - 收货、发运看板数据未加载】	6 years ago
jenkins	6fc8833b01	Jenkins自动合并	6 years ago
汪云昊	bc5beeba7d	添加适配记录索引	6 years ago
WYnneaoapc	9b8675c904	task `1292-1` 新增条码履历字段	6 years ago
jenkins	0349a43f71	Jenkins自动合并	6 years ago
于学杰	67b5069c48	1. 增加分组提交的配置字段	6 years ago
王杰	ad4b75bac9	Merge branch 'test'	6 years ago
王杰	8bb63e3bac	Merge branch 'dev' into test	6 years ago
王杰	1f4a8d6e55	【安灯修改枚举】	6 years ago
WYnneaoapc	ffb977ffc5	merge	6 years ago
jenkins	2c88a30b4d	Jenkins自动合并	6 years ago
WYnneaoapc	6852153227	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
WYnneaoapc	8dc1513947	bug`6897` SOP信息-编辑图片后未显示出图片地址	6 years ago
jokelone	a337f1824f	Merge branch 'dev' into test	6 years ago
陈思洁	3a353b1539	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	1d5f4b38a4	【KT-1282 计划拉动-班次管理】	6 years ago
gcj	32dccc056c	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev Conflicts: modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java	6 years ago
gcj	1e10bdee0c	【坤泰运输管理】	6 years ago
王杰	19a2f6661e	Merge branch 'test'	6 years ago
陆卫豪	345374354b	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
WYnneaoapc	fc5282342f	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
WYnneaoapc	ca952d5211	bug`6866` 2 打印模板同步	6 years ago
jenkins	1e089c4110	Jenkins自动合并	6 years ago
jokelone	056dbaacf2	Merge branch 'dev' into test	6 years ago
陈思洁	eb5f9610a8	【KT-1282 计划拉动-班次管理】	6 years ago
jenkins	5bd51e2045	Jenkins自动合并	6 years ago
陈思洁	dc8a44df2f	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	5797ec4b1b	新增工位表字段	6 years ago
王杰	4e866d70e1	Merge branch 'dev' into test	6 years ago
王杰	fcc2b09559	【安灯修改枚举】	6 years ago
jenkins	6d1d66daf3	Jenkins自动合并	6 years ago
WYnneaoapc	f4b50200b2	bug`6866` 1 打印模板同步	6 years ago
jokelone	7e0d27f0f4	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
jokelone	a0780669c3	【任务：1287】	6 years ago
zcg	032260b9f2	[需求：1290，导入excel]	6 years ago
jenkins	9d916c17d7	Jenkins自动合并	6 years ago
陈思洁	4f67cc1310	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	61f3465255	新增工位表字段	6 years ago
jenkins	a2947478ca	Jenkins自动合并	6 years ago
jokelone	178b30698c	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
jokelone	edcdeb3d4f	【任务：1287】	6 years ago
曾贞一	10d8b9626f	冲突解决	6 years ago
曾贞一	cb6fe137d1	【bug6863 生产入库时-如果判断该条码未报工】	6 years ago
jenkins	6ee5823e15	Jenkins自动合并	6 years ago
jokelone	917774921e	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
jokelone	a6730b0cd8	【任务：1287产品类型图片】	6 years ago
WYnneaoapc	64267e19b0	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
WYnneaoapc	7069bc5cbb	task`1287`3` 新增文件表，原来业务与文件脱离	6 years ago
许心洁	49a126843b	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	4fd9ec76f4	枚举漏提交	6 years ago
许心洁	2ce2f17353	流程管家：新增“是否连带提交创建状态移动单”属性；新增重置功能+生产扣减交易处理组件+交易处理成功程序+ESB解析程序多余异常输出去除+质检流程加上是否允许多人操作校验+PDA动态菜单交易类型描述国际化	6 years ago
王杰	2a10fd1021	【组织模型工厂加id】	6 years ago
钮海涛	57b3b4242e	新增表达式录入界面接口	6 years ago
jokelone	8c5eb8d7c5	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
jokelone	c42775389d	【任务：1273质量检测增加字段】	6 years ago
WYnneaoapc	2d7558e1ba	task`1287`2` 新增文件表，原来业务与文件脱离	6 years ago
WYnneaoapc	931eea704e	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
WYnneaoapc	93bc62b921	task`1287` 新增文件表，原来业务与文件脱离	6 years ago
汪云昊	f6d47519be	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
汪云昊	764a39a6a6	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
汪云昊	8c872302a3	细节调整	6 years ago
WYnneaoapc	2cde398cca	Merge branch 'test'	6 years ago
陆卫豪	37f32d4269	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
jokelone	f011aab765	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
jokelone	a4d38de535	【任务：1272代码优化】	6 years ago
jenkins	9fb017ce25	Jenkins自动合并	6 years ago
王杰	91730dd195	【需求：1277，关闭，暂停，完成工单需要停线，做到方法可配】	6 years ago
陆卫豪	448371a461	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
WYnneaoapc	603cd76784	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
WYnneaoapc	5b7f268b91	1274 修改组件普遍问题	6 years ago
jokelone	4025a0963b	【任务：1273质量检测增加检测项类型1】	6 years ago
jokelone	d835ef1bb5	【任务：1273质量检测标准增加检测项类型】	6 years ago
jokelone	a579358968	【任务：1257下线时间】	6 years ago
jenkins	4b6db8cd91	Jenkins自动合并	6 years ago
钮海涛	5e8e05ddb4	新增表达式录入界面接口	6 years ago
jenkins	cbbb9644a0	Jenkins自动合并	6 years ago
E	686cd3dbfa	【#1240 KT-发运看板】前端对接调整	6 years ago
jokelone	690918add5	Merge branch 'dev' into test	6 years ago
曾贞一	1c9f605c56	【VDA成品发运配料-客户发往地】	6 years ago
jenkins	de173e8500	Jenkins自动合并	6 years ago
曾贞一	594d6a4135	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
jokelone	935ca2f4d7	【任务：1211报表】	6 years ago
王杰	3df5888a69	更新 'modules/i3plus-pojo-workflow/pom.xml'	6 years ago
王杰	a254841385	更新 'modules/i3plus-pojo-wms/pom.xml'	6 years ago
王杰	ea8f527309	更新 'modules/i3plus-pojo-sweb/pom.xml'	6 years ago
王杰	be04366551	更新 'modules/i3plus-pojo-softswitch/pom.xml'	6 years ago
王杰	b2210e7425	更新 'modules/i3plus-pojo-report/pom.xml'	6 years ago
王杰	711116d041	更新 'modules/i3plus-pojo-platform/pom.xml'	6 years ago
王杰	4911d184e0	更新 'modules/i3plus-pojo-model/pom.xml'	6 years ago
王杰	5b672e7d68	更新 'modules/i3plus-pojo-mes-pcn/pom.xml'	6 years ago
王杰	b703c9394c	更新 'modules/i3plus-pojo-mes/pom.xml'	6 years ago
王杰	e09345984d	更新 'modules/i3plus-pojo-lac/pom.xml'	6 years ago
王杰	071c218a2e	更新 'modules/i3plus-pojo-jobflow/pom.xml'	6 years ago
王杰	fda76e06c8	更新 'modules/i3plus-pojo-hardswitch/pom.xml'	6 years ago
王杰	f8356637ae	更新 'modules/i3plus-pojo-form/pom.xml'	6 years ago
王杰	5d57bc44d8	更新 'modules/i3plus-pojo-base/pom.xml'	6 years ago
王杰	e43d593db6	更新 'modules/i3plus-pojo-aps/pom.xml'	6 years ago
王杰	d62aec1c62	更新 'modules/i3plus-pojo-andon/pom.xml'	6 years ago
王杰	cfa54aa2b6	修改pom	6 years ago
王杰	b9906cee55	增加枚举	6 years ago
puxiao.liao	e580dcbd2d	【扫描查询查询一个条码的时候要分行显示该条吗的：库存地，库位，条码，状态，数量，零件号，供应商批次，过期日期，收获批次，需要分行显示】bug6663	6 years ago
曾贞一	892d63b9b1	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	dd36a0b053	Merge branches 'master' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo	6 years ago
许心洁	ca71303bee	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	82e8df0af8	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
gcj	b6ae28c957	【采购收货】	6 years ago
jenkins	d2591b419b	Jenkins自动合并	6 years ago
许心洁	e4348cd334	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	fa8a88c6d0	流程管家：提交后如果流程第一个步骤的提示方法包含回显值则叠加在提交提示消息后+给基类BaseBean的isdeleted,isvalid加上默认值，给两个实体加默认值试试水+WmsCsDetailsModel类位置严重不符合规范，已移至Pojo-Model项目中	6 years ago
陆卫豪	93126de988	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
gcj	1d0c03ba9c	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
E	831daa4964	【#1241 KT-收货看板-增加道口】	6 years ago
gcj	a35171a41d	【采购收货】	6 years ago
jenkins	f9d508d1ef	Jenkins自动合并	6 years ago
qianhs	402b09e82e	【EU盘点】【 317-EU盘点-盘点差异查询】【1148EU盘点-盘点差异查询】	6 years ago
王杰	338367f3c3	Merge branch 'dev' into test	6 years ago
jokelone	6cf0ab98f6	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
jokelone	7004ad0971	【任务：1211报表质量数据导出】	6 years ago
曾贞一	bb92161133	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
钮海涛	64bfbb5013	新增甘特图工作块连线功能	6 years ago
jenkins	7630541146	Jenkins自动合并	6 years ago
jokelone	0e2b13d52f	【任务：1258枚举优化】	6 years ago
王杰	52f4854621	Merge branch 'dev' into test	6 years ago
jokelone	60e4e1a7f3	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
jokelone	3c9183e422	【任务：1256工序BOM改为工位BOM】	6 years ago
王杰	99b66e459d	【需求：1221，导入】	6 years ago
钮海涛	04009f02e0	新增数据校验功能	6 years ago
陆卫豪	2aca595bad	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
jokelone	7a379fb5ab	【任务：1211报表质量数据首检导出】	6 years ago
jenkins	33f3fd0963	Jenkins自动合并	6 years ago
qianhs	c8f23ba640	【库存报表中无法看到寄售零件】【bug6331】	6 years ago
puxiao.liao	91ec41b3c0	暂时注解掉索引信息。	6 years ago
WYnneaoapc	1313916b81	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
WYnneaoapc	55b07e8e75	1256 工序bom改为工位bom	6 years ago
王杰	8cba58d339	Merge branch 'dev'	6 years ago
曾贞一	793535e74c	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
曾贞一	8892c78692	【EU成品发运-客户编号】	6 years ago
王杰	5dd94058cf	Merge branch 'dev' into test	6 years ago
王杰	f038ed7234	增加枚举	6 years ago
jenkins	f4988f68f7	Jenkins自动合并	6 years ago
puxiao.liao	7df617b290	【质检单查询界面需要支持按照ASN和零件号查询，显示出的明细中质中要显示物料信息】bug6651	6 years ago
jenkins	66c59fb8ff	Jenkins自动合并	6 years ago
crish	9027b22af8	Merge branch 'dev'	6 years ago
WYnneaoapc	d05a858bd1	6565 修改fastdfs配置，工位监控显示完成数量	6 years ago
jenkins	ad6d4f5034	Jenkins自动合并	6 years ago
陈思洁	14f509b97a	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	42d1a461a4	新增附件信息表	6 years ago
钮海涛	d819f7b6c7	修复报表分页问题	6 years ago
jenkins	66252032b3	Jenkins自动合并	6 years ago
陈思洁	9cb03c8661	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	c6ff8f109c	新增附件信息表	6 years ago
王杰	be39fb2abe	Merge branch 'dev' into test	6 years ago
jokelone	ff69583e8d	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
jokelone	19c0c1deb5	【任务：1211报表】	6 years ago
汪云昊	56381b76f1	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
汪云昊	db019bf4eb	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
jenkins	d44d5d79ab	Jenkins自动合并	6 years ago
汪云昊	26e7f975bf	数据源适配器支持IN	6 years ago
钮海涛	0dddbb936c	新增报表接口	6 years ago
jenkins	6d9a2b5b80	2019年11月27日12:14:44	6 years ago
wei.peng	84d341aa87	Jenkins 自动合并代码测试	6 years ago
汪云昊	f5a0f24355	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
wei.peng	a0f1eab0f9	Jenkins 自动合并代码测试	6 years ago
汪云昊	f2c0c1206a	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
汪云昊	ad0389fb13	JOB日志优化	6 years ago
汪云昊	3faa679cf9	Job测试新增资源初始化方式（导入，导出）异常日志持久化bug OPC服务 MQ管理接口	6 years ago
王杰	6da48220a5	Merge branch 'dev' into test	6 years ago
王杰	3aa69e0262	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
王杰	6959d126a0	增加枚举	6 years ago
puxiao.liao	1d66ce2612	【VDA推荐入库-入库成功-无引导信息】bug6645	6 years ago
crish	cba2cda2d4	安灯主界面部分字段赋初始值	6 years ago
crish	376700de0d	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
crish	06e969af1b	安灯主界面	6 years ago
钮海涛	d4f963ee70	新增报表接口	6 years ago
jenkins	c8b0c49b57	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
陈思洁	544944d31c	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	d0e6d30a9e	#6639 【VDA生产领料-FIFO跳过-系统异常】	6 years ago
gcj	e827462426	【采购收货】	6 years ago
crish	74224b20ac	安灯主界面开发	6 years ago
WYnneaoapc	9306945691	Merge branch 'test'	6 years ago
陆卫豪	7556ada2d4	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
王杰	9e64ee8258	【需求：1221，导入】	6 years ago
jenkins	8a34eee5c5	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
jokelone	a49fdf87b8	【任务：1211报表质量数据】	6 years ago
陈思洁	42a6f8a02d	【#1219 在宁德现有生产扣减JOB基础上增加生成领料单功能】	6 years ago
陈思洁	d5ff3e4ce1	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	54d3e351be	合并冲突	6 years ago
WYnneaoapc	ec49074a8b	Merge branch 'test'	6 years ago
陆卫豪	5af777c4fd	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
WYnneaoapc	b69bd1ae53	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
WYnneaoapc	ed89db8be3	6565 更新同步流程	6 years ago
jenkins	dcd36cb6e5	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
gcj	af1324e9c7	【采购收货】	6 years ago
wei.peng	6d5fc7ab39	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
wei.peng	25cbbb5837	雪花ID 生成器改为prop 配置	6 years ago
许心洁	e5767574fe	任务明细POJO添加交易类型代码字段：唯一索引	6 years ago
王杰	73b1e827d6	Merge branch 'dev' into test	6 years ago
王杰	1ab2c3605a	【需求：1221，导入】	6 years ago
gcj	87dd679d47	【采购收货】	6 years ago
许心洁	151a7d65c8	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	48e136c4aa	任务列表展示创建人	6 years ago
王杰	e9055e3c5d	Merge branch 'dev' into test	6 years ago
王杰	2893d13e9f	需求1221，导入	6 years ago
WYnneaoapc	30aa0bb099	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
WYnneaoapc	c770dda7b2	问题修改 6283	6 years ago
许心洁	e37653c544	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
许心洁	214b3a07b7	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	f39e16511f	给所有JOB加上了redis锁+IOT解析优化+系统配置POJO参数值的类型改为长整形，否则新增时参数值过长会系统异常	6 years ago
jenkins	5947429d54	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
于学杰	8d15084b20	1. 调整5个批次的名称	6 years ago
jenkins	68b650ab81	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
1111	8447ef39c9	【采购收货】	6 years ago
jenkins	870dc7007d	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
1111	acbbbf8e32	【采购收货】	6 years ago
jokelone	902ef5b177	【bug：6577缺陷获取字段修改】	6 years ago
jenkins	f6506bdd0b	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
曾贞一	ca6b596b14	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
曾贞一	47ccfcc9e3	【EU成品发运-检查数量组件】【bug1177】【EU成品发运-检查单据是否操作完成组件】【bug1176】【EU成品发运-成品发运FIFO推荐组件】【bug1174】	6 years ago
王杰	1d920627ec	Merge branch 'dev' into test	6 years ago
wei.peng	7893bcd77e	功能菜单国际化完成	6 years ago
jokelone	0e9f13ff82	【bug：6582报废原因增加报废类型】	6 years ago
jokelone	e754cb9053	【优化：27班组增加产线、班长字段】	6 years ago
jokelone	8a806815a5	【任务：1193qty数量类型更改为Double】	6 years ago
jokelone	327e4dcd64	【优化：27班组增加产线、班长字段】	6 years ago
钮海涛	5f3f973c3e	新增报表接口	6 years ago
王杰	a41c00f129	Merge branch 'dev' into test	6 years ago
王杰	4146126284	【需求：1202，条码补打】	6 years ago
jokelone	515a3c5dec	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
jokelone	5bc9b9b082	【任务：1193字段类型修改】	6 years ago
jenkins	2f6400dc78	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
1111	f1cfe26378	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
1111	7452d49930	【采购收货】	6 years ago
王杰	dd0304d713	Merge branch 'dev' into test	6 years ago
王杰	7d623560b6	【需求：1202，条码补打】	6 years ago
jokelone	3eda200854	【bug：6545类型信息增加枚举】	6 years ago
王杰	09cf450156	Merge branch 'dev' into test	6 years ago
王杰	ca57c0342a	【需求：1202，条码补打】	6 years ago
汪云昊	f7d6fd4ae1	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
jenkins	ddee8a5215	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
qianhs	314aa78336	【采购日程单里的寄售属性选项是0/1，应改为是/否】【bug6369】	6 years ago
crish	852083f667	Merge branch 'test'	6 years ago
crish	4d3adf5daf	Merge branch 'dev' into test	6 years ago
汪云昊	c39324648e	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
crish	04c6946271	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
crish	b2b16e2017	安灯工位分组配置	6 years ago
汪云昊	f0e77305dd	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
汪云昊	3856a6d600	LAC调整微服务指令集操作方式 OPC UA工具订阅方式调整	6 years ago

... 36 37 38 39 40 ...

7697 Commits (6bfc2f92b0dd2f3ffbb17d590956f0dfd029edb1)