668 Commits

Author	SHA1	Message	Date
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	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	9db524dfdb	feat: em/filter apps 修改设备字段信息	2024-11-25 18:14:12 +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	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	05af336180	fix: mlog create 时的bug	2024-11-21 17:03:34 +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	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	af72749b8a	fix: mlog select_related_fields bug	2024-11-18 17:27:41 +08:00
caoqianming	71db15bacd	feat: 添加cms模块创建article表	2024-11-18 10:42:33 +08:00
caoqianming	4518344fa6	fix: do_out 领料时的material_ofrom	2024-11-14 13:04:40 +08:00
caoqianming	95739bc3bb	feat: wmaterial增加查询条件	2024-11-14 12:12:14 +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	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	4016c421be	feat: MaterialBatch 添加字段以支持追踪原料批次	2024-11-13 17:22:25 +08:00
caoqianming	7d9582fe34	feat: mlogb添加字段以追踪原料批次	2024-11-13 15:56:40 +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	6eec199488	feat: mlog create时校验mtask是否是下达状态	2024-11-07 09:40:32 +08:00
caoqianming	bce4a44408	feat: wmaterial可按mtask进行查询过滤	2024-11-05 17:43:34 +08:00
caoqianming	3d7a9fb481	feat: labelmat 返回state_name	2024-10-14 13:20:36 +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	008219e9ba	fix : em enm wpm 修改更新设备运行状态	2024-09-25 16:03:59 +08:00
caoqianming	305fda44c2	feat: wmaterialserializer 增加count_cando返回	2024-09-18 09:34:55 +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	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	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	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	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	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
caoqianming	6754b668bc	fix: handover serializer validate bug	2024-07-09 14:03:44 +08:00
caoqianming	24b2a98440	refecor: 一些处理	2024-07-05 08:49:36 +08:00
caoqianming	a0dae66cf7	feat: 根据光芯需求对wpm做兼容性处理2	2024-07-03 13:19:21 +08:00
caoqianming	59b8634d3e	fix: handover serializer bug2	2024-07-02 23:25:14 +08:00
caoqianming	67ca07bb35	fix: handover serializer bug	2024-07-02 23:04:16 +08:00
caoqianming	427bf31d50	fix: mlogb 取material bug	2024-07-02 12:09:08 +08:00
caoqianming	a6a3dcf33c	fix: handover validate bug	2024-07-01 16:21:52 +08:00
caoqianming	d579a7358d	feat: 根据光芯需求对wpm做兼容性处理	2024-07-01 10:07:57 +08:00
caoqianming	3c52125440	feat: wm,handover,mlog增加检索条件	2024-06-28 15:29:39 +08:00
caoqianming	5efd9888dd	feat: 交接记录提交只要是同部门的就可以2	2024-06-21 13:27:47 +08:00
caoqianming	966821fad6	feat: 交接记录提交只要是同部门的就可以	2024-06-21 10:40:07 +08:00
caoqianming	8548004690	fix: 用于混料的原料不与车间库存交互	2024-06-04 09:11:06 +08:00
caoqianming	bf5df19a59	feat: mlog添加两个不合格项目	2024-05-22 14:53:46 +08:00
caoqianming	7819aa5b5e	feat: stlog的sflog的cascad改一下	2024-05-21 18:18:13 +08:00
caoqianming	617013f299	fix: sflog展示run_hour	2024-05-17 09:16:45 +08:00
caoqianming	32c1647b9b	feat: sflog展示run_hour	2024-05-17 09:13:10 +08:00
caoqianming	bd33a33ed6	fix: get_pcoal_heat 逻辑严谨	2024-05-16 17:18:17 +08:00
caoqianming	a90396099b	fix: 更新煤粉热值触发计算的bug3	2024-05-16 16:57:00 +08:00
caoqianming	9a1074caf8	fix: 更新煤粉热值触发计算的bug	2024-05-16 16:48:42 +08:00
caoqianming	5093eb7b29	feat: 更新煤粉热值触发计算的bug	2024-05-16 16:26:33 +08:00
caoqianming	e1172c2fcf	feat: SfLogExp添加约束及cal_exp_duration_sec优化	2024-05-15 12:59:12 +08:00
caoqianming	3d6adedb8c	feat: hour计数改为sec计数 步骤3移除字段	2024-05-15 10:40:46 +08:00
caoqianming	b4b3d6eadc	feat: hour计数改为sec计数 步骤2	2024-05-15 10:31:17 +08:00
caoqianming	8753994468	fix: hour计数改为sec计数 make_sflogs 的bug	2024-05-15 10:14:57 +08:00
caoqianming	a3f5e48b8c	feat: hour计数改为sec计数	2024-05-15 10:06:49 +08:00
caoqianming	3fc8e17266	feat: stlog添加约束	2024-05-13 23:06:47 +08:00
caoqianming	2e67f7c468	fix: cal_exp_duration_hour 默认一个参数值	2024-05-08 16:32:00 +08:00
caoqianming	b22058d0bb	feat: cal_exp_duration_hour 添加参数以做测试	2024-05-08 16:07:03 +08:00
caoqianming	035b9b392a	fix: get_pcoal_heat 时以work_date为准	2024-05-08 16:06:08 +08:00
caoqianming	ce38c3e338	fix: get_total_hour_now exclude 错误	2024-05-07 10:16:22 +08:00
caoqianming	6ee42a6993	fix: get_total_hour_now默认参数为空	2024-05-07 10:00:24 +08:00
caoqianming	634884f336	doc: 增加注释	2024-05-02 00:02:41 +08:00
caoqianming	6ea5e0b5d7	fix: make_sflogs当天班生成缺少的bug	2024-05-02 00:01:47 +08:00
caoqianming	2263c0decb	fix: 如果结束时间为0点则取开始时间来返回年月日2	2024-04-30 19:00:19 +08:00
caoqianming	a6914413f7	fix: 如果结束时间为0点则取开始时间来返回年月日	2024-04-30 18:20:31 +08:00
caoqianming	dddab37c63	fix: get_sflog 取的时候与happen_time对比错误	2024-04-30 12:59:38 +08:00
caoqianming	df5a6d5d96	feat: 生成值班记录只对工段	2024-04-28 17:50:44 +08:00
caoqianming	ece11699f8	feat: sflogexp返回更多信息	2024-04-28 13:32:53 +08:00
caoqianming	acad9c6acf	fix: stlog create时validate3	2024-04-28 13:10:01 +08:00
caoqianming	8375345e56	fix: stlog create时validate2	2024-04-28 11:30:05 +08:00
caoqianming	05f675f610	fix: stlog create时validate	2024-04-28 11:26:55 +08:00
caoqianming	6f98d9dfb3	fix: stlog validate total_secondsbug	2024-04-28 10:04:30 +08:00
caoqianming	d01bb012b9	fix: 异常值班处理的权限	2024-04-28 09:35:16 +08:00
caoqianming	1139bb6119	feat: 优化make_sflog/get_sflog	2024-04-11 10:56:32 +08:00
caoqianming	5078a516d2	feat: mlog增加退火后碎字段	2024-04-02 15:44:19 +08:00
caoqianming	779488589a	fix: handover_submit针对混料特殊处理的bug3	2024-03-06 22:24:11 +08:00
caoqianming	2addfc8433	fix: handover_submit针对混料特殊处理的bug2	2024-03-06 21:52:55 +08:00
caoqianming	3ddb050330	fix: handover_submit针对混料特殊处理的bug	2024-03-06 21:45:17 +08:00
caoqianming	b429ad9059	fix: 废弃一些接口	2024-03-06 18:01:24 +08:00
caoqianming	8a32690395	feat: handoverserializer返回更多数据	2024-03-06 17:44:50 +08:00
caoqianming	abdee3d2d5	feat: 增加wmaterial查询条件	2024-03-06 17:21:48 +08:00
caoqianming	4c3610ac25	feat: 混料支持车间库存	2024-03-06 17:07:51 +08:00
caoqianming	f6db92f815	feat: 增加wmaterial查询条件	2024-03-06 15:50:29 +08:00
caoqianming	0de0489272	feat: 增加箱中破不合格字段	2024-03-05 10:11:33 +08:00
caoqianming	5c0c016872	fix: correct_tuihuo_log矫正退火日志2	2024-03-04 15:50:49 +08:00
caoqianming	c1d5ef86f1	fix: correct_tuihuo_log矫正退火日志	2024-03-04 14:58:36 +08:00
caoqianming	e99854b56f	fix: mlog填写时进行更进一步校验	2024-03-04 13:54:31 +08:00
caoqianming	eef99ed624	feat: 出入库操作支持提交后可撤销功能	2024-02-29 17:10:50 +08:00
caoqianming	d483bb6b61	fix: mlog update时mlogb不更新	2024-01-28 00:18:10 +08:00
caoqianming	d0b13ac215	feat: do_in时增加更完整的提示信息	2024-01-25 09:49:37 +08:00
caoqianming	6f8c7c0567	feat: mlog validate时计算count_notok	2024-01-20 23:30:09 +08:00
caoqianming	78fd0c9721	feat: 日志撤回后修改任务状态	2024-01-18 10:55:41 +08:00
caoqianming	a4d23f534a	fix: mlog validate bug	2024-01-18 10:27:38 +08:00
caoqianming	4a6aabd860	fix: do_in new_count为0时wm.delete	2024-01-12 16:45:07 +08:00
caoqianming	7ca12228e2	feat: 库存减到0时删除该记录	2024-01-11 17:56:00 +08:00
caoqianming	89215d4752	feat: 任务停止后日志不可再提交	2024-01-04 09:11:53 +08:00
caoqianming	6165af7c47	feat: mlog_submit返回更详细的报错	2023-12-28 17:28:46 +08:00
caoqianming	c91533a328	feat: mlog增加equipments字段	2023-12-27 09:51:04 +08:00
caoqianming	03d6a6c99f	fix: mtask_submit时导致重复计算	2023-12-27 09:03:12 +08:00
caoqianming	d131741f4b	feat: handover返回material_name	2023-12-25 13:04:37 +08:00
caoqianming	93de5ea879	feat: wmaterialserializer返回全名	2023-12-22 13:47:59 +08:00
caoqianming	c80b486a00	feat: equipment_name 返回—的为__str__数据	2023-12-22 10:19:25 +08:00
caoqianming	00c860b001	fix: mlog update时mtask, mgroup不可变	2023-12-21 08:49:07 +08:00
caoqianming	ef2975d05d	feat: wmaterial增加筛选条件	2023-12-21 00:14:13 +08:00
caoqianming	ec3014d5ee	feat: mlog增加返回数据	2023-12-20 23:30:27 +08:00
caoqianming	0f2d2dbee9	feat: 其他生产记录增加查询handle_date	2023-12-20 15:17:31 +08:00
caoqianming	043869e828	feat: mlog增加不合格原因字段	2023-12-18 14:21:56 +08:00
caoqianming	bf5d62e99d	fix: mlog提交时如有mtask则handle_date为mtask日期2	2023-12-18 12:25:19 +08:00
caoqianming	6182ef3c58	feat: mlog提交时如有mtask则handle_date为mtask日期	2023-12-18 11:20:51 +08:00
caoqianming	a9c16c4a9d	feat: 日志提交和撤回返回序列化信息	2023-12-18 11:12:33 +08:00
caoqianming	625074049e	feat: mlog日志撤回	2023-12-18 09:18:06 +08:00
caoqianming	845a510068	fix: mlog撤回1未完成	2023-12-18 08:08:42 +08:00
caoqianming	8c43f8ec62	fix: handover update validate更严谨一些	2023-12-17 19:55:45 +08:00
caoqianming	1b5c910cf8	fix: 交接记录的提交bug	2023-12-16 13:00:56 +08:00
caoqianming	4f1ae6ddc6	fix: mlogsubmit bug	2023-12-16 11:46:57 +08:00
caoqianming	bd6b4a5f82	fix: gen_by_wm需提供send_mgroup	2023-12-16 11:42:38 +08:00
caoqianming	128dc2a7e3	feat: utask mtask状态submit调整	2023-12-15 09:05:08 +08:00
caoqianming	6b6ff7cd3c	feat: mlog更新时更新日志	2023-12-14 10:36:47 +08:00
caoqianming	ea63c29a69	feat: mlog有mtask时固定handle_date	2023-12-07 10:55:06 +08:00
caoqianming	2d8169849f	feat: 将mlog添加审计日志	2023-12-07 09:39:52 +08:00
caoqianming	95f67b6543	feat: is_hidden的物料也需要进行车间库存管理	2023-12-05 13:02:14 +08:00
caoqianming	ac323781eb	feat 增加wm查询条件	2023-12-01 15:51:32 +08:00
caoqianming	e3d37c6dfa	feat: wm增加查询条件	2023-12-01 14:16:06 +08:00
caoqianming	dc47570a5b	feat: wm增加查询条件	2023-12-01 11:33:23 +08:00
caoqianming	6e8d78a5e9	doc: 增加注释	2023-11-30 17:10:42 +08:00
caoqianming	cc0a2719de	feat: mtask增加submit_time	2023-11-30 16:30:07 +08:00
caoqianming	81e97c4789	feat: 日志提交时间校验	2023-11-30 14:48:47 +08:00
caoqianming	9dc31b366b	fix: handover submit bug	2023-11-30 14:14:52 +08:00
caoqianming	abb3fef89f	feat: 交接记录修改	2023-11-30 10:47:38 +08:00
caoqianming	a7ff21bb80	fix: handover增加送料工段	2023-11-30 10:15:31 +08:00
caoqianming	3a24e6f858	feat: handover增加送料工段	2023-11-29 16:52:00 +08:00
caoqianming	eb665c7943	feat: mlog增加查询条件	2023-11-29 16:23:07 +08:00
caoqianming	e24a16b692	fix: mlog设置必填项目	2023-11-28 00:23:48 +08:00
caoqianming	9ba83cc1fe	feat: 交接记录增加查询条件	2023-11-27 23:19:35 +08:00
caoqianming	64ac57d217	feat: handover material必填	2023-11-27 23:15:19 +08:00
caoqianming	014b21ba2b	feat: mlog增加筛选条件	2023-11-27 22:45:13 +08:00