| 
						
					 | 
					
						
						
							
						
						5521f07c18
					 | 
					
						
						
							
							Merge pull request 'projects/mes-zjl' (#61) from projects/mes-zjl into projects/mes-test
						
						
						
						
						
						
						
						Reviewed-on: #61 
						
						
					 | 
					
						2023-11-03 17:02:04 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						14d426b020
					 | 
					
						
						
							
							merge test
						
						
						
						
						
						
					 | 
					
						2023-11-03 17:01:14 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						046a5eea32
					 | 
					
						
						
							
							成品发货
						
						
						
						
						
						
					 | 
					
						2023-11-03 16:59:07 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b468204f88
					 | 
					
						
						
							
							Merge pull request 'projects/mes-dy' (#60) from projects/mes-dy into projects/mes-test
						
						
						
						
						
						
						
						Reviewed-on: #60 
						
						
					 | 
					
						2023-11-03 15:38:59 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								helloDy
							
						 
					 | 
					
						
						
							
						
						e5978d1700
					 | 
					
						
						
							
							merge
						
						
						
						
						
						
					 | 
					
						2023-11-03 11:16:30 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								helloDy
							
						 
					 | 
					
						
						
							
						
						91eb13af26
					 | 
					
						
						
							
							客商信息、人事相关
						
						
						
						
						
						
					 | 
					
						2023-11-03 11:15:12 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						fe29043ab1
					 | 
					
						
						
							
							Merge pull request 'projects/mes-lb' (#59) from projects/mes-lb into projects/mes-test
						
						
						
						
						
						
						
						Reviewed-on: #59 
						
						
					 | 
					
						2023-11-01 09:45:17 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						2075b42427
					 | 
					
						
						
							
							'merge'
						
						
						
						
						
						
					 | 
					
						2023-11-01 09:39:25 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c851188989
					 | 
					
						
						
							
							update before hand over
						
						
						
						
						
						
					 | 
					
						2023-11-01 09:37:47 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Melete
							
						 
					 | 
					
						
						
							
						
						0fa310609e
					 | 
					
						
						
							
							update 设备备品备件+巡检
						
						
						
						
						
						
					 | 
					
						2023-10-31 22:34:10 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						57a4ca96e7
					 | 
					
						
						
							
							add
						
						
						
						
						
						
					 | 
					
						2023-10-31 17:49:39 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						af868a7cd7
					 | 
					
						
						
							
							update 设备基础配置,设备保养
						
						
						
						
						
						
					 | 
					
						2023-10-30 16:51:37 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						cb1ad9edec
					 | 
					
						
						
							
							Merge pull request 'projects/mes-zhp' (#57) from projects/mes-zhp into projects/mes-test
						
						
						
						
						
						
						
						Reviewed-on: #57 
						
						
					 | 
					
						2023-10-30 11:04:40 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								‘937886381’
							
						 
					 | 
					
						
						
							
						
						34e8178ddc
					 | 
					
						
						
							
							解决合并冲突
						
						
						
						
						
						
					 | 
					
						2023-10-30 10:50:21 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								‘937886381’
							
						 
					 | 
					
						
						
							
						
						6c094b2a2e
					 | 
					
						
						
							
							修改bug
						
						
						
						
						
						
					 | 
					
						2023-10-30 10:48:32 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4a796130d0
					 | 
					
						
						
							
							update 设备采集配置
						
						
						
						
						
						
					 | 
					
						2023-10-30 10:47:06 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						60f65e6f85
					 | 
					
						
						
							
							Merge pull request 'projects/mes-lb' (#56) from projects/mes-lb into projects/mes-test
						
						
						
						
						
						
						
						Reviewed-on: #56 
						
						
					 | 
					
						2023-10-30 10:37:41 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3bf8150764
					 | 
					
						
						
							
							Merge branch 'projects/mes-test' into projects/mes-lb
						
						
						
						
						
						
					 | 
					
						2023-10-30 10:36:13 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						bacf2eab0b
					 | 
					
						
						
							
							update
						
						
						
						
						
						
					 | 
					
						2023-10-30 10:35:09 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8155a78649
					 | 
					
						
						
							
							Merge pull request 'projects/mes-zjl' (#55) from projects/mes-zjl into projects/mes-test
						
						
						
						
						
						
						
						Reviewed-on: #55 
						
						
					 | 
					
						2023-10-30 10:33:43 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						013c08710c
					 | 
					
						
						
							
							merge test
						
						
						
						
						
						
					 | 
					
						2023-10-30 10:32:51 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						00fba0a83b
					 | 
					
						
						
							
							2023.10.30提测能源&班组
						
						
						
						
						
						
					 | 
					
						2023-10-30 10:26:54 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c71613f3fc
					 | 
					
						
						
							
							Merge pull request 'projects/mes-dy' (#54) from projects/mes-dy into projects/mes-test
						
						
						
						
						
						
						
						Reviewed-on: #54 
						
						
					 | 
					
						2023-10-27 16:19:19 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								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 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						55e023d0a8
					 | 
					
						
						
							
							Merge pull request 'projects/mes-lb' (#53) from projects/mes-lb into projects/mes-test
						
						
						
						
						
						
						
						Reviewed-on: #53 
						
						
					 | 
					
						2023-10-26 11:34:28 +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 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						619cf9e1ce
					 | 
					
						
						
							
							Merge pull request 'projects/mes-zjl' (#52) from projects/mes-zjl into projects/mes-test
						
						
						
						
						
						
						
						Reviewed-on: #52 
						
						
					 | 
					
						2023-10-24 15:22:19 +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 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						74d5646d65
					 | 
					
						
						
							
							Merge pull request '包装管理' (#51) from projects/mes-zhp into projects/mes-test
						
						
						
						
						
						
						
						Reviewed-on: #51 
						
						
					 | 
					
						2023-10-23 08:57:17 +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 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						416d4bb390
					 | 
					
						
						
							
							update
						
						
						
						
						
						
					 | 
					
						2023-10-17 15:27:08 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |