| 
						
					 | 
					
						
						
							
						
						ac041c2f4a
					 | 
					
						
						
							
							update bom-selector v1
						
						
						
						
						
						
					 | 
					
						2023-11-20 15:53:23 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						dd23c49ba0
					 | 
					
						
						
							
							update 设备选择
						
						
						
						
						
						
					 | 
					
						2023-11-20 14:21:14 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						44452f2e89
					 | 
					
						
						
							
							update
						
						
						
						
						
						
					 | 
					
						2023-11-20 11:26:27 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8ddef0de9d
					 | 
					
						
						
							
							update bomselector
						
						
						
						
						
						
					 | 
					
						2023-11-17 17:07:52 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7249abf5b1
					 | 
					
						
						
							
							add BomSelector
						
						
						
						
						
						
					 | 
					
						2023-11-17 16:57:55 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						76f5385140
					 | 
					
						
						
							
							add Candidate
						
						
						
						
						
						
					 | 
					
						2023-11-17 16:05:57 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						bb731dfcd4
					 | 
					
						
						
							
							add custom tree
						
						
						
						
						
						
					 | 
					
						2023-11-17 14:56:43 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d3eb9d8fbc
					 | 
					
						
						
							
							update custom-transfer
						
						
						
						
						
						
					 | 
					
						2023-11-17 11:25:28 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9a7521e691
					 | 
					
						
						
							
							add CustomTrasfer
						
						
						
						
						
						
					 | 
					
						2023-11-17 11:15:18 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d1cbac481d
					 | 
					
						
						
							
							Merge branch 'projects/mes-test' into projects/mes-lb
						
						
						
						
						
						
					 | 
					
						2023-11-17 10:14:26 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c895975703
					 | 
					
						
						
							
							update
						
						
						
						
						
						
					 | 
					
						2023-11-17 10:12:00 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6ef90a8eba
					 | 
					
						
						
							
							merge test
						
						
						
						
						
						
					 | 
					
						2023-11-17 10:00:04 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c99393dd12
					 | 
					
						
						
							
							更新仓库bug
						
						
						
						
						
						
					 | 
					
						2023-11-17 09:55:09 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						23c1b4b3c6
					 | 
					
						
						
							
							update
						
						
						
						
						
						
					 | 
					
						2023-11-17 09:48:39 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						88615a52a4
					 | 
					
						
						
							
							'1'
						
						
						
						
						
						
					 | 
					
						2023-11-17 08:46:35 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Melete
							
						 
					 | 
					
						
						
							
						
						010e51c0f6
					 | 
					
						
						
							
							update 工艺流程
						
						
						
						
						
						
					 | 
					
						2023-11-16 22:18:45 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Melete
							
						 
					 | 
					
						
						
							
						
						a6b48280aa
					 | 
					
						
						
							
							update 工艺流程
						
						
						
						
						
						
					 | 
					
						2023-11-16 22:00:50 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								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’
							
						 
					 | 
					
						
						
							
						
						7523f98f84
					 | 
					
						
						
							
							Merge branch 'projects/mes-test' into projects/mes-zhp
						
						
						
						
						
						
					 | 
					
						2023-11-16 18:54:43 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								‘937886381’
							
						 
					 | 
					
						
						
							
						
						b349432eaa
					 | 
					
						
						
							
							修改bug
						
						
						
						
						
						
					 | 
					
						2023-11-16 18:52:55 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						42177846e8
					 | 
					
						
						
							
							Merge branch 'projects/mes-test' into projects/mes-lb
						
						
						
						
						
						
					 | 
					
						2023-11-16 17:25:39 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c5b5de7a78
					 | 
					
						
						
							
							update
						
						
						
						
						
						
					 | 
					
						2023-11-16 17:23:58 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0884159dd7
					 | 
					
						
						
							
							update login
						
						
						
						
						
						
					 | 
					
						2023-11-16 17:16:37 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d37c5881a5
					 | 
					
						
						
							
							2
						
						
						
						
						
						
					 | 
					
						2023-11-16 16:53:35 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						2b0579dc70
					 | 
					
						
						
							
							merge test
						
						
						
						
						
						
					 | 
					
						2023-11-16 16:13:36 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6a10afd04e
					 | 
					
						
						
							
							1
						
						
						
						
						
						
					 | 
					
						2023-11-16 16:12:05 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								helloDy
							
						 
					 | 
					
						
						
							
						
						25d1ac8d90
					 | 
					
						
						
							
							merge
						
						
						
						
						
						
					 | 
					
						2023-11-16 14:07:50 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								helloDy
							
						 
					 | 
					
						
						
							
						
						3667b98da9
					 | 
					
						
						
							
							bug
						
						
						
						
						
						
					 | 
					
						2023-11-16 13:57:21 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						bbdf0a75f0
					 | 
					
						
						
							
							update system
						
						
						
						
						
						
					 | 
					
						2023-11-16 13:47:18 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								‘937886381’
							
						 
					 | 
					
						
						
							
						
						3832aee028
					 | 
					
						
						
							
							解决冲突
						
						
						
						
						
						
					 | 
					
						2023-11-16 08:52:38 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								‘937886381’
							
						 
					 | 
					
						
						
							
						
						2fbc6ea5e7
					 | 
					
						
						
							
							修改bug
						
						
						
						
						
						
					 | 
					
						2023-11-16 08:50:59 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								helloDy
							
						 
					 | 
					
						
						
							
						
						4ce62c14ee
					 | 
					
						
						
							
							Merge branch 'projects/mes-test' into projects/mes-dy
						
						
						
						
						
						
					 | 
					
						2023-11-15 17:47:31 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								helloDy
							
						 
					 | 
					
						
						
							
						
						e5966c27a3
					 | 
					
						
						
							
							工单[
						
						
						
						
						
						
					 | 
					
						2023-11-15 17:46:54 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3e9f629888
					 | 
					
						
						
							
							Merge pull request '修改bug' (#82) from projects/mes-zhp into projects/mes-test
						
						
						
						
						
						
						
						Reviewed-on: #82 
						
						
					 | 
					
						2023-11-15 16:03:01 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								‘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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |