caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								b5c21b7472
								
							
						 | 
						
							
							
								
								feat: fmlog添加工艺步骤字段及相应返回数据
							
							
							
							
							
						 | 
						
							2025-04-16 17:59:20 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								4bc126ca97
								
							
						 | 
						
							
							
								
								release: 2.6.2025041613
							
							
							
							
							
						 | 
						
							2025-04-16 13:49:06 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								300023ff81
								
							
						 | 
						
							
							
								
								fix: 交接分批bug/加工前不良的bug
							
							
							
							
							
						 | 
						
							2025-04-16 13:43:38 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								e0217e86c4
								
							
						 | 
						
							
							
								
								feat: 添加count_json_from字段及相应逻辑
							
							
							
							
							
						 | 
						
							2025-04-16 11:31:23 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								4c7f2b24f8
								
							
						 | 
						
							
							
								
								feat: 车间库存按任务筛选时count>0
							
							
							
							
							
						 | 
						
							2025-04-16 08:57:12 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								7a3c5be4eb
								
							
						 | 
						
							
							
								
								feat: 工艺步骤增加排序字段
							
							
							
							
							
						 | 
						
							2025-04-15 18:14:00 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								d3263236f9
								
							
						 | 
						
							
							
								
								feat: 物料筛选low_inm进行优化
							
							
							
							
							
						 | 
						
							2025-04-15 18:13:41 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								50b264929b
								
							
						 | 
						
							
							
								
								fix: mio_saleout时正确计算delivered_count
							
							
							
							
							
						 | 
						
							2025-04-15 17:44:43 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								4874f6356e
								
							
						 | 
						
							
							
								
								feat: 变更order状态
							
							
							
							
							
						 | 
						
							2025-04-15 15:09:03 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								d864405c0d
								
							
						 | 
						
							
							
								
								feat: 扣减库存不足增加提示
							
							
							
							
							
						 | 
						
							2025-04-15 15:08:42 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								8c27b1a03c
								
							
						 | 
						
							
							
								
								feat: update_inm关于销售发货/其他出库的bug2
							
							
							
							
							
						 | 
						
							2025-04-15 14:31:58 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								afc884eb7f
								
							
						 | 
						
							
							
								
								feat: update_inm关于销售发货/其他出库的bug
							
							
							
							
							
						 | 
						
							2025-04-15 11:06:16 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								c670bd69e1
								
							
						 | 
						
							
							
								
								feat: fmlog添加is_fix字段校验
							
							
							
							
							
						 | 
						
							2025-04-15 10:30:02 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								cd294bc53c
								
							
						 | 
						
							
							
								
								fix: 返修交接后物料状态都变为返修品
							
							
							
							
							
						 | 
						
							2025-04-14 23:03:34 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								88bf75baaf
								
							
						 | 
						
							
							
								
								feat: fmlog添加is_fix字段
							
							
							
							
							
						 | 
						
							2025-04-14 22:49:31 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								1cbbade280
								
							
						 | 
						
							
							
								
								feat: 单个日志填写时带入wm_in的batch
							
							
							
							
							
						 | 
						
							2025-04-14 22:26:42 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								c791bde5be
								
							
						 | 
						
							
							
								
								fix: handover拆批请选择车间库存2
							
							
							
							
							
						 | 
						
							2025-04-14 15:29:36 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								22b6b1305f
								
							
						 | 
						
							
							
								
								fix: handover拆批请选择车间库存
							
							
							
							
							
						 | 
						
							2025-04-14 15:19:45 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								882b0f2cbd
								
							
						 | 
						
							
							
								
								feat: 添加ichat以支持AI对话
							
							
							
							
							
						 | 
						
							2025-04-13 10:12:38 +08:00 | 
						
					
				
					
						
							
							
								
								 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 |