caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								f228884b27
								
							
						 | 
						
							
							
								
								release: 2.6.2025041113
							
							
							
							
							
						 | 
						
							2025-04-11 13:33:48 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								fda9ecae94
								
							
						 | 
						
							
							
								
								fix: get_alldata_with_batch中小数计算异常捕获
							
							
							
							
							
						 | 
						
							2025-04-11 10:16:51 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								1ff822161a
								
							
						 | 
						
							
							
								
								feat: ptest性能检验样品编号字段更改为text
							
							
							
							
							
						 | 
						
							2025-04-11 08:42:10 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								4b87f6fe8e
								
							
						 | 
						
							
							
								
								Merge branch 'gzerp'
							
							
							
							
							
						 | 
						
							2025-04-09 15:30:58 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								648aaa465c
								
							
						 | 
						
							
							
								
								fix: 光子综合查询对小数和None的处理
							
							
							
							
							
						 | 
						
							2025-04-09 15:30:17 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								cdc30f5163
								
							
						 | 
						
							
							
								
								release: 2.6.2025040913
							
							
							
							
							
						 | 
						
							2025-04-09 13:20:45 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								060c07abd7
								
							
						 | 
						
							
							
								
								fix: 来料加工和完成筛选完善
							
							
							
							
							
						 | 
						
							2025-04-09 13:19:12 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								c0eacd7fa8
								
							
						 | 
						
							
							
								
								fix: decimal存入json字段时使用myjsondecoder
							
							
							
							
							
						 | 
						
							2025-04-09 13:18:42 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								8068cb1ca3
								
							
						 | 
						
							
							
								
								fix: cal_x_task_count分配任务数的bug
							
							
							
							
							
						 | 
						
							2025-04-09 13:18:00 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								15ccfbe6f9
								
							
						 | 
						
							
							
								
								feat: 添加MyJSONEncoder以支持decimal
							
							
							
							
							
						 | 
						
							2025-04-09 10:50:18 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								948bbcb805
								
							
						 | 
						
							
							
								
								release: 2.6.2025040813
							
							
							
							
							
						 | 
						
							2025-04-08 13:38:31 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								2a0c97dfb2
								
							
						 | 
						
							
							
								
								fix: ftest当is_ok为True时设置defect为空
							
							
							
							
							
						 | 
						
							2025-04-08 11:38:46 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								b34e477593
								
							
						 | 
						
							
							
								
								fix: ftest当is_ok为false时才设置defect_main
							
							
							
							
							
						 | 
						
							2025-04-08 11:06:51 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								ef0414b053
								
							
						 | 
						
							
							
								
								fix: material_out_tracking获取时对None的情况进行处理
							
							
							
							
							
						 | 
						
							2025-04-08 08:38:22 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								1efd1c71da
								
							
						 | 
						
							
							
								
								release: 2.6.2025040710
							
							
							
							
							
						 | 
						
							2025-04-07 10:29:00 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								b852e9b740
								
							
						 | 
						
							
							
								
								fix: get_dag时matin matout为空时不报错
							
							
							
							
							
						 | 
						
							2025-04-07 10:18:43 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								61488bb4bd
								
							
						 | 
						
							
							
								
								feat: copy时matin matout不自动生成
							
							
							
							
							
						 | 
						
							2025-04-07 10:13:33 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								166b83c04d
								
							
						 | 
						
							
							
								
								release: 2.6.2025040316
							
							
							
							
							
						 | 
						
							2025-04-03 16:42:49 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								de5f231154
								
							
						 | 
						
							
							
								
								release: 2.6.2025040316
							
							
							
							
							
						 | 
						
							2025-04-03 16:35:14 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								9f0a9fc699
								
							
						 | 
						
							
							
								
								fix: 通过指定mat_in/mat_out复制工艺路线 bug2
							
							
							
							
							
						 | 
						
							2025-04-03 16:12:35 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								885d932fc8
								
							
						 | 
						
							
							
								
								fix: 通过指定mat_in/mat_out复制工艺路线 bug1
							
							
							
							
							
						 | 
						
							2025-04-03 16:11:54 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								b400b13ded
								
							
						 | 
						
							
							
								
								feat: 通过指定mat_in/mat_out复制工艺路线
							
							
							
							
							
						 | 
						
							2025-04-03 14:48:14 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								a8f9676ed0
								
							
						 | 
						
							
							
								
								fix: get_alldata_with_batch_and_store时保存json数据采用DjangoJSONEncoder以处理decimal
							
							
							
							
							
						 | 
						
							2025-04-03 08:34:57 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								a79717abd8
								
							
						 | 
						
							
							
								
								fix: 组合件入库后未添加count的bug
							
							
							
							
							
						 | 
						
							2025-04-02 18:39:31 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								18546d48f5
								
							
						 | 
						
							
							
								
								feat: 销售发货编号非必填
							
							
							
							
							
						 | 
						
							2025-04-02 16:31:12 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								10e0f4aaef
								
							
						 | 
						
							
							
								
								release: 2.6.2025040211
							
							
							
							
							
						 | 
						
							2025-04-02 11:19:42 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								2923fad2a8
								
							
						 | 
						
							
							
								
								feat: HTML_BASE_URL 前缀统一修改
							
							
							
							
							
						 | 
						
							2025-04-02 11:04:46 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								5fe24c381b
								
							
						 | 
						
							
							
								
								feat: sysbaseview返回系统版本号
							
							
							
							
							
						 | 
						
							2025-04-02 10:12:30 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								20943494ad
								
							
						 | 
						
							
							
								
								fix: base log delay=True减少冲突
							
							
							
							
							
						 | 
						
							2025-04-02 10:11:00 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								783a56dfea
								
							
						 | 
						
							
							
								
								fix: get_can_save_from_save_expr的match转为str
							
							
							
							
							
						 | 
						
							2025-04-02 09:32:33 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								cde15991a1
								
							
						 | 
						
							
							
								
								feat: 2.6.2025040115
							
							
							
							
							
						 | 
						
							2025-04-01 15:57:30 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								6dfb5c489a
								
							
						 | 
						
							
							
								
								fix: 该工艺步骤已存在的校验bug
							
							
							
							
							
						 | 
						
							2025-04-01 15:41:33 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								c05c59b004
								
							
						 | 
						
							
							
								
								feat: handover数据库变动/初步更新批次数据关系链
							
							
							
							
							
						 | 
						
							2025-03-31 16:42:18 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								cb28f1d9ef
								
							
						 | 
						
							
							
								
								feat: 添加mio,mlog,handover关于batch的查询条件
							
							
							
							
							
						 | 
						
							2025-03-31 15:35:39 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								146fe6641f
								
							
						 | 
						
							
							
								
								feat: get_batch_dag节点排序改动
							
							
							
							
							
						 | 
						
							2025-03-31 15:11:43 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								0b76602c84
								
							
						 | 
						
							
							
								
								change: base 改变log backupcount为30
							
							
							
							
							
						 | 
						
							2025-03-31 15:08:23 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								1936fe183f
								
							
						 | 
						
							
							
								
								perf: base settings里日志记录handler优化
							
							
							
							
							
						 | 
						
							2025-03-31 15:04:39 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								3c0e416735
								
							
						 | 
						
							
							
								
								feat: 支持退料交接
							
							
							
							
							
						 | 
						
							2025-03-31 14:17:20 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								88da422f54
								
							
						 | 
						
							
							
								
								feat: mlogchangeserializer增加生产设备选择
							
							
							
							
							
						 | 
						
							2025-03-31 13:36:25 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								853c28976d
								
							
						 | 
						
							
							
								
								feat: 完善版本追踪
							
							
							
							
							
						 | 
						
							2025-03-31 11:10:47 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								cb1b2dfae6
								
							
						 | 
						
							
							
								
								fix: cal_x_task_count bug
							
							
							
							
							
						 | 
						
							2025-03-28 10:25:30 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								98d76424c7
								
							
						 | 
						
							
							
								
								feat: route create update 强校验4
							
							
							
							
							
						 | 
						
							2025-03-28 09:20:08 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								c541e58006
								
							
						 | 
						
							
							
								
								feat: route create update 强校验3
							
							
							
							
							
						 | 
						
							2025-03-28 09:07:50 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								6b3a34879e
								
							
						 | 
						
							
							
								
								feat: route create update 强校验2
							
							
							
							
							
						 | 
						
							2025-03-28 08:49:57 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								4b9e65ba40
								
							
						 | 
						
							
							
								
								feat: route create update 强校验
							
							
							
							
							
						 | 
						
							2025-03-28 08:48:05 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								18e5ca2598
								
							
						 | 
						
							
							
								
								fix: routeserializer material_out_tracking错误
							
							
							
							
							
						 | 
						
							2025-03-28 08:29:25 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								73f0e504c9
								
							
						 | 
						
							
							
								
								feat: batchst g_create 默认relation_type
							
							
							
							
							
						 | 
						
							2025-03-28 08:28:58 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								40370b876f
								
							
						 | 
						
							
							
								
								fix: 分配任务的get_routes 参数bug
							
							
							
							
							
						 | 
						
							2025-03-27 17:21:58 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								ce38115255
								
							
						 | 
						
							
							
								
								fix: validate_and_return_gjson bug
							
							
							
							
							
						 | 
						
							2025-03-27 13:36:34 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								afe53f3687
								
							
						 | 
						
							
							
								
								fix: _validate_subgraph bug
							
							
							
							
							
						 | 
						
							2025-03-27 12:50:07 +08:00 |