|  E | 0cc70fe2d0 | 【#1390 基础数据-客户信息增加导入功能】 | 6 years ago | 
				
					
						|  jenkins | 3db9a86504 | Jenkins自动合并 | 6 years ago | 
				
					
						|  袁津哲 | fc19275ef0 | Merge remote-tracking branch 'origin/dev' into dev | 6 years ago | 
				
					
						|  袁津哲 | 4e0f40042a | Wms动态搜索与自定义列表,表单开发 | 6 years ago | 
				
					
						|  陈思洁 | b0065bd650 | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev | 6 years ago | 
				
					
						|  陈思洁 | fa576d7a6d | 【6847 开发执行异常的预警报表。存在处理异常数据时,提供报表展示。盘点前所有异常数据均需处理完成】 | 6 years ago | 
				
					
						|  jenkins | fe71007a5c | Jenkins自动合并 | 6 years ago | 
				
					
						|  袁津哲 | 42bbb852c4 | Wms初始化扫描实体字段新增逻辑优化 | 6 years ago | 
				
					
						|  汪云昊 | 536200cf2b | Merge remote-tracking branch 'remotes/origin/dev' into test | 6 years ago | 
				
					
						|  袁津哲 | 2f2f24356c | Merge remote-tracking branch 'origin/dev' into dev | 6 years ago | 
				
					
						|  袁津哲 | daf3365ce3 | Wms初始化扫描实体字段新增逻辑优化 | 6 years ago | 
				
					
						|  gcj | cbe87c6bd7 | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev | 6 years ago | 
				
					
						|  gcj | c14d6c6916 | 【宁德问题清单】 | 6 years ago | 
				
					
						|  袁津哲 | e5138ac4e9 | Merge remote-tracking branch 'origin/dev' into dev | 6 years ago | 
				
					
						|  袁津哲 | e1386275d0 | Wms初始化扫描实体字段新增逻辑优化 | 6 years ago | 
				
					
						|  陈思洁 | 99f79ee5db | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev | 6 years ago | 
				
					
						|  陈思洁 | 25606ea25a | 【6847 开发执行异常的预警报表。存在处理异常数据时,提供报表展示。盘点前所有异常数据均需处理完成】 | 6 years ago | 
				
					
						|  袁津哲 | 29f785ed35 | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev | 6 years ago | 
				
					
						|  袁津哲 | 7d4ba10449 | Wms初始化扫描实体字段新增逻辑优化 | 6 years ago | 
				
					
						|  jenkins | ae8475de5d | Jenkins自动合并 | 6 years ago | 
				
					
						|  许心洁 | 2f90982e68 | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev | 6 years ago | 
				
					
						|  许心洁 | c53c8c04e3 | BUG#7186 | 6 years ago | 
				
					
						|  jenkins | b0bbf43a9b | Jenkins自动合并 | 6 years ago | 
				
					
						|  宋军超 | b0f60a9176 | 2020-01-08创建动态列表与查询model | 6 years ago | 
				
					
						|  jenkins | 75dc17f4c4 | Jenkins自动合并 | 6 years ago | 
				
					
						|  e-jiawentao1 | 7b696d7e73 | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev | 6 years ago | 
				
					
						|  e-jiawentao1 | a92090a3ab | 2020-01-07创建动态查询与表单各层 | 6 years ago | 
				
					
						|  e-jiawentao1 | c51453a856 | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev | 6 years ago | 
				
					
						|  e-jiawentao1 | 9fbc120666 | 动态搜索与自定义列表初始化扫描Bean字段 | 6 years ago | 
				
					
						|  jenkins | 189bece3f7 | Jenkins自动合并 | 6 years ago | 
				
					
						|  e-jiawentao1 | b2edab4ef4 | 2020-01-07创建动态查询与表单dao | 6 years ago | 
				
					
						|  e-jiawentao1 | 1dba90f768 | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev | 6 years ago | 
				
					
						|  e-jiawentao1 | b939ce6625 | 2020-01-07创建动态查询实体 | 6 years ago | 
				
					
						|  王杰 | 685d7949bf | Merge branch 'dev' into test | 6 years ago | 
				
					
						|  许心洁 | 7d63a933c0 | 生产报工JOB出错没有更新状态+流程修改初始化组件没有重新加载组件+流程管家:加上可设置是否提交逻辑 | 6 years ago | 
				
					
						|  jenkins | a685cd208d | Jenkins自动合并 | 6 years ago | 
				
					
						|  许心洁 | 267ec6c647 | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev | 6 years ago | 
				
					
						|  wei.peng | 823f818abf | Merge remote-tracking branch 'remotes/origin/dev' into test | 6 years ago | 
				
					
						|  许心洁 | fe809e2eff | 定时处理遗漏的待处理移动单JOB:处理周期改为可配置的JOB参数+流程管家:在放入“IS_COMMIT_REF_MOVE”缓存时需要判断是否为空+交易类型添加属性“是否推送异常邮件”用于第一次处理移动单出错 | 6 years ago | 
				
					
						|  曾贞一 | 989e05c64c | 【7168 对于发运单标签补打功能,根据发运单中的ship-to获取标签模板进行打印】 | 6 years ago | 
				
					
						|  jenkins | dfb06def2b | Jenkins自动合并 | 6 years ago | 
				
					
						|  曾贞一 | 9e9d3e2afa | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev | 6 years ago | 
				
					
						|  曾贞一 | 5a4510cedb | 【7168 对于发运单标签补打功能,根据发运单中的ship-to获取标签模板进行打印】 | 6 years ago | 
				
					
						|  陈思洁 | bae2130d72 | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev | 6 years ago | 
				
					
						|  陈思洁 | 1f1f6ec825 | 【KT-1346 增加拉动任务的暂停和开启】 | 6 years ago | 
				
					
						|  WYnneaoapc | adb4bd2a1c | Merge branch 'dev' into test | 6 years ago | 
				
					
						|  puxiao.liao | 0d2df2ec43 | 【 7194 Po明细导出,单据状态为中文 】bug7194 | 6 years ago | 
				
					
						|  puxiao.liao | a3a5e63baa | 【 7194 Po明细导出,单据状态为中文 】bug7194 | 6 years ago | 
				
					
						|  许心洁 | 861f46323b | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev | 6 years ago | 
				
					
						|  许心洁 | 7594b3d515 | SAP取消指令:按行取消函数逻辑从软删明细和条码变为更新单据明细和条码的状态为行取消 | 6 years ago | 
				
					
						|  E | a1276b5542 | 【#1338 库位物料中需要增加批量导入】 | 6 years ago | 
				
					
						|  许心洁 | a231651315 | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev | 6 years ago | 
				
					
						|  WYnneaoapc | 0a7f6ebf24 | Merge branch 'dev' into test | 6 years ago | 
				
					
						|  gcj | b29347c409 | 【坤泰运输管理】 | 6 years ago | 
				
					
						|  许心洁 | 9a272f8b6a | BUG#6755:移动单监听队列新增逻辑:如果当前处理的移动单的交易类型配置成需要推送异常邮件,并且全局参数“系统管理员”也有配置,则随送异常邮件 | 6 years ago | 
				
					
						|  jenkins | 688d976683 | Jenkins自动合并 | 6 years ago | 
				
					
						|  陈思洁 | 05efdbb568 | 【KT-1339 安全库存拉动,新增低于起订量概念】 | 6 years ago | 
				
					
						|  陈思洁 | 1e1e5e907e | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev | 6 years ago | 
				
					
						|  陈思洁 | 472adfd03c | 【KT-1339 安全库存拉动,新增低于起订量概念】 | 6 years ago | 
				
					
						|  WYnneaoapc | 569c2613fe | Merge branch 'dev' into test | 6 years ago | 
				
					
						|  puxiao.liao | f8e3edabc3 | 【 7159 线边退料逻辑错误,应该为:扫描A条码,输入原条码的剩余数量,拆包生成的新条码留在线边,原条码退回仓库。若数量与原条码相等,则不做拆包。 】bug7159 | 6 years ago | 
				
					
						|  jenkins | 028ae09f9c | Jenkins自动合并 | 6 years ago | 
				
					
						|  曾贞一 | 2da366630f | 【VDA波次配料--物料汇总优化】 | 6 years ago | 
				
					
						|  曾贞一 | ed25a6f7d6 | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev | 6 years ago | 
				
					
						|  曾贞一 | 46bf93f410 | 【VDA波次配料--物料汇总优化】 | 6 years ago | 
				
					
						|  jenkins | 9ee137a5c3 | Jenkins自动合并 | 6 years ago | 
				
					
						|  gcj | 5c838ebcf1 | Merge remote-tracking branch 'origin/dev' into dev | 6 years ago | 
				
					
						|  gcj | 62c50e04cc | 【宁德问题清单】 | 6 years ago | 
				
					
						|  jenkins | c830600235 | Jenkins自动合并 | 6 years ago | 
				
					
						|  E | b175de4635 | 【#1335 基础数据-包装规格管理-增加导入导出】"默认容器类型"改为"容器类型" | 6 years ago | 
				
					
						|  E | e962a1d22a | 【#1331 KT-基础数据-物料信息】“标准包装”改为“标包” | 6 years ago | 
				
					
						|  许心洁 | d5efd000b0 | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev | 6 years ago | 
				
					
						|  许心洁 | d94ccd5ac5 | 下线扣减交易处理组件BUG:获取双精度类型数值时应该判断是否为空getHandledQtyVal | 6 years ago | 
				
					
						|  王杰 | 7287aaeb77 | 其他组未提交的代码 | 6 years ago | 
				
					
						|  E | 9e47c4ac5a | 【#1332 基础数据-容器类型管理】新增期限单位字段 | 6 years ago | 
				
					
						|  jenkins | b96d22b011 | Jenkins自动合并 | 6 years ago | 
				
					
						|  许心洁 | 018908d3cb | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev | 6 years ago | 
				
					
						|  许心洁 | 032bd61b87 | 物料拆分新增等份拆分功能+ 快速移库写入移动单明细的行号写入规则不对,优化性能+
下线扣减交易处理组件修改逻辑:有条码就扣减,移动单明细表新增已处理数量,处理完毕才更新移动单的状态为已处理并传给MOVE_TO_ERP处理程序+
实时库存明细报表新增列“处理中数量”(待过账的数量) | 6 years ago | 
				
					
						|  puxiao.liao | d34ba5e114 | 【 经讨论六合一允许扫描来源或目标不同的零件号,但是提交时需要按照目标来源拆分成不同的单据 】bug7068 | 6 years ago | 
				
					
						|  jenkins | e306cc6cdc | Jenkins自动合并 | 6 years ago | 
				
					
						|  qianhs | 7f69df95df | 【存调整盘点,扫描库位后,提示内容“零件号,条码,数量”】【bug7060	】 | 6 years ago | 
				
					
						|  jenkins | 1163faaac1 | Jenkins自动合并 | 6 years ago | 
				
					
						|  曾贞一 | 0493feaf80 | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev | 6 years ago | 
				
					
						|  曾贞一 | 1f8885779f | 【6714 FIFO重新变化时需要有提示信息,加组件,用通用变量设置组件保存上次的FIFO信息。】 | 6 years ago | 
				
					
						|  陆卫豪 | 56fe97e200 | Merge branch 'dev' of i3-IMPP/i3plus-pojo into test | 6 years ago | 
				
					
						|  陈思洁 | 9d5eac441e | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev | 6 years ago | 
				
					
						|  陈思洁 | b5d50af250 | 【KT-1284 计划拉动-生产计划管理】 | 6 years ago | 
				
					
						|  曾贞一 | 6eafdb1d7e | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev | 6 years ago | 
				
					
						|  曾贞一 | 5ea55135dc | 【6714 FIFO重新变化时需要有提示信息,加组件,用通用变量设置组件保存上次的FIFO信息。】 | 6 years ago | 
				
					
						|  jenkins | 320607590b | Jenkins自动合并 | 6 years ago | 
				
					
						|  gcj | c199b977e5 | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev | 6 years ago | 
				
					
						|  gcj | cfa465817f | 【修改模糊查询】 | 6 years ago | 
				
					
						|  王杰 | 06afd98334 | Merge branch 'dev' into test | 6 years ago | 
				
					
						|  qianhs | 34e4d837af | 【存调整盘点,扫描库位后,提示内容“零件号,条码,数量”】【bug7060	】 | 6 years ago | 
				
					
						|  jenkins | 6a19a07fce | Jenkins自动合并 | 6 years ago | 
				
					
						|  gcj | 7e41cde458 | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev | 6 years ago | 
				
					
						|  gcj | 894dbed46c | 【宁德问题清单】 | 6 years ago | 
				
					
						|  jenkins | f39163513c | Jenkins自动合并 | 6 years ago | 
				
					
						|  曾贞一 | 4bd0aa8d57 | 【系统配置-模糊查询 】 | 6 years ago | 
				
					
						|  jenkins | 1fbd9c4357 | Jenkins自动合并 | 6 years ago | 
				
					
						|  gcj | 9c2dcba09d | 【运输管理】添加查询关联单号 | 6 years ago | 
				
					
						|  jenkins | cc45dbc2cb | Jenkins自动合并 | 6 years ago | 
				
					
						|  曾贞一 | 91716272a6 | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev | 6 years ago | 
				
					
						|  曾贞一 | 393d3f12b8 | 【7055 新增波次拣货流程】 | 6 years ago | 
				
					
						|  jenkins | 695a9b2e63 | Jenkins自动合并 | 6 years ago | 
				
					
						|  陈思洁 | 03982ad2e0 | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev | 6 years ago | 
				
					
						|  陈思洁 | 03eeacd273 | 【KT-1298 物流路线【处理模式】优化】 | 6 years ago | 
				
					
						|  王杰 | ab68895760 | test分支修改pom | 6 years ago | 
				
					
						|  王杰 | c87b00756f | dev分支修改pom | 6 years ago | 
				
					
						|  qianhs | 1d7cf41653 | 【VDA静态盘点-盘点调差-实时库存未解冻】【bug7009】后期待优化 | 6 years ago | 
				
					
						|  qianhs | 4c8a94bdfa | 【VDA静态盘点-盘点调差-实时库存未解冻】【bug7009】 | 6 years ago | 
				
					
						|  qianhs | a2ac02aa47 | 【VDA静态盘点-盘点调差-实时库存未解冻】【bug7009】 | 6 years ago | 
				
					
						|  E | 69e20029e8 | 【1320 KT物料信息--需要维护物料的类型:器具】增加描述:90=器具库 | 6 years ago | 
				
					
						|  gcj | a7d1ec785b | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev | 6 years ago | 
				
					
						|  许心洁 | eb084d3904 | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev | 6 years ago | 
				
					
						|  许心洁 | 0d7e64b160 | 在调用交易处理组件之前把交易处理组件类型名称一并赋值到MOVEMASTER对象中,省去每个组件中再去循环查询。 | 6 years ago | 
				
					
						|  qianhs | 5c28c8344c | 【VDA静态盘点-盘点调差-实时库存未解冻】【bug7009】 | 6 years ago | 
				
					
						|  WYnneaoapc | 0191a17a4d | Merge branch 'dev' into test | 6 years ago | 
				
					
						|  gcj | b29d84bbad | 【运输管理】 | 6 years ago | 
				
					
						|  gcj | ba355aab55 | 【运输管理】 | 6 years ago | 
				
					
						|  jenkins | 5513e95884 | Jenkins自动合并 | 6 years ago | 
				
					
						|  gcj | 01e5919349 | Merge remote-tracking branch 'origin/dev' into dev | 6 years ago | 
				
					
						|  jenkins | 34b843bd1f | Jenkins自动合并 | 6 years ago | 
				
					
						|  puxiao.liao | 4f1455012f | 【领料上线扫描时,在扫描完条码后将目标库位带出。 】bug7024 | 6 years ago | 
				
					
						|  gcj | 0e1599789d | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev | 6 years ago | 
				
					
						|  gcj | d92850c1a4 | 【运输管理】 | 6 years ago | 
				
					
						|  jenkins | 03051f4fd1 | Jenkins自动合并 | 6 years ago | 
				
					
						|  puxiao.liao | 0c01ffb230 | 【在配料时,点击右上角放大镜,输入单号无法查询,并且显示的内容需要有来源,目标,是否紧急 】6978 | 6 years ago | 
				
					
						|  jenkins | 8efcd210aa | Jenkins自动合并 | 6 years ago | 
				
					
						|  陈思洁 | d0ddf208c3 | 【KT-1297 物流路线的【适用范围】优化】 | 6 years ago | 
				
					
						|  jenkins | 95048bce44 | Jenkins自动合并 | 6 years ago | 
				
					
						|  qianhs | d4d30bf634 | 【 零件号条码打印,扫描后需要提示当前扫描零件,当前扫描数量,剩余扫描数量(标包减去扫描数量)。】【bug7020】 | 6 years ago | 
				
					
						|  汪云昊 | 1318c6ef56 | Merge remote-tracking branch 'remotes/origin/dev' into test | 6 years ago | 
				
					
						|  陈思洁 | 5d4e8a94c4 | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev | 6 years ago | 
				
					
						|  陈思洁 | c5ae91b41e | 【KT-1286 计划拉动-计划拉动JOB】 | 6 years ago | 
				
					
						|  jenkins | 55dcb795c9 | Jenkins自动合并 | 6 years ago | 
				
					
						|  许心洁 | 258c1ccbe8 | 流程导入:优化数字类型CELL为空字符串时的校验+有些SHEET没有数据时无需校验+快速移库:只能移入库状态的条码;不可多人操作同一个库位进行整库移库 | 6 years ago | 
				
					
						|  jenkins | cfebb937fb | Jenkins自动合并 | 6 years ago | 
				
					
						|  gcj | 4c2d922ed9 | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev | 6 years ago | 
				
					
						|  gcj | 2c63820f98 | 【运输管理】 | 6 years ago | 
				
					
						|  jenkins | 350f7101d2 | Jenkins自动合并 | 6 years ago | 
				
					
						|  puxiao.liao | da4f32f0b4 | 【在配料时,点击右上角放大镜,输入单号无法查询,并且显示的内容需要有来源,目标,是否紧急 】6978 | 6 years ago | 
				
					
						|  gcj | 59e7704f67 | 【运输管理】装车单 | 6 years ago | 
				
					
						|  陆卫豪 | 5393d6e034 | Merge branch 'dev' of i3-IMPP/i3plus-pojo into test | 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 | 
				
					
						|  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 | 
				
					
						|  jenkins | 6be1ef7dbd | Jenkins自动合并 | 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 | ef9293867f | 【bug6929 收货道口数量长度没有限制】【bug6928 收货道口为0时没有默认为1】 | 6 years ago | 
				
					
						|  jokelone | 0dfb948810 | Merge branch 'dev' into test | 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 | 
				
					
						|  陈思洁 | 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 | 
				
					
						|  qianhs | da2cfd77b0 | 【 增加一个扫描零件上的条码,累计数量达到零件标包后自动打印条码+按照主数据自动报工的界面】【bug6704】 | 6 years ago | 
				
					
						|  陈思洁 | 7d07580a78 | 合并冲突 | 6 years ago | 
				
					
						|  陈思洁 | b9844c255b | 生产计划表结构增加 | 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 | 
				
					
						|  于学杰 | 67b5069c48 | 1. 增加分组提交的配置字段 | 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 | 
				
					
						|  jokelone | 056dbaacf2 | Merge branch 'dev' into test | 6 years ago | 
				
					
						|  陈思洁 | eb5f9610a8 | 【KT-1282 计划拉动-班次管理】 | 6 years ago | 
				
					
						|  陈思洁 | 5797ec4b1b | 新增工位表字段 | 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 | 
				
					
						|  许心洁 | 49a126843b | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev | 6 years ago | 
				
					
						|  许心洁 | 2ce2f17353 | 流程管家:新增“是否连带提交创建状态移动单”属性;新增重置功能+生产扣减交易处理组件+交易处理成功程序+ESB解析程序多余异常输出去除+质检流程加上是否允许多人操作校验+PDA动态菜单交易类型描述国际化 | 6 years ago | 
				
					
						|  jokelone | 690918add5 | Merge branch 'dev' into test | 6 years ago | 
				
					
						|  曾贞一 | 594d6a4135 | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev | 6 years ago | 
				
					
						|  王杰 | a254841385 | 更新 'modules/i3plus-pojo-wms/pom.xml' | 6 years ago | 
				
					
						|  王杰 | cfa54aa2b6 | 修改pom | 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 | 
				
					
						|  曾贞一 | bb92161133 | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev | 6 years ago | 
				
					
						|  jenkins | 33f3fd0963 | Jenkins自动合并 | 6 years ago | 
				
					
						|  qianhs | c8f23ba640 | 【	库存报表中无法看到寄售零件】【bug6331】 | 6 years ago |