3017 Commits

Author	SHA1	Message	Date
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	348464598e	fix：MlogbwCreateUpdateSerializer bug3	2025-01-09 12:28:55 +08:00
caoqianming	58aa629648	fix：MlogbwCreateUpdateSerializer bug3	2025-01-09 11:36:18 +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	868b37559f	fix: FtestProcessSerializer的bug	2025-01-09 10:18:44 +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	22ff47a6ba	feat: init_by_qct	2025-01-08 12:17:59 +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	38aa64df12	feat: 检测编号改为textfield	2025-01-07 15:37:14 +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	f8c72a1487	feat: 增加routemat表	2025-01-07 09:50:44 +08:00
caoqianming	3efeb746dc	feat: wprlist增加筛选条件	2025-01-07 08:38:47 +08:00
caoqianming	8afbc9a0b5	feat: wprlist默认排除已消耗的2	2025-01-06 17:08:48 +08:00
caoqianming	0673580d3b	feat: wprlist默认排除已消耗的	2025-01-06 17:06:00 +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	f8b056cadb	feat: mioitemw为1个时自动创建2	2025-01-03 17:50:05 +08:00
caoqianming	53f3f25030	feat: mioitemw为1个时自动创建	2025-01-03 17:46:18 +08:00
caoqianming	38978c9dea	feat: mioitem增加wm和mb字段	2025-01-03 17:33:08 +08:00
caoqianming	437501b668	feat: mioitemw等增加wpr字段	2025-01-03 16:53:42 +08:00
caoqianming	84525c03c8	feat: wpr增加返回信息及筛选条件	2025-01-03 15:39:13 +08:00
caoqianming	a151baaedd	feat: 增加清洗数据的接口	2025-01-03 15:21:16 +08:00
caoqianming	2790bddefa	feat: wpr注册到路由	2025-01-03 15:20:29 +08:00
caoqianming	86007d0ad4	fix: MIOItemwSerializer修改	2025-01-03 15:19:44 +08:00
caoqianming	8d0d5ebcd0	fix: 主要是wpmw change_or_new的修正	2025-01-03 14:37:57 +08:00
caoqianming	726946979c	Merge remote-tracking branch 'origin/master'	2025-01-02 17:16:16 +08:00
caoqianming	cd6e78961b	fix: def cal_mlogb_count bug	2025-01-02 17:14:56 +08:00
zty	f2e5ce1d8d	feat: enm 修改测点缓存 已存在	2025-01-02 16:33:27 +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	0a2f671f0f	feat: materialsimpleserializer增加返回字段	2025-01-02 14:50:47 +08:00
caoqianming	ba41228d69	fix: 生产提交支持单个物料	2025-01-02 14:01:09 +08:00
caoqianming	2c107d4050	fix: 生产领料支持单个	2025-01-02 11:32:11 +08:00
caoqianming	82070c2bf1	feat: 生产领料支持单个	2025-01-02 11:28:16 +08:00
caoqianming	09716d07fd	fix: 修改wpdefect为wprdefect	2025-01-02 10:49:49 +08:00
caoqianming	64fc04d368	fix: 先注释mioitemw	2025-01-02 10:44:53 +08:00
caoqianming	37a6f37af5	feat: wproducts统一用wprs	2025-01-02 10:41:42 +08:00
caoqianming	def67ebac5	fix: base 添加wpmw并支持出入库提交	2025-01-02 10:32:36 +08:00
caoqianming	73b1d58b8a	fix: base 添加wpmw app以追踪到个	2025-01-02 09:37:37 +08:00
caoqianming	796d6e248f	fix: base materialbatch添加字段	2025-01-02 09:35:18 +08:00
caoqianming	89cbab8258	fix: base CustomRetrieveModelMixin支持添加add_info	2024-12-31 15:31:54 +08:00
caoqianming	83d8889b5e	fix: base safe_get_or_create使用分布式锁	2024-12-31 15:28:28 +08:00
caoqianming	d3a35fac31	feat: mioitemwtest 接口	2024-12-31 10:53:46 +08:00
caoqianming	1072621301	fix: 优化safe_get_or_create以处理并发4	2024-12-31 09:18:01 +08:00
caoqianming	f6fe704f65	feat: MIOItemCreateSerializer wproducts设置为非必填	2024-12-31 08:57:13 +08:00
caoqianming	b50cbcbc92	fix: 添加mioitemw	2024-12-31 08:50:23 +08:00
caoqianming	7621be49b6	feat: 添加mioitemw	2024-12-31 08:45:52 +08:00
caoqianming	afe710e248	fix: 优化safe_get_or_create以处理并发3	2024-12-30 17:48:21 +08:00
caoqianming	20d648957a	feat: 重跑计算时添加日志	2024-12-30 15:15:42 +08:00
caoqianming	b6cfaf45ae	fix: 优化safe_get_or_create以处理并发2	2024-12-30 14:28:38 +08:00
caoqianming	ac7c3cd29c	feat: mpoint增加筛选条件	2024-12-30 14:23:02 +08:00
caoqianming	564d8e1796	feat: base 优化safe_get_or_create以处理并发	2024-12-30 10:24:12 +08:00
caoqianming	2d42a485af	feat: 通过给定时间获取班年月日	2024-12-30 10:01:10 +08:00
caoqianming	2197480831	feat: 优化safe_get_or_create以处理并发	2024-12-29 11:31:22 +08:00
caoqianming	1fd76611b6	fix: make_sflogs if start_time的bug	2024-12-29 00:34:32 +08:00
caoqianming	9c2e940994	fix: get_mgroup_goals 可复用去年数据3	2024-12-29 00:01:34 +08:00
caoqianming	9b44d2c398	fix: get_mgroup_goals 可复用去年的数据2	2024-12-28 23:32:14 +08:00
caoqianming	a310185c9d	feat: get_mgroup_goals 可复用去年的数据	2024-12-28 23:22:50 +08:00
caoqianming	28c7cf5375	feat: 增加goal返回code	2024-12-28 12:30:59 +08:00
caoqianming	cd2f6eb77a	feat: 原料磨用code处理	2024-12-27 17:16:48 +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
caoqianming	7f4acd2370	fix: objects.get_or_create 变更为safe_get_or_create用于解决并发冲突	2024-12-27 09:17:30 +08:00
caoqianming	7a6dc733f7	fix: cal_quastat_sflog 用sflog.work_date进行抽取年月日	2024-12-26 13:12:14 +08:00
caoqianming	1e4e80879f	feat: 添加计算系数后的enm task修改	2024-12-25 15:24:26 +08:00
caoqianming	4b5308b0cc	feat: 增加cal_coefficient_method 字段	2024-12-25 15:09:03 +08:00
caoqianming	aae5c909c5	feat: enm mpoint 添加计算系数字段	2024-12-25 14:06:57 +08:00
zty	5a41aee253	feat: 生产qm 迁移文件	2024-12-25 10:17:05 +08:00
shijing	0c340bebcd	fix:defect添加note	2024-12-25 10:13:44 +08:00
caoqianming	039cb3108b	fix: mpointstat safe_get_or_create	2024-12-24 22:08:43 +08:00
caoqianming	43509aa25a	feat: mpointstat safe_get_or_create	2024-12-24 21:59:41 +08:00
caoqianming	a8f9583f7f	feat: 增加safe_get_or_create方法	2024-12-24 21:58:53 +08:00
caoqianming	71ab520f3e	fix: enstat_cen_consume_unit change bug	2024-12-24 18:35:04 +08:00
caoqianming	4a642b9014	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server	2024-12-24 18:20:52 +08:00
caoqianming	f90bcd530b	feat: 变更enstat排序	2024-12-24 18:20:40 +08:00
zty	13c4fb6663	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server	2024-12-24 18:09:03 +08:00
zty	bcaa69ab30	feat：task 修改 更新 bill_date	2024-12-24 18:09:01 +08:00
caoqianming	841ece1d4f	feat: 工段计算公式校正	2024-12-24 17:54:46 +08:00
zty	f5fd9558ba	feat: 修改 task bill_date	2024-12-24 15:49:20 +08:00
zty	aa3ba099be	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server	2024-12-24 09:26:59 +08:00
zty	978d8f3577	feat: 增加定时任务 每天更新bill_date(出厂水泥采集)	2024-12-24 09:26:57 +08:00
caoqianming	27e3dfa3b3	feat: db_ins_mplogx bill_date bug	2024-12-23 18:31:02 +08:00
caoqianming	cbcba52ff4	fix: QctTestItemSerializer 细化返回信息	2024-12-23 15:55:53 +08:00
caoqianming	91dacba668	fix: QctDetailSerializer bug	2024-12-23 15:29:10 +08:00
caoqianming	4eb8aeca96	feat: qct增加筛选条件	2024-12-23 10:52:14 +08:00
caoqianming	f4c84f0354	feat: testitem add_info_for_list	2024-12-20 17:49:40 +08:00
caoqianming	4ab711cc71	feat: formula 调整到testitem	2024-12-20 15:46:32 +08:00
caoqianming	7fa065ce88	feat: QctTestItem 增加字段	2024-12-20 14:42:03 +08:00
caoqianming	b289c7813e	feat: qct 重构	2024-12-19 15:10:12 +08:00
caoqianming	796cdbc615	feat: base listmixin描述去除	2024-12-19 11:07:08 +08:00
caoqianming	1647b2f06e	fix: 增加检测模板功能字段 bug	2024-12-19 11:04:16 +08:00
caoqianming	e7c08dc16c	fix: 增加检测模板功能QctItemSerializer bug	2024-12-19 10:12:24 +08:00
caoqianming	468f5ffdbf	feat: 增加检测模板功能	2024-12-19 10:11:27 +08:00
caoqianming	c58be8cdc3	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server	2024-12-18 14:53:33 +08:00
caoqianming	ddb517d1f8	feat: material增加tracking字段	2024-12-18 14:53:21 +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	e62f7e5a9c	feat: cal_real_task_count 纳入div_number	2024-12-18 11:08:42 +08:00
caoqianming	92145451e3	feat: route增加div_number字段3	2024-12-18 09:08:25 +08:00
caoqianming	2a5926f95b	feat: route增加div_number字段2	2024-12-18 09:06:55 +08:00
caoqianming	f653c2c191	feat: route增加div_number字段	2024-12-18 09:06:11 +08:00
caoqianming	7937a632a0	feat: process增加mtype	2024-12-17 17:20:54 +08:00
caoqianming	7d2d74ee80	feat: 日志操作时对有ticket的进行处理	2024-12-17 13:37:22 +08:00
caoqianming	c3338d05c2	feat：ftestwork_audit_end时get_alldata_with_batch_and_store	2024-12-17 13:31:53 +08:00
caoqianming	7ad5bad137	feat: defect create update时进行限制	2024-12-17 13:28:29 +08:00
caoqianming	9a14216b78	feat: qm增加defect	2024-12-17 09:42:11 +08:00
caoqianming	8928c0b7aa	feat: base get_user_route 排除route_name为空的	2024-12-16 17:02:54 +08:00
caoqianming	c0136400d6	feat: get_user_route 排除path为空的	2024-12-16 16:51:53 +08:00
caoqianming	bdd644a527	fix: 日志撤销的同时将任务变更状态	2024-12-16 13:06:02 +08:00
caoqianming	7e578b52c2	feat: 调整permission以支持后端路由2	2024-12-16 08:50:48 +08:00
caoqianming	28d89176e6	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server	2024-12-13 18:09:45 +08:00
caoqianming	5572b4cb0f	feat: enstat update权限	2024-12-13 18:09:29 +08:00
zty	c1e958f2f9	feat: enstate note makemigration	2024-12-13 17:46:28 +08:00
zty	d364a0ae1e	fix: enstatupdateserializer	2024-12-13 17:41:50 +08:00
zty	15950dacf9	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server	2024-12-13 17:32:59 +08:00
zty	cdc70177bb	fix: sflog work_date 默认start_time.date	2024-12-13 17:32:56 +08:00
caoqianming	005b5c1057	feat: 增加enstat note字段	2024-12-13 17:05:02 +08:00
zty	e331002538	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server	2024-12-13 15:29:13 +08:00
zty	62a177b773	feat:登入 记录IP 和 增加每日的能源统计定时任务	2024-12-13 15:29:10 +08:00
caoqianming	da54222e20	feat: 调整permission以支持后端路由	2024-12-13 13:01:10 +08:00
caoqianming	a2f676e58c	feat: 增加userfullinfoserializer	2024-12-13 12:59:20 +08:00
caoqianming	1a296e8e30	feat: process添加工序类型	2024-12-12 15:17:26 +08:00
caoqianming	765bcc39de	feat: ftestwork添加ticket审批并编写绑定函数	2024-12-12 14:42:50 +08:00
caoqianming	a432dca39b	feat: mgroup添加查询条件	2024-12-12 11:18:07 +08:00
caoqianming	80fd2090ad	feat: 工段添加code标识	2024-12-12 11:10:01 +08:00
caoqianming	0f920bae99	feat: 信号更新设备状态冲突时优先处理监测设备	2024-12-12 09:28:08 +08:00
caoqianming	6ecf61706a	feat: 优化cal_exp_duration_sec	2024-12-11 18:16:03 +08:00
caoqianming	aadb9fdf2c	feat: mpoint增加is_rep_ep0_running_state字段	2024-12-11 18:14:08 +08:00
caoqianming	c79cc14f46	feat: mpoint增加is_rep_ep0_running_state字段	2024-12-11 17:54:45 +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	4791716ec9	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server	2024-12-11 12:18:11 +08:00
zty	44af9bc494	feat : 修改排班规则	2024-12-11 12:18:09 +08:00
caoqianming	d349970a47	doc: 删除一部分print语句	2024-12-11 08:41:35 +08:00
zty	e6cad72807	feat: enm 增加氨水消耗量	2024-12-10 14:12:16 +08:00
zty	e0915676e3	feat: enm/view service 修改聚合和煤粉热值 缓存失效时间。	2024-12-09 09:46:51 +08:00
caoqianming	1b3bfabd55	feat: mpoint增加查询条件	2024-12-06 19:26:38 +08:00
caoqianming	2f35b78604	feat: 调整enstat和mpointstat排序	2024-12-06 18:23:44 +08:00
caoqianming	6da1b14e7b	feat: stlog部分字段设置为非必填	2024-12-06 17:59:28 +08:00
caoqianming	05beed5146	feat: enm enstat调整一下排序	2024-12-06 17:26:08 +08:00
caoqianming	152b0b5a3a	feat: 忽略10s内的停机	2024-12-06 17:24:07 +08:00
caoqianming	3cfc4393de	feat: mpointvalues 聚合查询bug	2024-12-06 15:05:06 +08:00
caoqianming	9c0160f556	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server	2024-12-06 14:46:28 +08:00
caoqianming	0cf481a69b	feat: enm end_time 查询包前不包后	2024-12-06 14:46:26 +08:00
zty	3901a57986	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server	2024-12-06 13:55:50 +08:00
zty	8c059fabe4	feat: enm/view 增加一个返回字段（峰谷平用）	2024-12-06 13:55:47 +08:00
caoqianming	438406842d	feat: enstat提供排序条件2	2024-12-06 13:25:36 +08:00
caoqianming	3ba0ddaaa9	feat: enstat提供排序条件	2024-12-06 13:24:06 +08:00
caoqianming	a464ee6ecf	feat: Equip filter增加state_measure2	2024-12-06 11:12:12 +08:00
caoqianming	f8976e9fe8	feat: Equip filter增加state_measure	2024-12-06 10:50:08 +08:00
caoqianming	17622f230e	feat: 根据排班规则填入班组	2024-12-05 18:59:55 +08:00
zty	2b10f3bfff	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server	2024-12-05 18:20:01 +08:00
zty	4c732894df	feat: wpm 排班修改	2024-12-05 18:19:58 +08:00
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