|  joke | 6964d4cf4e | [ptl-pcn: 32 亮灯作业] | 6 years ago | 
				
					
						|  陈思洁 | 686012563f | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev | 6 years ago | 
				
					
						|  陈思洁 | 40094365ce | 【PTL_区段亮灯任务明细状态】 | 6 years ago | 
				
					
						|  joke | f362f9931f | [ptl:32 亮灯作业] | 6 years ago | 
				
					
						|  joke | c73cd26574 | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev | 6 years ago | 
				
					
						|  joke | f01b3664c2 | [ptl: 32 亮灯作业程序] | 6 years ago | 
				
					
						|  宋军超 | 464c8b68cc | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev | 6 years ago | 
				
					
						|  宋军超 | d56756e9e5 | 添加主任务、区域、区段枚举 | 6 years ago | 
				
					
						|  陈思洁 | e4ba6e21c8 | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev | 6 years ago | 
				
					
						|  宋军超 | cac0f91150 | 添加BOM中父物料描述默认值 | 6 years ago | 
				
					
						|  陈思洁 | 728f46b43d | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev | 6 years ago | 
				
					
						|  陈思洁 | 2c305e0ca6 | 【修改枚举类名大写(部分)】 | 6 years ago | 
				
					
						|  许心洁 | 2a09c009f3 | Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test | 6 years ago | 
				
					
						|  宋军超 | 0fe0abff63 | 新增区域、区段、标签控制器、标签信息、BOM和物料 基础数据 | 6 years ago | 
				
					
						|  宋军超 | 896bd9b35b | 添加基础数据枚举 | 6 years ago | 
				
					
						|  宋军超 | 60ad38649d | 新增区域、区段、标签控制器、标签信息、BOM和物料 基础数据 | 6 years ago | 
				
					
						|  luweihao | 43a471d996 | 修改ptl项目pom | 6 years ago | 
				
					
						|  王杰 | 7662905caa | Merge branch 'test' | 6 years ago | 
				
					
						|  王杰 | b516ca254c | 解决冲突 | 6 years ago | 
				
					
						|  王杰 | 39a454f89b | ptl | 6 years ago | 
				
					
						|  luweihao | 1f4e7c5d45 | Merge branch 'dev' into test | 6 years ago | 
				
					
						|  luweihao | b556051295 | task  修改监控类位置 | 6 years ago | 
				
					
						|  luweihao | 246dd85721 | Merge branch 'dev' into test | 6 years ago | 
				
					
						|  陈思洁 | 658885ade5 | 合并冲突 | 6 years ago | 
				
					
						|  陈思洁 | 1e431aef58 | 【1418 新增固化看板】 | 6 years ago | 
				
					
						|  许心洁 | 55e3f212ce | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev | 6 years ago | 
				
					
						|  许心洁 | 7f161e3bae | 3D可视化仓库 | 6 years ago | 
				
					
						|  jenkins | 1ada447069 | Jenkins自动合并 | 6 years ago | 
				
					
						|  luweihao | 1b727f1721 | task   任务重试测试 | 6 years ago | 
				
					
						|  luweihao | 68cbd54f37 | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev | 6 years ago | 
				
					
						|  luweihao | 5fd51f6b1d | task   任务重试测试 | 6 years ago | 
				
					
						|  qianhs | 91b43823c9 | 【 日生产计划生成的条码在条码打印界面只能补打,不能打印】【bug7514】 | 6 years ago | 
				
					
						|  puxiao.liao | 58fe5f61d8 | Merge remote-tracking branch 'origin/dev' into dev | 6 years ago | 
				
					
						|  puxiao.liao | 53a2152ff1 | 【 7531 在网页的条码打印界面增加一个按钮,可以修改部分条码数量,修改条件,库位为空,库区有值,条码状态为待入库。此部分条码为日生产计划生成的条码。 】bug7531 | 6 years ago | 
				
					
						|  joke | d42b7ebbb6 | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev | 6 years ago | 
				
					
						|  joke | 2b84f93950 | 任务: 1424 DT通信 | 6 years ago | 
				
					
						|  jenkins | b56d9cb824 | Jenkins自动合并 | 6 years ago | 
				
					
						|  陈思洁 | 970d8a3506 | Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev | 6 years ago | 
				
					
						|  陈思洁 | c40d3360d3 | 【1416 新增固化时间维护】 | 6 years ago | 
				
					
						|  汪云昊 | c4149a2d11 | Merge remote-tracking branch 'origin/dev' into dev | 6 years ago | 
				
					
						|  luweihao | be2f1cb146 | Merge branch 'dev' into test | 6 years ago | 
				
					
						|  luweihao | 5eb7cf03ed | task 数据同步添加错误信息字段 | 6 years ago | 
				
					
						|  jenkins | 9f0a0852e7 | Jenkins自动合并 | 6 years ago | 
				
					
						|  puxiao.liao | 709db0b573 | 【 7526 发运单接收时,在主表中增加一个字段,在讲单据信息写入数据库时,如果该单据条码中只存在一步法的零件号,则该字段需要在前台显示为一步法,如果存在两步法的零件号,则显示为两步法。 】bug7526 | 6 years ago | 
				
					
						|  jenkins | 1ee4a53d64 | Jenkins自动合并 | 6 years ago | 
				
					
						|  puxiao.liao | f2586f846a | Merge remote-tracking branch 'origin/dev' into dev | 6 years ago | 
				
					
						|  puxiao.liao | 37ee72adaf | 【 7523 条码拆箱功能输入数量时,此处提示改为“扫描成功,请输入新条码数量” 】bug7523 | 6 years ago | 
				
					
						|  jenkins | 9fc85191fe | Jenkins自动合并 | 6 years ago | 
				
					
						|  王杰 | 748ef11ccf | ptl-pcn标签控制器枚举 | 6 years ago | 
				
					
						|  puxiao.liao | 759fda55b9 | 【 7527 1.推荐入库(推荐生产入库),如果扫描加密码错,报错有问题,2.如果扫描库位时,检查条码某项条件不符合入库规范则需要回到请扫描条码那一步。 】bug7527 | 6 years ago |