4756 Commits (9fc85191feff08b9a7aa0598b61527eff851222a)

Author	SHA1	Message	Date
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
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	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	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自动合并	5 years ago
gcj	4c2d922ed9	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
gcj	2c63820f98	【运输管理】	5 years ago
jenkins	350f7101d2	Jenkins自动合并	5 years ago
jokelone	f3756e6b34	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
jokelone	b9b30cf19c	【任务：1306质量标准配置】	5 years ago
puxiao.liao	da4f32f0b4	【在配料时，点击右上角放大镜，输入单号无法查询，并且显示的内容需要有来源，目标，是否紧急 ... 】6978	5 years ago
gcj	59e7704f67	【运输管理】装车单	5 years ago
王杰	7bc434ed15	安灯组装模型优化	5 years ago
WYnneaoapc	84227c9b8a	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
WYnneaoapc	b3a04911b6	task `1300` 5 BI 产线运行情况	5 years ago
汪云昊	8e3c1b750a	Merge remote-tracking branch 'remotes/origin/dev' into test	5 years ago
汪云昊	35fd2f7952	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
汪云昊	3902fb6309	资源增量导入优化	5 years ago
王杰	dfb23bab1d	Merge branch 'dev' into test	5 years ago
王杰	bc61b43e8d	安灯人员统计报表工位代码不显示问题修复	5 years ago
陆卫豪	5393d6e034	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	5 years ago
zcg	586dfb416b	[mes枚举修改]	5 years ago
陈思洁	40c64db0b1	冲突	5 years ago
陈思洁	ee14ce1d4b	【KT-快速入库功能】	5 years ago
jenkins	015d284239	Jenkins自动合并	5 years ago
puxiao.liao	99a1ec309d	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
puxiao.liao	3bfb0995d5	【物料基础信息增加【贵重物料】属性，领料上线流程根据此属性判断是否需要扫描目标库位 ... 】bug1299	5 years ago
WYnneaoapc	168edce5bd	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
WYnneaoapc	48338fec28	task `1300` 5 BI 产线运行情况	5 years ago
jenkins	39f4c733a4	Jenkins自动合并	5 years ago
gcj	304677e7da	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
gcj	91e3209ef9	【运输管理】	5 years ago
王杰	c4c615bd15	Merge branch 'dev' into test	5 years ago
王杰	3ff9fbc140	安灯图表	5 years ago
WYnneaoapc	b088b40fd1	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
WYnneaoapc	a1a602e457	task `1300` 5 BI 产线运行情况	5 years ago
jokelone	6995189893	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
jokelone	46ec9e51b0	【任务：1211报表导出冗余字段】	5 years ago
jenkins	6be1ef7dbd	Jenkins自动合并	5 years ago
WYnneaoapc	ba0a857dd5	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
WYnneaoapc	b52d5b392d	task `1300` 4 BI 产线运行情况	5 years ago
许心洁	5a1dc6dc7d	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
许心洁	67f7d66782	宁德现场问题#330	5 years ago
jokelone	874fd139dc	Merge branch 'dev' into test	5 years ago
E	59bdec9c6f	【6933 收货看板容器未收货时，看板收货状态为收货完成】修改收货看板枚举	5 years ago
E	cc95fad3e8	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
E	ef9293867f	【bug6929 收货道口数量长度没有限制】【bug6928 收货道口为0时没有默认为1】	5 years ago
WYnneaoapc	ef34a13313	task `1300` 2 BI 产线运行情况	5 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	5 years ago
WYnneaoapc	b2daf9fd9c	task `1300` 1 BI 产线运行情况	5 years ago
zcg	d6975bf5de	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
zcg	ccfba0fe56	mes枚举修改	5 years ago
jokelone	0dfb948810	Merge branch 'dev' into test	5 years ago
jokelone	519d985838	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
jokelone	0acf17ddd7	【1211：报表1】	5 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
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
汪云昊	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
WYnneaoapc	f57f1087d9	task `1295` 1 添加数据库索引	6 years ago
钮海涛	8385038290	修改甘特图日历接口	6 years ago
qianhs	da2cfd77b0	【 增加一个扫描零件上的条码，累计数量达到零件标包后自动打印条码+按照主数据自动报工的界面】【bug6704】	6 years ago
陈思洁	7d07580a78	合并冲突	6 years ago
陈思洁	b9844c255b	生产计划表结构增加	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
钮海涛	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
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
王杰	bba25ad2de	批量打包model修改	6 years ago
E	c7d4253e5e	【bug 6872 - 收货、发运看板数据未加载】	6 years ago
汪云昊	bc5beeba7d	添加适配记录索引	6 years ago
WYnneaoapc	9b8675c904	task `1292-1` 新增条码履历字段	6 years ago
于学杰	67b5069c48	1. 增加分组提交的配置字段	6 years ago
王杰	1f4a8d6e55	【安灯修改枚举】	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
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
jokelone	056dbaacf2	Merge branch 'dev' into test	6 years ago
陈思洁	eb5f9610a8	【KT-1282 计划拉动-班次管理】	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
王杰	fcc2b09559	【安灯修改枚举】	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
陈思洁	4f67cc1310	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	61f3465255	新增工位表字段	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
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
汪云昊	764a39a6a6	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
汪云昊	8c872302a3	细节调整	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
王杰	91730dd195	【需求：1277，关闭，暂停，完成工单 需要停线，做到方法可配】	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
钮海涛	5e8e05ddb4	新增表达式录入界面接口	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
许心洁	ca71303bee	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	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
曾贞一	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
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
陆卫豪	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
陆卫豪	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	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
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
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