caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								b98227b032
								
							
						 | 
						
							
							
								
								feat: FtestWorkCreateUpdate 可更新抽检和合格数量
							
							
							
							
							
						 | 
						
							2024-07-24 13:50:05 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								7af77c484b
								
							
						 | 
						
							
							
								
								fix: order destory bug
							
							
							
							
							
						 | 
						
							2024-07-24 13:44:10 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								34c0f82ed1
								
							
						 | 
						
							
							
								
								fix: gen_material_out 优化
							
							
							
							
							
						 | 
						
							2024-07-24 11:20:30 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								e3f32932d8
								
							
						 | 
						
							
							
								
								Merge branch 'erp1'
							
							
							
							
							
						 | 
						
							2024-07-24 10:55:08 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								94c492166d
								
							
						 | 
						
							
							
								
								fix: orderviewset filter属性错误
							
							
							
							
							
						 | 
						
							2024-07-24 10:54:56 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								4bbe973071
								
							
						 | 
						
							
							
								
								Merge branch 'erp1'
							
							
							
							
							
						 | 
						
							2024-07-24 10:52:35 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								2e1f94b24c
								
							
						 | 
						
							
							
								
								feat: order增加filter/miosale增加校验
							
							
							
							
							
						 | 
						
							2024-07-24 10:51:42 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								0a1679d8a2
								
							
						 | 
						
							
							
								
								Merge branch 'erp1'
							
							
							
							
							
						 | 
						
							2024-07-23 13:02:20 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								0e26b2188e
								
							
						 | 
						
							
							
								
								feat: 增加ftestwork count_ok 字段
							
							
							
							
							
						 | 
						
							2024-07-23 12:56:11 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								c068c47bc7
								
							
						 | 
						
							
							
								
								feat: 增加外协生产日志功能
							
							
							
							
							
						 | 
						
							2024-07-23 10:11:31 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								caf83b7e0f
								
							
						 | 
						
							
							
								
								feat: 供应商里增加外协字段
							
							
							
							
							
						 | 
						
							2024-07-23 09:42:36 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								da8e381b3f
								
							
						 | 
						
							
							
								
								doc: 添加NotokOption注释
							
							
							
							
							
						 | 
						
							2024-07-23 08:39:36 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								0ab6e0bc72
								
							
						 | 
						
							
							
								
								feat: 增加不合格项接口
							
							
							
							
							
						 | 
						
							2024-07-22 17:58:21 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								ec0df66542
								
							
						 | 
						
							
							
								
								feat: 完成返工交接2
							
							
							
							
							
						 | 
						
							2024-07-22 15:32:23 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								9c67675ca7
								
							
						 | 
						
							
							
								
								feat: 完成返工交接
							
							
							
							
							
						 | 
						
							2024-07-22 15:26:45 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								19cac7729a
								
							
						 | 
						
							
							
								
								feat: handoverserializer type设置为非必填
							
							
							
							
							
						 | 
						
							2024-07-19 10:24:13 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								92fc1e9e0a
								
							
						 | 
						
							
							
								
								feat: 添加返修交接支持
							
							
							
							
							
						 | 
						
							2024-07-19 10:04:02 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								cb5ede39f0
								
							
						 | 
						
							
							
								
								feat: process admin 字段展示
							
							
							
							
							
						 | 
						
							2024-07-18 16:46:49 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								a3e51a84db
								
							
						 | 
						
							
							
								
								refector: HandoverSerializer validate 优化
							
							
							
							
							
						 | 
						
							2024-07-18 16:32:31 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								30be6dc291
								
							
						 | 
						
							
							
								
								fix: mlogchange 改 mlogupdate
							
							
							
							
							
						 | 
						
							2024-07-18 15:58:53 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								6fd2f2a009
								
							
						 | 
						
							
							
								
								fix: MyThread 调用错误
							
							
							
							
							
						 | 
						
							2024-07-18 15:36:23 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								950b017073
								
							
						 | 
						
							
							
								
								feat: mlog_submit 时校验handle_date
							
							
							
							
							
						 | 
						
							2024-07-18 14:48:55 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								9b3cbe75ae
								
							
						 | 
						
							
							
								
								feat: submit时校验mlogbout
							
							
							
							
							
						 | 
						
							2024-07-18 14:48:36 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								6778af3f07
								
							
						 | 
						
							
							
								
								fix: 增加mlogb.update权限标识
							
							
							
							
							
						 | 
						
							2024-07-18 14:31:34 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								8d75f3f251
								
							
						 | 
						
							
							
								
								feat: 增加mlogb.update权限标识
							
							
							
							
							
						 | 
						
							2024-07-18 14:26:39 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								6a51fd1177
								
							
						 | 
						
							
							
								
								feat: 添加筛选条件和mlogbin 校验
							
							
							
							
							
						 | 
						
							2024-07-18 13:46:16 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								d561a0d24b
								
							
						 | 
						
							
							
								
								feat: 日志提交时不合格品存储到车间库存
							
							
							
							
							
						 | 
						
							2024-07-18 11:30:10 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								ee65658145
								
							
						 | 
						
							
							
								
								fix: MlogbInSerializer bug
							
							
							
							
							
						 | 
						
							2024-07-17 17:08:42 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								c058fe9338
								
							
						 | 
						
							
							
								
								feat: 支持不合格品处理/添加不合格品存储字段
							
							
							
							
							
						 | 
						
							2024-07-17 16:58:28 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								83ec822f9d
								
							
						 | 
						
							
							
								
								fix: db_insert_mplogx bug
							
							
							
							
							
						 | 
						
							2024-07-16 15:36:40 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								d31cf4d143
								
							
						 | 
						
							
							
								
								feat: 从数据库转存到超表做count限制
							
							
							
							
							
						 | 
						
							2024-07-16 14:50:50 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								bf98ea8a48
								
							
						 | 
						
							
							
								
								feat: 从数据库转存到超表
							
							
							
							
							
						 | 
						
							2024-07-16 14:06:46 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								ab413eed81
								
							
						 | 
						
							
							
								
								feat: 停机记录在小于60s可删除
							
							
							
							
							
						 | 
						
							2024-07-16 10:58:33 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								061a291889
								
							
						 | 
						
							
							
								
								feat: 增加handover和mio的查询条件
							
							
							
							
							
						 | 
						
							2024-07-15 17:57:39 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								876c18149e
								
							
						 | 
						
							
							
								
								feat: route增加返回字段
							
							
							
							
							
						 | 
						
							2024-07-15 17:32:45 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								79900462ff
								
							
						 | 
						
							
							
								
								feat: 交接记录receive_dept非必填
							
							
							
							
							
						 | 
						
							2024-07-15 17:05:13 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								07680704ec
								
							
						 | 
						
							
							
								
								feat: cal_mtask_progress_from_mlog
							
							
							
							
							
						 | 
						
							2024-07-15 16:57:09 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								6e904f083a
								
							
						 | 
						
							
							
								
								fix: gen_material_out 优化
							
							
							
							
							
						 | 
						
							2024-07-12 10:58:48 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								af80e3ce5b
								
							
						 | 
						
							
							
								
								fix: mlogb type filter bug
							
							
							
							
							
						 | 
						
							2024-07-12 10:50:41 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								4934327808
								
							
						 | 
						
							
							
								
								feat: mlogbout url register
							
							
							
							
							
						 | 
						
							2024-07-11 17:44:18 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								d38e91667e
								
							
						 | 
						
							
							
								
								fix: mlogb init serializer bug
							
							
							
							
							
						 | 
						
							2024-07-11 17:04:01 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								b33c86fd6e
								
							
						 | 
						
							
							
								
								feat: mlogb in update 接口
							
							
							
							
							
						 | 
						
							2024-07-11 15:58:08 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								ac1b4b6c3e
								
							
						 | 
						
							
							
								
								feat: mlogb增加筛选条件
							
							
							
							
							
						 | 
						
							2024-07-11 15:57:49 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								debc268c88
								
							
						 | 
						
							
							
								
								feat: mlog增加不合格项目字段=
							
							
							
							
							
						 | 
						
							2024-07-11 15:57:18 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								deeda736b9
								
							
						 | 
						
							
							
								
								feat: mlog增加不合格项目字段
							
							
							
							
							
						 | 
						
							2024-07-11 15:55:44 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								12fb18205d
								
							
						 | 
						
							
							
								
								feat: 增加route和routepack查询条件
							
							
							
							
							
						 | 
						
							2024-07-11 13:28:30 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								4177ba93f8
								
							
						 | 
						
							
							
								
								feat: wmaterial增加mgroupx 查询条件
							
							
							
							
							
						 | 
						
							2024-07-11 13:13:39 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								5ad15c0a9e
								
							
						 | 
						
							
							
								
								feat: MlogbIn create时同步创建out
							
							
							
							
							
						 | 
						
							2024-07-11 13:06:48 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								2d522a1fd4
								
							
						 | 
						
							
							
								
								feat: route增加batch_bind字段/mlogbin接口
							
							
							
							
							
						 | 
						
							2024-07-11 11:26:18 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								2f08b9ce81
								
							
						 | 
						
							
							
								
								feat: mtask 添加route查询条件
							
							
							
							
							
						 | 
						
							2024-07-11 11:24:37 +08:00 |