963 Commits

Author	SHA1	Message	Date
caoqianming	a0084f7825	feat: mgroup增加自产和外协字段及相关逻辑校验	2025-03-19 14:32:24 +08:00
caoqianming	459fc3bbe8	feat: mgroup增加自产和外协字段及相关逻辑	2025-03-19 14:27:07 +08:00
caoqianming	1040e55a48	feat: wpr增加wpr_from的相关逻辑	2025-03-19 14:08:34 +08:00
caoqianming	da084e21cb	feat: wmaterial增加来源批次和物料	2025-03-19 13:35:27 +08:00
caoqianming	982fa7f373	fix: mlogbupdate serializer	2025-03-18 14:35:11 +08:00
caoqianming	70c415aa1f	feat: mlogbinserializer update也进行支持	2025-03-18 13:58:49 +08:00
caoqianming	232ecb0f45	fix: MlogbSerializer mlog字段只读	2025-03-18 10:47:46 +08:00
caoqianming	6d6e4e88ae	fix: MlogbSerializer mlog字段取消	2025-03-18 10:36:58 +08:00
caoqianming	f7e3e7977d	feat: mlogb增加count_json	2025-03-18 10:30:13 +08:00
caoqianming	53a3105f10	fix: 转成 小数后的to_representation bug	2025-03-17 10:33:11 +08:00
caoqianming	5bda6adf92	fix: mlogdefect 非必填	2025-03-17 10:06:21 +08:00
caoqianming	10a5d3301e	feat: 日志变更模型以支持小数	2025-03-17 09:55:31 +08:00
caoqianming	443a818aec	feat: 一次填写的也mlogb_from	2025-03-14 18:14:43 +08:00
caoqianming	8f079c9d5d	feat: 通过is_fix支持ftestwork转mlog	2025-03-14 17:07:08 +08:00
caoqianming	9489f80b3f	fix: 个到个的拆分bug9	2025-03-14 16:32:55 +08:00
caoqianming	42f5c20f86	fix: 个到个的拆分bug8	2025-03-14 16:32:02 +08:00
caoqianming	099fe4b18b	fix: 个到个的拆分bug7	2025-03-14 16:10:40 +08:00
caoqianming	a66d47ec47	fix: 个到个的拆分bug6	2025-03-14 16:06:49 +08:00
caoqianming	c8cde0a436	fix: 个到个的拆分bug5	2025-03-14 16:01:54 +08:00
caoqianming	6fa9c9182b	fix: 个到个的拆分bug4	2025-03-14 15:35:37 +08:00
caoqianming	82b4f39fed	fix: 个到个的拆分bug3	2025-03-14 15:28:26 +08:00
caoqianming	60a7827e1b	fix: 个到个的拆分bug2	2025-03-14 15:20:32 +08:00
caoqianming	5ba937ecd8	fix: 个到个的拆分bug	2025-03-14 14:29:36 +08:00
caoqianming	7488900ac8	feat: mlogbw destory bug	2025-03-14 13:17:53 +08:00
caoqianming	b067ec2ea7	fix: handover validate handoverbw的bug	2025-03-14 09:57:28 +08:00
caoqianming	f58b84a4ee	feat: 物料编号允许非不同物料的重复	2025-03-13 17:37:54 +08:00
caoqianming	dafdb8f608	fix: 调整数据结构4	2025-03-13 17:13:34 +08:00
caoqianming	9ef752cb05	fix: 调整数据结构3	2025-03-13 17:11:02 +08:00
caoqianming	a350d97202	fix: 调整数据结构2	2025-03-13 16:58:07 +08:00
caoqianming	ed80edbef8	fix: 调整数据结构	2025-03-13 16:46:32 +08:00
caoqianming	38dc9199e2	feat: 调整数据结构	2025-03-13 16:33:59 +08:00
caoqianming	f43726a884	fix: mlogbin 删除时未对应删除mlogbout的bug	2025-03-13 12:48:16 +08:00
caoqianming	7cca8b7277	fix: handover需要进行3层校验	2025-03-13 12:02:43 +08:00
caoqianming	31ef257a60	feat: attrs["count"] = len(attrs["handoverb"])	2025-03-13 10:58:09 +08:00
caoqianming	64ca8b97ad	fix: mlogbw删除bug2	2025-03-12 14:55:43 +08:00
caoqianming	8bd3e120df	fix: mlogbw删除bug	2025-03-12 14:53:28 +08:00
caoqianming	e52b894603	fix: mlogbw delete bug3	2025-03-12 14:28:11 +08:00
caoqianming	459d2348d4	fix: mlogbw delete bug2	2025-03-12 14:24:01 +08:00
caoqianming	d847b84fd8	fix: mlogbw delete bug	2025-03-12 14:21:37 +08:00
caoqianming	90e0e7ad3b	fix: mlogbin delete数据	2025-03-12 14:10:34 +08:00
caoqianming	8d67c06e63	feat: 生成产出出错2的bug	2025-03-12 13:34:56 +08:00
caoqianming	378648436f	fix: 生成产出出错3的bug	2025-03-12 11:22:50 +08:00
caoqianming	5a05710ff2	feat: 增加mlogbw_to以进行追踪	2025-03-12 09:23:38 +08:00
caoqianming	5bd17c4a37	feat: mio自动生成编号	2025-03-11 12:40:45 +08:00
caoqianming	f59cb2cbc2	feat: 个拆批2	2025-03-10 17:58:09 +08:00
caoqianming	75ec24702c	feat: 个拆批	2025-03-10 17:48:11 +08:00
caoqianming	8f46507a6b	feat: mlogbin时从单个拆分为多个批次2	2025-03-10 16:03:50 +08:00
caoqianming	85cc38c842	feat: mlogbin时从单个拆分为多个批次	2025-03-10 16:00:01 +08:00
caoqianming	f295956c69	fix: mlogbw cal_count_notok	2025-03-10 11:29:43 +08:00
caoqianming	fbb18ae990	feat: 部分bug修复	2025-03-09 11:36:17 +08:00
caoqianming	cb45e0bab1	feat: 子任务可为空以及一些查询条件	2025-03-07 13:00:00 +08:00
caoqianming	25d63c0b27	feat: fmlog update 更新是否可用字段	2025-03-07 11:00:57 +08:00
caoqianming	456f05a83e	feat: 针对加工前不良的处理2	2025-03-07 10:42:27 +08:00
caoqianming	330d44e2a3	feat: 优化一下mlogbdefect的代码结构	2025-03-07 10:09:49 +08:00
caoqianming	8a715ed136	feat: wpm revert支持加工强不良	2025-03-07 09:20:20 +08:00
caoqianming	925bc2027c	feat: mlogb_submit支持加工前不良	2025-03-07 08:51:22 +08:00
caoqianming	2a9bd7ef6a	feat: mlogbdefect defect可为空代表合格品	2025-03-07 08:51:01 +08:00
caoqianming	1844fa7228	feat: mlogb添加字段	2025-03-06 19:00:04 +08:00
caoqianming	e2fbc63293	feat: 支持传入加工前不良的数据	2025-03-06 18:51:18 +08:00
caoqianming	73b3ab9377	feat: handover增加筛选条件	2025-03-06 16:36:32 +08:00
caoqianming	f7843621df	feat: wm 增加 来料/完成 筛选	2025-03-06 16:15:08 +08:00
caoqianming	74f0db77ed	feat: Handoverb 支持拆批	2025-03-06 14:15:45 +08:00
caoqianming	afdcc5374e	feat: 添加wmaterial检索字段	2025-03-06 09:02:07 +08:00
caoqianming	33957216cd	feat: handover recive user可为空	2025-03-06 09:01:45 +08:00
caoqianming	deb50efba1	feat: 添加wmaterial筛选条件	2025-03-06 09:01:23 +08:00
caoqianming	df427d60b2	fix: mlog ftestwork submit关于合格b类的调整	2025-03-04 15:45:56 +08:00
caoqianming	aa32047bf7	fix: 一些bug调整	2025-03-04 12:33:51 +08:00
caoqianming	46d586430e	fix: FmlogViewSet test	2025-03-03 19:09:17 +08:00
caoqianming	eca0f26623	fix: bulk create bug	2025-03-03 19:05:27 +08:00
caoqianming	07f60a1a29	feat: mlogbdefect返回defect_okcate	2025-03-03 19:00:51 +08:00
caoqianming	de27865a3b	fix: swagger bug	2025-03-03 18:29:36 +08:00
caoqianming	9907bf7c43	feat: mlog填写支持defect定义	2025-03-03 18:21:03 +08:00
caoqianming	7e40596665	fix: mlogbupdate bug	2025-03-03 15:47:53 +08:00
caoqianming	666fbd306b	fix: 获取qct提出到model	2025-03-03 15:13:28 +08:00
caoqianming	bbed6fa646	feat: mlogbdefect添加字段floor	2025-03-03 14:50:26 +08:00
caoqianming	6ad6670a90	feat: mlogbdetail 增加返回mlogbdefect	2025-02-28 17:06:50 +08:00
caoqianming	7c7dcee194	fix: cal_count_notok bug2	2025-02-28 16:57:46 +08:00
caoqianming	2311e1773f	fix: cal_count_notok bug	2025-02-28 16:49:08 +08:00
caoqianming	278e55c08a	fix: cal_count_notok 是一个类方法	2025-02-28 16:39:49 +08:00
caoqianming	12416a4f61	fix: mlogbw create bug2	2025-02-28 16:30:47 +08:00
caoqianming	9eb3abefc4	fix: mlogbw create bug	2025-02-28 16:27:23 +08:00
caoqianming	a2fb5598f8	fix: get_alldata_with_batch 除0bug	2025-02-28 16:23:24 +08:00
caoqianming	31e8b92d29	feat: mlogbin create时处理qct	2025-02-28 15:50:23 +08:00
caoqianming	c5bcfb4e53	feat: mlogboutupdate兼容性处理	2025-02-28 15:38:36 +08:00
caoqianming	286a5306e3	feat: 批次处理做兼容性处理	2025-02-28 15:31:38 +08:00
caoqianming	77f7a454a1	feat: mlogbw变更出发mlogbdefect	2025-02-28 11:28:40 +08:00
caoqianming	fb7fbb7388	fix: drf swagger bug	2025-02-28 09:41:13 +08:00
caoqianming	1bddfaa920	fix: get_alldata_with_batch bug	2025-02-28 09:18:10 +08:00
caoqianming	b2f801deda	feat: 添加mlogbdefect	2025-02-28 09:14:55 +08:00
caoqianming	39eef7d2b4	fix: material_out.tracking的比较bug	2025-02-26 12:07:02 +08:00
caoqianming	c71bb0d8f6	fix: 不能删除该产出明细更新限制条件	2025-02-26 11:27:25 +08:00
caoqianming	2010078665	perf: 优化mlog list速度3	2025-02-25 17:33:41 +08:00
caoqianming	4e6aa547b5	perf: 优化mlog list速度2	2025-02-25 17:30:40 +08:00
caoqianming	6653befcdb	perf: 优化mlog list速度	2025-02-25 16:33:54 +08:00
caoqianming	32ba222523	fix: mlog_submit process获取bug	2025-02-24 17:29:00 +08:00
caoqianming	63004f81ca	fix: mlog_submit tracking获取方式	2025-02-24 17:21:28 +08:00
caoqianming	14cad30b2e	fix: mlog_submit is_fix bug	2025-02-24 17:14:33 +08:00
caoqianming	debf07a7b9	feat: mlogbdetail 返回时携带tracking	2025-02-24 16:20:56 +08:00
caoqianming	2e8ca4a14d	fix: mlogbin perform_create处理返工的bug	2025-02-24 16:12:46 +08:00
caoqianming	2941ebd7d6	fix: mlogbinserializer处理返工的错误	2025-02-24 16:06:55 +08:00
caoqianming	2663f20953	feat: 返修逻辑完成	2025-02-24 13:22:43 +08:00
caoqianming	553fbcc826	feat: labelmat和wpr都加上返修Enum	2025-02-24 10:26:00 +08:00
caoqianming	0c5cc55b54	feat: 用于返修的mlog	2025-02-24 09:39:05 +08:00
caoqianming	74a7025f6c	feat: wm_in 在mlogbin时必填	2025-02-20 17:02:36 +08:00
caoqianming	c585f2fc11	feat: mlogbin支持mtask非必填	2025-02-19 14:29:55 +08:00
caoqianming	f741eda285	feat: 七车间入库_仓库执行人 remove None	2025-02-18 17:45:42 +08:00
caoqianming	b062d7ef6b	fix: cal_material_count 挪到单独文件里	2025-02-18 11:03:22 +08:00
caoqianming	edac22b701	feat: cal_material_count 改为同步执行	2025-02-18 10:51:31 +08:00
caoqianming	b3d060b25a	feat: cal_material_count_from_mlog	2025-02-18 10:42:59 +08:00
caoqianming	855ca9b054	feat: wpm和wpmw表添加doc2	2025-02-17 16:57:50 +08:00
caoqianming	89642fb194	feat: wpm和wpmw表添加doc	2025-02-17 16:17:06 +08:00
caoqianming	8cbb921969	feat: 光子棒管综合统计添加数据	2025-02-17 11:24:43 +08:00
caoqianming	861bb03469	feat: wpmw添加字段	2025-02-12 15:10:00 +08:00
caoqianming	ac41f5a105	fix: 粗中细磨的统计要涵盖粗磨和粗中磨的数据	2025-02-11 14:40:38 +08:00
caoqianming	44486b64a3	feat: mlogbw的输出不允许删除	2025-02-11 11:12:14 +08:00
caoqianming	b8c0a9b420	fix: 车间执行人和仓库人问题	2025-02-10 15:57:40 +08:00
caoqianming	ff4bdf027f	fix: equip_last_mlog 添加运行状态	2025-02-08 10:53:23 +08:00
caoqianming	5b7b1bf276	fix: 获取可交接到的工段进行去重	2025-02-08 09:45:05 +08:00
caoqianming	550a3281bc	fix: 获取可交接到的工段2	2025-02-07 13:34:25 +08:00
caoqianming	2488e500ce	fix: 获取可交接到的工段	2025-02-07 10:12:27 +08:00
caoqianming	b96846d2c0	feat: 获取可交接到的工段	2025-02-07 10:04:12 +08:00
caoqianming	622d594795	feat: 优化mloginit报错提示	2025-02-06 16:56:06 +08:00
caoqianming	821b88eb90	feat: handover submit支持改版	2025-02-05 10:55:21 +08:00
caoqianming	8a2e409c8a	feat: 增加改版交接类型	2025-02-05 09:54:22 +08:00
caoqianming	89449eb7c6	feat: mlogbin 只校验主批是否重复	2025-01-22 10:14:49 +08:00
caoqianming	50f19291a0	fix: mlog revert bug	2025-01-20 10:45:10 +08:00
caoqianming	1eb990d3d5	fix: mlogbw submit错误	2025-01-20 10:33:44 +08:00
caoqianming	4699b31f83	feat: ftest增加defect_main的后续逻辑变更	2025-01-17 16:52:14 +08:00
caoqianming	805d4ac4fe	fix: 切分融合的单件生成2	2025-01-17 15:42:24 +08:00
caoqianming	5b7f8e1359	fix: 切分融合的单件生成	2025-01-17 14:54:09 +08:00
caoqianming	713c51bdbd	feat: 切分融合的单件生成	2025-01-17 14:45:31 +08:00
caoqianming	d653caed1d	fix: 变更单件产品的属性问题2	2025-01-17 10:01:02 +08:00
caoqianming	8b7887ec43	fix: 变更单件产品的属性问题	2025-01-17 09:57:53 +08:00
caoqianming	e59a5894f3	fix: mlogbin allow_empty	2025-01-16 10:17:35 +08:00
caoqianming	6ea24b6b1c	feat: MlogbInSerializer wm_in allow_blank False	2025-01-16 09:27:06 +08:00
caoqianming	8d4d0f7cbc	fix: mlogbw create时进行wpr的校验	2025-01-14 11:27:40 +08:00
caoqianming	f4f17fd2b8	fix: handover submit合并批次bug	2025-01-14 08:52:16 +08:00
caoqianming	a333810dd9	fix: handover create bug	2025-01-13 17:34:10 +08:00
caoqianming	f68d498dd3	feat: handover submit支持合并为单个新批次	2025-01-13 17:26:41 +08:00
caoqianming	ced8692585	feat: handoverserializer 优化	2025-01-13 16:12:18 +08:00
caoqianming	23b837c784	feat: festworkdefect submit操作	2025-01-13 14:05:00 +08:00
caoqianming	58b3863763	feat: 删除次批时无需删除输出2	2025-01-10 16:00:36 +08:00
caoqianming	79cb50709e	feat: 删除次批时无需删除输出	2025-01-10 15:51:49 +08:00
caoqianming	155f305071	feat: mlogbin 在merge时向下取整	2025-01-10 14:55:45 +08:00
caoqianming	18f39bff9c	feat: get_alldata_with_batch_and_store	2025-01-10 14:41:56 +08:00
caoqianming	ee3dc6a5a2	feat: mlog revert bug	2025-01-10 14:30:04 +08:00
caoqianming	4b327c0575	feat: mlog撤回	2025-01-10 13:47:39 +08:00
caoqianming	695590589e	fix: 追踪到个的才需要赋予质检表	2025-01-10 11:27:08 +08:00
caoqianming	b8fd5fd13b	feat: 追踪到个的才需要赋予质检表	2025-01-10 10:34:59 +08:00
caoqianming	c03129ae81	feat: Handover正常交接不支持不合格品	2025-01-10 09:40:51 +08:00
caoqianming	533e3e09dc	feat: wmserializer返回defect_name	2025-01-10 08:43:00 +08:00
caoqianming	8d923255fd	fix: mlog_submit提交的bug	2025-01-09 18:14:36 +08:00
caoqianming	ce7183ff17	fix: 不支持消耗物料的检验	2025-01-09 17:02:30 +08:00
caoqianming	0429ac6988	feat: mlogbin无需加载qct	2025-01-09 16:56:01 +08:00
caoqianming	4f1bbaa574	feat: mlogbin初始化质检表的bug	2025-01-09 16:37:30 +08:00
caoqianming	7a290f9af6	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server	2025-01-09 16:27:35 +08:00
caoqianming	88535650a7	fix: mlog submit中提交wprbug	2025-01-09 16:27:12 +08:00
zty	d1bd74fd5d	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server	2025-01-09 16:19:43 +08:00
zty	d60cc99b48	feat: wpm/sflog 增加enstat 数据	2025-01-09 16:19:39 +08:00
caoqianming	aca5cd8a63	fix: mlog submit defect_qs	2025-01-09 15:57:23 +08:00
caoqianming	56808f21ca	feat: mlog删除时同步删除ftest2	2025-01-09 15:42:12 +08:00
caoqianming	f241194c40	feat: mlog删除时同步删除ftest	2025-01-09 15:36:19 +08:00
caoqianming	37cce1664b	feat: mlog submit支持质检	2025-01-09 15:28:31 +08:00
caoqianming	180724bee5	Merge remote-tracking branch 'origin/master'	2025-01-09 14:17:07 +08:00
caoqianming	5b0063e42d	fix: mlogbin delete bug	2025-01-09 14:14:32 +08:00
zty	4a3934b4fd	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server	2025-01-09 13:36:58 +08:00
zty	07c996964d	feat: wpm/sflog 增加 enstat 数据	2025-01-09 13:36:54 +08:00
caoqianming	ef4a31c3a5	fix：MlogbwCreateUpdateSerializer bug2	2025-01-09 11:25:52 +08:00
caoqianming	d33678a603	fix：MlogbwCreateUpdateSerializer bug	2025-01-09 11:15:15 +08:00
caoqianming	6fbe0a7b1c	fix: mlogbw删除的bug	2025-01-09 10:51:04 +08:00
caoqianming	3c6aa3ea18	feat: 去除mlogbdefects2	2025-01-09 10:12:01 +08:00
caoqianming	860e2157b1	feat: 去除mlogbdefects2	2025-01-09 10:09:48 +08:00
caoqianming	3751b2f2e2	feat: 去除mlogbdefect	2025-01-09 10:07:51 +08:00
caoqianming	f209d1767d	feat: mlogbin也需要找寻质检表	2025-01-09 09:37:57 +08:00
caoqianming	bc44d0335a	feat: mlogbin删除时需要删除子集ftest记录2	2025-01-09 09:03:32 +08:00
caoqianming	b20dee64df	feat: mlogbin删除时需要删除子集ftest记录	2025-01-09 08:58:24 +08:00
caoqianming	51123ee0c5	feat: mlogbw增加质检保存bug	2025-01-09 08:43:32 +08:00
caoqianming	a20b15abed	feat: mlogbw增加质检统计3	2025-01-08 16:43:47 +08:00
caoqianming	396fcdd7cc	feat: mlogbw增加质检统计2	2025-01-08 16:34:13 +08:00
caoqianming	5f88433a25	feat: mlogbw增加质检统计	2025-01-08 16:21:18 +08:00
caoqianming	2331bec13b	feat: 增加MlogbDefect以进行统计	2025-01-08 15:02:41 +08:00
caoqianming	8eddeb4f70	fix: mlogb质检	2025-01-08 10:29:12 +08:00
caoqianming	95b98df8cf	fix: mlogb找寻质检表	2025-01-07 15:41:04 +08:00
caoqianming	7c9feb23ac	feat: mlogb添加qct字段以便调用检验表	2025-01-07 15:29:19 +08:00
caoqianming	98f4af2f8c	fix: 如果是主要输入物料且是主批次，才需生成输出3	2025-01-07 14:38:34 +08:00
caoqianming	abd6ca53f1	feat: Mlogb返回增加树型结构	2025-01-07 14:31:10 +08:00
caoqianming	e333b84c1b	feat: Mlogb添加parent字段	2025-01-07 14:24:00 +08:00
caoqianming	d3a304b918	feat: Mlogb的排序	2025-01-07 14:08:32 +08:00
caoqianming	011df65e4c	fix: 如果是主要输入物料且是主批次，才需生成输出	2025-01-07 14:07:25 +08:00
caoqianming	c8594aaa99	feat: wm添加route查询条件	2025-01-07 13:52:31 +08:00
caoqianming	ccac1aea87	feat: 如果是主要输入物料且是主批次，才需生成输出2	2025-01-07 13:23:55 +08:00
caoqianming	0e428f6c9d	feat: 如果是主要输入物料且是主批次，才需生成输出	2025-01-07 11:10:07 +08:00
caoqianming	9f56968385	fix: change_or_new该物料编号已存在不可使用	2025-01-06 16:12:33 +08:00
caoqianming	561fb94930	fix: MlogbwCreateUpdateSerializer validate bug	2025-01-06 14:56:17 +08:00
caoqianming	afb3b23486	feat: mlogbin自动创建mlogbout数量2	2025-01-06 14:09:10 +08:00
caoqianming	b454972943	feat: mlogbin自动创建mlogbout数量	2025-01-06 13:46:23 +08:00
caoqianming	49d1b95968	feat: handoverbw的处理2	2025-01-06 11:34:03 +08:00
caoqianming	26c7652095	feat: handoverbw的处理	2025-01-06 11:02:08 +08:00
caoqianming	fc56ecea08	fix: mlogbin创建mlogbw的错误2	2025-01-06 10:40:33 +08:00
caoqianming	84723967dc	fix: mlogbin创建mlogbw的错误	2025-01-06 10:33:33 +08:00
caoqianming	d784ac8a3c	feat: 生产日志追踪到个完善	2025-01-06 10:23:51 +08:00
caoqianming	437501b668	feat: mioitemw等增加wpr字段	2025-01-03 16:53:42 +08:00
caoqianming	8d0d5ebcd0	fix: 主要是wpmw change_or_new的修正	2025-01-03 14:37:57 +08:00
caoqianming	cd6e78961b	fix: def cal_mlogb_count bug	2025-01-02 17:14:56 +08:00
caoqianming	70e344ed68	feat: mlogrever支持单件回退	2025-01-02 16:29:09 +08:00
caoqianming	426be9d805	feat: 添加mlogbw接口	2025-01-02 15:36:55 +08:00
caoqianming	ba41228d69	fix: 生产提交支持单个物料	2025-01-02 14:01:09 +08:00
caoqianming	def67ebac5	fix: base 添加wpmw并支持出入库提交	2025-01-02 10:32:36 +08:00
caoqianming	1fd76611b6	fix: make_sflogs if start_time的bug	2024-12-29 00:34:32 +08:00
caoqianming	afc910a805	fix: make_sflogs bug	2024-12-27 15:29:57 +08:00
zty	cc8d9b1bf4	feat: enm/service 修改 service	2024-12-27 14:42:10 +08:00
zty	c08dff56bf	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server	2024-12-18 14:16:14 +08:00
zty	0df2506f26	feat: 修改 enm/qua_data 排序问题	2024-12-18 14:16:11 +08:00
caoqianming	7d2d74ee80	feat: 日志操作时对有ticket的进行处理	2024-12-17 13:37:22 +08:00
caoqianming	bdd644a527	fix: 日志撤销的同时将任务变更状态	2024-12-16 13:06:02 +08:00
zty	cdc70177bb	fix: sflog work_date 默认start_time.date	2024-12-13 17:32:56 +08:00
caoqianming	6ecf61706a	feat: 优化cal_exp_duration_sec	2024-12-11 18:16:03 +08:00
caoqianming	41b27c0113	feat: sflog save 保存team leader	2024-12-11 13:03:29 +08:00
caoqianming	13639568b1	feat: 回退make_sflogs中start_time缺班bug	2024-12-11 12:58:55 +08:00
caoqianming	6815babe0f	feat: get_team_x bug	2024-12-11 12:45:57 +08:00
zty	44af9bc494	feat : 修改排班规则	2024-12-11 12:18:09 +08:00
zty	e0915676e3	feat: enm/view service 修改聚合和煤粉热值 缓存失效时间。	2024-12-09 09:46:51 +08:00
caoqianming	6da1b14e7b	feat: stlog部分字段设置为非必填	2024-12-06 17:59:28 +08:00
caoqianming	152b0b5a3a	feat: 忽略10s内的停机	2024-12-06 17:24:07 +08:00
caoqianming	17622f230e	feat: 根据排班规则填入班组	2024-12-05 18:59:55 +08:00
zty	4c732894df	feat: wpm 排班修改	2024-12-05 18:19:58 +08:00
zty	918df6b345	feat: 新增tkx 测点 聚合	2024-12-05 15:22:33 +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
caoqianming	b93c4bddeb	feat: 触发批次分析统计	2024-12-03 18:07:23 +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	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	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