helloDy
							
						 
					 | 
					
						
						
							
						
						c4091b7181
					 | 
					
						
						
							
							Merge branch 'projects/mes-test' into projects/mes-dy
						
						
						
						
						
						
					 | 
					
						2023-11-16 21:07:59 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								helloDy
							
						 
					 | 
					
						
						
							
						
						34e6a73852
					 | 
					
						
						
							
							bug
						
						
						
						
						
						
					 | 
					
						2023-11-16 21:07:21 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								‘937886381’
							
						 
					 | 
					
						
						
							
						
						b349432eaa
					 | 
					
						
						
							
							修改bug
						
						
						
						
						
						
					 | 
					
						2023-11-16 18:52:55 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								helloDy
							
						 
					 | 
					
						
						
							
						
						e5966c27a3
					 | 
					
						
						
							
							工单[
						
						
						
						
						
						
					 | 
					
						2023-11-15 17:46:54 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								helloDy
							
						 
					 | 
					
						
						
							
						
						aef062b4c9
					 | 
					
						
						
							
							merge
						
						
						
						
						
						
					 | 
					
						2023-11-15 14:37:52 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								helloDy
							
						 
					 | 
					
						
						
							
						
						952490f0d4
					 | 
					
						
						
							
							24h,设备
						
						
						
						
						
						
					 | 
					
						2023-11-15 14:30:28 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								‘937886381’
							
						 
					 | 
					
						
						
							
						
						ecc84a1c4b
					 | 
					
						
						
							
							合并冲突
						
						
						
						
						
						
					 | 
					
						2023-11-15 09:10:45 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								‘937886381’
							
						 
					 | 
					
						
						
							
						
						95f7004d1c
					 | 
					
						
						
							
							修改bug
						
						
						
						
						
						
					 | 
					
						2023-11-15 09:08:20 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								helloDy
							
						 
					 | 
					
						
						
							
						
						e6158cd59b
					 | 
					
						
						
							
							merge
						
						
						
						
						
						
					 | 
					
						2023-11-11 20:51:01 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								helloDy
							
						 
					 | 
					
						
						
							
						
						624ed7bc27
					 | 
					
						
						
							
							设备管理
						
						
						
						
						
						
					 | 
					
						2023-11-11 20:49:31 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								‘937886381’
							
						 
					 | 
					
						
						
							
						
						f7846f2767
					 | 
					
						
						
							
							Merge branch 'projects/mes-test' into projects/mes-zhp
						
						
						
						
						
						
					 | 
					
						2023-11-10 17:03:25 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								‘937886381’
							
						 
					 | 
					
						
						
							
						
						a8adb317c0
					 | 
					
						
						
							
							质量管理
						
						
						
						
						
						
					 | 
					
						2023-11-10 17:02:52 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3812eb38a9
					 | 
					
						
						
							
							修改订单bug
						
						
						
						
						
						
					 | 
					
						2023-11-09 15:01:50 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								‘937886381’
							
						 
					 | 
					
						
						
							
						
						1962ecc6df
					 | 
					
						
						
							
							质量管理
						
						
						
						
						
						
					 | 
					
						2023-11-07 19:10:45 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								helloDy
							
						 
					 | 
					
						
						
							
						
						fcb1885bf7
					 | 
					
						
						
							
							基础,物料,设备
						
						
						
						
						
						
					 | 
					
						2023-11-07 15:53:01 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								helloDy
							
						 
					 | 
					
						
						
							
						
						1d38a560ec
					 | 
					
						
						
							
							Merge branch 'projects/mes-test' into projects/mes-dy
						
						
						
						
						
						
					 | 
					
						2023-11-06 12:55:03 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								helloDy
							
						 
					 | 
					
						
						
							
						
						0ae3c66dc3
					 | 
					
						
						
							
							基础核心
						
						
						
						
						
						
					 | 
					
						2023-11-06 12:54:28 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0deb38647e
					 | 
					
						
						
							
							更新仓库管理
						
						
						
						
						
						
					 | 
					
						2023-11-04 16:40:16 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						14d426b020
					 | 
					
						
						
							
							merge test
						
						
						
						
						
						
					 | 
					
						2023-11-03 17:01:14 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						046a5eea32
					 | 
					
						
						
							
							成品发货
						
						
						
						
						
						
					 | 
					
						2023-11-03 16:59:07 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								helloDy
							
						 
					 | 
					
						
						
							
						
						91eb13af26
					 | 
					
						
						
							
							客商信息、人事相关
						
						
						
						
						
						
					 | 
					
						2023-11-03 11:15:12 +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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								helloDy
							
						 
					 | 
					
						
						
							
						
						4615e975e8
					 | 
					
						
						
							
							merge
						
						
						
						
						
						
					 | 
					
						2023-10-27 16:17:28 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								helloDy
							
						 
					 | 
					
						
						
							
						
						e961bf6cfa
					 | 
					
						
						
							
							物料模块
						
						
						
						
						
						
					 | 
					
						2023-10-27 16:16:13 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						06e8a72f80
					 | 
					
						
						
							
							merge mes-test
						
						
						
						
						
						
					 | 
					
						2023-10-26 11:30:07 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						392c1ea09b
					 | 
					
						
						
							
							merge test
						
						
						
						
						
						
					 | 
					
						2023-10-24 15:21:27 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ac4565e587
					 | 
					
						
						
							
							班组&能源基础
						
						
						
						
						
						
					 | 
					
						2023-10-24 15:16:20 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								‘937886381’
							
						 
					 | 
					
						
						
							
						
						2c3bdde403
					 | 
					
						
						
							
							包装管理
						
						
						
						
						
						
					 | 
					
						2023-10-23 08:42:46 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						fe7821cbd8
					 | 
					
						
						
							
							update 核心模块-厂务-设备
						
						
						
						
						
						
					 | 
					
						2023-10-17 15:22:17 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								helloDy
							
						 
					 | 
					
						
						
							
						
						4a67e226e1
					 | 
					
						
						
							
							merge
						
						
						
						
						
						
					 | 
					
						2023-10-13 17:09:07 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								helloDy
							
						 
					 | 
					
						
						
							
						
						46aaa47e07
					 | 
					
						
						
							
							bug
						
						
						
						
						
						
					 | 
					
						2023-10-13 17:05:01 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7acccd3de0
					 | 
					
						
						
							
							bugfix zentao
						
						
						
						
						
						
					 | 
					
						2023-10-12 15:40:05 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ebcf3d4d78
					 | 
					
						
						
							
							修改bug
						
						
						
						
						
						
					 | 
					
						2023-09-20 16:57:20 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						eff5e0d1e1
					 | 
					
						
						
							
							merge test
						
						
						
						
						
						
					 | 
					
						2023-09-18 08:50:53 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						60dc449a27
					 | 
					
						
						
							
							排班
						
						
						
						
						
						
					 | 
					
						2023-09-18 08:41:14 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								helloDy
							
						 
					 | 
					
						
						
							
						
						e9538744c3
					 | 
					
						
						
							
							冲突
						
						
						
						
						
						
					 | 
					
						2023-09-15 14:38:43 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								helloDy
							
						 
					 | 
					
						
						
							
						
						8cf2f9f7e9
					 | 
					
						
						
							
							生产监控
						
						
						
						
						
						
					 | 
					
						2023-09-15 14:37:30 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								‘937886381’
							
						 
					 | 
					
						
						
							
						
						e8cc1fc50b
					 | 
					
						
						
							
							生产分析
						
						
						
						
						
						
					 | 
					
						2023-09-13 16:00:43 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								‘937886381’
							
						 
					 | 
					
						
						
							
						
						7d959e8ad3
					 | 
					
						
						
							
							Merge branch 'test' into zhp
						
						
						
						
						
						
					 | 
					
						2023-09-11 16:09:42 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								‘937886381’
							
						 
					 | 
					
						
						
							
						
						6f0040a0ae
					 | 
					
						
						
							
							生产监控更新
						
						
						
						
						
						
					 | 
					
						2023-09-11 16:09:07 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4e05b3e3d6
					 | 
					
						
						
							
							merge from test
						
						
						
						
						
						
					 | 
					
						2023-09-11 15:04:16 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						df0dc6bfa0
					 | 
					
						
						
							
							能源分析
						
						
						
						
						
						
					 | 
					
						2023-09-08 16:01:54 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9c59a7e715
					 | 
					
						
						
							
							能源分析
						
						
						
						
						
						
					 | 
					
						2023-09-05 15:45:59 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						383f98e1d9
					 | 
					
						
						
							
							add 设备监控
						
						
						
						
						
						
					 | 
					
						2023-08-29 09:56:27 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6975c52062
					 | 
					
						
						
							
							add 设备绑定分组
						
						
						
						
						
						
					 | 
					
						2023-08-28 15:52:19 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						01fe2da523
					 | 
					
						
						
							
							能源监控
						
						
						
						
						
						
					 | 
					
						2023-08-25 16:27:46 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6e39dd48ff
					 | 
					
						
						
							
							能源配置&能源抄表
						
						
						
						
						
						
					 | 
					
						2023-08-21 11:12:23 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						84a055e605
					 | 
					
						
						
							
							Merge branch 'test' into lb
						
						
						
						
						
						
					 | 
					
						2023-08-18 15:21:10 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						18a9a4f51b
					 | 
					
						
						
							
							能源类型
						
						
						
						
						
						
					 | 
					
						2023-08-14 16:19:12 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |