| 
						
					 | 
					
						
						
							
						
						d8dc98a060
					 | 
					
						
						
							
							Merge pull request 'addon修改' (#2) from feature-branch into master
						
						
						
						
						
						
						
						Reviewed-on: #2 
						
						
					 | 
					
						2025-05-20 16:20:37 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						dec8bdf36a
					 | 
					
						
						
							
							addon修改
						
						
						
						
						
						
					 | 
					
						2025-05-20 16:19:18 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a4d8417922
					 | 
					
						
						
							
							Merge pull request '20250516修改' (#1) from feature-branch into master
						
						
						
						
						
						
						
						Reviewed-on: #1 
						
						
					 | 
					
						2025-05-16 17:03:06 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						27e5cc3524
					 | 
					
						
						
							
							20250516修改
						
						
						
						
						
						
					 | 
					
						2025-05-16 17:01:38 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6b978fa93b
					 | 
					
						
						
							
							done 1019 again
						
						
						
						
						
						
					 | 
					
						2023-10-19 16:22:56 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						82171c8ea8
					 | 
					
						
						
							
							done 1019 again
						
						
						
						
						
						
					 | 
					
						2023-10-19 16:14:00 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						41f2f01fd7
					 | 
					
						
						
							
							done 1019
						
						
						
						
						
						
					 | 
					
						2023-10-19 16:12:33 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						002c5a80e5
					 | 
					
						
						
							
							update 1019
						
						
						
						
						
						
					 | 
					
						2023-10-19 14:47:18 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						31b2cfcee6
					 | 
					
						
						
							
							add car maintain
						
						
						
						
						
						
					 | 
					
						2023-09-26 09:43:43 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						506cab65a4
					 | 
					
						
						
							
							bugfix 0922
						
						
						
						
						
						
					 | 
					
						2023-09-22 14:41:11 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						33d13b3eb4
					 | 
					
						
						
							
							update docs0918
						
						
						
						
						
						
					 | 
					
						2023-09-19 15:17:30 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3c44fbc636
					 | 
					
						
						
							
							update
						
						
						
						
						
						
					 | 
					
						2023-09-15 16:56:51 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						61ca7b82cd
					 | 
					
						
						
							
							update
						
						
						
						
						
						
					 | 
					
						2023-09-15 15:19:39 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						eafb0f7c2a
					 | 
					
						
						
							
							update
						
						
						
						
						
						
					 | 
					
						2023-09-15 09:20:22 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1f99830600
					 | 
					
						
						
							
							update
						
						
						
						
						
						
					 | 
					
						2023-09-14 17:03:23 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1bd826b21c
					 | 
					
						
						
							
							update 0913
						
						
						
						
						
						
					 | 
					
						2023-09-13 10:50:10 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						71851b65e0
					 | 
					
						
						
							
							update orderimport template
						
						
						
						
						
						
					 | 
					
						2023-09-11 15:46:40 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						13de0ce8ea
					 | 
					
						
						
							
							update 订单-导出
						
						
						
						
						
						
					 | 
					
						2023-09-08 14:18:35 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						bd73613803
					 | 
					
						
						
							
							update 0904docs
						
						
						
						
						
						
					 | 
					
						2023-09-05 10:49:37 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						847b2c787c
					 | 
					
						
						
							
							update docs_0825
						
						
						
						
						
						
					 | 
					
						2023-08-25 15:21:27 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7de3355106
					 | 
					
						
						
							
							update print dom
						
						
						
						
						
						
					 | 
					
						2023-08-25 11:04:27 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						807766f83f
					 | 
					
						
						
							
							add 包装报工-检测线报工
						
						
						
						
						
						
					 | 
					
						2023-08-25 10:51:16 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						521563bd00
					 | 
					
						
						
							
							Merge branch 'docs_0815'
						
						
						
						
						
						
					 | 
					
						2023-08-23 16:38:09 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d4a427ec5e
					 | 
					
						
						
							
							update docs_0822
						
						
						
						
						
						
					 | 
					
						2023-08-23 16:30:59 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a28544b671
					 | 
					
						
						
							
							add 生成托盘弹窗
						
						
						
						
						
						
					 | 
					
						2023-08-22 10:36:46 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7513d82d4d
					 | 
					
						
						
							
							add 报工历史
						
						
						
						
						
						
					 | 
					
						2023-08-21 16:16:23 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						02c8538d47
					 | 
					
						
						
							
							update dialog style
						
						
						
						
						
						
					 | 
					
						2023-08-21 13:30:42 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7b0f53f677
					 | 
					
						
						
							
							add 库存订单表
						
						
						
						
						
						
					 | 
					
						2023-08-21 10:56:21 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a33784740d
					 | 
					
						
						
							
							update 订单编辑相关页面
						
						
						
						
						
						
					 | 
					
						2023-08-21 09:37:33 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0939b96386
					 | 
					
						
						
							
							update report dialog
						
						
						
						
						
						
					 | 
					
						2023-08-21 08:58:41 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						58f86a9b2b
					 | 
					
						
						
							
							update 压机报工页面
						
						
						
						
						
						
					 | 
					
						2023-08-18 11:02:01 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3adabb68b8
					 | 
					
						
						
							
							add 报工预览
						
						
						
						
						
						
					 | 
					
						2023-08-17 17:01:53 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						725fa19bd1
					 | 
					
						
						
							
							update 批量打印
						
						
						
						
						
						
					 | 
					
						2023-08-16 16:58:55 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						cdaa2c1f6c
					 | 
					
						
						
							
							update 压机报工的search logic
						
						
						
						
						
						
					 | 
					
						2023-08-16 11:30:16 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						84a4b2999d
					 | 
					
						
						
							
							add 压机报工
						
						
						
						
						
						
					 | 
					
						2023-08-15 13:24:39 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						99619fdc0a
					 | 
					
						
						
							
							bug PrintDom 打印成功也会提示失败
						
						
						
						
						
						
					 | 
					
						2023-08-15 10:41:43 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d1bc97f42a
					 | 
					
						
						
							
							update 更新包装托盘打印
						
						
						
						
						
						
					 | 
					
						2023-08-14 17:00:28 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						62f625197f
					 | 
					
						
						
							
							add print logic
						
						
						
						
						
						
					 | 
					
						2023-08-11 16:23:58 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4addca6d97
					 | 
					
						
						
							
							update docs_0811
						
						
						
						
						
						
					 | 
					
						2023-08-11 11:05:05 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						09c6a609b8
					 | 
					
						
						
							
							update docs_0810
						
						
						
						
						
						
					 | 
					
						2023-08-10 16:14:53 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e3346be048
					 | 
					
						
						
							
							Merge branch 'docs_0727'
						
						
						
						
						
						
					 | 
					
						2023-08-09 14:12:46 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						bc5b6c2868
					 | 
					
						
						
							
							update 订单管理的cell-class-name
						
						
						
						
						
						
					 | 
					
						2023-08-09 14:11:57 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						bfd6a42349
					 | 
					
						
						
							
							update blender-order
						
						
						
						
						
						
					 | 
					
						2023-08-09 10:52:02 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3601b574fb
					 | 
					
						
						
							
							add 子订单进度—混料订单编辑
						
						
						
						
						
						
					 | 
					
						2023-08-08 17:01:39 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						2ab361be85
					 | 
					
						
						
							
							fix 0807docs
						
						
						
						
						
						
					 | 
					
						2023-08-08 16:13:03 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						92a9aa2f62
					 | 
					
						
						
							
							update 0803_docs
						
						
						
						
						
						
					 | 
					
						2023-08-03 16:54:24 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						42a7fb8bc9
					 | 
					
						
						
							
							Merge branch 'docs_0727'
						
						
						
						
						
						
					 | 
					
						2023-08-03 10:00:55 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ff46d76396
					 | 
					
						
						
							
							update 0801docs
						
						
						
						
						
						
					 | 
					
						2023-08-03 10:00:31 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						87298d1c37
					 | 
					
						
						
							
							update 混料批次
						
						
						
						
						
						
					 | 
					
						2023-08-02 15:43:01 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c4187de9a0
					 | 
					
						
						
							
							fix 0801 上料管理
						
						
						
						
						
						
					 | 
					
						2023-08-01 16:02:31 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |