|  刘敏 | 1a43546bd1 | 条码状态报表开发 | 6 years ago | 
				
					
						|  alwaysfrin | 4ce22aaa3f | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev | 6 years ago | 
				
					
						|  alwaysfrin | d4dce36280 | 流程管家优化 | 6 years ago | 
				
					
						|  jenkins | e4cf82841f | Merge branch 'dev' into test | 6 years ago | 
				
					
						|  于学杰 | 663d8cdcf1 | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev | 6 years ago | 
				
					
						|  于学杰 | aed953a03e | 1. FIFO 推荐时要加上 sn_status = 40 的筛选条件 | 6 years ago | 
				
					
						|  刘敏 | 6aaf2f3f3e | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev | 6 years ago | 
				
					
						|  刘敏 | 1f403ebe40 | 代码优化 | 6 years ago | 
				
					
						|  jenkins | c12cdea29f | Merge branch 'dev' into test | 6 years ago | 
				
					
						|  peter.pan | 96e031b2f2 | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev | 6 years ago | 
				
					
						|  peter.pan | 062b20af23 | 物料清单dao层 | 6 years ago | 
				
					
						|  刘敏 | 8d8c91f352 | 盘点调差导入接口表开发 | 6 years ago | 
				
					
						|  wei.peng | a4016dc911 | Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test | 6 years ago | 
				
					
						|  曾贞一 | 022d178833 | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev | 6 years ago | 
				
					
						|  曾贞一 | e8c736ee67 | 开发 交叉盘点 库存容量更新 | 6 years ago | 
				
					
						|  曾贞一 | 316050dd24 | 开发 交叉盘点 库存容量更新 | 6 years ago | 
				
					
						|  刘敏 | 98cf305653 | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev | 6 years ago | 
				
					
						|  于学杰 | 6ee8d7d2a2 | 1. 修改潜在BUG | 6 years ago | 
				
					
						|  刘敏 | 7488f0652e | 移库单明细查询条件新增、盘点导入开发 | 6 years ago | 
				
					
						|  刘敏 | 34dcf6d526 | 枚举修改 | 6 years ago | 
				
					
						|  wei.peng | 3605e5ef35 | Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test | 6 years ago | 
				
					
						|  于学杰 | 9282edf93a | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev | 6 years ago | 
				
					
						|  于学杰 | c6f5111510 | 1. 解决标准拣货中的 FIFO 按照存储区推荐问题 | 6 years ago | 
				
					
						|  汪云昊 | 0507cf7ee0 | Merge remote-tracking branch 'remotes/origin/test' | 6 years ago | 
				
					
						|  汪云昊 | 6c68b123f0 | Merge remote-tracking branch 'remotes/origin/dev' into test | 6 years ago | 
				
					
						|  许心洁 | a8a1c2fe8b | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev | 6 years ago | 
				
					
						|  许心洁 | 659968da3c | 流程管家启动加载流程不存在不报错+MOVE_NO存KEY的BUG | 6 years ago | 
				
					
						|  汪云昊 | f9955609bd | Merge remote-tracking branch 'remotes/origin/test' | 6 years ago | 
				
					
						|  汪云昊 | f3ba4b33a2 | Merge remote-tracking branch 'remotes/origin/dev' into test | 6 years ago | 
				
					
						|  陈思洁 | 5f74c26466 | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev | 6 years ago | 
				
					
						|  陈思洁 | 326992e6ce | 通过库存地查询存储区的sql新增 | 6 years ago | 
				
					
						|  刘敏 | 60be1763b2 | 实体数字类型get方法重写 | 6 years ago | 
				
					
						|  汪云昊 | 5d6f9a42af | Merge remote-tracking branch 'remotes/origin/dev' into test | 6 years ago | 
				
					
						|  刘敏 | b815564e6e | 线边配料页面新增任务字段、主表状态字段 | 6 years ago | 
				
					
						|  汪云昊 | 91677f3c13 | Merge remote-tracking branch 'remotes/origin/dev' | 6 years ago | 
				
					
						|  汪云昊 | 90028caa6f | Merge remote-tracking branch 'remotes/origin/dev' into test | 6 years ago | 
				
					
						|  sky.meng | 78c8d3b689 | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev | 6 years ago | 
				
					
						|  sky.meng | 9d2146b23d | 客户零件号功能完成 | 6 years ago | 
				
					
						|  jenkins | 0b302482fd | Merge remote-tracking branch 'origin/dev' into test | 6 years ago | 
				
					
						|  于学杰 | 5b6068b2ae | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev | 6 years ago | 
				
					
						|  于学杰 | 60d151eb35 | 1. 完成 WMS --> SAP 接口程序 | 6 years ago | 
				
					
						|  jenkins | 8132c94cee | Merge branch 'dev' into test | 6 years ago | 
				
					
						|  刘敏 | c6b24ea3cc | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev | 6 years ago | 
				
					
						|  刘敏 | 8c4646bc41 | 实体类型修改 | 6 years ago | 
				
					
						|  shiyanghuan | f6bc967e07 | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev | 6 years ago | 
				
					
						|  shiyanghuan | bcd3e43867 | 库存交易报表部分代码提交以及供应商物料bug修复 | 6 years ago | 
				
					
						|  陈思洁 | b6ae6c64ed | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev | 6 years ago | 
				
					
						|  陈思洁 | add3f05985 | 数据权限hql修改 | 6 years ago | 
				
					
						|  wei.peng | 33ec897657 | Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo | 6 years ago | 
				
					
						|  wei.peng | 734340fe63 | Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test | 6 years ago | 
				
					
						|  许心洁 | 7b83985f40 | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev | 6 years ago | 
				
					
						|  许心洁 | f6bf244b12 | 流程管家放MOVENO的BUG | 6 years ago | 
				
					
						|  陈思洁 | 5f5bd84089 | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev | 6 years ago | 
				
					
						|  陈思洁 | 8e8cafc6d8 | 数据权限增加角色名称 库存条码数量封装 | 6 years ago | 
				
					
						|  刘敏 | 9b2356231e | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev | 6 years ago | 
				
					
						|  刘敏 | 4a5f799291 | 实体新增 | 6 years ago | 
				
					
						|  刘敏 | 8a420ff9c9 | 库存转储指令   供应商退货指令实体新增 | 6 years ago | 
				
					
						|  汪云昊 | f4fe91ace0 | Merge remote-tracking branch 'origin/dev' into dev | 6 years ago | 
				
					
						|  汪云昊 | 6259bd56bc | 通用EXCEl导出MODEL | 6 years ago | 
				
					
						|  sky.meng | 15c22e28fd | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev | 6 years ago | 
				
					
						|  sky.meng | 0182dd3cc3 | 生产线(工作中心) 存储区关系管理功能完成 | 6 years ago | 
				
					
						|  shiyanghuan | f7f0ebadaf | Merge branch 'dev' of http://git.estsh.com/i3-WMS/i3plus-wms into dev # Conflicts:
#	modules/i3plus-wms-apiservice/src/main/java/cn/estsh/i3plus/wms/apiservice/controller/base/WmsUnitController.java | 6 years ago | 
				
					
						|  刘敏 | 81f0ea48ba | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev | 6 years ago | 
				
					
						|  jenkins | 5694d58256 | Merge remote-tracking branch 'origin/dev' into test | 6 years ago | 
				
					
						|  于学杰 | 02734d33f9 | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev | 6 years ago | 
				
					
						|  于学杰 | b6746b7e6f | 1. 增加 WMS 到 SAP 接口的处理代码 | 6 years ago | 
				
					
						|  刘敏 | 0a7583a91b | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev | 6 years ago | 
				
					
						|  刘敏 | 85681c4465 | 导入问题统一修改 | 6 years ago | 
				
					
						|  陈思洁 | 0210ab9d70 | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev | 6 years ago | 
				
					
						|  陈思洁 | 16ceb8ff7b | 修复任务权限业务逻辑 | 6 years ago | 
				
					
						|  曾贞一 | 8f56fc5620 | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev | 6 years ago | 
				
					
						|  曾贞一 | fa59716c17 | 需求变更 冻结盘点业务 | 6 years ago | 
				
					
						|  jenkins | 4212c9b61e | Merge remote-tracking branch 'origin/dev' into test | 6 years ago | 
				
					
						|  shiyanghuan | 6222923c80 | 修改 | 6 years ago | 
				
					
						|  刘敏 | 3310571d18 | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev | 6 years ago | 
				
					
						|  刘敏 | 856345e830 | 初始化问题修改 | 6 years ago | 
				
					
						|  许心洁 | c4bdbc3c17 | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev | 6 years ago | 
				
					
						|  许心洁 | 7fa871508e | 流程修改去掉工厂代码+库存交易实体新增scrapQty字段 | 6 years ago | 
				
					
						|  wei.peng | 1be5aa02bf | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test | 6 years ago | 
				
					
						|  刘敏 | 8dc939b849 | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev | 6 years ago | 
				
					
						|  刘敏 | 07e6e58e23 | 实体新增与修改 | 6 years ago | 
				
					
						|  陈思洁 | e85c2ea992 | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev | 6 years ago | 
				
					
						|  陈思洁 | 91999948b6 | sql优化 | 6 years ago | 
				
					
						|  刘敏 | e726833580 | 非JIS发运实体新增 | 6 years ago | 
				
					
						|  许心洁 | ada53de0fe | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev | 6 years ago | 
				
					
						|  许心洁 | f69795cc5f | 任务数据来源基础数据维护唯一校验修改 | 6 years ago | 
				
					
						|  sky.meng | baee01a070 | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev | 6 years ago | 
				
					
						|  sky.meng | 5f898661c7 | 添加产线(工作中心)-存储区信息 repository | 6 years ago | 
				
					
						|  wei.peng | a02b32a20e | Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test | 6 years ago | 
				
					
						|  曾贞一 | 8d64152e58 | 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 | 
				
					
						|  曾贞一 | 8289de8259 | 优化 新建盘点范围数据 需求更新 盘点冻结业务 | 6 years ago | 
				
					
						|  shiyanghuan | 619487aedb | 修改库位物料和供应商物料bug | 6 years ago | 
				
					
						|  shiyanghuan | f7d4f85d45 | 库位物料和供应商物料bug修复 | 6 years ago | 
				
					
						|  jenkins | 320910e2ae | Merge remote-tracking branch 'origin/dev' into test | 6 years ago | 
				
					
						|  刘敏 | 721ddbee3c | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev | 6 years ago | 
				
					
						|  刘敏 | 16400aa31c | 实体字段修改 | 6 years ago | 
				
					
						|  sky.meng | e5e0da62e7 | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev | 6 years ago | 
				
					
						|  sky.meng | 939d67e7f3 | 添加产线信息管理(工作中心) | 6 years ago | 
				
					
						|  许心洁 | dfef27151d | 冲突 | 6 years ago | 
				
					
						|  许心洁 | f834e91353 | Task#764+枚举TRUE_OR_FALSE | 6 years ago |