|  caoqianming | e5ac627834 | feat: wmaterial filter_queryset默认返回非报废品 | 2024-09-05 12:29:36 +08:00 | 
				
					
						|  caoqianming | 308fa4c7ad | feat: 报废交接时固定recive | 2024-09-05 11:37:40 +08:00 | 
				
					
						|  caoqianming | 2b9ec6d01c | feat: 增加handoverb | 2024-09-05 10:58:09 +08:00 | 
				
					
						|  caoqianming | d6e3657298 | fix: count_pn_jgqbl的扣减bug | 2024-09-05 10:50:32 +08:00 | 
				
					
						|  caoqianming | 0de377ddc4 | feat: 去除 handle_date的日期校验 | 2024-09-05 09:35:54 +08:00 | 
				
					
						|  caoqianming | 00853f395d | feat: handle_date 根据work_time自动处理 | 2024-09-05 09:29:49 +08:00 | 
				
					
						|  caoqianming | 982247ee70 | feat: count_n_jgqbl 改为count_pn_jgqbl | 2024-09-05 09:11:48 +08:00 | 
				
					
						|  caoqianming | eb5a8df7e0 | feat: mlog create 时校验 | 2024-09-04 18:21:32 +08:00 | 
				
					
						|  caoqianming | 8c56523285 | feat: mlog 增加fmlog筛选条件 | 2024-09-04 17:01:08 +08:00 | 
				
					
						|  caoqianming | 22052d1d82 | fix: fmlog validate 未返回attrs | 2024-09-04 16:21:00 +08:00 | 
				
					
						|  caoqianming | c2649ec963 | feat: mtask增加mtaskb的返回并在日志填写时校验 | 2024-09-04 16:13:50 +08:00 | 
				
					
						|  caoqianming | 463390691a | feat: wpm 添加mtaskb等字段 | 2024-09-04 15:53:04 +08:00 | 
				
					
						|  caoqianming | bae2b7b8f5 | feat: mlogb 校验 | 2024-09-04 15:50:07 +08:00 | 
				
					
						|  caoqianming | 6e7e6c584e | feat: 一二级日志录入 | 2024-09-04 15:25:14 +08:00 | 
				
					
						|  caoqianming | 233591728a | feat: fmlog创建时校验 | 2024-09-04 09:13:26 +08:00 | 
				
					
						|  caoqianming | 170f3db824 | feat: 添加fmlog | 2024-09-04 09:04:37 +08:00 | 
				
					
						|  caoqianming | 044819815e | fix: cal_mlog_count_from_mlogb 统计bug | 2024-09-03 17:57:23 +08:00 | 
				
					
						|  caoqianming | bb311999e8 | feat: mlogb 添加字段以记录分层检验信息 | 2024-09-03 14:16:18 +08:00 | 
				
					
						|  caoqianming | 0148efba62 | feat: process添加中间状态 | 2024-09-03 10:58:33 +08:00 | 
				
					
						|  caoqianming | 31f8f002aa | feat: mlog 增加ticket查询条件 | 2024-09-03 10:25:59 +08:00 | 
				
					
						|  caoqianming | 6a573dd4dd | feat: mlog经审批后提交 | 2024-09-03 09:10:28 +08:00 | 
				
					
						|  caoqianming | b3e527e5a6 | fix: count_n_jgqbl 字符错误 | 2024-09-02 16:58:16 +08:00 | 
				
					
						|  caoqianming | 65c1c8aa40 | fix: mlogb update serializer | 2024-09-02 15:51:34 +08:00 | 
				
					
						|  caoqianming | 40b012b962 | feat: 加工前不良的日志提交和撤回 | 2024-09-02 15:27:38 +08:00 | 
				
					
						|  caoqianming | 91add9ec1d | feat: 增加加工前不良的不合格项 | 2024-09-02 14:17:52 +08:00 | 
				
					
						|  caoqianming | 78dc923305 | fix: 日志提交的校验 | 2024-08-30 13:31:37 +08:00 | 
				
					
						|  caoqianming | 5289e71280 | feat: wmaterial添加外协字段及相关调整 | 2024-08-30 09:21:29 +08:00 | 
				
					
						|  caoqianming | 301535813b | feat: mlogbout 校验不合格字段 | 2024-08-29 15:13:08 +08:00 | 
				
					
						|  caoqianming | ab759a76c9 | feat: mog submit时产出为0 | 2024-08-29 15:05:53 +08:00 | 
				
					
						|  caoqianming | 54c7c65fe0 | feat: 产出物为0时跳过revert | 2024-08-29 14:52:30 +08:00 | 
				
					
						|  caoqianming | 42cf64e9f7 | feat: mlog 添加不合格项 | 2024-08-28 10:58:46 +08:00 | 
				
					
						|  zty | 62fb5aa54c | feat: sflog teamchange cal_quastat_sflog | 2024-08-16 18:45:11 +08:00 | 
				
					
						|  caoqianming | 7028fd31ee | feat: wmaterial增加state字段并进行相应处理2 | 2024-08-15 10:43:45 +08:00 | 
				
					
						|  caoqianming | ba6c30a745 | feat: wmaterial增加state字段并进行相应处理 | 2024-08-15 10:41:36 +08:00 | 
				
					
						|  caoqianming | ad1d0680b1 | feat: mlogbupdate 校验 | 2024-08-13 15:06:07 +08:00 | 
				
					
						|  caoqianming | bbac19c791 | feat: notok option 其他 | 2024-08-13 14:47:26 +08:00 | 
				
					
						|  caoqianming | ba2368f59b | feat: handover增加筛选条件 | 2024-08-12 15:05:47 +08:00 | 
				
					
						|  caoqianming | c5dfb325dc | feat: handover 增加查询条件 | 2024-08-12 14:39:44 +08:00 | 
				
					
						|  caoqianming | 2108b1c33a | feat: wmaterial增加查询条件 | 2024-08-12 14:35:33 +08:00 | 
				
					
						|  caoqianming | 562372b0b9 | feat: mlog添加不合格项目 | 2024-08-12 11:07:29 +08:00 | 
				
					
						|  caoqianming | 1a42cf34f0 | feat: wmaterial增加count_xtest/handover增加检验交接 | 2024-08-09 15:09:26 +08:00 | 
				
					
						|  zty | 314b614c53 | fix: cal_exp_duration_sec 还需要更新时间为None3 | 2024-08-06 19:00:38 +08:00 | 
				
					
						|  zty | 1fe8c7ae76 | feat: cal_exp_duration_sec 还需要更新时间为None2 | 2024-08-06 18:43:20 +08:00 | 
				
					
						|  zty | 5461fb5f55 | feat: cal_exp_duration_sec 还需要更新时间为None的 | 2024-08-06 18:40:34 +08:00 | 
				
					
						|  zty | 341a681d00 | fix: get_sflog 提前起始时间 | 2024-08-06 09:54:34 +08:00 | 
				
					
						|  zty | f1a76cba74 | Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server | 2024-08-06 09:45:10 +08:00 | 
				
					
						|  zty | 73176847e0 | feat: make_sflogs_simple 扩大范围 | 2024-08-06 09:44:24 +08:00 | 
				
					
						|  caoqianming | 42c1386efd | feat: sflogexp增加返回信息 | 2024-08-06 08:29:21 +08:00 | 
				
					
						|  caoqianming | dc7e6f9d03 | fix: get_total_sec_now及cal_exp_duration_sec 添加now参数 | 2024-08-02 13:50:05 +08:00 | 
				
					
						|  caoqianming | aa42ba6e3f | feat: submit时校验消耗和产出是否已经填写 | 2024-08-01 18:12:30 +08:00 | 
				
					
						|  caoqianming | 071558af8d | feat: mlogbin 校验记录已存在 | 2024-08-01 17:32:48 +08:00 | 
				
					
						|  caoqianming | cbedb81b0e | fix: mlogbin 不合格物料校验去除 | 2024-08-01 16:54:09 +08:00 | 
				
					
						|  caoqianming | cbe516ccf5 | fix: handover submit时更新bug | 2024-08-01 15:25:16 +08:00 | 
				
					
						|  caoqianming | 6efcf19716 | fix: mlog_revert bug | 2024-08-01 15:15:00 +08:00 | 
				
					
						|  caoqianming | f3f0ea132c | fix: find_material_can_change 只可返工到半成品 | 2024-08-01 10:30:55 +08:00 | 
				
					
						|  caoqianming | 9ff4f21f9a | fix: mlogbin create时生成编号变更3 | 2024-08-01 09:59:39 +08:00 | 
				
					
						|  caoqianming | 99ab4e1957 | feat: mlogbin create时生成编号变更2 | 2024-08-01 09:20:15 +08:00 | 
				
					
						|  caoqianming | 0813a3b568 | feat: mlogbin create时生成编号变更 | 2024-07-31 16:33:32 +08:00 | 
				
					
						|  caoqianming | 821d7613d1 | fix: get_sflog 增加 sflog创建范围 | 2024-07-31 15:55:34 +08:00 | 
				
					
						|  caoqianming | bea83f93d5 | fix: 批次号追加设备编号 | 2024-07-31 14:30:53 +08:00 | 
				
					
						|  caoqianming | 9ad0cf6498 | feat: 批次号追加number | 2024-07-31 14:27:15 +08:00 | 
				
					
						|  zty | 181a4e3a5f | fix: HandoverSerializer recive_mgroup 校验bug | 2024-07-30 15:11:23 +08:00 | 
				
					
						|  zty | ebf6f739ca | feat: 出入库添加工段逻辑 | 2024-07-30 13:24:21 +08:00 | 
				
					
						|  caoqianming | 6759ea76bf | feat: material增加into_wm字段控制与车间库存交互 | 2024-07-25 13:27:44 +08:00 | 
				
					
						|  caoqianming | 71dbd6c572 | feat: handover 添加返回信息 | 2024-07-25 11:31:39 +08:00 | 
				
					
						|  caoqianming | 391d9b137d | feat: handover filter增加筛选条件 | 2024-07-25 08:34:50 +08:00 | 
				
					
						|  caoqianming | 47f4222f03 | fix: mlog submit wm belong_dept 缺失 | 2024-07-24 16:43:30 +08:00 | 
				
					
						|  caoqianming | c068c47bc7 | feat: 增加外协生产日志功能 | 2024-07-23 10:11:31 +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 | 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 | 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 | 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 | 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 | 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 | 2e60cb7eaf | feat: mlog change接口 | 2024-07-11 08:44:40 +08:00 | 
				
					
						|  caoqianming | 2f5edc041c | feat: mlog init | 2024-07-10 15:32:33 +08:00 |