3260 Commits

Author	SHA1	Message	Date
caoqianming	cde3d68d7f	fix: wmaterial search bug2	2025-03-20 09:34:59 +08:00
caoqianming	d136f96bcc	fix: wmaterial search bug	2025-03-20 09:33:11 +08:00
caoqianming	77f411887a	feat: mio utask number非必填	2025-03-20 09:30:33 +08:00
caoqianming	48988d3237	fix: wmaterial 去除 material__process__exclude 字段	2025-03-20 09:09:41 +08:00
caoqianming	1761dcdf6d	feat: mioitemcreate 增加校验	2025-03-19 18:51:31 +08:00
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	b9b418e81f	feat: FtestWorkCreateUpdateSerializer defect非必填	2025-03-19 11:17:20 +08:00
caoqianming	6d435a21e4	feat: base route支持iframe	2025-03-19 08:59:36 +08:00
caoqianming	f92c696a9e	feat: base get_user_route排序增加create_time	2025-03-19 08:14:16 +08:00
caoqianming	982fa7f373	fix: mlogbupdate serializer	2025-03-18 14:35:11 +08:00
caoqianming	2238ab119d	feat: mpoint增加存储表达式用于决定是否存储	2025-03-18 14:15:22 +08:00
caoqianming	70c415aa1f	feat: mlogbinserializer update也进行支持	2025-03-18 13:58:49 +08:00
caoqianming	da3c672dd1	feat: qm增加最大不合格率字段	2025-03-18 13:43:15 +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	c44b71b847	feat: 默认密码从get_sysconfig获取	2025-03-18 10:07:23 +08:00
caoqianming	64af59d22d	fix: kingclient 优化	2025-03-17 16:32:56 +08:00
caoqianming	2b1d22df85	feat: pm改成小数字段	2025-03-17 10:45:33 +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	8928bb4307	fix: wpr delete在撤销时可以触发	2025-03-14 18:19: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	43ca73ab15	feat: 添加update_dict函数	2025-03-14 16:02:06 +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	20e431cb7d	feat: mtask添加筛选条件	2025-03-14 14:16:54 +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	143408ab4f	feat: 添加mes的清空数据操作	2025-03-14 09:05:31 +08:00
caoqianming	dcfa6155a9	feat: 调整wpmw允许编号重复	2025-03-14 09:02:49 +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	71b67b7210	feat: miodo 所属部门可不编辑	2025-03-13 09:56:15 +08:00
caoqianming	c0ffb175a9	feat: wpmw number允许重复	2025-03-12 16:10:44 +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	9a7230d752	feat: 自动生成任务编号	2025-03-12 09:35:24 +08:00
caoqianming	5a05710ff2	feat: 增加mlogbw_to以进行追踪	2025-03-12 09:23:38 +08:00
caoqianming	c74de4ef21	fix: mio自动生成编号	2025-03-11 13:25:11 +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	fd26a65966	feat: qct get bug	2025-03-07 09:20:41 +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	4f60483a49	feat: qct get_qs接口 bug	2025-03-06 15:35:19 +08:00
caoqianming	0d45c380c0	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server	2025-03-06 15:26:14 +08:00
caoqianming	767896f3dc	feat: qct get_qs接口	2025-03-06 15:26:11 +08:00
caoqianming	3a1ed151c7	feat: qctdefect 返回时添加defect_okcate	2025-03-06 14:20:26 +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
zty	c8ba7dc563	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server	2025-03-05 18:36:10 +08:00
zty	0dd62244ab	feat: 修改采集更新时间换成 data_time	2025-03-05 18:36:07 +08:00
caoqianming	62d2c8b21e	feat: inm batch textfield	2025-03-04 18:08:52 +08:00
caoqianming	47976de657	feat: 使用身份证强校验函数	2025-03-04 16:27:00 +08:00
caoqianming	a8ce6c3989	feat: base 添加身份证校验函数	2025-03-04 16:26:35 +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	71cbda504c	fix: ftestwork validate bug	2025-03-04 09:07:30 +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	5245689ec2	feat: ftestwork create update serializer	2025-03-03 16:17:52 +08:00
caoqianming	8fdd56555f	feat: testitem description可为空	2025-03-03 15:53:00 +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	fac85d17d2	feat: defect code设置为非必填	2025-02-28 09:50:30 +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	d69d4568f6	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server	2025-02-27 16:59:24 +08:00
caoqianming	8c4b11d9c9	feat: mb添加查询条件state	2025-02-27 16:59:20 +08:00
zty	ea5e041575	feat: enm/task 修改班时校正	2025-02-27 14:28:32 +08:00
caoqianming	bf35064f6e	feat: 优化em增加采集数据方法	2025-02-27 12:37:17 +08:00
caoqianming	d30ecabd16	feat: em增加采集数据方法2	2025-02-27 12:24:27 +08:00
caoqianming	1925e3e5d6	feat: em增加采集数据方法	2025-02-27 11:34:19 +08:00
caoqianming	1dbb07ddcb	feat: route支持传入material_out_tracking 2	2025-02-26 17:37:29 +08:00
caoqianming	d1c15b0b2e	feat: route支持传入material_out_tracking	2025-02-26 17:36:52 +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	ccce92f9f6	feat: testitem添加采集表达式	2025-02-26 09:19:48 +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	571e11cc8c	feat: wpr修改排序按number	2025-02-25 15:57:43 +08:00
caoqianming	73bc1bac2e	fix: wpr number需要唯一	2025-02-25 15:42:46 +08:00
caoqianming	3ce03827bf	fix: 出入库change_or_new要处理ftest	2025-02-25 15:10:43 +08:00
caoqianming	2e9f858205	fix: cal_real_task_count 在子任务数量上错误	2025-02-25 15:05:54 +08:00
caoqianming	0e96485fae	feat: mioitem添加count_tested	2025-02-25 10:33:22 +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	af999467db	fix: 去除materialbatch的数据库约束	2025-02-21 17:23:28 +08:00
caoqianming	a1525d1289	fix: mb create加锁	2025-02-21 17:05:50 +08:00
caoqianming	07473ddf90	feat: mio出入库支持选入mioitemw	2025-02-21 11:01:47 +08:00
caoqianming	74a7025f6c	feat: wm_in 在mlogbin时必填	2025-02-20 17:02:36 +08:00
caoqianming	7200bc45b3	fix: do_in xmaterial的type error	2025-02-20 14:48:18 +08:00
caoqianming	7b484a65cd	feat: route添加document字段	2025-02-19 15:35:15 +08:00
caoqianming	c585f2fc11	feat: mlogbin支持mtask非必填	2025-02-19 14:29:55 +08:00
caoqianming	5f0d34f9c3	feat: route添加parent字段以支持子步骤	2025-02-19 14:02:29 +08:00
caoqianming	f741eda285	feat: 七车间入库_仓库执行人 remove None	2025-02-18 17:45:42 +08:00
caoqianming	f5229ab8cb	feat: ftestwork_submit 时根据工段配置生成不合格品	2025-02-18 11:09:49 +08:00
caoqianming	b062d7ef6b	fix: cal_material_count 挪到单独文件里	2025-02-18 11:03:22 +08:00
caoqianming	56d49b4d26	fix: cal_material_count 只统计合格品	2025-02-18 10:56:09 +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	7b87e79bf5	feat: 部分app model注释	2025-02-18 09:02:28 +08:00
caoqianming	855ca9b054	feat: wpm和wpmw表添加doc2	2025-02-17 16:57:50 +08:00
caoqianming	12c6cc0d17	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server	2025-02-17 16:17:09 +08:00
caoqianming	89642fb194	feat: wpm和wpmw表添加doc	2025-02-17 16:17:06 +08:00
zty	7544efdc1e	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server	2025-02-17 15:35:24 +08:00
zty	095a6f9d51	feat: enm/task view 修改校正测试 增加能修改 天和月的时间类型	2025-02-17 15:35:21 +08:00
caoqianming	9f558acedb	feat: base execute_raw_sql时允许不返回值	2025-02-17 14:37:30 +08:00
caoqianming	57e6e23e95	feat: equip添加采集数据请求字段	2025-02-17 14:35:43 +08:00
caoqianming	8cbb921969	feat: 光子棒管综合统计添加数据	2025-02-17 11:24:43 +08:00
caoqianming	e6b27950b2	feat: ftestitem增加检测设备字段	2025-02-17 09:34:48 +08:00
caoqianming	61525d236e	feat: qct detail是检测项按顺序返回	2025-02-14 10:56:40 +08:00
caoqianming	d7361a71df	perf: 优化has_envdata的sql查询2	2025-02-13 13:26:32 +08:00
caoqianming	61f9dc3b51	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server	2025-02-13 11:26:30 +08:00
caoqianming	dbbdaa89b9	perf: 优化has_envdata的sql查询	2025-02-13 11:26:27 +08:00
zty	5ecb3341e0	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server	2025-02-12 17:34:09 +08:00
zty	5f85d0273c	feat: 修改enm/task	2025-02-12 17:34:04 +08:00
caoqianming	9d27ccd1dc	fix: base get_user_route 路由重复的问题	2025-02-12 15:10:20 +08:00
caoqianming	861bb03469	feat: wpmw添加字段	2025-02-12 15:10:00 +08:00
caoqianming	a88f7e282e	feat: Ptest不指定testitem	2025-02-11 14:53:26 +08:00
caoqianming	7dc11e032d	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server	2025-02-11 14:40:41 +08:00
caoqianming	ac41f5a105	fix: 粗中细磨的统计要涵盖粗磨和粗中磨的数据	2025-02-11 14:40:38 +08:00
zty	f7d6f59fcd	feat: 修改 enm 回转窑产量计算	2025-02-11 14:24:59 +08:00
caoqianming	44486b64a3	feat: mlogbw的输出不允许删除	2025-02-11 11:12:14 +08:00
caoqianming	f8416d91b6	feat: 增加mio返回is_tested	2025-02-10 18:19:06 +08:00
caoqianming	b8c0a9b420	fix: 车间执行人和仓库人问题	2025-02-10 15:57:40 +08:00
caoqianming	1a3e428195	feat: do_in 支持wpr	2025-02-08 15:31:35 +08:00
caoqianming	33f162fa3a	fix: do_in 的bug	2025-02-08 14:49:30 +08:00
caoqianming	8838227919	feat: wpr增加查询条件	2025-02-08 14:26:21 +08:00
caoqianming	957938f8dd	feat: mpoint添加search字段	2025-02-08 11:09:58 +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	2843905def	feat: 默认密码从conf中读取	2025-02-08 09:41:49 +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	77a50ae162	feat: route添加material筛选条件	2025-02-06 16:40:42 +08:00
caoqianming	1b2f201786	feat: 入厂和作业时进行证书过期校验	2025-02-06 09:21:20 +08:00
caoqianming	171348fbbd	feat: base 短信发送读取配置	2025-02-05 17:24:08 +08:00
caoqianming	b1a574051c	feat: examrecord添加查询条件	2025-02-05 17:19:58 +08:00
caoqianming	6cd55f8460	feat: certificate添加state字段及其处理	2025-02-05 14:41:32 +08:00
caoqianming	821b88eb90	feat: handover submit支持改版	2025-02-05 10:55:21 +08:00
caoqianming	66e4273b97	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server	2025-02-05 09:54:31 +08:00
caoqianming	8a2e409c8a	feat: 增加改版交接类型	2025-02-05 09:54:22 +08:00
zty	abf50b97b8	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server	2025-02-05 09:20:49 +08:00
zty	2f46f9e31a	feat: 修改qm 增加rate_pass 目标值	2025-02-05 09:20:47 +08:00
caoqianming	7740613cf7	feat: testitem删除校验	2025-01-24 16:19:59 +08:00
zty	1d22dd983a	feat: qm/ task view 增加 rate_pass_t 设置合格率目标值	2025-01-23 11:15:25 +08:00
caoqianming	f88689cc1e	feat: 增加addto_wpr字段配置以在wpr表里添加额外信息	2025-01-22 13:51:03 +08:00
caoqianming	3e93fce213	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server	2025-01-22 10:15:07 +08:00
caoqianming	89449eb7c6	feat: mlogbin 只校验主批是否重复	2025-01-22 10:14:49 +08:00
zty	e0f7ce4636	feat: qm 合格率设置阈值	2025-01-21 15:15:24 +08:00
zty	4254e226d3	feat: enm/view 修改correct 增加不能校正当日或当月数据	2025-01-21 12:45:51 +08:00
zty	fa18fee720	feat：remove 碳排放强度计算和字段	2025-01-21 09:40:52 +08:00
zty	bec6600089	feat: enm/model 增加碳排放强度 和 碳排放量字段与 task 计算逻辑	2025-01-21 09:24:58 +08:00
caoqianming	4927afa9b7	feat: 工艺路线复制按钮	2025-01-20 15:43:04 +08:00
caoqianming	688b3fc3d1	feat: ftest增加筛选条件	2025-01-20 13:51:13 +08:00
caoqianming	fd5747f99c	feat: wpr change时变更defectbug	2025-01-20 11:03:25 +08:00
caoqianming	4b7ee277f1	feat: 撤回时部分恢复缺陷项	2025-01-20 10:55:10 +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	f004417d49	fix: ftest增加defect_main的后续逻辑变更 bug	2025-01-17 17:18:26 +08:00
caoqianming	4699b31f83	feat: ftest增加defect_main的后续逻辑变更	2025-01-17 16:52:14 +08:00
caoqianming	6737d3f0f4	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server	2025-01-17 16:38:28 +08:00
caoqianming	d9a5720cc6	feat: ftest添加主要缺陷字段	2025-01-17 16:38:15 +08:00
zty	cd652f3696	feat:enm/service 修改translate_eval_formula	2025-01-17 16:08:27 +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	6bcafcad3a	fix: 变更单件产品的属性问题3	2025-01-17 10:19:58 +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	7605574f37	fix: update_mb_item bug	2025-01-17 09:29:33 +08:00
caoqianming	7382eed0b6	fix: 修改mioitemw的外键名字	2025-01-17 08:58:44 +08:00
caoqianming	31f2fdde84	fix: 采购入库支持检验3	2025-01-16 17:30:53 +08:00
caoqianming	2f259bd5f3	feat: 采购入库支持检验2	2025-01-16 17:15:38 +08:00
caoqianming	8bcd6b4f69	feat: 采购入库支持检验	2025-01-16 17:09:01 +08:00
caoqianming	adf3341f4b	feat: testitem添加process查询条件	2025-01-16 15:27:47 +08:00
caoqianming	ae2ba421f8	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server	2025-01-16 15:01:02 +08:00
caoqianming	13418e9b1a	feat: ftest增加筛选mlogbw_ftest__wpr	2025-01-16 15:00:42 +08:00
zty	ae5cf55e9b	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server	2025-01-16 13:56:24 +08:00
zty	b8b1167f17	feat: 增加氨水液位计 绑定字段up_down 计算方式	2025-01-16 13:56:20 +08:00
caoqianming	7efdc2c316	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server	2025-01-16 11:30:40 +08:00
caoqianming	161d72094f	feat: testitemserializer返回process_name	2025-01-16 11:28:35 +08:00
zty	9c3cf5a534	feat: enm/service 修改传入公式，校正计算测点	2025-01-16 11:18:36 +08:00
caoqianming	0dbbc9beb2	feat: testitem增加type筛选条件	2025-01-16 10:34:42 +08:00
caoqianming	e59a5894f3	fix: mlogbin allow_empty	2025-01-16 10:17:35 +08:00
caoqianming	baef2c586a	feat: testitem支持操作项	2025-01-16 10:01:00 +08:00
caoqianming	6ea24b6b1c	feat: MlogbInSerializer wm_in allow_blank False	2025-01-16 09:27:06 +08:00
caoqianming	24bdb818a5	feat: 采购入库才可进行检验	2025-01-16 08:34:59 +08:00
caoqianming	923ac2276c	feat: 隐式物料不可出入库	2025-01-15 17:13:28 +08:00
caoqianming	a7b14994b7	feat: mioitemw添加ftest字段	2025-01-15 16:07:53 +08:00
caoqianming	84e1aca814	feat: ftest增加type选项	2025-01-15 15:20:12 +08:00
caoqianming	a2a89a0785	feat: 增加mioitemw的update	2025-01-15 15:02:19 +08:00
caoqianming	5409f5d55d	feat: mioitemw test	2025-01-15 13:37:28 +08:00
caoqianming	5b977d4cf9	fix: pmservice cal_real_task_count	2025-01-14 12:37:42 +08:00
caoqianming	620ed2e19e	fix: mioserializer add mio_user	2025-01-14 11:35:34 +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	e76b3dcd69	fix: ftestwork submit wm需要扣减bug3	2025-01-14 08:36:48 +08:00
caoqianming	f9bd8a3607	fix: ftestwork submit wm需要扣减bug2	2025-01-13 18:04:18 +08:00
caoqianming	f84b8b33b8	fix: ftestwork submit wm需要扣减bug	2025-01-13 17:41:59 +08:00
caoqianming	582cf99a58	fix: ftestwork create bug ins	2025-01-13 17:36:13 +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	77faee5d1a	fix: qm cal_count bug	2025-01-13 17:21:39 +08:00
caoqianming	ced8692585	feat: handoverserializer 优化	2025-01-13 16:12:18 +08:00
caoqianming	0931835708	feat: wpr返回详情	2025-01-13 16:10:11 +08:00
caoqianming	fbd424fce9	feat: labelmat返回defect_name	2025-01-13 14:58:36 +08:00
caoqianming	045183301b	feat: labelmat添加字段	2025-01-13 14:36:27 +08:00
caoqianming	23b837c784	feat: festworkdefect submit操作	2025-01-13 14:05:00 +08:00
caoqianming	14d785656d	feat: ftestworkdefect同步数据库	2025-01-13 11:32:26 +08:00
caoqianming	69daa63ea6	feat: ftestwork的submit支持defect	2025-01-13 11:23:42 +08:00
caoqianming	942e54a7e4	feat: ftestwork支持ftestworkdefect	2025-01-13 09:39:18 +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	2da98efca8	feat: wpr list 返回 defect详情	2025-01-10 09:20:41 +08:00
caoqianming	e77dee956f	feat: FtestProcessSerializer 更严谨	2025-01-10 08:49:25 +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