|  陈思洁 | f90371f632 | 【2144 06 1.2.4.6.1.3 装配计划排产】 | 5 years ago | 
				
					
						|  puxiao.liao | ffc2d4d56c | Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test  Conflicts:
	modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java | 5 years ago | 
				
					
						|  puxiao.liao | 49f9d06d5f | Fix bug#9062 无锡喜德-生产汇报(原材料/成品)用 函数取出来的父位置和子位置号可能会有多个-0620 | 5 years ago | 
				
					
						|  钮海涛 | 78fa4f3a37 | 修复版本问题 | 5 years ago | 
				
					
						|  钮海涛 | ac7e69e51e | 修复版本问题 | 5 years ago | 
				
					
						|  钮海涛 | 34e63db56c | Merge remote-tracking branch 'origin/dev' into dev | 5 years ago | 
				
					
						|  钮海涛 | e340749f87 | Finish Task #2196 Cost:4h | 5 years ago | 
				
					
						|  puxiao.liao | eeaaa74d1e | Merge remote-tracking branch 'origin/dev' into dev | 5 years ago | 
				
					
						|  puxiao.liao | 0818778346 | 自动化策略主表 | 5 years ago | 
				
					
						|  宋军超 | 819bd7aba8 | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev | 5 years ago | 
				
					
						|  王杰 | 71e0d9f5d8 | Merge branch 'dev' of jhforever.wang/wangjie-i3plus-pojo into dev | 5 years ago | 
				
					
						|  王杰 | 8cf6e99cf6 | mes | 5 years ago | 
				
					
						|  宋军超 | 87dc9ab966 | 与前端联调修改 | 5 years ago | 
				
					
						|  曾贞一 | 16271ea338 | Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test | 5 years ago | 
				
					
						|  曾贞一 | 68c3f087dc | 【2180 06 1.2.3.8泰国WMS-生产报工接口】 | 5 years ago | 
				
					
						|  曾贞一 | 77e6ee3b98 | 【2180 06 1.2.3.8泰国WMS-生产报工接口】 | 5 years ago | 
				
					
						|  宋军超 | 2ef42fdadd | Finish Task:2160,2175.北京麦格纳基础数据开发。 Finish Task #2160,2175 Cost:10h | 5 years ago | 
				
					
						|  钮海涛 | 9d64793a5f | Merge branch 'master' into test | 5 years ago | 
				
					
						|  joke.wang | 3dda15e00a | Finish Task #2153 Cost:24h | 5 years ago | 
				
					
						|  袁津哲 | edae2b00f6 | Fix Bug #8996,#9033 1.PCN同步配置界面同步方式及同步类型显示为空-0617
2.原材料上线扫描显示数量不正确 | 5 years ago | 
				
					
						|  puxiao.liao | 0c0d43cd96 | 北京海纳川:采购入库组件 | 5 years ago | 
				
					
						|  wynne1005 | 64b00d6717 | 接口表添加产品条码 | 5 years ago | 
				
					
						|  汪云昊 | 3c2462c1af | Merge remote-tracking branch 'origin/dev' into dev | 5 years ago | 
				
					
						|  汪云昊 | fdd5516a0f | FTP适配器优化 表单功能优化
UA 适配 LONG类型 | 5 years ago | 
				
					
						|  陈思洁 | b65d9e0f3d | 2171 首检生成逻辑调整 | 5 years ago | 
				
					
						|  wynne1005 | b0df686091 | Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo | 5 years ago | 
				
					
						|  wynne1005 | 878acb869f | 提交zh修改问题 | 5 years ago | 
				
					
						|  袁津哲 | c066820b18 | Fix Bug #9001 关键件绑定异常问题 | 5 years ago | 
				
					
						|  曾贞一 | a4fd88f237 | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev | 5 years ago | 
				
					
						|  曾贞一 | a59fa1bf9b | 【2078 06 1.2.3.9拣货策略-新增拣货推荐组价】 | 5 years ago | 
				
					
						|  袁津哲 | cb69f62c63 | Fix Bug #8886 原材料上线扫描,无法看到原材料已扣减数量和剩余数量 | 5 years ago | 
				
					
						|  wei.peng | b0e752c65e | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test | 5 years ago | 
				
					
						|  wei.peng | 91f4edc83f | 数据库读写分离 功能完善 | 5 years ago | 
				
					
						|  wei.peng | d5051cabdb | 数据库读写分离 功能完善 | 5 years ago | 
				
					
						|  wei.peng | 25b2109144 | getByProperty 查询优化 | 5 years ago | 
				
					
						|  王杰 | ef9c029bc0 | Merge branch 'dev' of jhforever.wang/wangjie-i3plus-pojo into dev | 5 years ago | 
				
					
						|  王杰 | 0388c36c41 | mes | 5 years ago | 
				
					
						|  wei.peng | fb65b042f0 | getByProperty 查询优化 | 5 years ago | 
				
					
						|  袁津哲 | 212dccad6c | 同前端联调倒计时组件逻辑 | 5 years ago | 
				
					
						|  wei.peng | ec3febfaa9 | Merge remote-tracking branch 'remotes/origin/dev' into test | 5 years ago | 
				
					
						|  陈思洁 | 67a7904024 | 【泰国演示问题修复】 | 5 years ago | 
				
					
						|  曾贞一 | 26e3053ecc | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev | 5 years ago | 
				
					
						|  曾贞一 | 99f1ba98b6 | 【2077 06 1.2.3.8上架策略-4.5	新增上架推荐组件】 | 5 years ago | 
				
					
						|  汪云昊 | 676ab32cd6 | Merge remote-tracking branch 'origin/dev' into dev | 5 years ago | 
				
					
						|  汪云昊 | 0ea80a0f63 | 删除无用代码 测试环境开关回滚 | 5 years ago | 
				
					
						|  袁津哲 | 2546395b8d | 优化定时倒计时组件逻辑和前后端调用逻辑 | 5 years ago | 
				
					
						|  wei.peng | 4208d39e3f | feat(密码规则验证完成): 用户登录,密码修改 | 5 years ago | 
				
					
						|  wei.peng | bdb5e6e27c | 密码策略完成 | 5 years ago | 
				
					
						|  袁津哲 | 089f655cfe | 优化工位定时组件调用逻辑 | 5 years ago | 
				
					
						|  袁津哲 | 638c032d95 | 优化工位定时组件调用逻辑 | 5 years ago |