xiaoning
							
						 | 
						
							
							
							
							
								
							
								4a0e79d5c8
								
							
								
							
						 | 
						
							
							
								
								xn
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
									
								
								 董哲奇
							
						 | 
						
							
							
							
							
								
							
								e57e1832d4
								
							
								
							
						 | 
						
							
							
								
								1.优化界面样式
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
									
								
								 董哲奇
							
						 | 
						
							
							
							
							
								
							
								b0a323b4b6
								
							
								
							
						 | 
						
							
							
								
								1.增加统计相关页面展示样例
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
									
								
								 董哲奇
							
						 | 
						
							
							
							
							
								
							
								ec754c40d0
								
							
								
							
						 | 
						
							
							
								
								1.修复工单上料计划生成语句
							
							
							
							
							
							
							
							2.当对应工序产能不存在时,按照文档日期计算规则设置默认计划期,自动生成抛丸日期和上料日期
3.修复bug 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
									
								
								 董哲奇
							
						 | 
						
							
							
							
							
								
							
								cb90afdb50
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
									
								
								 董哲奇
							
						 | 
						
							
							
							
							
								
							
								3399e011b6
								
							
								
							
						 | 
						
							
							
								
								1.优化代码
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 xiaoning
							
						 | 
						
							
							
							
							
								
							
								389a5c32f4
								
							
								
							
						 | 
						
							
							
								
								xn
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 xiaoning
							
						 | 
						
							
							
							
							
								
							
								447315ae49
								
							
								
							
						 | 
						
							
							
								
								xn
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 xiaoning
							
						 | 
						
							
							
							
							
								
							
								de41312223
								
							
								
							
						 | 
						
							
							
								
								xn
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
									
								
								 董哲奇
							
						 | 
						
							
							
							
							
								
							
								05e355ca80
								
							
								
							
						 | 
						
							
							
								
								1.修复三月滚动计划管理导入失败的问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
									
								
								 董哲奇
							
						 | 
						
							
							
							
							
								
							
								f61407662e
								
							
								
							
						 | 
						
							
							
								
								1.修复查询错误及默认日期写死问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
									
								
								 董哲奇
							
						 | 
						
							
							
							
							
								
							
								137a82ff06
								
							
								
							
						 | 
						
							
							
								
								1.根据数据库表结构变化修正代码逻辑
							
							
							
							
							
							
							
							2.修复bug 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 xiaoning
							
						 | 
						
							
							
							
							
								
							
								d86dca0649
								
							
								
							
						 | 
						
							
							
								
								xn
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 xiaoning
							
						 | 
						
							
							
							
							
								
							
								a3310b6735
								
							
								
							
						 | 
						
							
							
								
								xn
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 xhj
							
						 | 
						
							
							
							
							
								
							
								b2af45b71d
								
							
								
							
						 | 
						
							
							
								
								1
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 xhj
							
						 | 
						
							
							
							
							
								
							
								c95c78bfab
								
							
								
							
						 | 
						
							
							
								
								pgd
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 xiaoning
							
						 | 
						
							
							
							
							
								
							
								066213c959
								
							
								
							
						 | 
						
							
							
								
								xn
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 xhj
							
						 | 
						
							
							
							
							
								
							
								f0202bb97c
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
							
							
							# Conflicts:
#	src/views/jhzxgl/pwjhFK.vue 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 xhj
							
						 | 
						
							
							
							
							
								
							
								91184501d5
								
							
								
							
						 | 
						
							
							
								
								pgd
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 xiaoning
							
						 | 
						
							
							
							
							
								
							
								67b05510b7
								
							
								
							
						 | 
						
							
							
								
								xn
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
									
								
								 董哲奇
							
						 | 
						
							
							
							
							
								
							
								9d0f2c35a9
								
							
								
							
						 | 
						
							
							
								
								1.预配盘和前方需求相关
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
									
								
								 董哲奇
							
						 | 
						
							
							
							
							
								
							
								33a0db5dbd
								
							
								
							
						 | 
						
							
							
								
								1.预配盘相关
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 xiaoning
							
						 | 
						
							
							
							
							
								
							
								bc53bde3b5
								
							
								
							
						 | 
						
							
							
								
								xn
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
									
								
								 董哲奇
							
						 | 
						
							
							
							
							
								
							
								a59ae3aef9
								
							
								
							
						 | 
						
							
							
								
								1.增加摆放位置相关功能
							
							
							
							
							
							
							
							2.增加采购计划到货情况查询
3.增加预配盘相关页面 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 xhj
							
						 | 
						
							
							
							
							
								
							
								36608310aa
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
							
							
							# Conflicts:
#	src/views/jhzxgl/dhqdFK.vue
#	src/views/jhzxgl/dmjhD.vue
#	src/views/jhzxgl/dmjhFK.vue
#	src/views/jhzxgl/pkjhD.vue
#	src/views/jhzxgl/pkjhFK.vue
#	src/views/jhzxgl/qgjhFK.vue
#	src/views/jhzxgl/qmjhFK.vue
#	src/views/jhzxgl/sljhFK.vue
#	src/views/jhzxgl/tzjhFK.vue 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 xhj
							
						 | 
						
							
							
							
							
								
							
								b35aeb1971
								
							
								
							
						 | 
						
							
							
								
								pgd
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 xiaoning
							
						 | 
						
							
							
							
							
								
							
								af38e985bb
								
							
								
							
						 | 
						
							
							
								
								xn
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 xhj
							
						 | 
						
							
							
							
							
								
							
								0f77695eb4
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 xhj
							
						 | 
						
							
							
							
							
								
							
								449fdc7db4
								
							
								
							
						 | 
						
							
							
								
								修正
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 xiaoning
							
						 | 
						
							
							
							
							
								
							
								7193ec2e17
								
							
								
							
						 | 
						
							
							
								
								xn
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 xhj
							
						 | 
						
							
							
							
							
								
							
								2d65162ecc
								
							
								
							
						 | 
						
							
							
								
								bom copy
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 xhj
							
						 | 
						
							
							
							
							
								
							
								4b48349d72
								
							
								
							
						 | 
						
							
							
								
								盘工单
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 xhj
							
						 | 
						
							
							
							
							
								
							
								782021f31d
								
							
								
							
						 | 
						
							
							
								
								修正
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 xiaoning
							
						 | 
						
							
							
							
							
								
							
								d209ff4e2b
								
							
								
							
						 | 
						
							
							
								
								XN
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								xiezuo003
							
						 | 
						
							
							
							
							
								
							
								822503496c
								
							
								
							
						 | 
						
							
							
								
								update
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 xhj
							
						 | 
						
							
							
							
							
								
							
								6fa1c3af24
								
							
								
							
						 | 
						
							
							
								
								基础数据
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 xhj
							
						 | 
						
							
							
							
							
								
							
								53c3ea7d2e
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 xhj
							
						 | 
						
							
							
							
							
								
							
								5683227407
								
							
								
							
						 | 
						
							
							
								
								基础数据
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 xiaoning
							
						 | 
						
							
							
							
							
								
							
								5da99ce30f
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 xiaoning
							
						 | 
						
							
							
							
							
								
							
								f0055b22b7
								
							
								
							
						 | 
						
							
							
								
								三月滚动明细修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 xhj
							
						 | 
						
							
							
							
							
								
							
								4cf214794a
								
							
								
							
						 | 
						
							
							
								
								基础数据
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 xhj
							
						 | 
						
							
							
							
							
								
							
								a9f04c5a64
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 xhj
							
						 | 
						
							
							
							
							
								
							
								312c2943fd
								
							
								
							
						 | 
						
							
							
								
								基础数据
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								xiezuo003
							
						 | 
						
							
							
							
							
								
							
								c26ae7ad5c
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://www.sanduolantoyoga.com/xiaoning/gjerp_ui
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								xiezuo003
							
						 | 
						
							
							
							
							
								
							
								593f41cb41
								
							
								
							
						 | 
						
							
							
								
								update
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 xhj
							
						 | 
						
							
							
							
							
								
							
								b38fe7b0c3
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 xhj
							
						 | 
						
							
							
							
							
								
							
								b1772301cc
								
							
								
							
						 | 
						
							
							
								
								基础数据
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 xiaoning
							
						 | 
						
							
							
							
							
								
							
								172a957b3d
								
							
								
							
						 | 
						
							
							
								
								改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 xiaoning
							
						 | 
						
							
							
							
							
								
							
								baa8cc7047
								
							
								
							
						 | 
						
							
							
								
								改名称
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 xhj
							
						 | 
						
							
							
							
							
								
							
								0ecc9f2f28
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2 years ago |