2820 Commits

Author	SHA1	Message	Date
caoqianming	15de6e3a5e	feat: srule list 返回rule_display	2024-12-05 18:13:11 +08:00
zty	22abc35d4b	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server	2024-12-05 15:22:35 +08:00
zty	918df6b345	feat: 新增tkx 测点 聚合	2024-12-05 15:22:33 +08:00
caoqianming	62fae4ceac	feat: mpoint增加筛选条件	2024-12-05 15:09:27 +08:00
caoqianming	1042deb817	feat: base 对登录失败次数过多做限制	2024-12-05 14:47:38 +08:00
zty	15d37604ea	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server	2024-12-04 16:08:47 +08:00
zty	c4c50670fd	feat: 修改 tkx 峰谷平	2024-12-04 16:08:43 +08:00
caoqianming	5e9ebcdd36	feat: 产品规格还需在管料退火处处理	2024-12-04 13:04:19 +08:00
caoqianming	7ce9ed5a19	fix: get_alldata_with_batch hanle_user bug	2024-12-04 12:42:12 +08:00
caoqianming	784500bf5b	feat: get_alldata_with_batch 其他入库也需要记录产品规格	2024-12-04 12:37:08 +08:00
caoqianming	a69f718859	feat: mlog 支持handle_user 默认create_by	2024-12-04 12:22:52 +08:00
caoqianming	5533cc6967	fix: get_alldata_with_batch 加入检验备注统计	2024-12-04 11:18:23 +08:00
caoqianming	ffd7bc13b0	feat: get_alldata_with_batch 加入检验备注统计	2024-12-04 11:00:49 +08:00
caoqianming	bcbaba330d	feat: batchst增加batch__startswith__in筛选条件	2024-12-04 10:16:41 +08:00
zty	cbaf79084c	fix: em回退到0021	2024-12-04 09:58:53 +08:00
zty	ca08fb5c20	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server	2024-12-03 18:27:51 +08:00
zty	284dc01f69	add : enm/filter 增加峰谷平查询字段	2024-12-03 18:27:48 +08:00
caoqianming	b2c28e1a88	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server	2024-12-03 18:07:35 +08:00
caoqianming	b93c4bddeb	feat: 触发批次分析统计	2024-12-03 18:07:23 +08:00
zty	6f3b418265	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server	2024-12-03 18:02:21 +08:00
zty	55b8564f0d	feat:tkx 计量设备临期预警	2024-12-03 18:02:17 +08:00
caoqianming	67be714355	fix: 完善get_alldata_with_batch -改_	2024-12-03 11:41:23 +08:00
caoqianming	91bc99a135	fix: 完善get_alldata_with_batch4	2024-12-03 11:13:55 +08:00
caoqianming	4253b39cc6	fix: 完善get_alldata_with_batch3	2024-12-03 11:06:01 +08:00
caoqianming	7e44cda500	fix: 完善get_alldata_with_batch	2024-12-03 11:02:55 +08:00
caoqianming	fb43bdde85	feat: 完善get_alldata_with_batch	2024-12-03 10:36:23 +08:00
zty	a08e66a06a	fix： task bug 修字段名	2024-12-02 15:36:36 +08:00
zty	c0169d25ac	add : enm 增加峰谷平电量统计	2024-12-02 15:26:12 +08:00
caoqianming	d9a1512a92	feat: 定义batchst默认排序为batch	2024-12-02 14:33:44 +08:00
caoqianming	bc6baca698	fix: batchst last_time取用错误	2024-12-02 14:20:54 +08:00
caoqianming	de6e5d315a	feat: 记录batchst 最后操作时间	2024-12-02 14:13:17 +08:00
caoqianming	17697d6482	feat: 添加batchst路由	2024-12-02 13:39:43 +08:00
caoqianming	c3bd32ee68	feat: property改为classmethod	2024-12-02 13:13:28 +08:00
caoqianming	8435b35be6	feat: get_alldata_with_batch	2024-12-02 12:27:26 +08:00
caoqianming	ab52c033dc	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server	2024-11-28 17:06:58 +08:00
caoqianming	6396eff968	feat: fmlog 移除route字段	2024-11-28 17:06:42 +08:00
zty	2f31997b43	feat: enm/task 修改报警事件	2024-11-28 16:13:00 +08:00
zty	4671ee9e7a	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server	2024-11-28 14:28:26 +08:00
zty	4c38cee983	add: mtm/model serializer view 增加tkx 自动排班	2024-11-28 14:28:24 +08:00
caoqianming	31b1aae03c	feat: generate_new_batch 追加锅号	2024-11-28 09:37:17 +08:00
caoqianming	08d6763db6	feat: 添加count_n_b	2024-11-28 09:27:15 +08:00
caoqianming	87c6b0cf9e	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server	2024-11-28 09:12:22 +08:00
caoqianming	bf524286c1	feat: 添加不合格项目 炸头	2024-11-28 09:12:08 +08:00
zty	c0f796f4a0	fix: em/service 修改tkx 设备model	2024-11-26 17:54:59 +08:00
zty	42d8dced09	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server	2024-11-25 18:14:17 +08:00
zty	9db524dfdb	feat: em/filter apps 修改设备字段信息	2024-11-25 18:14:12 +08:00
caoqianming	1311217668	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server	2024-11-25 17:52:17 +08:00
caoqianming	f3d023432d	feat: 支持合格b类	2024-11-25 17:52:04 +08:00
zty	1010a6b86f	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server	2024-11-25 17:45:10 +08:00
zty	f0a748e304	feat:修改自动生成班组	2024-11-25 17:45:08 +08:00
caoqianming	53322ed9ad	feat: 兄弟件产出需要注意batch的修改	2024-11-24 17:22:03 +08:00
caoqianming	12d77e53b6	feat: mlog submit 添加一个注释	2024-11-24 17:03:39 +08:00
caoqianming	a484c0021d	fix: wm_in 找不到的错误	2024-11-24 16:07:11 +08:00
caoqianming	d52bd4e064	feat: mlog 变化不再创建日志	2024-11-23 23:12:45 +08:00
caoqianming	84f7de61bc	fix: mlog update 没有消耗时的校验	2024-11-23 23:06:01 +08:00
caoqianming	cb36aac9ca	feat: 去除handover send强校验	2024-11-23 22:32:55 +08:00
caoqianming	89d9a987f4	fix: mtask_submit 不会触发utask_submit	2024-11-23 22:24:38 +08:00
caoqianming	580109aa9f	fix: mlog 填写方式及handoverb的问题	2024-11-22 18:35:12 +08:00
caoqianming	5d6ce9f6c0	feat: mlog_submit mlog_revert bug	2024-11-22 09:07:03 +08:00
caoqianming	2c569db0d8	fix: do_in wm_production_dept	2024-11-21 17:23:35 +08:00
caoqianming	8c63aea877	fix: validate data pop None	2024-11-21 17:04:36 +08:00
caoqianming	05af336180	fix: mlog create 时的bug	2024-11-21 17:03:34 +08:00
caoqianming	72b04ddc7a	feat: 单工序多工段情况下平均分配	2024-11-21 15:20:27 +08:00
caoqianming	32158dfa77	feat: WMaterialFilter mtaskx根据batch_bind进行校验	2024-11-21 13:34:15 +08:00
caoqianming	1bfafdb0e4	feat: handover添加备注字段	2024-11-21 13:21:53 +08:00
caoqianming	93cabf0ebc	feat: mlogb增加查询条件以支持查询返工记录	2024-11-21 11:25:31 +08:00
caoqianming	9014a7c869	feat: ftestwork添加设备和备注字段	2024-11-21 10:45:31 +08:00
caoqianming	3dfcbd8a8b	feat: speaker 接口忽略采集器5	2024-11-20 16:42:19 +08:00
caoqianming	258d4975f8	feat: speaker 接口忽略采集器4	2024-11-20 16:38:44 +08:00
caoqianming	5c2aac22e1	feat: speaker 接口忽略采集器3	2024-11-20 16:38:14 +08:00
caoqianming	72604f9992	feat: speaker 接口忽略采集器2	2024-11-20 16:28:11 +08:00
caoqianming	ae15f1a33c	feat: speaker 接口忽略采集器	2024-11-20 16:24:04 +08:00
caoqianming	8667267046	feat: equipment 列表支持is_deleted查询	2024-11-20 13:18:42 +08:00
caoqianming	16272cd15f	feat: save_voice_and_speak 添加日志	2024-11-20 09:56:00 +08:00
caoqianming	598cadc4bb	feat: 添加事件喇叭播放测试api	2024-11-20 09:49:42 +08:00
caoqianming	a11ce128be	feat: 喇叭播放的日志	2024-11-20 09:45:53 +08:00
caoqianming	5730a00742	feat: ftest更新ftestwork的count_sampling等字段	2024-11-19 17:52:57 +08:00
caoqianming	1cb64b26af	feat: mlog list 接口一点优化	2024-11-19 09:25:36 +08:00
caoqianming	7c85d3df65	fix: mlog select_related_fields bug2	2024-11-18 17:38:11 +08:00
caoqianming	a0423cbd3f	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server	2024-11-18 17:28:03 +08:00
caoqianming	af72749b8a	fix: mlog select_related_fields bug	2024-11-18 17:27:41 +08:00
zty	13751b8a76	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server	2024-11-18 13:51:09 +08:00
zty	3fff294189	fix : enm 修改 单位产品综合能耗	2024-11-18 13:51:04 +08:00
caoqianming	e67bd892ae	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server	2024-11-18 10:42:44 +08:00
caoqianming	71db15bacd	feat: 添加cms模块创建article表	2024-11-18 10:42:33 +08:00
zty	c2cae12c4f	fix:enm/service 修改小数点	2024-11-18 09:34:27 +08:00
zty	9d5d7eceaf	fix : tkx enm bug fix	2024-11-14 17:48:48 +08:00
caoqianming	4518344fa6	fix: do_out 领料时的material_ofrom	2024-11-14 13:04:40 +08:00
caoqianming	6ef01ee301	fix: 其他出入库错误	2024-11-14 12:26:40 +08:00
caoqianming	95739bc3bb	feat: wmaterial增加查询条件	2024-11-14 12:12:14 +08:00
caoqianming	6006d42f9d	fix: do_in bug	2024-11-14 11:54:55 +08:00
caoqianming	a00f533752	fix: mlog submit 关于wm.batch_ofrom的bug	2024-11-14 11:39:17 +08:00
caoqianming	9fb09f7c2a	fix: mlog submit 关于count_n的bug	2024-11-14 11:24:13 +08:00
caoqianming	fdb06c6883	fix: 非合格/返修品不可使用 报错	2024-11-14 11:17:11 +08:00
caoqianming	384bef705c	fix: MaterialBatch 添加字段以支持追踪原料批次6	2024-11-14 11:02:05 +08:00
caoqianming	e92ceca953	feat: MaterialBatch 添加字段以支持追踪原料批次5	2024-11-14 10:52:21 +08:00
caoqianming	b5928b2927	feat: MaterialBatch 添加字段以支持追踪原料批次4	2024-11-14 10:40:14 +08:00
caoqianming	b9d9cf42cb	feat: mlog serializer添加batch_ofrom等	2024-11-14 08:47:31 +08:00
caoqianming	90e699155c	feat: MaterialBatch 添加字段以支持追踪原料批次3	2024-11-13 18:16:02 +08:00
caoqianming	27c646e6df	feat: MaterialBatch 添加字段以支持追踪原料批次2	2024-11-13 17:23:41 +08:00
caoqianming	4016c421be	feat: MaterialBatch 添加字段以支持追踪原料批次	2024-11-13 17:22:25 +08:00
caoqianming	7d9582fe34	feat: mlogb添加字段以追踪原料批次	2024-11-13 15:56:40 +08:00
caoqianming	c1d140a082	feat: mpointstat filterset 支持hour,day,month,year	2024-11-12 15:26:02 +08:00
caoqianming	6698e38d32	feat: wmaterial增加字段	2024-11-12 14:51:53 +08:00
caoqianming	0d66ae5e90	feat: generate_new_batch 中添加-变为>	2024-11-12 14:13:06 +08:00
caoqianming	a6fadedee2	fix: handle_date使用localdate获取日期	2024-11-11 17:00:33 +08:00
caoqianming	96ba8c8223	feat: base permission serializer修改继承	2024-11-11 10:53:11 +08:00
caoqianming	ec834e27df	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server	2024-11-07 17:51:04 +08:00
caoqianming	764396f42c	feat: base 支持树型的递归分页查询以传with_children参数	2024-11-07 17:50:48 +08:00
zty	feae902704	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server	2024-11-07 16:50:15 +08:00
zty	9c8e0081e2	feat: 修改 last_val - first_val 值	2024-11-07 16:50:11 +08:00
caoqianming	6eec199488	feat: mlog create时校验mtask是否是下达状态	2024-11-07 09:40:32 +08:00
caoqianming	79b1317cc6	feat: count_running_state返回更多信息2	2024-11-07 09:03:54 +08:00
caoqianming	0ba6737661	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server	2024-11-07 09:02:08 +08:00
caoqianming	8c8d7af1ba	feat: count_running_state返回更多信息	2024-11-07 09:01:53 +08:00
zty	aa75148878	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server	2024-11-06 10:43:50 +08:00
zty	8ec5f8c6dd	feat: enm 回转窑综合电耗计算	2024-11-06 10:43:45 +08:00
caoqianming	98e3520127	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server	2024-11-05 17:43:50 +08:00
caoqianming	bce4a44408	feat: wmaterial可按mtask进行查询过滤	2024-11-05 17:43:34 +08:00
zty	5fe86c3e98	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server	2024-11-05 13:34:45 +08:00
zty	336f35ed28	feat:修改喇叭内容	2024-11-05 13:34:42 +08:00
caoqianming	8859cc01a6	feat: mtask增加route__sort排序	2024-10-31 15:51:01 +08:00
caoqianming	c403b9161a	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server	2024-10-29 14:50:31 +08:00
caoqianming	cdcfbf35ef	feat: SPLIT_FIELD 改为 #	2024-10-29 14:50:19 +08:00
zty	a563566623	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server	2024-10-29 09:36:33 +08:00
zty	1ff55c6ee4	feat: apps/enm/view 修改offline状态	2024-10-29 09:36:28 +08:00
caoqianming	8d6939a4fc	feat: base 更新全部权限时仅失效缓存即可	2024-10-23 17:07:52 +08:00
caoqianming	d4dc94df89	feat: edu paper添加type字段	2024-10-23 16:30:28 +08:00
caoqianming	3343d30f77	feat: develop添加测试任务	2024-10-22 08:28:04 +08:00
caoqianming	7b34ddd70c	fix: 系统初始化时不必获取全部权限标识	2024-10-20 11:02:07 +08:00
caoqianming	f02008f6de	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server	2024-10-20 10:46:08 +08:00
caoqianming	ca32d9f20f	fix: base permission获取优化	2024-10-20 10:46:06 +08:00
caoqianming	abeb70d166	feat: develop添加一个测试任务	2024-10-18 09:43:06 +08:00
caoqianming	f85db52ec7	fix: get_from_mioitem bug	2024-10-17 15:55:26 +08:00
caoqianming	27f7b3c076	feat: check_remployee_leave触发账户禁用	2024-10-17 13:39:45 +08:00
caoqianming	deb0cb48df	fix: check_remployee_leave转task	2024-10-17 11:12:29 +08:00
caoqianming	7dd39d75bf	fix: 相关方分配管理员重置岗位	2024-10-17 10:28:39 +08:00
caoqianming	b28174309a	feat: 从车间库存明细获取物料标签	2024-10-16 11:13:25 +08:00
zty	46dd264dba	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server	2024-10-15 09:54:54 +08:00
zty	e6e18c6c30	feat: enm/task nick_name	2024-10-15 09:54:24 +08:00
caoqianming	3d7a9fb481	feat: labelmat 返回state_name	2024-10-14 13:20:36 +08:00
caoqianming	af751f5a9d	feat: 增加从车间库存明细获取物料标签	2024-10-14 09:09:25 +08:00
caoqianming	ebf3bbe257	feat: get_from_mb 返回更多信息	2024-10-11 15:54:19 +08:00
caoqianming	0157daa0ab	feat: 获取标签明细3	2024-10-11 15:41:55 +08:00
caoqianming	ef28e1ba47	feat: 获取标签明细2	2024-10-11 15:39:04 +08:00
caoqianming	52a7d41518	feat: 获取标签明细	2024-10-11 15:38:28 +08:00
caoqianming	419dbf3560	feat: 获取物料标签信息	2024-10-11 15:34:10 +08:00
caoqianming	107818301f	feat: 改变条码格式	2024-10-11 15:28:07 +08:00
caoqianming	c524d1b9a5	feat: 添加条码二维码管理的app	2024-10-11 15:26:48 +08:00
caoqianming	8e918e9a7e	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server	2024-10-11 13:36:56 +08:00
caoqianming	ed8ee4e68d	feat: materialbatch 添加supplier字段	2024-10-11 13:36:53 +08:00
zty	5203719023	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server	2024-10-10 13:34:16 +08:00
zty	96f4b0c445	feat: apps/enm 新增成本计算	2024-10-10 13:33:58 +08:00
caoqianming	c546e25808	fix: base get_alld_perms 传参	2024-10-09 14:18:11 +08:00
caoqianming	f347630981	feat: base 优化permission缓存处理	2024-10-09 13:57:35 +08:00
caoqianming	bc77137093	feat: base perm变动时出发get_alld_perms	2024-10-09 13:56:20 +08:00
caoqianming	552055e6c5	feat: base 启动时缓存perms_alld_list	2024-10-09 13:55:41 +08:00
caoqianming	5e38f96925	feat: base CustomGenericViewSet 初始化优化	2024-10-09 13:47:11 +08:00
caoqianming	71ac63bdaf	feat: base 添加全局线程池	2024-10-09 13:46:38 +08:00
zty	74ece85b0a	fix: import edge_tts 在函数中引入	2024-10-09 10:00:46 +08:00
zty	7f9e2ad616	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server	2024-10-09 09:29:12 +08:00
zty	66af6475d9	feat: 修改采集时候出现0的处理	2024-10-09 09:26:29 +08:00
caoqianming	7c71eafa41	feat: 添加edge-tts语音生成	2024-10-08 15:10:59 +08:00
caoqianming	494b078a09	feat: save_voice_and_speak 优化	2024-10-08 15:10:42 +08:00
caoqianming	40c6479cf3	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server	2024-10-08 12:58:19 +08:00
caoqianming	4f73aa2030	feat: 检查相关方人员门禁到期设为离职	2024-10-08 12:58:17 +08:00
zty	924d7f2b61	feat: 百度语音的配置	2024-09-30 17:05:43 +08:00
zty	780564f6e1	feat: 煤粉热值处理2	2024-09-30 16:22:30 +08:00
zty	cc5b521f5d	feat: 煤粉热值校正	2024-09-30 16:21:44 +08:00
zty	9c6e8f5992	fix: 电表水表0值处理	2024-09-30 16:21:18 +08:00
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