helloDy
							
						 
					 | 
					
						
						
							
						
						4615e975e8
					 | 
					
						
						
							
							merge
						
						
						
						
						
						
					 | 
					
						2023-10-27 16:17:28 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								helloDy
							
						 
					 | 
					
						
						
							
						
						e961bf6cfa
					 | 
					
						
						
							
							物料模块
						
						
						
						
						
						
					 | 
					
						2023-10-27 16:16:13 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						216aa6291d
					 | 
					
						
						
							
							update 设备管理-基础配置-设备分组绑定
						
						
						
						
						
						
					 | 
					
						2023-10-27 14:24:47 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						66660bfef7
					 | 
					
						
						
							
							update
						
						
						
						
						
						
					 | 
					
						2023-10-26 17:01:09 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d25261b256
					 | 
					
						
						
							
							move coreEquipment
						
						
						
						
						
						
					 | 
					
						2023-10-26 15:14:00 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						583b934511
					 | 
					
						
						
							
							delete some files
						
						
						
						
						
						
					 | 
					
						2023-10-26 14:07:36 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						503e988f7b
					 | 
					
						
						
							
							merge again
						
						
						
						
						
						
					 | 
					
						2023-10-26 11:32:29 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						06e8a72f80
					 | 
					
						
						
							
							merge mes-test
						
						
						
						
						
						
					 | 
					
						2023-10-26 11:30:07 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6c348202a1
					 | 
					
						
						
							
							update extend process
						
						
						
						
						
						
					 | 
					
						2023-10-26 11:28:24 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						5ba186b0c6
					 | 
					
						
						
							
							update
						
						
						
						
						
						
					 | 
					
						2023-10-25 17:02:43 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e153d7e077
					 | 
					
						
						
							
							update 流程图
						
						
						
						
						
						
					 | 
					
						2023-10-24 17:07:32 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3c31e5d63a
					 | 
					
						
						
							
							done 新建工序
						
						
						
						
						
						
					 | 
					
						2023-10-24 15:56:15 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						392c1ea09b
					 | 
					
						
						
							
							merge test
						
						
						
						
						
						
					 | 
					
						2023-10-24 15:21:27 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ac4565e587
					 | 
					
						
						
							
							班组&能源基础
						
						
						
						
						
						
					 | 
					
						2023-10-24 15:16:20 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6006ae13d9
					 | 
					
						
						
							
							update flow
						
						
						
						
						
						
					 | 
					
						2023-10-24 11:17:07 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								‘937886381’
							
						 
					 | 
					
						
						
							
						
						2c3bdde403
					 | 
					
						
						
							
							包装管理
						
						
						
						
						
						
					 | 
					
						2023-10-23 08:42:46 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						106d0ed89c
					 | 
					
						
						
							
							merge server
						
						
						
						
						
						
					 | 
					
						2023-10-20 17:03:06 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						cfbd00b560
					 | 
					
						
						
							
							update process
						
						
						
						
						
						
					 | 
					
						2023-10-20 17:00:49 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a787935263
					 | 
					
						
						
							
							add process flow and process node
						
						
						
						
						
						
					 | 
					
						2023-10-20 16:03:40 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						15da20fac7
					 | 
					
						
						
							
							add 添加一个缓存方案
						
						
						
						
						
						
					 | 
					
						2023-10-20 14:22:46 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6b4e906e75
					 | 
					
						
						
							
							update process flow
						
						
						
						
						
						
					 | 
					
						2023-10-19 16:40:36 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d121e408af
					 | 
					
						
						
							
							add 工艺流程列表
						
						
						
						
						
						
					 | 
					
						2023-10-19 11:13:37 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f8baaa8955
					 | 
					
						
						
							
							update ui
						
						
						
						
						
						
					 | 
					
						2023-10-17 17:02:53 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						fe7821cbd8
					 | 
					
						
						
							
							update 核心模块-厂务-设备
						
						
						
						
						
						
					 | 
					
						2023-10-17 15:22:17 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a7e81ad8fb
					 | 
					
						
						
							
							Merge branch 'test' into lb
						
						
						
						
						
						
					 | 
					
						2023-10-16 17:04:34 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						32cbf9076f
					 | 
					
						
						
							
							update 更新设备类型上传
						
						
						
						
						
						
					 | 
					
						2023-10-16 17:03:29 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								helloDy
							
						 
					 | 
					
						
						
							
						
						2b355aaf8f
					 | 
					
						
						
							
							ui
						
						
						
						
						
						
					 | 
					
						2023-10-16 15:47:31 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f60a46ed1d
					 | 
					
						
						
							
							update 设备信息上传
						
						
						
						
						
						
					 | 
					
						2023-10-16 15:36:26 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								helloDy
							
						 
					 | 
					
						
						
							
						
						4a67e226e1
					 | 
					
						
						
							
							merge
						
						
						
						
						
						
					 | 
					
						2023-10-13 17:09:07 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								helloDy
							
						 
					 | 
					
						
						
							
						
						46aaa47e07
					 | 
					
						
						
							
							bug
						
						
						
						
						
						
					 | 
					
						2023-10-13 17:05:01 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ca0f62b2eb
					 | 
					
						
						
							
							Merge branch 'test' into lb
						
						
						
						
						
						
					 | 
					
						2023-10-13 17:04:18 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						5534104e87
					 | 
					
						
						
							
							update equipment edit
						
						
						
						
						
						
					 | 
					
						2023-10-13 17:01:49 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b72fe1bfed
					 | 
					
						
						
							
							update equipment edit
						
						
						
						
						
						
					 | 
					
						2023-10-13 16:08:31 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								helloDy
							
						 
					 | 
					
						
						
							
						
						d682ecc91c
					 | 
					
						
						
							
							Merge branch 'test' into dy
						
						
						
						
						
						
					 | 
					
						2023-10-12 17:05:03 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								helloDy
							
						 
					 | 
					
						
						
							
						
						2b76ef7d23
					 | 
					
						
						
							
							bug
						
						
						
						
						
						
					 | 
					
						2023-10-12 17:04:03 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9ec13b35b8
					 | 
					
						
						
							
							update equipment
						
						
						
						
						
						
					 | 
					
						2023-10-12 17:03:07 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7acccd3de0
					 | 
					
						
						
							
							bugfix zentao
						
						
						
						
						
						
					 | 
					
						2023-10-12 15:40:05 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9f53ea6981
					 | 
					
						
						
							
							10.12
						
						
						
						
						
						
					 | 
					
						2023-10-12 14:39:59 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8f634d012c
					 | 
					
						
						
							
							bugfix zentao
						
						
						
						
						
						
					 | 
					
						2023-10-12 11:08:51 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						348714edaf
					 | 
					
						
						
							
							merge test
						
						
						
						
						
						
					 | 
					
						2023-10-11 14:33:37 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						814fe4605a
					 | 
					
						
						
							
							UI样式修改能源&班组
						
						
						
						
						
						
					 | 
					
						2023-10-11 14:30:18 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0162f338ba
					 | 
					
						
						
							
							Merge branch 'test' into lb
						
						
						
						
						
						
					 | 
					
						2023-10-11 10:30:25 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8f99915720
					 | 
					
						
						
							
							add 设备看板
						
						
						
						
						
						
					 | 
					
						2023-10-11 10:29:26 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								helloDy
							
						 
					 | 
					
						
						
							
						
						69bdab75d4
					 | 
					
						
						
							
							bug
						
						
						
						
						
						
					 | 
					
						2023-10-10 17:06:39 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						af5e0333ed
					 | 
					
						
						
							
							update ui
						
						
						
						
						
						
					 | 
					
						2023-10-10 17:01:57 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b2ee61b8cb
					 | 
					
						
						
							
							update 改为抽屉展示
						
						
						
						
						
						
					 | 
					
						2023-10-10 14:22:00 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						723d83cc02
					 | 
					
						
						
							
							update 设备分组
						
						
						
						
						
						
					 | 
					
						2023-10-10 10:04:23 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						769830c448
					 | 
					
						
						
							
							update 设备分组
						
						
						
						
						
						
					 | 
					
						2023-10-09 17:01:19 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						907db90e93
					 | 
					
						
						
							
							update 设备分组的抽屉
						
						
						
						
						
						
					 | 
					
						2023-10-09 16:27:44 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6e390bf12a
					 | 
					
						
						
							
							update
						
						
						
						
						
						
					 | 
					
						2023-10-09 13:32:33 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |