5447 Commits (92c13e5bcd98d5719a125886595ae3cb10625c0c)

Author	SHA1	Message	Date
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	5 years ago
zcg	9175fc028f	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
zcg	c7d494c31e	[需求：1324，导出excel]	5 years ago
jenkins	f39163513c	Jenkins自动合并	5 years ago
曾贞一	4bd0aa8d57	【系统配置-模糊查询 】	5 years ago
jenkins	1fbd9c4357	Jenkins自动合并	5 years ago
gcj	c51de088d6	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
gcj	9c2dcba09d	【运输管理】添加查询关联单号	5 years ago
zcg	dccd104fdd	[需求：1324，excel导出]	5 years ago
jenkins	4e8ee475b4	Jenkins自动合并	5 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	5 years ago
gcj	fc9b8629ab	【采购收货】	5 years ago
jenkins	cc45dbc2cb	Jenkins自动合并	5 years ago
曾贞一	91716272a6	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
曾贞一	393d3f12b8	【7055 新增波次拣货流程】	5 years ago
E	996526ac7c	【bug7088 物料信息中的导入功能】	5 years ago
王杰	90de0f7df6	Merge branch 'dev' into test	5 years ago
王杰	b0709aca97	枚举	5 years ago
jenkins	695a9b2e63	Jenkins自动合并	5 years ago
陈思洁	03982ad2e0	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
陈思洁	03eeacd273	【KT-1298 物流路线【处理模式】优化】	5 years ago
钮海涛	335ab2ce51	新增KPI接口	5 years ago
王杰	ab68895760	test分支修改pom	5 years ago
王杰	c87b00756f	dev分支修改pom	5 years ago
WYnneaoapc	9de807ab24	Merge branch 'test'	5 years ago
qianhs	1d7cf41653	【VDA静态盘点-盘点调差-实时库存未解冻】【bug7009】后期待优化	5 years ago
qianhs	4c8a94bdfa	【VDA静态盘点-盘点调差-实时库存未解冻】【bug7009】	5 years ago
qianhs	a2ac02aa47	【VDA静态盘点-盘点调差-实时库存未解冻】【bug7009】	5 years ago
E	69e20029e8	【1320 KT物料信息--需要维护物料的类型：器具】增加描述：90=器具库	5 years ago
E	7ef04dd824	【1320 KT物料信息--需要维护物料的类型：器具】	5 years ago
gcj	a7d1ec785b	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
许心洁	eb084d3904	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
许心洁	0d7e64b160	在调用交易处理组件之前把交易处理组件类型名称一并赋值到MOVEMASTER对象中，省去每个组件中再去循环查询。	5 years ago
qianhs	5c28c8344c	【VDA静态盘点-盘点调差-实时库存未解冻】【bug7009】	5 years ago
汪云昊	4705b77a7e	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
汪云昊	b674087ffc	资源导入优化	5 years ago
王杰	339f1a86c2	删除枚举代码中间的注释	5 years ago
puxiao.liao	0453363336	【发运配料界面显示将单据数量改为剩余配料数量。 ... 】bug7063	5 years ago
王杰	423b81609a	【需求：1198】	5 years ago
qianhs	fdfc5884c5	【 库存调整盘点（两个界面）需要可以扫描库位以后立刻提交。】【bug7040】	5 years ago
jokelone	e2c9d9e569	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
jokelone	54fe0ce760	【bug：6360 工厂初始化】	5 years ago
zcg	b06ecdd3f3	[bug：7043，PCN节点-模块修改]	5 years ago
gcj	49134cc5b3	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
钮海涛	81b84d86e5	新增KPI接口	5 years ago
WYnneaoapc	51623754c7	Merge branch 'test'	5 years ago
WYnneaoapc	0191a17a4d	Merge branch 'dev' into test	5 years ago
WYnneaoapc	0103c64247	task `1316` 1 拆分job任务	5 years ago
WYnneaoapc	9157020997	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
gcj	b29d84bbad	【运输管理】	5 years ago
WYnneaoapc	e206057aba	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
gcj	ba355aab55	【运输管理】	5 years ago
jenkins	5513e95884	Jenkins自动合并	5 years ago
gcj	01e5919349	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
E	b5006a88f1	【#1302 器具管理-新增器具规则检查组件】【#1303 器具管理-修改更新箱条码组件】	5 years ago
jenkins	78d80f03cf	Jenkins自动合并	5 years ago
qianhs	15d3d3b5e1	【 库存调整盘点（两个界面）需要可以扫描库位以后立刻提交。】【bug7040】	5 years ago
jenkins	34b843bd1f	Jenkins自动合并	5 years ago
puxiao.liao	4f1455012f	【领料上线扫描时，在扫描完条码后将目标库位带出。 ... 】bug7024	5 years ago
曾贞一	f800d3dd7b	【成品发运，获取在途库位逻辑修改】	5 years ago
WYnneaoapc	50f77a5081	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
gcj	0e1599789d	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
gcj	d92850c1a4	【运输管理】	5 years ago
WYnneaoapc	a38dc051ac	task `1308` 1 PCN国际化资源	5 years ago
汪云昊	38fc49f053	Merge remote-tracking branch 'remotes/origin/dev' into test	5 years ago
汪云昊	2fb79b8354	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
汪云昊	14f1ced301	会话文件展示地址封装	5 years ago
jenkins	03051f4fd1	Jenkins自动合并	5 years ago
puxiao.liao	0c01ffb230	【在配料时，点击右上角放大镜，输入单号无法查询，并且显示的内容需要有来源，目标，是否紧急 ... 】6978	5 years ago
许心洁	4b340e6954	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
许心洁	773f56b577	TASK_INO_STATUS 20和30的枚举类名严重错误，容易误导开发	5 years ago
jenkins	8efcd210aa	Jenkins自动合并	5 years ago
陈思洁	d0ddf208c3	【KT-1297 物流路线的【适用范围】优化】	5 years ago
jenkins	95048bce44	Jenkins自动合并	5 years ago
qianhs	d4d30bf634	【 零件号条码打印，扫描后需要提示当前扫描零件，当前扫描数量，剩余扫描数量（标包减去扫描数量）。】【bug7020】	5 years ago
jenkins	cd1696c787	Jenkins自动合并	5 years ago
汪云昊	4632c7572c	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
汪云昊	1318c6ef56	Merge remote-tracking branch 'remotes/origin/dev' into test	5 years ago
汪云昊	3dd247491a	软件适配器异常信息优化	5 years ago
WYnneaoapc	129c84d4a8	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
WYnneaoapc	bc21d0b461	task `1308` 1 PCN国际化资源	5 years ago
陈思洁	5d4e8a94c4	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
陈思洁	c5ae91b41e	【KT-1286 计划拉动-计划拉动JOB】	5 years ago
jenkins	55dcb795c9	Jenkins自动合并	5 years ago
许心洁	e816c2fd6a	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
许心洁	258c1ccbe8	流程导入：优化数字类型CELL为空字符串时的校验+有些SHEET没有数据时无需校验+快速移库：只能移入库状态的条码；不可多人操作同一个库位进行整库移库	5 years ago
WYnneaoapc	7ecae4d56b	Merge branch 'test'	5 years ago
WYnneaoapc	2a3499de65	Merge branch 'dev' into test	5 years ago
WYnneaoapc	4182b4d852	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
WYnneaoapc	6d357abe9f	task `1304` 2 活化开线管控	5 years ago
jenkins	1594c49ca9	Jenkins自动合并	5 years ago
zcg	f23b0f7bfe	解决冲突	5 years ago
陆卫豪	3e9c1aaa76	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	5 years ago
WYnneaoapc	7451bc9460	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into wynne_temp_wc	5 years ago
WYnneaoapc	99fd4221e2	task `1304` 1 活化开线管控	5 years ago
jenkins	0e35bd1d6b	Jenkins自动合并	5 years ago
钮海涛	e0f81a73d7	修改甘特图日历接口	5 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
曾贞一	07f51040c3	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
曾贞一	ff1f561b9d	消息样式实体类 增加一条	6 years ago
1111	f0290a758d	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
1111	e349ab3e9b	【采购收货】	6 years ago
王杰	4f87ec8516	解决冲突	6 years ago
wei.peng	6cb9eeed8c	功能权限 倒入导出 添加产品类型校验	6 years ago
wei.peng	11bc240347	功能权限国际完成	6 years ago
jokelone	07ee1971ae	【bug：6522工位增加序号字段】	6 years ago
crish	54ae351d91	安灯任务管理界面查询代码优化， 解决安灯任务， 开发信号发送逻辑	6 years ago
qinjia zou	f7c89fa6b1	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
qinjia zou	c051b6024b	【VDA物流路线-路线新增-字段赋值】bug6515	6 years ago
jokelone	869278c614	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
jokelone	c5bc44f29a	【bug：6522工位增加序号字段】	6 years ago
钮海涛	f640f97116	修复副资源排程Bug	6 years ago
钮海涛	f969ab4599	修复副资源排程Bug	6 years ago
WYnneaoapc	81873315c3	Merge branch 'test'	6 years ago
crish	55ee26db3c	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
crish	f836daf8a6	将广播设备写死的代码配置化	6 years ago
陆卫豪	62800f757e	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
WYnneaoapc	185b40a586	6518 管控代码修改	6 years ago
钮海涛	bed955575d	修复规则组合关联问题	6 years ago
jokelone	ce63c161be	【任务：1211报表功能开发：生产报表】	6 years ago
jenkins	04ae04246e	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
许心洁	549f63aa0d	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	07bda76d4f	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	b181cf2ac3	【安全库存拉动】	6 years ago
许心洁	77b921ef38	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	b0c4d11000	流程设计界面：查询组件列表根据作业类型名称分组返回给前端+每个步骤开始前都重新获取当前流程明细的步骤参数并放入缓存（BUG#6304）	6 years ago
crish	86171d35b7	修改master分支pom为PROD	6 years ago
crish	2469e13e95	pom文件修改为PROD	6 years ago
jenkins	edc281dffe	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
qinjia zou	51d70654ef	【欧洲-生产快速入库】bug6389	6 years ago
王杰	ac5432bebb	解决冲突	6 years ago
王杰	71d39f54d2	Merge branch 'dev' into test	6 years ago
王杰	c595d3f6b1	修改字段	6 years ago
陆卫豪	d6ff7aa2b1	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
wei.peng	492367670b	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
wei.peng	59d6eb0727	添加系统配置接口	6 years ago
王杰	5943854c5b	增加字段	6 years ago
jokelone	054502b657	【任务：1193接口调试】	6 years ago
钮海涛	695ab094d2	修复资源表多选枚举显示问题。	6 years ago
钮海涛	89943f6586	修复资源表多选枚举显示问题。	6 years ago
qinjia zou	7a134dc0cb	【欧洲-生产快速入库】bug6389	6 years ago
jenkins	8eb8c2f97e	Merge branch 'master' of i3-IMPP/i3plus-pojo into test	6 years ago
钮海涛	7b47c7b942	修复关联对象字段显示问题	6 years ago
王杰	9f9c095846	Merge branch 'dev' into test	6 years ago
WYnneaoapc	4441d1dc86	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
WYnneaoapc	88d480403c	数据库字段初始化属性 赋值longtext	6 years ago
crish	92c1e846b6	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
汪云昊	c4ed0f1f37	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
汪云昊	12ba5d2ff3	lac微服务模式优化	6 years ago
1111	e0a5b36061	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
许心洁	b88a879c58	Merge branches 'master' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo	6 years ago
jenkins	603004c190	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
钮海涛	1720952d23	修复自定义字段表达式取值问题	6 years ago
crish	3645541765	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
1111	d35c6e97cd	【采购收货】	6 years ago
王杰	a595fed4fe	Merge branch 'test'	6 years ago
王杰	9baac06cb7	Merge branch 'dev' into test	6 years ago
王杰	e91369c82a	【需求：1198】	6 years ago
陆卫豪	0fad1e4df5	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
WYnneaoapc	23b3ae88e5	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
WYnneaoapc	0e9b9b26fd	包装打印逻辑修改	6 years ago
jenkins	e7bad502c3	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
1111	96ea008725	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
汪云昊	c0d8375d0f	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
1111	41a48b4b59	【采购收货】 采购收货	6 years ago
许心洁	8d6a2b53b1	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	b7c6189308	生产汇报JOB优化（新增根据多个属性值将对象集合进行分组的公共方法）+标准收货速度优化（30%）	6 years ago
jenkins	4be5d5e1aa	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
wei.peng	8f07751100	LAC 日志记录查询完成	6 years ago
汪云昊	c60213ad3e	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
汪云昊	2ad6d16684	参数重复校验错误	6 years ago
qianhs	d4422bee15	【 PO订单页面，点击查询后，过滤条件错误，导致数据显示异常】【bug6493】	6 years ago
王杰	7a023d0f4b	Merge branch 'dev' into test	6 years ago
王杰	fe962c1ab3	【bug:6483】	6 years ago
王杰	3c3de49512	【bug:6483】	6 years ago
crish	6c07f29317	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
钮海涛	407fdbf217	修复对象关联删除出错问题	6 years ago
王杰	64d631c180	Merge branch 'test'	6 years ago
王杰	e5db689881	Merge branch 'dev' into test	6 years ago
王杰	85e35eede1	解决冲突	6 years ago
汪云昊	f95482501b	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
汪云昊	efea8980e7	解除冲突	6 years ago
汪云昊	5a2a2a5e8d	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev ... Conflicts: modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java	6 years ago
jenkins	092f72872b	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
wei.peng	4b17995206	LAC 日志记录Cache 完成	6 years ago
王杰	7f08847c50	Merge branch 'test'	6 years ago
王杰	6297ccc4d7	Merge branch 'dev' into test	6 years ago
jokelone	5e813f30e7	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
jokelone	f632308d0a	【任务：1193接口数据解析】	6 years ago
王杰	2a5c32b8ea	解决冲突	6 years ago
陈思洁	5050c0c5a1	新增实体--安全库存	6 years ago
qinjia zou	2210482918	【自动入库】bug6390	6 years ago
汪云昊	13f77e69c1	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
wei.peng	02a9c64a42	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
qinjia zou	a8ebcb669b	【自动入库】bug6390	6 years ago
qinjia zou	6e8977e5aa	【自动入库】bug6390	6 years ago
钮海涛	e3ba4f6349	新增规则组合执行接口	6 years ago
jokelone	e046553788	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
jokelone	987a502d7e	【bug：6380 物料字段拼写有误】	6 years ago
陆卫豪	4a76c480ac	Merge branch 'test' of i3-IMPP/i3plus-pojo into master	6 years ago
陆卫豪	82fd56dc68	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
WYnneaoapc	12a66262be	解决冲突	6 years ago
WYnneaoapc	fdd051f2dd	打印修复	6 years ago
jenkins	f76aaddbd5	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
qianhs	a55795d43f	【 VDA收货---预收货的单据，要在页面上可以查询】【bug6465】	6 years ago
许心洁	3559962ccb	Merge branches 'master' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo	6 years ago
qianhs	f0b35d1d74	【VDA生产退料-条码所在库位-需为线边库位】【bug6442】 ... 【VDA收货---选择ASN订单，点击预收货，预收货成功后，按钮还可以点击。导致数据重复】【bug6464】 【 VDA收货---预收货的单据，要在页面上可以查询】【bug6465】	6 years ago
jenkins	4d2a2a35b0	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
许心洁	339a12eba3	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	3781713a29	实时库存-条码明细优化查询速度	6 years ago
于学杰	9e625acc0d	1. MOVE_TO_ERP 增加是否预收货字段	6 years ago
曾贞一	3ba4e9b4f1	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
曾贞一	28078287af	【VDA收货】【预收货的单据，要在页面上可以查询-bug6465】	6 years ago
王杰	f6d50bdfb7	【需求：1167，产品批量打包】	6 years ago
王杰	693ac2451e	【需求：1167，产品批量打包】	6 years ago
于学杰	71818c4745	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
于学杰	db9a698c68	1. 增加是否寄售的属性	6 years ago
jokelone	4cec8e8ac8	【任务：1193接口物料拆解增加工位字段】	6 years ago
汪云昊	b4976be85e	LAC执行流程调试 ... UA订阅次数问题	6 years ago
王杰	1a7164c474	Merge branch 'dev' into test	6 years ago
王杰	b15c3f4ae7	【需求：1101，定时任务优化】	6 years ago
jokelone	9ca2760866	【任务：1193接口repository】/s	6 years ago
jokelone	9842ed2181	【任务：1193接口pojo】	6 years ago
王杰	e60256e291	【需求：1167，包装特殊批次工步】	6 years ago
qianhs	48cbf9d471	【NC冻结】【350 NC冻结-4.2 批量NC冻结】【1187 NC冻结-4.2 批量NC冻结】 ... 【 库存报表中无法看到寄售零件】【bug6331】	6 years ago
puxiao.liao	3bda3169f4	【超级移库】bug6295	6 years ago
钮海涛	9597cee596	修复删除对象Bug，关联没有删除问题	6 years ago
王杰	57253ea87b	Merge branch 'dev' into test	6 years ago
puxiao.liao	a441633326	【超级移库】bug6295	6 years ago
crish	5b6b303722	Merge branch 'test'	6 years ago
crish	17d5f1e512	Merge branch 'dev' into test	6 years ago
crish	70683025db	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
crish	97958262b6	查询条件优化	6 years ago
王杰	2660e0268e	【需求：1198，代码优化】	6 years ago
crish	410558d43c	Merge branch 'test'	6 years ago
汪云昊	7cb9ffd37b	Lac细节优化 ... OPC调整	6 years ago
曾贞一	0b9587586d	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
曾贞一	7dbb55bcb0	【VDA质检】【缺了检验条码数量是否为-bug6402】	6 years ago
陆卫豪	95d8dbb908	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
WYnneaoapc	7ba63dc9a8	6283 打包扫描	6 years ago
jenkins	b5685a7874	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
陈思洁	c27daae8e4	移动单条码表 --供应商编码	6 years ago
陈思洁	6de87a1581	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	9969916e0a	开口合同 -关联单据类型	6 years ago
许心洁	3005beda46	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
wei.peng	0e1220c329	Core 服务 用户查询优化	6 years ago
许心洁	4ad645d34e	流程管家新增触发源（放大镜80）+修改流程BUG#5826#5779+查询类型为可选列表的参数时没有加上软删条件	6 years ago
王杰	9137555226	Merge branch 'dev' into test	6 years ago
王杰	028d7641d2	【需求：1126，设备周期计划优化】	6 years ago
crish	6567b30178	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
crish	ad6baaa1e6	安灯通知方式调试， 日志调试	6 years ago
钮海涛	58b0f4a531	新增BOM树信息获取接口	6 years ago
puxiao.liao	21375ed6f4	【超级移库】bug6295	6 years ago
陆卫豪	3fa5437c5a	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
WYnneaoapc	37e288ff77	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev ... Conflicts: modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java	6 years ago
WYnneaoapc	360f908ae4	获取生产数据 6283	6 years ago
jenkins	3d8421e1ec	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
于学杰	c3441184c0	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	6 years ago
汪云昊	8ff5d888c2	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
汪云昊	aab18be0e6	Lac细节优化 ... OPC调整	6 years ago
qianhs	137e473543	【 EU编组管理】【 334- EU编组管理-组件和函数复用】【1172EU编组管理-组件和函数复用】	6 years ago
王杰	da0478ec7e	Merge branch 'dev' into test	6 years ago
王杰	ebb59cbb64	【需求:1167,批量打包】	6 years ago
于学杰	b80a5b21ba	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
于学杰	bcc7c282ca	1. 增加质检单生成类型	6 years ago
王杰	093008fae8	Merge branch 'dev' into test	6 years ago
jokelone	616d39fa38	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
jokelone	246726a67d	【任务：1193 接口基础数据】	6 years ago
jenkins	c1b50db526	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
王杰	49637cb23f	【需求:1167,批量打包】	6 years ago
汪云昊	d23303f07b	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
puxiao.liao	1f85c75f6c	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
puxiao.liao	9b8d4c900b	【事物查询】bug6294	6 years ago
1111	60ec41e149	【采购收货】	6 years ago
1111	4063929c34	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	6 years ago
jenkins	a7b751d9dc	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
1111	2077c651e7	【采购收货】	6 years ago
crish	4bd4ca8745	通知方式， 通知内容	6 years ago
WYnneaoapc	c1c00213e1	工位监控修改 6283	6 years ago
汪云昊	423d8d2c03	日志开关 ... lac优化 OPC UA工具类	6 years ago
crish	835ea47ba2	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
crish	a30f4aae83	andon广播音量可配置， 安灯通知记录	6 years ago
jokelone	3eeaff50b3	【bug：5957工厂初始化】	6 years ago
puxiao.liao	75701682d2	【EU-生产报工撤销】【353生产报工撤销-4.1 处理报工撤销条码组件】【1191生产报工撤销-4.1 处理报工撤销条码组件】	6 years ago
许心洁	838b7ac311	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
许心洁	cce413945d	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	c1476f83c0	关闭任务	6 years ago
许心洁	003ed70f98	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
crish	ee51d54030	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
crish	aa22d18645	添加注解	6 years ago
crish	577b2c462a	按照安灯类型统计当天发生的安灯总次数和安灯超时次数	6 years ago
WYnneaoapc	b595d76056	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
WYnneaoapc	45d14fe3e2	枚举增加 生产模式参数 6823	6 years ago
许心洁	ed7e002f6d	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
crish	7678b95aaa	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
crish	a294c1ccb0	安灯看板超时统计功能	6 years ago
qianhs	6536109b66	【 EU编组管理】【 334- EU编组管理-组件和函数复用】【1172EU编组管理-组件和函数复用】	6 years ago
王杰	71bde083a3	Merge branch 'dev' into test	6 years ago
陈思洁	508618baf6	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	9b491b742e	业务类型枚举维护	6 years ago
许心洁	60c25d7a71	Merge branches 'master' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo	6 years ago
许心洁	738aa2d08c	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
王杰	e2249ea8dd	【需求：1189，产品条码工步】	6 years ago
许心洁	ccb29c5903	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
WYnneaoapc	3425b443c8	工位监控优化 6283	6 years ago
1111	f3cb409ca6	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
1111	2f2c843006	【坤泰-采购收货】包装关系	6 years ago
王杰	f5c8e36ac9	【需求：1189，产品条码工步】	6 years ago
王杰	649ffb548d	Merge branch 'dev' into test	6 years ago
王杰	e30ba280e0	解决冲突	6 years ago
王杰	bcf3866ca6	Merge branch 'dev' into test	6 years ago
王杰	5142191f55	解决冲突	6 years ago
许心洁	208410340e	Merge branches 'master' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo	6 years ago
qianhs	1453a3d49b	【EU盘点】【 317-EU盘点-盘点差异查询】【1148EU盘点-盘点差异查询】	6 years ago
王杰	ab34ebb769	Merge branch 'dev' into test	6 years ago
陈思洁	3b235acda0	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	31e24390dd	合并冲突	6 years ago
WYnneaoapc	c93dd66cd9	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
WYnneaoapc	7b88c605ba	枚举修改 1060	6 years ago
陈思洁	99947f284e	枚举修改--移动业务类型	6 years ago
qianhs	62bb71f4b0	【EU盘点】【 317-EU盘点-盘点差异查询】【1148EU盘点-盘点差异查询】	6 years ago
许心洁	6d9787dc65	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
lpx	94dc90172d	【扫描查询】bug6246	6 years ago
张哲铭	578be0650a	Merge branch 'dev' into test	6 years ago
wei.peng	43e400d354	数据映射类型 更改BigDecimal	6 years ago
1111	db952282e0	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
1111	7378df1b9e	【宁德问题清单】	6 years ago
许心洁	b6e27c33c8	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
jokelone	a04b8f7c57	【bug：5791 生产工单明细1】	6 years ago
jokelone	5fd619ac79	【bug：5791生产工单明细】	6 years ago
王杰	75e7aa30c2	Merge branch 'dev' into test	6 years ago
王杰	84bf5ba64a	【需求：1162，pcn登陆】	6 years ago
陈思洁	04e876250b	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	58c9795b7c	移动类型、业务类型维护数据	6 years ago
王杰	acaacf63a3	Merge branch 'dev' into test	6 years ago
WYnneaoapc	b4cea27a5b	代码审核 修改2	6 years ago
WYnneaoapc	56e6cf7918	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
张哲铭	6871e96496	Merge branch 'dev' into test	6 years ago
1111	88a69ac7f8	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
1111	71c867dd8c	【包装规格】	6 years ago
许心洁	ac43296df3	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	5dc8ffb394	日志处理队列V1.0	6 years ago
张哲铭	8e19f4dde3	Merge branch 'dev' into test	6 years ago
钮海涛	8e614bcb72	1:增加多选枚举的功能。	6 years ago
钮海涛	6be9a55983	1:增加多选枚举的功能。	6 years ago
钮海涛	f85dd4cbe5	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
王杰	bc14fcf027	Merge branch 'dev' into test	6 years ago
汪云昊	eeebbfd1fe	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
alwaysfrin	759f9ee819	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
王杰	e26dadca01	【需求：1162，pcn登陆】	6 years ago
汪云昊	dcbb6a7a1c	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
汪云昊	053b3ae0e4	LAC 前端联调调整	6 years ago
alwaysfrin	da582b871d	日志处理优化	6 years ago
crish	c4d7a2380c	Merge branch 'test'	6 years ago
jokelone	755e920513	【bug：6250 返工返修拆解优化】	6 years ago
张哲铭	efbe0dfce9	Merge remote-tracking branch 'origin/dev' into test	6 years ago
lpx	fc49ddeea5	【事务查询】【326EU事务查询-新增按条码查询事务交易记录组件】【1157 新增按条码查询事务交易记录组件】	6 years ago
lpx	fc79b1b0f3	【扫描查询】【308扫描查询-4.2增加处理查询结果组件】【1132扫描查询-4.2增加处理查询结果组件】	6 years ago
王杰	aa2f514f6c	Merge branch 'dev' into test	6 years ago
WYnneaoapc	029c9b6bc8	代码审核 修改1	6 years ago
王杰	980ae89cdf	【需求id：1162，pcn登陆】	6 years ago
许心洁	970105ac19	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
jokelone	b6d7156b0b	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
jokelone	9a6c5cfda3	【任务：1163客户订单】	6 years ago
王杰	b2886012a5	【需求id：1162，pcn登陆】	6 years ago
许心洁	e433915759	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
qianhs	c68cb7889e	【VDA物料拆分-输入数量-数量检验】【6233】	6 years ago
钮海涛	bd834a24cb	1:增加资源甘特图获取数据接口	6 years ago
曾贞一	c2d3e044fb	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
曾贞一	be75c4ec42	【VDA质检--物料信息维护】任务号1135 ... 【VDA质检--检查数量组件--修改】任务号1134 【VDA质检--检查质检箱数组件】任务号1133	6 years ago
陆卫豪	64be0c721c	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
WYnneaoapc	4b47ceb42d	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
WYnneaoapc	3b447fa77a	数据抽取修改 1130	6 years ago
jokelone	bdce8a7103	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
jokelone	9418a0838b	【任务：1129 产品编码配置基础数据】	6 years ago
许心洁	017cd18950	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
钮海涛	64cda23c12	1:增加资源甘特图获取数据接口	6 years ago
曾贞一	d428aa302d	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
曾贞一	b7071bd0db	供应商字段 添加	6 years ago
crish	87d9b5c6ec	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
crish	1a7fda268b	andon 系统配置	6 years ago
许心洁	9755e5f751	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
钮海涛	809e23aad7	1:修复启动时从数据库加载数据时的Bug。	6 years ago
钮海涛	7aa078e7ce	1:修复未设置基准时间的Bug	6 years ago
wei.peng	da7ba77dab	LAC 跨服务调用软适配接口完成	6 years ago
陆卫豪	46fc5f5750	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
WYnneaoapc	a6e8265e29	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
jokelone	90ec0f107e	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
jokelone	32dbaed8fe	【任务：1129数据对象、对象结构、产品包装关系基础数据】	6 years ago
WYnneaoapc	4308084ca3	数据抽取修改 1130	6 years ago
王杰	d2c7a81893	Merge branch 'dev' into test	6 years ago
陈思洁	d69e863959	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	3ef115bbe2	新增冗余字段	6 years ago
汪云昊	23f0503454	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
WYnneaoapc	1215a5c658	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
WYnneaoapc	855cc46448	数据抽取修改 1116	6 years ago
wei.peng	0ba20f0094	LAC 日志查询接口功能完成	6 years ago
陆卫豪	07a80e7fd2	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
WYnneaoapc	46e0488d5a	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
WYnneaoapc	1de5b8b196	数据抽取修改 1116	6 years ago
wei.peng	0d777d1894	LAC 日志处理功能完成	6 years ago
crish	851ba63e7c	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
crish	f111febd8d	修改“其他”安灯类型的名字为“自处理”， 统一修改获取组织代码的方法	6 years ago
wei.peng	3645368544	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
wei.peng	b963bcb502	LAC 日志处理功能完成	6 years ago
汪云昊	dd0de76d4d	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	219bf6db9a	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
qianhs	457e10bc75	1,【拆包管理】【305-4.3物料信息维护】【1122物料信息维护】	6 years ago
许心洁	04453aa706	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
gaochangjiang	d0165fd342	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
陈思洁	2414993cf9	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	777060450e	新增字段--目标库位	6 years ago
gaochangjiang	047b9d5e35	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
gaochangjiang	02e3ac4960	【库存预警】bug 修复库存预警	6 years ago
汪云昊	25425822a8	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
汪云昊	154bba4b3b	LAC 调度模式优化	6 years ago
WYnneaoapc	7f9f9cb242	返工返修pojo字段更改 1092	6 years ago
陆卫豪	576f02f75d	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
WYnneaoapc	9ad66157a8	数据同步优化 1078-4	6 years ago
钮海涛	2c47556abf	1：新增工作计划资源位置插入逻辑	6 years ago
jokelone	93438e1bdb	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
jokelone	21087d5d4d	【需求：1092 工序BOM和物料绑定记录模板增加构造方法】	6 years ago
王杰	2417b40635	Merge branch 'dev' into test	6 years ago
钮海涛	921be6b0f2	1：新增工作计划资源位置插入逻辑	6 years ago
汪云昊	ba7c713b6f	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
汪云昊	cfd7f5276e	实体调整	6 years ago
crish	6996dc2273	6204: MesConfig配置添加业务主键	6 years ago
WYnneaoapc	4ceef3c6d1	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
于学杰	6087fe0c2c	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
于学杰	80c340308a	1. 修改通用接口POJO中的字段长度	6 years ago
WYnneaoapc	35f625ac21	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
WYnneaoapc	563955570d	数据同步优化 1078	6 years ago
许心洁	9c54b2561c	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
汪云昊	e0ec7bb377	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
汪云昊	50bf9300ba	LAC 调度模式完成	6 years ago
王杰	a95b6baae1	Merge branch 'dev' into test	6 years ago
jokelone	828cf66784	【需求：1090 工序BOM，物料绑定记录删除多余字段】	6 years ago
王杰	cb319e4304	【需求：1126，设备周期计划】	6 years ago
王杰	dfec2532cb	Merge branch 'dev' into test	6 years ago
lpx	00954f2917	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
lpx	69be002972	【装箱防错】【301-4.2条码装箱防错】【1118条码装箱防错建任务】	6 years ago
jokelone	4dcbcf068a	【需求：1090 产品类型图片增加字段】	6 years ago
王杰	7291a7a85c	Merge branch 'dev' into test	6 years ago
汪云昊	86a18d730a	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
汪云昊	4b66ec0e87	任务实例id	6 years ago
汪云昊	9907813aed	Lac调度实体	6 years ago
许心洁	c9f26c22c1	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
jokelone	7ee96d1444	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
jokelone	6fd7e6be5f	【需求：1092 维修类型】	6 years ago
许心洁	bbec6a1002	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	7799937093	成功处理移动单写入MOVE_TO_ERP表：根据移动单号+行号+零件号查询是否已存在数据，是则将此数据标记为不同步且无效软删除	6 years ago
许心洁	b112bdb5e8	成功处理移动单写入MOVE_TO_ERP表：根据移动单号+行号+零件号查询是否已存在数据，是则将此数据标记为不同步且无效软删除	6 years ago
王杰	75ce77f6f1	【需求：1126，设备周期计划】	6 years ago
钮海涛	6a1990a215	1：新增弹出框选择多个对象信息接口	6 years ago
钮海涛	2e02d77966	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
王杰	347c47c82f	【需求：1125，设备报表】	6 years ago
王杰	1846c6f4f8	Merge branch 'dev' into test	6 years ago
jokelone	438517be44	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
jokelone	6c847cf305	【需求：1091 返厂返修添加字段和枚举】	6 years ago
王杰	2069d6a3ae	【需求：1125，设备报表】	6 years ago
王杰	9446a76159	Merge branch 'dev' into test	6 years ago
wei.peng	f67a61ec92	网关 添加 APS 路由 ... BASE URL 路径优化	6 years ago
wei.peng	aeff042046	添加 组织代码查询	6 years ago
曾贞一	ed9e388c8b	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
曾贞一	1357dfad30	【VDA收货-- 前端PC端POsn页】任务号1102 ... 【VDA收货-- 问题清单中加密库位】任务号1104 【VDA收货-- 系统无法查看保质期物料的具体信息】任务号1112 【VDA收货-- 对于分组数据如何查看分组信息】任务号1111	6 years ago
WYnneaoapc	b668879f9d	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
王杰	42ec1b3693	Merge branch 'dev' into test	6 years ago
王杰	2f382d37cc	【需求：1124，首检件配置】	6 years ago
jokelone	0011a4bc56	【需求：1089 过程检测数据 增加字段】	6 years ago
王杰	dcaf007f4d	【需求：1107，生产工单首检件】	6 years ago
WYnneaoapc	29ac92566d	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
钮海涛	b05711dc6c	1：新增弹出框选择多个对象信息接口	6 years ago
许心洁	6d59aeddad	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
jiajack	3c8b920a4c	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
jiajack	95789b1bd8	增加生产质量情况BI业务	6 years ago
钮海涛	794bbc4fba	1：新增弹出框选择多个对象信息接口	6 years ago
王杰	35cf3cf162	Merge branch 'dev' into test	6 years ago
jokelone	bc13a8a3ac	【需求：1090 返厂返修增加分页查询】	6 years ago
钮海涛	5b712ce774	1：新增弹出框选择多个对象信息接口	6 years ago
许心洁	c79786a677	合并开发分支的代码POM文件被改成DEV修改回TEST	6 years ago
许心洁	dd86ce354a	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	b8842edbb1	无条码打印：新功能开发完成	6 years ago
WYnneaoapc	dbd4a7578b	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
crish	88af19f8e9	修改开发环境pom文件test为dev	6 years ago
changjiang.gao	376ca4bbd4	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
王杰	3f6f6428f6	【需求:1106,设备通知，优化】	6 years ago
changjiang.gao	13066bd4d1	【库存预警】bug 243	6 years ago
WYnneaoapc	04c99167c8	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
WYnneaoapc	6de6d36e80	数据库抽取反写 1105-1	6 years ago
jokelone	a5609d97fb	【1092 返厂返修增加枚举】	6 years ago
钮海涛	d99ad6c44a	1：新增弹出框选择对象信息接口。	6 years ago
王杰	03a4c98234	Merge branch 'dev' into test	6 years ago
王杰	803d5c57f2	【需求1101，设备维修作业，第3次提交】	6 years ago
wei.peng	699276777a	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
wei.peng	7496eb4a1b	LAC 全部 CRUD 接口完成	6 years ago
钮海涛	5183163abd	1：新增弹出框选择对象信息接口。	6 years ago
WYnneaoapc	e6e2e9fb22	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
crish	18161e8191	Merge branch 'test'	6 years ago
crish	67461457fc	Merge branch 'dev' into test	6 years ago
crish	1e0f0c706c	安灯问题修复	6 years ago
crish	f093a97cf0	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
crish	4eaa8b5b17	导入导出	6 years ago
crish	6902c79472	问题清单问题修复	6 years ago
crish	7d8b8664cc	问题清单问题修复	6 years ago
WYnneaoapc	848f6b2f23	工位监控优化 1050-6	6 years ago
WYnneaoapc	c71d667d0f	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
王杰	56996126be	【需求：1101，mes同步设备安灯维修任务】	6 years ago
jokelone	d7f55250ef	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
jokelone	8d10a46953	(1092 MesProdBindRecordModel增加有参构造方法)	6 years ago
changjiang.gao	30007cee47	Merge branch 'dev' into test	6 years ago
王杰	9bdae2ad13	【需求：1086，设备点检保养作业】	6 years ago
WYnneaoapc	c56822dc40	工位监控优化 1050-5	6 years ago
WYnneaoapc	3dbbee3c60	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
jiajack	f6b06e6b52	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
jiajack	aef7f7a948	增加班次顺序字段	6 years ago
jiajack	d87d81e34a	【产线运行情况】-BI报表开发	6 years ago
许心洁	73aef5326c	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
jokelone	d0b98f0869	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
jokelone	00e849a62e	(1089 过程质量检测基础数据；1090 返厂返修基础数据)	6 years ago
许心洁	3bc277178e	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
crish	f7fbd1c24f	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
crish	3e9cc95017	pojo-model加入andon-pojo依赖	6 years ago
陈思洁	42189da443	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	a90aa8498f	实体修改字段类型【int】改成【Integer】	6 years ago
crish	e15e402890	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
crish	2906667856	mes定时获取安灯安灯任务信息	6 years ago
许心洁	0c20a2b655	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
钮海涛	16162542ba	1：修改listByPage由GET方法为POST方法。	6 years ago
lpx	ca0cf21a7c	【NC解冻-4.2 组件复用】PR12-01~PR12-02	6 years ago
wei.peng	4c6f0b0d57	添加 CRUD Base	6 years ago
陈思洁	935845704a	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	e5b5891d23	bom信息中新增冗余字符	6 years ago
crish	a537daee62	导出不导出有效性	6 years ago
qianhs	caf6dc17ab	【NC冻结】nc冻结	6 years ago
crish	fd5c6b2c9d	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
crish	0824a58ead	安灯定时自处理job, 广播播报内容优化	6 years ago
WYnneaoapc	34a9ad36fe	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	1d0a2351b9	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
钮海涛	1f9fc9f280	1：新增实现生产时间的计算逻辑	6 years ago
许心洁	44fccb14d6	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
王杰	0c01648551	【需求：1088，设备维修作业】	6 years ago
WYnneaoapc	b47f97fa05	1050-2 工位监控	6 years ago
王杰	09cff08e1e	[需求1086，设备点检保养作业，第2次提交]	6 years ago
王杰	752476b3df	[需求1086，设备点检保养作业，第2次提交]	6 years ago
许心洁	f5a8e9f130	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
wei.peng	d5a45176d0	LAC 任务类型、指令集类型 对象优化	6 years ago
曾贞一	610a96d2ee	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
曾贞一	6b9c7b3ced	【VDA库存调整盘点】 添加供应商字段	6 years ago