‘937886381’
							
						 
					 | 
					
						
						
							
						
						ecabeeeea9
					 | 
					
						
						
							
							修改bug
						
						
						
						
						
						
					 | 
					
						2023-11-15 15:47:45 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								helloDy
							
						 
					 | 
					
						
						
							
						
						aef062b4c9
					 | 
					
						
						
							
							merge
						
						
						
						
						
						
					 | 
					
						2023-11-15 14:37:52 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								helloDy
							
						 
					 | 
					
						
						
							
						
						952490f0d4
					 | 
					
						
						
							
							24h,设备
						
						
						
						
						
						
					 | 
					
						2023-11-15 14:30:28 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0ae68aacef
					 | 
					
						
						
							
							订单
						
						
						
						
						
						
					 | 
					
						2023-11-15 14:22:45 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a37fa65e8f
					 | 
					
						
						
							
							bug
						
						
						
						
						
						
					 | 
					
						2023-11-15 14:02:16 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						5d054254f7
					 | 
					
						
						
							
							merge test
						
						
						
						
						
						
					 | 
					
						2023-11-15 10:17:35 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						76cdc34af1
					 | 
					
						
						
							
							小bug
						
						
						
						
						
						
					 | 
					
						2023-11-15 10:13:54 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								‘937886381’
							
						 
					 | 
					
						
						
							
						
						ecc84a1c4b
					 | 
					
						
						
							
							合并冲突
						
						
						
						
						
						
					 | 
					
						2023-11-15 09:10:45 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								‘937886381’
							
						 
					 | 
					
						
						
							
						
						95f7004d1c
					 | 
					
						
						
							
							修改bug
						
						
						
						
						
						
					 | 
					
						2023-11-15 09:08:20 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						de06dfddf4
					 | 
					
						
						
							
							仓库-bug修改
						
						
						
						
						
						
					 | 
					
						2023-11-14 16:02:16 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						67612c79df
					 | 
					
						
						
							
							merge test
						
						
						
						
						
						
					 | 
					
						2023-11-14 15:47:06 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						26862423c1
					 | 
					
						
						
							
							首页
						
						
						
						
						
						
					 | 
					
						2023-11-14 10:35:10 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d2c82fa692
					 | 
					
						
						
							
							更新-仓库-库位监控
						
						
						
						
						
						
					 | 
					
						2023-11-14 09:42:38 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ebae332674
					 | 
					
						
						
							
							update
						
						
						
						
						
						
					 | 
					
						2023-11-14 09:23:08 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7f6fa0af96
					 | 
					
						
						
							
							Merge branch 'projects/mes-test' into projects/mes-lb
						
						
						
						
						
						
					 | 
					
						2023-11-13 16:56:07 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ba92da2d5d
					 | 
					
						
						
							
							update login mobile
						
						
						
						
						
						
					 | 
					
						2023-11-13 16:55:16 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						06c124a149
					 | 
					
						
						
							
							update login
						
						
						
						
						
						
					 | 
					
						2023-11-13 16:37:04 +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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3ada2c5d08
					 | 
					
						
						
							
							merge test
						
						
						
						
						
						
					 | 
					
						2023-11-07 16:01:07 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9e8276d3a7
					 | 
					
						
						
							
							merge test
						
						
						
						
						
						
					 | 
					
						2023-11-07 15:55:19 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								helloDy
							
						 
					 | 
					
						
						
							
						
						f9741b07c0
					 | 
					
						
						
							
							Merge branch 'projects/mes-test' into projects/mes-dy
						
						
						
						
						
						
					 | 
					
						2023-11-07 15:53:53 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								helloDy
							
						 
					 | 
					
						
						
							
						
						fcb1885bf7
					 | 
					
						
						
							
							基础,物料,设备
						
						
						
						
						
						
					 | 
					
						2023-11-07 15:53:01 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						97e6a665de
					 | 
					
						
						
							
							更新仓库
						
						
						
						
						
						
					 | 
					
						2023-11-07 15:49:33 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6e1bf994c2
					 | 
					
						
						
							
							bug
						
						
						
						
						
						
					 | 
					
						2023-11-07 15:49:07 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						876f7d8f3c
					 | 
					
						
						
							
							merge test
						
						
						
						
						
						
					 | 
					
						2023-11-06 13:42:09 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						5695c3db90
					 | 
					
						
						
							
							成品发货
						
						
						
						
						
						
					 | 
					
						2023-11-06 13:37:52 +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
							
						 
					 | 
					
						
						
							
						
						e5978d1700
					 | 
					
						
						
							
							merge
						
						
						
						
						
						
					 | 
					
						2023-11-03 11:16:30 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								helloDy
							
						 
					 | 
					
						
						
							
						
						91eb13af26
					 | 
					
						
						
							
							客商信息、人事相关
						
						
						
						
						
						
					 | 
					
						2023-11-03 11:15:12 +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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								‘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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						013c08710c
					 | 
					
						
						
							
							merge test
						
						
						
						
						
						
					 | 
					
						2023-10-30 10:32:51 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						00fba0a83b
					 | 
					
						
						
							
							2023.10.30提测能源&班组
						
						
						
						
						
						
					 | 
					
						2023-10-30 10:26:54 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |