|  zty | 956500d3aa | fix :enm/serializer round | 2024-09-26 15:56:18 +08:00 | 
				
					
						|  zty | 9a3e15f926 | feat: 优化mgroup_run_change | 2024-09-26 11:51:36 +08:00 | 
				
					
						|  zty | 9f90d84244 | fix: em/bug | 2024-09-26 11:02:59 +08:00 | 
				
					
						|  zty | 7517da3e92 | Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server | 2024-09-25 16:04:03 +08:00 | 
				
					
						|  zty | 008219e9ba | fix : em enm wpm 修改更新设备运行状态 | 2024-09-25 16:03:59 +08:00 | 
				
					
						|  caoqianming | c0cb51a5b5 | feat: utask生产任务提交 | 2024-09-25 13:24:48 +08:00 | 
				
					
						|  caoqianming | 73aa186293 | Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server | 2024-09-24 10:24:53 +08:00 | 
				
					
						|  caoqianming | 49712b8211 | feat: mio添加mgroup查询条件 | 2024-09-24 10:24:51 +08:00 | 
				
					
						|  zty | dd3c0d6f6b | Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server | 2024-09-23 10:04:46 +08:00 | 
				
					
						|  zty | d5e48c1ab8 | fix: enm、fim 修改费用过滤和能源加入班组开始结束时间 | 2024-09-23 10:04:43 +08:00 | 
				
					
						|  caoqianming | 8273a96597 | fix: FtestWork 检验数据设置为非负整数 | 2024-09-20 09:16:03 +08:00 | 
				
					
						|  caoqianming | 5628a1ff83 | feat: ftestwork增加校验 | 2024-09-19 15:08:54 +08:00 | 
				
					
						|  caoqianming | 305fda44c2 | feat: wmaterialserializer 增加count_cando返回 | 2024-09-18 09:34:55 +08:00 | 
				
					
						|  zty | 6c6a6ce440 | fix: mtm/service  note | 2024-09-13 15:21:26 +08:00 | 
				
					
						|  zty | 0453499ee5 | add: new migrations file | 2024-09-13 15:08:42 +08:00 | 
				
					
						|  zty | 7aae49b378 | Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server | 2024-09-13 13:41:29 +08:00 | 
				
					
						|  zty | c4607e1608 | fix /enm/service.py 停机时间短  无班组 加入异常原因 | 2024-09-13 13:40:45 +08:00 | 
				
					
						|  caoqianming | f51bb48428 | feat: handover serializer 优化 | 2024-09-13 12:53:55 +08:00 | 
				
					
						|  caoqianming | bc6406f12b | fix: ana equip_last_mlog | 2024-09-12 17:23:40 +08:00 | 
				
					
						|  caoqianming | 2753c78997 | feat: bi查询报错后打日志 | 2024-09-12 15:23:38 +08:00 | 
				
					
						|  caoqianming | 28e5b83896 | fix: wmaterial 返回count_working3 | 2024-09-12 11:31:08 +08:00 | 
				
					
						|  caoqianming | 2d79796ccb | fix: wmaterial 返回count_working2 | 2024-09-12 11:29:43 +08:00 | 
				
					
						|  caoqianming | 8f0e512654 | fix: wmaterial 返回count_working | 2024-09-12 11:26:39 +08:00 | 
				
					
						|  caoqianming | de42dfc75f | fix: wmaterial 返回count_working | 2024-09-12 11:24:56 +08:00 | 
				
					
						|  caoqianming | 7a8bee5e59 | feat: wmaterial增加count_working proptey | 2024-09-12 11:19:00 +08:00 | 
				
					
						|  caoqianming | bc92e90765 | feat: ftestwork 增加shift字段 | 2024-09-11 16:39:09 +08:00 | 
				
					
						|  caoqianming | 1caba24321 | feat: ftestwork belong_dept默认test_user 所在部门 | 2024-09-11 16:20:34 +08:00 | 
				
					
						|  caoqianming | ca2103db8e | fix: handover增加dept查询条件 | 2024-09-10 17:38:35 +08:00 | 
				
					
						|  caoqianming | 082619070e | feat: handover增加dept查询条件 | 2024-09-10 17:06:56 +08:00 | 
				
					
						|  caoqianming | 18fe346661 | fix: tran_time_to_mstate | 2024-09-10 15:12:14 +08:00 | 
				
					
						|  caoqianming | f3c31a5b39 | feat: 投产分析接口 | 2024-09-10 08:50:30 +08:00 | 
				
					
						|  caoqianming | 1490a35a32 | feat: 投产分析 | 2024-09-09 16:44:25 +08:00 | 
				
					
						|  caoqianming | 9a26529e0a | feat: 完善equip_last_mlog5 | 2024-09-09 15:03:38 +08:00 | 
				
					
						|  caoqianming | 1b6e947492 | feat: 完善equip_last_mlog4 | 2024-09-09 14:01:57 +08:00 | 
				
					
						|  caoqianming | 4d5195308f | feat: 完善equip_last_mlog3 | 2024-09-09 13:52:51 +08:00 | 
				
					
						|  caoqianming | 9ffe025ef7 | feat: 完善equip_last_mlog2 | 2024-09-09 13:49:35 +08:00 | 
				
					
						|  caoqianming | 768f7a9a22 | feat: 完善equip_last_mlog | 2024-09-09 13:33:48 +08:00 | 
				
					
						|  caoqianming | d940c82e34 | fix: tran_time_to_mstate | 2024-09-09 13:21:42 +08:00 | 
				
					
						|  caoqianming | 1f8bdd0461 | feat: 增加wpm 数据分析 | 2024-09-09 10:48:53 +08:00 | 
				
					
						|  caoqianming | 01cff014ff | feat: 增加wpm datax | 2024-09-08 14:33:09 +08:00 | 
				
					
						|  caoqianming | bb270d7105 | feat: inm mio相关增加inout_date校验 | 2024-09-08 14:32:49 +08:00 | 
				
					
						|  caoqianming | c07d0666c0 | fix: handoverb返回更多信息 | 2024-09-06 11:30:43 +08:00 | 
				
					
						|  caoqianming | 4e5d16f7f6 | feat: handoverb返回更多信息 | 2024-09-06 11:26:31 +08:00 | 
				
					
						|  caoqianming | aab98fba62 | fix: mlog update 错误 | 2024-09-06 11:16:23 +08:00 | 
				
					
						|  caoqianming | 7510b2fc31 | feat: 报废提交不需要限制接收人 | 2024-09-06 10:11:44 +08:00 | 
				
					
						|  caoqianming | b6b72b2826 | fix: handover submit need_add | 2024-09-06 10:01:47 +08:00 | 
				
					
						|  caoqianming | ee89b0bded | feat: handover 报废处理 | 2024-09-06 09:31:00 +08:00 | 
				
					
						|  caoqianming | fbaf4b5767 | feat: mlog 12 支持update | 2024-09-05 19:08:51 +08:00 | 
				
					
						|  caoqianming | ba8bc4fb72 | fix: handover_submit | 2024-09-05 17:50:04 +08:00 | 
				
					
						|  caoqianming | 789ffe53d3 | fix: handoverb支持编辑 | 2024-09-05 17:02:06 +08:00 | 
				
					
						|  caoqianming | ee7b7a526c | fix: handoverb 校验 | 2024-09-05 16:38:39 +08:00 | 
				
					
						|  caoqianming | 38ba04cc80 | fix: handoverserializer mgroup 处理 | 2024-09-05 15:52:22 +08:00 | 
				
					
						|  caoqianming | 2ce99bc842 | fix: handoverbserializer handoverb | 2024-09-05 15:41:24 +08:00 | 
				
					
						|  caoqianming | e51960d5ba | fix: handover_submit bug | 2024-09-05 15:17:58 +08:00 | 
				
					
						|  caoqianming | 4b44b40c77 | fix: handoverb validate错误 | 2024-09-05 15:13:50 +08:00 | 
				
					
						|  caoqianming | beb6b79709 | fix: mlog view select related | 2024-09-05 15:00:40 +08:00 | 
				
					
						|  caoqianming | ec441d770b | feat: handover create 对handoverb进行处理 | 2024-09-05 14:56:55 +08:00 | 
				
					
						|  caoqianming | 51a649c864 | feat: mlog返回routepack_name2 | 2024-09-05 14:17:54 +08:00 | 
				
					
						|  caoqianming | 1243a50463 | feat: mlog返回routepack_name | 2024-09-05 14:17:21 +08:00 | 
				
					
						|  caoqianming | 97dae72617 | feat: 增加mloginit的可用字段 | 2024-09-05 13:57:46 +08:00 | 
				
					
						|  caoqianming | a1871a3763 | feat: mloginit 可填end_time及test_user_name 返回 | 2024-09-05 13:14:12 +08:00 | 
				
					
						|  caoqianming | c2e2465439 | feat: 优化mtask list | 2024-09-05 13:09:11 +08:00 | 
				
					
						|  caoqianming | 0baec25a8b | feat: handover count可不填写 | 2024-09-05 12:50:51 +08:00 | 
				
					
						|  caoqianming | e2f4cd1612 | feat: handover_submit优化 | 2024-09-05 12:44:40 +08:00 | 
				
					
						|  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 | f4f44be101 | feat: add_mtaskb 增加校验 | 2024-09-04 17:52:37 +08:00 | 
				
					
						|  caoqianming | 668fff3f2d | fix: add_mtaskb用错序列化器了4 | 2024-09-04 17:40:57 +08:00 | 
				
					
						|  caoqianming | fc855d2830 | fix: add_mtaskb用错序列化器了3 | 2024-09-04 17:31:51 +08:00 | 
				
					
						|  caoqianming | 4c57c6e9ee | feat: mtaskb 删除校验 | 2024-09-04 17:19:30 +08:00 | 
				
					
						|  caoqianming | 8c56523285 | feat: mlog 增加fmlog筛选条件 | 2024-09-04 17:01:08 +08:00 | 
				
					
						|  caoqianming | ea83d57129 | fix: add_mtaskb用错序列化器了2 | 2024-09-04 16:55:55 +08:00 | 
				
					
						|  caoqianming | afa55df750 | fix: add_mtaskb用错序列化器了 | 2024-09-04 16:52:23 +08:00 | 
				
					
						|  caoqianming | e12a1042b9 | feat: 优化add_mtaskb | 2024-09-04 16:40:37 +08:00 | 
				
					
						|  caoqianming | 09b3f17025 | fix: add_mtaskb perm错误 | 2024-09-04 16:38:55 +08:00 | 
				
					
						|  caoqianming | 7afa494803 | feat: mtask增加mtaskb接口 | 2024-09-04 16:38:21 +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 | 6694820dcd | fix: mtaskb查询条件错误 | 2024-09-04 16:00:00 +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 | e77f3159f5 | feat: mtaskb增加筛选条件 | 2024-09-04 10:34:45 +08:00 | 
				
					
						|  caoqianming | 9ca66782b9 | fix: FtestWorkCreateUpdate 缺少count_sampling_ok | 2024-09-04 10:22:38 +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 | 9fee0b52d5 | feat: 增加mtaskb | 2024-09-03 16:41:51 +08:00 | 
				
					
						|  caoqianming | bc9a098cc8 | feat: mtask_submit 校验是否有日志 | 2024-09-03 14:51: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 | 89af31a383 | feat: 增加check_test_when_do_out配置参数 | 2024-09-03 09:48:10 +08:00 | 
				
					
						|  caoqianming | 6a573dd4dd | feat: mlog经审批后提交 | 2024-09-03 09:10:28 +08:00 | 
				
					
						|  caoqianming | 2a8254b581 | feat: process添加mlog_need_ticket字段 | 2024-09-02 17:04:59 +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 | fc2195eba1 | feat: ftestwork增加是否更新库存字段 | 2024-09-02 15:29:41 +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 | cff14fa042 | feat: ftestwork添加抽检合格数 | 2024-08-30 13:36:53 +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 | b8994b94c1 | feat: ftestwork增加filter | 2024-08-29 15:43:12 +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 | 81a90f31cd | feat: 计算测点可不指定物料2 | 2024-08-29 13:47:16 +08:00 | 
				
					
						|  caoqianming | 1855e3ae67 | feat: bind_routepack 时校验产出是否一致 | 2024-08-29 10:51:44 +08:00 | 
				
					
						|  caoqianming | 0f0bc9bd37 | feat: 计算测点可不指定物料 | 2024-08-29 10:28:59 +08:00 | 
				
					
						|  caoqianming | e94996471f | feat: 优化enstat2 | 2024-08-29 09:28:39 +08:00 | 
				
					
						|  caoqianming | cf10f02829 | fix: xscript change_data 变更 | 2024-08-28 17:14:49 +08:00 | 
				
					
						|  caoqianming | da3b0f62e5 | feat: 增加change_data字段 | 2024-08-28 17:09:24 +08:00 | 
				
					
						|  caoqianming | 4ac5d1f1f7 | feat: xscript添加logger | 2024-08-28 16:27:35 +08:00 | 
				
					
						|  caoqianming | 43d0d90e41 | fix: tag_update 先判断是否本地时间 | 2024-08-28 16:17:14 +08:00 | 
				
					
						|  caoqianming | 730aa68966 | feat: tag_update 先判断是否本地时间 | 2024-08-28 16:12:31 +08:00 | 
				
					
						|  caoqianming | 038e7f86cd | feat: xscript相关调整 | 2024-08-28 14:11:42 +08:00 | 
				
					
						|  caoqianming | 42cf64e9f7 | feat: mlog 添加不合格项 | 2024-08-28 10:58:46 +08:00 | 
				
					
						|  caoqianming | 4bfa8a5460 | feat: insert_mplogx_from_xscript 修改 | 2024-08-27 18:42:18 +08:00 | 
				
					
						|  caoqianming | 417dae76fd | fix: xscript update bug | 2024-08-27 17:40:05 +08:00 | 
				
					
						|  caoqianming | 2be34d3caa | feat: enm添加xscript | 2024-08-27 17:28:30 +08:00 | 
				
					
						|  caoqianming | e6e80f5d52 | feat: base 增加code分析工具类 | 2024-08-27 17:26:29 +08:00 | 
				
					
						|  caoqianming | 8828625346 | feat: base dbconnection支持pg | 2024-08-27 17:26:05 +08:00 | 
				
					
						|  caoqianming | 1b19c02754 | feat: base ptaskresult 更多filter | 2024-08-27 17:25:46 +08:00 | 
				
					
						|  caoqianming | b57fd16d5a | fix: base basemodel handle_parent 处理bug | 2024-08-26 15:28:13 +08:00 | 
				
					
						|  caoqianming | ac6fd28aba | feat: 增加棕圈作为不合格项 | 2024-08-26 14:25:26 +08:00 | 
				
					
						|  caoqianming | cdd879c583 | feat: 添加不合格品小崩边 | 2024-08-26 14:15:01 +08:00 | 
				
					
						|  caoqianming | d83b5ec0d2 | feat: myschedule createserializer 优化2 | 2024-08-26 13:49:27 +08:00 | 
				
					
						|  caoqianming | 4739124cc8 | Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server | 2024-08-26 13:28:40 +08:00 | 
				
					
						|  caoqianming | ba00580fec | feat: myschedule createserializer 优化 | 2024-08-26 13:27:09 +08:00 | 
				
					
						|  zty | c5e180944d | Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server | 2024-08-23 17:21:16 +08:00 | 
				
					
						|  zty | 28834f88cd | fix : 煤磨 | 2024-08-23 17:20:57 +08:00 | 
				
					
						|  caoqianming | 6205ba682c | feat: gascheck增加字段 | 2024-08-22 15:08:45 +08:00 | 
				
					
						|  caoqianming | 26172b767f | feat: utask mtask 增加筛选条件 | 2024-08-22 12:45:53 +08:00 | 
				
					
						|  zty | 4960ee7fac | feat: 增加水泥包装 | 2024-08-21 17:55:23 +08:00 | 
				
					
						|  caoqianming | 33a7e7320b | fix: daoru_material 增加校验 | 2024-08-21 14:12:52 +08:00 | 
				
					
						|  caoqianming | a48ee63679 | Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server | 2024-08-21 09:27:40 +08:00 | 
				
					
						|  caoqianming | 4a277eb954 | feat: base 可使用跳板机转发错误邮件 | 2024-08-21 09:27:37 +08:00 | 
				
					
						|  zty | 5a35ea6028 | feat: 增加出厂水泥 和 计算 | 2024-08-21 08:59:24 +08:00 | 
				
					
						|  zty | bc38196f68 | Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server | 2024-08-20 14:43:55 +08:00 | 
				
					
						|  zty | 206e33d091 | fix :apps\enm filter | 2024-08-20 14:43:53 +08:00 | 
				
					
						|  caoqianming | 1e667e69ac | feat: daoru_material 增加校验 | 2024-08-20 14:39:38 +08:00 | 
				
					
						|  caoqianming | 561c2a0c31 | feat: materialbatch也不进行物理删除 | 2024-08-20 14:25:01 +08:00 | 
				
					
						|  caoqianming | 592e34c07e | refector: mgroup_on_change时创建stlog优化 | 2024-08-20 08:56:08 +08:00 | 
				
					
						|  caoqianming | d102f01c26 | feat: 增加check_opl_work_imgs | 2024-08-19 16:51:46 +08:00 | 
				
					
						|  caoqianming | e2d652f9ef | fix: get_area_from_point 获取cache bug | 2024-08-19 16:17:33 +08:00 | 
				
					
						|  caoqianming | 28958b405c | fix: check_opl_audit_imgs bug | 2024-08-19 13:41:47 +08:00 | 
				
					
						|  caoqianming | 9ce56d3f34 | feat: ftestwork增加关联仓库库存字段 | 2024-08-19 11:35:36 +08:00 | 
				
					
						|  caoqianming | c00f59f8d9 | Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server | 2024-08-19 08:59:26 +08:00 | 
				
					
						|  caoqianming | 808a1c825d | feat: check_opl_audit_imgs raise | 2024-08-19 08:59:24 +08:00 | 
				
					
						|  zty | c3b62f1831 | fix: equip_elec_data 计算 | 2024-08-16 18:45:31 +08:00 | 
				
					
						|  zty | 62fb5aa54c | feat: sflog teamchange cal_quastat_sflog | 2024-08-16 18:45:11 +08:00 | 
				
					
						|  zty | 7a780ebd0d | fix: set coefficient | 2024-08-16 18:44:50 +08:00 | 
				
					
						|  zty | cbce4998d9 | feat: mpoint stat添加筛选条件 | 2024-08-16 18:44:30 +08:00 | 
				
					
						|  zty | a09343322e | Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server | 2024-08-16 18:44:02 +08:00 | 
				
					
						|  zty | 4cdc48e549 | fix: equip_elec_data 计算 | 2024-08-16 18:44:00 +08:00 | 
				
					
						|  caoqianming | c8db1ad29b | feat: base handle_parent报错调整 | 2024-08-15 15:53:42 +08:00 | 
				
					
						|  caoqianming | 0aa0b051e9 | fix: em ecate serializer 优化 | 2024-08-15 15:53:17 +08:00 | 
				
					
						|  caoqianming | c71624def0 | fix: em serializer 优化 | 2024-08-15 11:36:38 +08:00 | 
				
					
						|  caoqianming | 3976e3834e | Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server | 2024-08-15 11:17:51 +08:00 | 
				
					
						|  caoqianming | cb46d9bfc6 | fix: ecate code 必填校验 | 2024-08-15 11:17:48 +08:00 | 
				
					
						|  zty | 71dd916dbf | Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server | 2024-08-15 10:47:47 +08:00 | 
				
					
						|  zty | 13fb91e83a | fix:enm/service 修改稿last_val | 2024-08-15 10:47:43 +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 | 824dacf78d | Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server | 2024-08-15 09:47:06 +08:00 | 
				
					
						|  caoqianming | bcafe94e71 | fix: base validate_password支持.号 | 2024-08-15 09:47:04 +08:00 | 
				
					
						|  zty | f52b501aa1 | feat : enm/service 增加测点采集系数 | 2024-08-15 09:19:19 +08:00 | 
				
					
						|  zty | 29ba9647b4 | Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server | 2024-08-14 18:33:05 +08:00 | 
				
					
						|  zty | 6a20445ddd | fix : em/service 修改update_time | 2024-08-14 18:33:01 +08:00 | 
				
					
						|  caoqianming | 42769e3abe | fix: mioitempurin bug | 2024-08-14 18:17:31 +08:00 | 
				
					
						|  caoqianming | db792a2de5 | feat: ftestwork增加检验人及不合格项 | 2024-08-14 18:07:12 +08:00 | 
				
					
						|  caoqianming | a9acf6d187 | feat: 物料导入模板增加编号列 | 2024-08-14 17:42:27 +08:00 | 
				
					
						|  caoqianming | 27c60ff973 | feat: mio pur test 支持count_sampling自填 | 2024-08-13 17:28:39 +08:00 | 
				
					
						|  caoqianming | 3bb3834c04 | fix: miolist pu_order_number | 2024-08-13 17:11:22 +08:00 | 
				
					
						|  caoqianming | cc5dcc9685 | fix: gen_material_out bug | 2024-08-13 16:29:59 +08:00 | 
				
					
						|  caoqianming | 58ddc8dd0b | Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server | 2024-08-13 15:06:10 +08:00 | 
				
					
						|  caoqianming | ad1d0680b1 | feat: mlogbupdate 校验 | 2024-08-13 15:06:07 +08:00 | 
				
					
						|  zty | 779bd763a1 | fix : em/service 修改运行设备更新状态 根据最后一次时间修改 | 2024-08-13 15:00:09 +08:00 | 
				
					
						|  caoqianming | bbac19c791 | feat: notok option 其他 | 2024-08-13 14:47:26 +08:00 | 
				
					
						|  caoqianming | bfad89bf2f | feat: ftestwork_submit增加抽检逻辑 | 2024-08-13 14:31:38 +08:00 | 
				
					
						|  caoqianming | 23dd745192 | feat: ftestwork增加查询条件 | 2024-08-13 13:59:58 +08:00 | 
				
					
						|  caoqianming | 0a0b6b72ba | feat: ftestworkcreate type2处理 | 2024-08-13 13:42:00 +08:00 | 
				
					
						|  caoqianming | 8e7e60c600 | fix: ftestwork_submit bug2 | 2024-08-12 17:36:12 +08:00 | 
				
					
						|  caoqianming | e6e4a61289 | fix: ftestwork_submit bug | 2024-08-12 17:31:19 +08:00 | 
				
					
						|  caoqianming | 096ad540d4 | feat: qm batch增加长度 | 2024-08-12 17:21:17 +08:00 | 
				
					
						|  caoqianming | f6f84533d1 | fix: notokoption 修改3 | 2024-08-12 17:18:09 +08:00 | 
				
					
						|  caoqianming | 38f052c015 | fix: notokoption 修改2 | 2024-08-12 17:15:23 +08:00 | 
				
					
						|  caoqianming | cfbd79a206 | fix: notokoption 修改 | 2024-08-12 17:12:22 +08:00 | 
				
					
						|  caoqianming | 274a0df0eb | feat: 检验工作增加查询条件 | 2024-08-12 16:57:22 +08:00 | 
				
					
						|  caoqianming | b9dc211df3 | Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server | 2024-08-12 16:46:14 +08:00 | 
				
					
						|  caoqianming | 5fc38eabaa | fix: notokoption values | 2024-08-12 16:46:12 +08:00 | 
				
					
						|  zty | 7664dfefa4 | Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server | 2024-08-12 16:04:57 +08:00 | 
				
					
						|  zty | 47acf9ceb4 | fix: enm/service 修改service | 2024-08-12 16:04:55 +08:00 |