| 
						
					 | 
					
						
						
							
						
						c6504f0d3d
					 | 
					
						
						
							
							Merge branch 'new'
						
						
						
						
						
						
					 | 
					
						2023-07-19 16:15:52 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8e20e4429c
					 | 
					
						
						
							
							udpate
						
						
						
						
						
						
					 | 
					
						2023-07-19 16:14:29 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						35758a3b2d
					 | 
					
						
						
							
							update bomTechAndFiring
						
						
						
						
						
						
					 | 
					
						2023-07-19 16:12:24 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						5f1acde7c0
					 | 
					
						
						
							
							update bomTech edit
						
						
						
						
						
						
					 | 
					
						2023-07-19 14:46:40 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f1e588a716
					 | 
					
						
						
							
							update
						
						
						
						
						
						
					 | 
					
						2023-07-19 09:13:17 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d1e7dc4d05
					 | 
					
						
						
							
							modify bomTechAndFiring
						
						
						
						
						
						
					 | 
					
						2023-07-19 09:10:19 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						eaf91c90b9
					 | 
					
						
						
							
							添加 bomTechAndFiring
						
						
						
						
						
						
					 | 
					
						2023-07-19 08:57:35 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4c69135048
					 | 
					
						
						
							
							update order
						
						
						
						
						
						
					 | 
					
						2023-07-18 11:24:17 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						80e7c5d292
					 | 
					
						
						
							
							update firingstep
						
						
						
						
						
						
					 | 
					
						2023-07-18 10:26:17 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7ce44fadd9
					 | 
					
						
						
							
							update 0710反馈
						
						
						
						
						
						
					 | 
					
						2023-07-14 15:25:25 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						5b9e03a5a7
					 | 
					
						
						
							
							update 0714反馈
						
						
						
						
						
						
					 | 
					
						2023-07-14 13:54:18 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						2f7124ef22
					 | 
					
						
						
							
							update icons and templates
						
						
						
						
						
						
					 | 
					
						2023-07-14 13:49:50 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						bfd5f31a24
					 | 
					
						
						
							
							update 更新订单
						
						
						
						
						
						
					 | 
					
						2023-07-10 16:11:23 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7f3634e0c1
					 | 
					
						
						
							
							update shape upload
						
						
						
						
						
						
					 | 
					
						2023-07-10 15:27:02 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c193a18252
					 | 
					
						
						
							
							update AttachmentDialog
						
						
						
						
						
						
					 | 
					
						2023-07-10 11:25:03 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e12d6d161b
					 | 
					
						
						
							
							add AttachmentDialog
						
						
						
						
						
						
					 | 
					
						2023-07-10 10:57:50 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3b101e022d
					 | 
					
						
						
							
							update
						
						
						
						
						
						
					 | 
					
						2023-07-07 17:03:52 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7828a1cc4e
					 | 
					
						
						
							
							update copy
						
						
						
						
						
						
					 | 
					
						2023-07-07 16:13:49 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1080660be3
					 | 
					
						
						
							
							update user/role 's search bar
						
						
						
						
						
						
					 | 
					
						2023-07-07 15:37:54 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						68732740c3
					 | 
					
						
						
							
							bufix order timezone
						
						
						
						
						
						
					 | 
					
						2023-07-07 09:27:53 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ef1fa671b0
					 | 
					
						
						
							
							bugfix 0706 物料配方 同步功能
						
						
						
						
						
						
					 | 
					
						2023-07-06 17:02:22 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a33636ef05
					 | 
					
						
						
							
							bugfix 0706 doc
						
						
						
						
						
						
					 | 
					
						2023-07-06 16:41:09 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d55614cd6d
					 | 
					
						
						
							
							bugfix 0706 doc
						
						
						
						
						
						
					 | 
					
						2023-07-06 13:57:27 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						bea02c6d0d
					 | 
					
						
						
							
							bugfix 0706 doc
						
						
						
						
						
						
					 | 
					
						2023-07-06 13:35:44 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						eac4976304
					 | 
					
						
						
							
							bugfix 0706 zentao
						
						
						
						
						
						
					 | 
					
						2023-07-06 09:59:08 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b8765af77f
					 | 
					
						
						
							
							bufix 0705 zentao
						
						
						
						
						
						
					 | 
					
						2023-07-05 17:16:33 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f076e23a67
					 | 
					
						
						
							
							bugfix 0704zentao
						
						
						
						
						
						
					 | 
					
						2023-07-05 11:18:08 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0ec0e4bed0
					 | 
					
						
						
							
							bugfix 0703反馈
						
						
						
						
						
						
					 | 
					
						2023-07-04 17:05:12 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9c3133aa29
					 | 
					
						
						
							
							bugfix 解决一部分0703反馈bug
						
						
						
						
						
						
					 | 
					
						2023-07-04 14:18:08 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f4be2d1efe
					 | 
					
						
						
							
							update
						
						
						
						
						
						
					 | 
					
						2023-06-30 17:05:10 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						257696028b
					 | 
					
						
						
							
							update
						
						
						
						
						
						
					 | 
					
						2023-06-29 14:56:06 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b4242ef7de
					 | 
					
						
						
							
							update bom imoprt
						
						
						
						
						
						
					 | 
					
						2023-06-29 13:24:36 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						192a7859c9
					 | 
					
						
						
							
							update 0625 订单模板和订单操作顺序
						
						
						
						
						
						
					 | 
					
						2023-06-27 14:27:10 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a16ae4922f
					 | 
					
						
						
							
							update 0625 配方同步
						
						
						
						
						
						
					 | 
					
						2023-06-27 14:23:42 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0c6646dd29
					 | 
					
						
						
							
							update 0625 料仓动态
						
						
						
						
						
						
					 | 
					
						2023-06-27 13:50:44 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						02f7578179
					 | 
					
						
						
							
							update 0625 配方详情
						
						
						
						
						
						
					 | 
					
						2023-06-27 10:22:53 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4bd828b151
					 | 
					
						
						
							
							update
						
						
						
						
						
						
					 | 
					
						2023-05-26 14:03:08 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3352f0ac72
					 | 
					
						
						
							
							Merge branch 'lb-style-refactor'
						
						
						
						
						
						
					 | 
					
						2023-05-26 11:29:58 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d7f9d0996f
					 | 
					
						
						
							
							update material 原料最大尺寸字段
						
						
						
						
						
						
					 | 
					
						2023-05-26 11:29:16 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ef9f36c75d
					 | 
					
						
						
							
							fix Login页面相关的问题
						
						
						
						
						
						
					 | 
					
						2023-05-26 11:10:45 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						66efe8c476
					 | 
					
						
						
							
							update preview pdf
						
						
						
						
						
						
					 | 
					
						2023-05-25 14:15:27 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						03661f63b5
					 | 
					
						
						
							
							update 进行中的订单-查看详情弹窗
						
						
						
						
						
						
					 | 
					
						2023-05-05 14:26:38 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						74c0adbc46
					 | 
					
						
						
							
							update 订单详情-窑车详情
						
						
						
						
						
						
					 | 
					
						2023-05-05 14:17:25 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ebfbc895bb
					 | 
					
						
						
							
							add 混料压制合并
						
						
						
						
						
						
					 | 
					
						2023-04-28 15:38:09 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f5bab979c9
					 | 
					
						
						
							
							done 窑车温度
						
						
						
						
						
						
					 | 
					
						2023-04-28 14:57:33 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						62ab300c60
					 | 
					
						
						
							
							import chart
						
						
						
						
						
						
					 | 
					
						2023-04-28 11:09:06 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9ea9a632c9
					 | 
					
						
						
							
							update TableHeight
						
						
						
						
						
						
					 | 
					
						2023-04-28 10:47:41 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1333ac989e
					 | 
					
						
						
							
							update
						
						
						
						
						
						
					 | 
					
						2023-04-28 10:04:04 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1e7b7ba3e3
					 | 
					
						
						
							
							update TemperatureDIalog
						
						
						
						
						
						
					 | 
					
						2023-04-28 09:20:23 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8e76ced541
					 | 
					
						
						
							
							update 温度弹窗
						
						
						
						
						
						
					 | 
					
						2023-04-27 17:01:52 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |