7168 Commits (4e013a7ef0ab93b9fb3f780dcda809a248c0f679)

Author	SHA1	Message	Date
宋军超	c5ebcaf2b5	天津麦格纳添加出入库事务表枚举	5 years ago
puxiao.liao	97a8a5a6ec	修复MGN系列BUG	5 years ago
puxiao.liao	698128aff5	MGN修复BUG	5 years ago
宋军超	7a6bda2994	天津麦格纳问题修复	5 years ago
陈思洁	2c91dfba60	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	e4dc2e1a46	【2637 08 ext 20042 PCN界面优化，log调整 0804】	5 years ago
joke.wang	d33dae14dc	jsp计算bug优化	5 years ago
曾贞一	99e63fea8c	【2741 北京麦格纳WMS-质检跳批】	5 years ago
宋军超	f73e826cd8	天津麦格纳问题修复	5 years ago
钮海涛	729a7b6990	合并冲突	5 years ago
钮海涛	5c9da87650	合并冲突	5 years ago
钮海涛	d47607880e	合并冲突	5 years ago
钮海涛	56b1ae99a9	Merge remote-tracking branch 'origin/test' into test	5 years ago
钮海涛	1b6bbed47c	Fix Bug #10974	5 years ago
曾贞一	193cff013f	【2737 09 1.2.1.9.1库位新增库位别名】	5 years ago
joke.wang	b8c743896d	拆解接口表优化	5 years ago
puxiao.liao	61b87d2d00	MGN修复BUG	5 years ago
puxiao.liao	15d915370e	MGN修复BUG	5 years ago
曾贞一	fe9a19c534	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
曾贞一	6ca0948a5d	【11026 20011--有关北美收货产生的需求变更--0910】	5 years ago
宋军超	b0aba21859	中航导入问题修复	5 years ago
曾贞一	5dc142ba34	【2719 06 1.1.10 数据库文档管理-导入模板生成功能新增】	5 years ago
songss	bdf708b73a	增加上传图片job	5 years ago
joke.wang	045babeee1	已生产队列查询修改	5 years ago
joke.wang	ba940f9a39	BYPASS项映射关系表	5 years ago
汪云昊	0a0727e2fa	fix:代码错误	5 years ago
汪云昊	f878e6b283	Merge remote-tracking branch 'remotes/origin/dev' into test	5 years ago
汪云昊	2e102f4189	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
汪云昊	1ccd4f3b65	feat:添加区间查询	5 years ago
puxiao.liao	48a6dec057	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
puxiao.liao	9a7bef44ac	MGN修复BUG	5 years ago
陈思洁	01fc8bb062	【条码履历增加字段】	5 years ago
陈思洁	75fe475b53	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	01eda59dd5	【11069 19048- 抛光质量待定扫描条码后，提示信息不明确！-2020-09-05】	5 years ago
王杰	396dcdf56c	涂装 一箱 优化	5 years ago
曾贞一	332e37ea94	【2719 06 1.1.10 数据库文档管理-导入模板生成功能新增】	5 years ago
宋军超	b7542f8db0	修改中航问题	5 years ago
wynne1005	38096fb04e	mes表名过长不兼容oracle	5 years ago
汪云昊	6457cac828	feat:去除非空校验	5 years ago
曾贞一	54dc09ff76	【冲突解决】	5 years ago
曾贞一	9ebe3c17b7	【枚举状态】	5 years ago
joke.wang	bd8cc364c1	jsp计算优化	5 years ago
汪云昊	1243607e0e	Merge remote-tracking branch 'remotes/origin/dev' into test	5 years ago
汪云昊	5fbd0fdd80	fix:单号生成记录	5 years ago
puxiao.liao	26367ea28d	Finish Task #2184 Cost:8h ... 2184 06 1.2.3.7.1物流路线检查	5 years ago
汪云昊	cf2bf8d291	企业微信适配	5 years ago
rock.yu	6e37cd934b	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
rock.yu	d7133b24f5	增加缺失的字段	5 years ago
陈思洁	decd0ae558	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	6c351c09b5	【11016 19048- 总装生产计划显示多条！-2020-09-03】	5 years ago
曾贞一	8ca16d7c68	【枚举状态】	5 years ago
许心洁	7f11e5b1d7	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
许心洁	1fe5b807c6	BUG#10826,11025,11024	5 years ago
曾贞一	92e8364b58	【1140 09 1.2.1.1.1客户发运车辆推荐】	5 years ago
曾贞一	62733aa799	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
曾贞一	a53e7c5724	【2712 子 09 1.2.1.1.1客户发运车辆推荐 / 09 1.2.1.1.1客户发运车辆推荐 -后端】	5 years ago
puxiao.liao	acbad1a637	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test ... Conflicts: modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java	5 years ago
puxiao.liao	df4e794a48	修复MGN系列BUG	5 years ago
rock.yu	1e5fe42702	完成了麦格纳质检录入不良数量的功能	5 years ago
曾贞一	a0b50da83e	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
曾贞一	c06c504805	【2712 子 09 1.2.1.1.1客户发运车辆推荐 / 09 1.2.1.1.1客户发运车辆推荐 -后端】	5 years ago
joke.wang	746a17bd75	bj-mgn辅助展示组件	5 years ago
songss	7243e20cc8	Merge remote-tracking branch 'origin/test' into test	5 years ago
songss	d5d6f2cfee	修改枚举值	5 years ago
陈思洁	5dd7cc44b2	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	fad811c2bc	【增加索引】	5 years ago
joke.wang	18ca368f3c	照片采集	5 years ago
puxiao.liao	679ad59b86	Fix bug#10977 ... 19128+MES工单生成WMS领料任务无法生成+20200901	5 years ago
wynne1005	4bdfebede1	中航打包PCR完成	5 years ago
puxiao.liao	0e89f89327	修复MGN系列BUG	5 years ago
puxiao.liao	137c45b5cc	修复MGN系列BUG	5 years ago
汪云昊	b2517a11b8	feat(用户登录日志):用户登录日志查询及导出功能	5 years ago
陈思洁	564fdb261b	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	03730fe13c	【[#2702::07 ext 虚拟工单关闭按钮（注塑、涂装、组装） ] 】	5 years ago
wynne1005	fa8beadc4f	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
wynne1005	191220442f	websocket错误提示音	5 years ago
rock.yu	3935bde8f6	同步 SAP 数据同步 JOB（从仪征同步）	5 years ago
wynne1005	89ec0cbd71	解决冲突	5 years ago
wynne1005	d86c84a39e	添加工步返回表格背景色	5 years ago
许心洁	73c0ae5d42	优化合并仪征代码	5 years ago
陈思洁	df2342e097	【2703 07 ext 虚拟工单关闭按钮（注塑、涂装、组装）】	5 years ago
puxiao.liao	1eb3622d19	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
alwaysfrin	8b6271cebc	1，数据源参数配置优化 ... 2，读写分离数据源切换优化 3，日志切面优化调整 4，登陆线程优化 5，对象新增、修改监听优化	5 years ago
songss	19f1cf85c4	Merge remote-tracking branch 'origin/test' into test	5 years ago
songss	fad439a5a0	增加MES状态机Repository类	5 years ago
puxiao.liao	b8a938df2e	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	23d8afd0ae	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	09c95d3542	【库存排程配置增加禁用启用接口】	5 years ago
joke.wang	3815c1c730	扭矩采集plc优化	5 years ago
puxiao.liao	2527fe0163	修复MGN系列BUG	5 years ago
陈思洁	381ff0c974	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	de248a944f	【2701 08 1.2.3.3.8 涂装检测工位，显示合格数、不良数】	5 years ago
钮海涛	51746154ba	合并dev到test	5 years ago
钮海涛	e6b472bcfd	合并test代码到dev	5 years ago
钮海涛	98b992408c	Merge remote-tracking branch 'remotes/origin/test' into dev	5 years ago
钮海涛	4144e12b5d	合并test代码到master	5 years ago
钮海涛	92f0158dab	合并master代码	5 years ago
曾贞一	57aae56345	【2690 ext新增委外库存查询报表 -后端】	5 years ago
wynne1005	f06f51cc7e	master merge test	5 years ago
rock.yu	f6b812aaf8	PDA组件原生支持脚本组件	5 years ago
joke.wang	b09aa27e0f	排程job	5 years ago
rock.yu	9be1dd70d5	盘点明细表 lotno 字段增加默认值	5 years ago
汪云昊	feace77fc3	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
puxiao.liao	7f91f1269c	修复MGN系列BUG	5 years ago
汪云昊	731a92fa2c	Merge remote-tracking branch 'remotes/origin/dev' into test	5 years ago
汪云昊	6dc0d94085	feat:适配器添加空报文保存开关	5 years ago
汪云昊	4dc40c79dd	fix:pager.startRow重复计算	5 years ago
钮海涛	3bca09c091	Merge remote-tracking branch 'origin/test' into test	5 years ago
钮海涛	8d38a297d2	三力士演示demo	5 years ago
汪云昊	7e678e747d	feat:移除mongo日志持久化方法	5 years ago
puxiao.liao	36e9000710	麦格纳BUG	5 years ago
joke.wang	a2eab983d9	缓存池订单池增加jit_seq字段	5 years ago
钮海涛	2133d0d7e4	Merge remote-tracking branch 'origin/test' into test	5 years ago
钮海涛	f0023a2232	三力士演示demo	5 years ago
曾贞一	c1cb461f36	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
曾贞一	a9e97d4e28	【2688 08 extPDA-查询查看零件对应库位】 ... 【2683 08 ext单据打印新增字段查询和显示】 【2682 08 ext单据打印新增模板选择】	5 years ago
钮海涛	0b6764e8fe	Merge remote-tracking branch 'origin/test' into test	5 years ago
钮海涛	6dd429d328	三力士演示demo	5 years ago
songss	a2f257e414	Merge remote-tracking branch 'origin/test' into test	5 years ago
songss	df6f0bb4f2	删除没用代码	5 years ago
songss	f4d7e55f05	喷涂过程条码批量打印报错bug修复	5 years ago
陈思洁	0325e3dc95	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	98afecf57b	【10877 19048-预组装看板及操作工位变更调整-20200828】	5 years ago
wynne1005	a580c70c04	添加正态分布数据总数	5 years ago
wynne1005	762b73dddf	添加StepResult的返回cmd CLEAR_CACHE	5 years ago
wynne1005	9563ebeb66	normalDistribution	5 years ago
wynne1005	b4b1c2f3f8	erge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
wynne1005	0fd5989864	新增帮助类型的busiType	5 years ago
rock.yu	42187ebadc	完善流程管家日志信息	5 years ago
钮海涛	85395e84fd	合并dev代码	5 years ago
钮海涛	2013d47353	合并dev代码	5 years ago
宋军超	940510ea5b	北京海纳川、北京麦格纳问题修复	5 years ago
陈思洁	d7f8796d36	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	ee1b0b5b67	【2674 预装区基础页面开发】	5 years ago
puxiao.liao	d63d07ad7e	麦格纳收货BUG	5 years ago
joke.wang	ac55ae1df1	库存排程配置增加物料名称	5 years ago
王杰	7a502c45c9	注塑上料 展示组件增加字段	5 years ago
陈思洁	baa7d144b7	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	daf0b94314	【10828 19048-10827-预装作业界面优化！-2020-08-25】	5 years ago
曾贞一	3f2232d741	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
曾贞一	ec7aee68a7	【10744 20011--二维码收货时，如果该零件号设置了特殊批次，则扫描系统自己生成的二维码时永远报错“条码未维护供应商批次 执行成功请扫描二维码”，实际批次已经存在与条码最后一个字段中--0830】	5 years ago
宋军超	53d392ebe1	海纳川问题修复枪头更换添加弹框校验	5 years ago
wynne1005	ebd12f7c65	去除ProductBiModel重复字段	5 years ago
wynne1005	f9fa5814f6	冲突解决	5 years ago
wynne1005	40ec96a390	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
wynne1005	bbcd0c8f69	去除多余枚举	5 years ago
许心洁	2cc6abb902	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
许心洁	291c0b2a40	BUG#10584,BUG#10784,BUG#10785	5 years ago
钮海涛	9a41c2e2e0	合并test到dev	5 years ago
钮海涛	025cc19f68	合并dev到test	5 years ago
钮海涛	347f6671f2	合并dev到test	5 years ago
钮海涛	99b8cb146c	Merge remote-tracking branch 'remotes/origin/master' into test	5 years ago
钮海涛	310da99743	合并master代码	5 years ago
wynne1005	3769a630fe	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
wynne1005	42a340d0c0	timeModuleInit	5 years ago
宋军超	f3cb06ba5a	Merge remote-tracking branch 'origin/test' into test	5 years ago
宋军超	030343f2ce	海纳川问题修复	5 years ago
王杰	43ad04818c	pom	5 years ago
王杰	0d256b3afd	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
钮海涛	b4a4c42fe0	合并master代码	5 years ago
wynne1005	b3aa6eef70	中航 均值极差	5 years ago
钮海涛	35d3a85b60	合并master代码	5 years ago
钮海涛	c7adb56b9c	Merge remote-tracking branch 'origin/test' into test	5 years ago
汪云昊	8d6b01c06e	Merge remote-tracking branch 'remotes/origin/dev' into test	5 years ago
钮海涛	3df3c89db9	Merge remote-tracking branch 'origin/test' into test	5 years ago
汪云昊	a52646a65d	Merge remote-tracking branch 'remotes/origin/dev' into test ... # Conflicts: # modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java	5 years ago
钮海涛	ea43d63d7e	Merge remote-tracking branch 'remotes/origin/master' into test	5 years ago
汪云昊	dd75e3729b	feat:添加条码解析校验模式	5 years ago
汪云昊	d02c73f431	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
汪云昊	26cf4c5e92	feat:mongo模块化	5 years ago
汪云昊	103137e2fc	feat:添加条码解析校验模式	5 years ago
汪云昊	a5d7ff1ef4	feat:添加条码解析校验模式	5 years ago
王杰	3b31f9fcc8	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
王杰	d0bfa965f7	类型信息 seq	5 years ago
陈思洁	b0c3b85378	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	68fef2b051	【2634 19048--涂装Unpack流程！-2020-08-05】	5 years ago
wynne1005	c3f30530a8	erge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
wynne1005	086c78f828	新增pcn页面的辅助展示组件	5 years ago
puxiao.liao	6d59e00fc5	Fix bug#10545 ... 10545 19081 -- 出入库界面更改 20200814	5 years ago
joke.wang	e3146c9fb4	Fix Bug #0776	5 years ago
王杰	4c9b5d087c	涂装 二箱 客户 查询工作逻辑变更	5 years ago
王杰	a2084204f0	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
王杰	41422d895e	涂装 客户 二箱 查询工单逻辑变更	5 years ago
puxiao.liao	ba5befe291	Finish Task #2645 Cost:8h ... 【PCR-20200525-003_委外出库条码变更】中的零件号转化	5 years ago
joke.wang	fd771bccf8	报功接口增加工单类型字段	5 years ago
joke.wang	6f2905de1a	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
joke.wang	f6460749db	jsp解析优化	5 years ago
曾贞一	d81a7bf22e	【接口映射优化】	5 years ago
joke.wang	84dcf36c86	Fix Bug #10708	5 years ago
陈思洁	d17161d359	【2658 LPS导入后端开发】	5 years ago
曾贞一	867ecc6d71	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
曾贞一	15314209ae	【2636 07 1.2.3.4.3坤泰ERP&WMS接口】	5 years ago
joke.wang	f275d70136	Fix Bug #10674	5 years ago
puxiao.liao	9299f17c3b	Fix bug#10671 ... 二维码收货扫描条码报错系统异常 --20200821	5 years ago
陈思洁	358d582209	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	b56cf991be	【2607 08 ext PCR-200623001需求变更-预组装】	5 years ago
王杰	5f495a1b98	产品工作中心配置	5 years ago
曾贞一	d3ae797ba0	【坤泰接口开发】 ... 【质保周期检查组件--优化代码】	5 years ago
joke.wang	9207f20b37	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
joke.wang	09b8ccd1e3	Fix Bug #10520	5 years ago
王杰	1d86ce6429	总装打包 展示组件 列表显示封箱状态名称	5 years ago
陈思洁	406c625974	【2634 19048--涂装Unpack流程！】	5 years ago
陈思洁	c937e2aa64	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	ee927b7056	【2607 08 ext PCR-200623001需求变更-预组装】	5 years ago
宋军超	6db85d596b	修改海纳川问题	5 years ago
王杰	72afe6891b	料箱显示工作中心名称	5 years ago
rock.yu	f1bbe0344b	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
rock.yu	5bfd542402	增加工单拉动	5 years ago
宋军超	5e81b1f448	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
宋军超	4d816de5da	修改海纳川问题,添加PTL新逻辑关联bug:10538	5 years ago
王杰	a7c3167eef	注塑上料	5 years ago
joke.wang	562ba3e339	增加按灯停机时长接口	5 years ago
曾贞一	0b09e410f5	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
曾贞一	fe2017fbe4	【622 08 1.2.2.2.6 BOM增加虚阶零件】	5 years ago
钮海涛	228d3dd2ab	Merge remote-tracking branch 'origin/test' into test	5 years ago
钮海涛	841742e474	托标签收货合并到二维码收货	5 years ago
宋军超	163c385842	修改海纳川问题	5 years ago
puxiao.liao	fde40074ce	BUG修复	5 years ago
joke.wang	85b6067133	BI优化1	5 years ago
wynne1005	a400bf5aa7	还原orderBy	5 years ago
wynne1005	8ee28db80b	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
wynne1005	887e1d04f7	baseBean sortParamMap 先注释	5 years ago
宋军超	ba7cdc84e5	修改海纳川问题	5 years ago
wynne1005	953e243fe8	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
wynne1005	ef83a7aa08	是否重选更换名称 大小枪与绑定支持并发	5 years ago
钮海涛	9878547daa	合并dev分支代码	5 years ago
钮海涛	272c92dcb6	Merge remote-tracking branch 'origin/test' into test	5 years ago
钮海涛	f42ece4f6c	优化流程管家执行性能	5 years ago
wynne1005	032a7e8126	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
wynne1005	d699e88984	StationRequestBean	5 years ago
joke.wang	1cf11c4500	Fix Bug #10477	5 years ago
joke.wang	3f03b5fab5	产线表增加序号字段	5 years ago
wynne1005	a751d5a8a7	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
wynne1005	8d7b0fae6a	添加小枪日志 与不需要打枪绑定 自动跳过	5 years ago
宋军超	44b90bf639	修改海纳川问题	5 years ago
钮海涛	2fb46609c3	sweb功能开发	5 years ago
钮海涛	ad4b59a700	Merge remote-tracking branch 'origin/test' into test	5 years ago
钮海涛	dd7347d352	Sweb功能开发	5 years ago
钮海涛	b437a78e31	Merge remote-tracking branch 'origin/test' into test	5 years ago
王杰	f45137db94	注塑上料	5 years ago
钮海涛	438dcacdce	Merge remote-tracking branch 'origin/test' into test	5 years ago
曾贞一	8f7a7fcc32	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
曾贞一	6ba2d2826a	【麦格纳问题】	5 years ago
汪云昊	2013ca569a	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
汪云昊	15aa885cf8	fix:定时任务空指针的问题	5 years ago
汪云昊	a45d1ed104	fix:分页结束行计算错误的问题	5 years ago
钮海涛	53151424b9	Merge remote-tracking branch 'remotes/origin/master' into test	5 years ago
陈思洁	a5ea72f593	【新增库位实体】	5 years ago
陈思洁	a093f06edc	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	38f9adc2dd	【10554 19048--喷涂条码打印功能不应该查询出其他车间的生产计划！-2020-08-13】	5 years ago
wynne1005	59aadc94ce	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
wynne1005	763b88b420	工位扫描添加工步触发条件	5 years ago
许心洁	9bbc387818	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
许心洁	4ec9858182	任务#2625	5 years ago
宋军超	19b1bfb9b6	修改海纳川打印	5 years ago
joke.wang	2d52fe0a40	Fix Bug #10535	5 years ago
wynne1005	3030a109b2	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
wynne1005	0d3a8a3af7	添加放行记录	5 years ago
joke.wang	89bd4f189a	项目表增加字段	5 years ago
joke.wang	74cc0c757d	成品标签打印	5 years ago
曾贞一	3c4239c66a	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
曾贞一	2bef33960c	【2617 08 1.2.2.2.4新增保质期检查组件】	5 years ago
许心洁	c0629d52d1	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
许心洁	1c02cd6562	任务#2612，2613	5 years ago
wynne1005	ba558d640e	tmp	5 years ago
joke.wang	bf902b8366	Fix Bug #10294	5 years ago
王杰	175052ebcc	报工表加质量状态 默认合格	5 years ago
王杰	1707f6b228	MesProdWorkCenter	5 years ago
陈思洁	3baf748329	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	9b9871534a	【10493 19048-产品颜色无导入功能】	5 years ago
汪云昊	bda160ccec	Merge remote-tracking branch 'remotes/origin/dev' into test	5 years ago
joke.wang	a522db04a9	过程条码增加字段vinCode	5 years ago
宋军超	84f61e65fc	修改海纳川问题	5 years ago
王杰	18dd2cbcb2	zs	5 years ago
汪云昊	b4c90b01fa	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
汪云昊	8d17cfcec0	feat:用户定制化配置功能	5 years ago
王杰	772229b983	andon	5 years ago
王杰	9e8cb0b844	注塑	5 years ago
陈思洁	056d4390ca	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	4a99857248	【10414 19048 - 注塑产品消耗BOM报表！-2020-08-05】	5 years ago
joke.wang	8c2fd8a587	Fix Bug #10476	5 years ago
joke.wang	f495ffed54	Fix Bug #10477	5 years ago
joke.wang	4bdd2b770b	Fix Bug #10486	5 years ago
joke.wang	51f9d92d36	北京麦格纳esop展示组件修改	5 years ago
ypf	97a2bdd60e	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
ypf	523d2ffc80	关于欧洲领料看板逻辑实体的添加	5 years ago
joke.wang	7c3594a870	Fix Bug #9589	5 years ago
陈思洁	e4c8431a22	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	653b413623	【10334 19048-MES、WMS接口JIT02中增加内部工单号！-2020-08-03】	5 years ago
宋军超	e70192d3c2	添加日志查询问题	5 years ago
钮海涛	54b0af00cc	Sweb功能开发	5 years ago
宋军超	625b780aaf	添加海纳川数据复核工步和产线状态看板变更	5 years ago
wynne1005	5d9e055fe1	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
wynne1005	3af4d32a97	mes工位运行状态	5 years ago
汪云昊	a3e8caf085	fix:detachObject为空时报错	5 years ago
宋军超	6aaa26b192	修改海纳川问题	5 years ago
joke.wang	edb85b5ea6	桌面BI	5 years ago
汪云昊	55b047448b	fix:会话模式为默认时出现不能正常覆盖的问题	5 years ago
宋军超	6e60bee0dd	修改海纳川问题	5 years ago
宋军超	731b1c60ee	修改海纳川问题	5 years ago
wynne1005	3c004324b1	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
wynne1005	6e455f5d72	reqBean 添加productSn	5 years ago
王杰	5413fc259c	pcn 缺陷	5 years ago
许心洁	4a9e5cbb59	Merge remote-tracking branch 'origin/test' into test	5 years ago
钮海涛	3a4c143563	Merge remote-tracking branch 'origin/test' into test	5 years ago
钮海涛	14e68803df	增加根据物料号取库存地信息的微服务接口	5 years ago
许心洁	afeb22c8ec	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
许心洁	7dcd8a1627	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
许心洁	7482a6dd74	BUG#9928 和任务#2590	5 years ago
汪云昊	410f469450	Merge remote-tracking branch 'remotes/origin/dev' into test	5 years ago
汪云昊	7f291a26cd	会话模式配置-调整默认模式	5 years ago
puxiao.liao	f9061f5d27	BUG修复	5 years ago
宋军超	162e2d33d7	修改海纳川问题	5 years ago
宋军超	99787412cd	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
宋军超	8eade912c7	添加返工返修数据复核逻辑	5 years ago
陈思洁	ed343a8064	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	ba3f5fde4d	【总装、涂装、注塑计划报表】	5 years ago
qianhs	86c9bce2aa	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
宋军超	c4f40d215b	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
宋军超	fa4b1e09aa	修改海纳川问题	5 years ago
曾贞一	067a859e83	【10229 19081-- 在已有的二维码生产报工逻辑上加上原材料扣减逻辑 --20200802】	5 years ago
钮海涛	933f2014ad	Merge remote-tracking branch 'origin/test' into test	5 years ago
钮海涛	39f6819e9b	修复合并版本问题	5 years ago
钮海涛	59a1acdafc	修复合并版本问题	5 years ago
puxiao.liao	d5d16569bb	Fix bug#10283 ... 20089+库存移动统计报表查询增加项目代码查询项	5 years ago
钮海涛	f760b72094	Merge remote-tracking branch 'remotes/origin/test'	5 years ago
宋军超	fe79944778	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
王杰	5739ac27bb	缺陷	5 years ago
陈思洁	39ea32e37e	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	a01cd4d34b	【注塑计划导入功能数据优化】	5 years ago
宋军超	8bc0da924c	修改海纳川问题	5 years ago
rock.yu	f368ec88cc	修改流程管家组件调用日志表	5 years ago
joke.wang	33cace48ab	半成品打印增加字段	5 years ago
qianhs	c872663847	Finish Task #2080 Cost:8h	5 years ago
宋军超	0b3c53b4ca	修改海纳川问题	5 years ago
wynne1005	e35fdcbc2a	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
wynne1005	4c9cdcb6a0	tmp	5 years ago
rock.yu	71a2b68991	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
rock.yu	b928acae47	1. 流程管家增加记录组件执行耗时的功能	5 years ago
陈思洁	b662a6ebe5	Merge remote-tracking branch 'origin/test' into test	5 years ago
陈思洁	26fe63eb8a	【10278 19048-总装标记不良功能通过外部输入条码标记不良-2020-08-03】	5 years ago
汪云昊	e6ecd4f86f	Merge remote-tracking branch 'remotes/origin/dev' into test	5 years ago
汪云昊	0d40470059	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
汪云昊	18a09cc4b6	FTP多文件读取问题 ... 脚本解析功能初版	5 years ago
汪云昊	101a71970c	虚拟属性数据校验及参数赋值问题	5 years ago
汪云昊	5a6a7a77fc	平台功能优化，移除通用缓存服务	5 years ago
钮海涛	51bae8d1e6	Fix Bug #10312 修复动态搜索取不到列信息问题	5 years ago
王杰	9a959a5184	pcn enum	5 years ago
陈思洁	41cbe4f380	【10284 19048-注塑生产计划导入变更-20200803】	5 years ago
陈思洁	ce7ca48c4b	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
宋军超	394a332de2	修改展示组件逻辑	5 years ago
陈思洁	72c8e22433	【接口映射代码调试】	5 years ago
wynne1005	88233f080a	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
wynne1005	3ec8109e82	枪优化	5 years ago
王杰	e8611616db	IPC	5 years ago
王杰	6c5e646d49	test merge master	5 years ago
joke.wang	c060377822	中航BI	5 years ago
wynne1005	5fad38392e	添加索引 脚本表更新	5 years ago
joke.wang	05fa7dba04	Fix Bug #10227	5 years ago
joke.wang	af539c85a7	mgn bug	5 years ago
宋军超	31f289e1be	修改展示组件和电检逻辑	5 years ago
曾贞一	f25a186d77	【2511 07 1.2.3.4.3坤泰ERP&WMS接口】	5 years ago
曾贞一	4ff84de904	【2557 sap指令锁定回传信息增加业务类型，交易类型，erp单号内容】	5 years ago
puxiao.liao	5990e56dfd	Finish Task #2540 Cost:8h ... 喜德WMS-新增“回传源材料扣减结果”的接口映射	5 years ago
王杰	bc9adf8ac0	ptl	5 years ago
王杰	784cd87c71	ptl	5 years ago
钮海涛	e239c89e63	Merge remote-tracking branch 'origin/test' into test ... # Conflicts: # modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java	5 years ago
钮海涛	7f55af4477	Finish Task #2560 Cost:8h	5 years ago
贾文涛	5d19c8876b	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	bc2d29c006	【2547 07 1.2.4.6.1.10 PCR-200617001需求变更-生产过程不良紧急拉料】	5 years ago
贾文涛	fd42a3292a	Fix Bug #10090,修复涂装二次箱条码作业完成后，一次箱条码工位数据会乱掉问题。	5 years ago
许心洁	f791b3f82f	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
许心洁	ffc70e158a	BUG#8696	5 years ago
钮海涛	5a64ce6021	Merge remote-tracking branch 'remotes/origin/dev' into test	5 years ago
joke.wang	13f7121610	海纳川看板	5 years ago
贾文涛	70693d5b63	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
joke.wang	01ac2e85da	Fix Bug #10087	5 years ago
宋军超	e007a52732	修改海纳川问题	5 years ago
王杰	4a59b5c913	bug: 10003 19073-安灯作业安灯类型自处理名称修改工装-20200728	5 years ago
贾文涛	8180795cd7	功能优化-打包时将工位代码存入包装表	5 years ago
王杰	7f5c1735ea	数据复核	5 years ago
joke.wang	ea922affba	Start Task #2522 Cost:8h Left:8h	5 years ago
qianhs	163d610265	Finish Task #2080 Cost:8h	5 years ago
puxiao.liao	937eac5e87	Finish Task #2549 Cost:4h ... 自动生成领料单增加默认来源存储区、自动获取默认目标库位	5 years ago
钮海涛	72c1363517	Merge remote-tracking branch 'origin/test' into test	5 years ago
钮海涛	f2cf6af1fe	Finish Task #2523 Cost:16h ... Fix Bug #10065 已增加数据权限控制	5 years ago
王杰	306b05b4d7	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
许心洁	46904c43d1	任务#2528，#2545	5 years ago
puxiao.liao	9b622a27fc	Merge remote-tracking branch 'origin/test' into test	5 years ago
puxiao.liao	3c3a5f6068	Fix bug#9902 ... 20089+物料拆分条码异常+0724	5 years ago
joke.wang	3223158529	Fix Bug #10108	5 years ago
王杰	47a155e1d1	git push	5 years ago
joke.wang	2a93bb2ca4	Finish Task #2521	5 years ago
rock.yu	0f8326d5f8	1. 修改扭矩枪采集部分因主数据变动引起的逻辑变动	5 years ago
wynne1005	7593b63cfc	重做枚举	5 years ago
joke.wang	47f7e24f57	Fix Bug #10060	5 years ago
puxiao.liao	47f466d1d6	Merge remote-tracking branch 'origin/test' into test	5 years ago
puxiao.liao	e85acdcfff	Fix bug#9994 ... 库存明细--显示重复	5 years ago
qianhs	958a45d3dd	Finish Task #2080 Cost:8h	5 years ago
钮海涛	fd0f079a6a	Merge remote-tracking branch 'origin/test' into test	5 years ago
钮海涛	34be0bde26	增加物料组功能	5 years ago
puxiao.liao	6cd46e07bc	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
宋军超	23f33a79d1	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
宋军超	c18c22a799	修改海纳川电检测问题	5 years ago
贾文涛	c7bba92741	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
rock.yu	35cdb1f257	完善脚本管理功能	5 years ago
贾文涛	aafb3d36fc	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
puxiao.liao	2e3f5bb2af	Fix bug#9994 ... 库存明细--显示重复	5 years ago
rock.yu	eef7ed9c32	调整 pojo 引用关系， mes-pcn-pojo 已废弃	5 years ago
rock.yu	1d02d45e61	增加脚本引擎缺失的DAO	5 years ago
rock.yu	9104f42d42	增加脚本引擎缺失的DAO	5 years ago
rock.yu	6fbb76b395	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
rock.yu	7d76a3ecc7	增加脚本持久化类	5 years ago
宋军超	3590ef4b68	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
宋军超	f0fd8da49c	修改海纳川问题	5 years ago
钮海涛	7a93a935cc	Merge remote-tracking branch 'origin/test' into test	5 years ago
puxiao.liao	5f90efe691	Fix bug#9982 ... 19125+条码打印页面，erpSrcNo字段数据错误，导致打印出的条码数据有误+0727	5 years ago
joke.wang	e5d54d8c0a	工位BOM增加预警字段	5 years ago
joke.wang	768e31e636	Fix Bug #9995	5 years ago
钮海涛	7ca3b43bfe	合并DEV分支代码	5 years ago
钮海涛	9b3bb48231	Merge remote-tracking branch 'remotes/origin/test' into dev	5 years ago
贾文涛	3e260a9b86	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
wynne1005	4d608dd4c3	扩展dispatcher model	5 years ago
宋军超	5fa18e05f1	修改中航问题	5 years ago
钮海涛	b04ef3caa4	合并TEST分支代码	5 years ago
钮海涛	ef40f20e1d	解决合并冲突	5 years ago
钮海涛	3c22c8e3f4	test版本合并到master	5 years ago
贾文涛	c10a7bae7e	增加方法代码字段	5 years ago
钮海涛	0eb571d717	Fix bug #9804	5 years ago
钮海涛	9bde10f13c	修复收货回执界面打不开问题	5 years ago
宋军超	457cb894db	添加工位队列信息功能	5 years ago
puxiao.liao	5006e0a938	Finish Task #2520 Cost:8h ... 2520 07 1.2.3.3.4北京麦格纳WMS-JIS生产报工与内部移库	5 years ago
陈思洁	2636e43b9b	【9914 天津】	5 years ago
joke.wang	c90a009e66	Fix Bug #9874	5 years ago
wynne1005	d0e1900a84	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
wynne1005	c1fd1f6eee	bypass redo release	5 years ago
王杰	03dbb18bb8	8832 PO-HJMGN-19073--TJX5没有设备信息，但是显示了新松线的设备信息。--20200609	5 years ago
王杰	41ff729f99	workorderlog	5 years ago
宋军超	13142b4ce1	修改电检逻辑	5 years ago
曾贞一	374e73128d	【坤泰流程测试】	5 years ago
汪云昊	1aa63db4d3	Merge remote-tracking branch 'remotes/origin/dev' into test	5 years ago
汪云昊	4b3470b1fd	定时任务日志优化 ... 邮件发送失败记录	5 years ago
宋军超	933e9efb3d	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
宋军超	3a31ccae70	队列明细添加临时字段	5 years ago
贾文涛	a577eac60a	修复缓存redis时，忽略ModuleServer对象。	5 years ago
wynne1005	f3a13522a1	解决冲突	5 years ago
wynne1005	3ba1c8ee62	新增组件类型枚举	5 years ago
joke.wang	a1af94fe70	Fix Bug #9760	5 years ago
宋军超	ae285a6dc6	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
王杰	4df8a743a7	9735 19048-物料信息导入模板增加喷涂必需信息的维护-2020-07-21	5 years ago