 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 |