 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 |
|
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 |
|
caoqianming
|
c546e25808
|
fix: base get_alld_perms 传参
|
2024-10-09 14:18:11 +08:00 |
|
caoqianming
|
f347630981
|
feat: base 优化permission缓存处理
|
2024-10-09 13:57:35 +08:00 |
|
caoqianming
|
bc77137093
|
feat: base perm变动时出发get_alld_perms
|
2024-10-09 13:56:20 +08:00 |
|
caoqianming
|
552055e6c5
|
feat: base 启动时缓存perms_alld_list
|
2024-10-09 13:55:41 +08:00 |
|
caoqianming
|
5e38f96925
|
feat: base CustomGenericViewSet 初始化优化
|
2024-10-09 13:47:11 +08:00 |
|
caoqianming
|
71ac63bdaf
|
feat: base 添加全局线程池
|
2024-10-09 13:46:38 +08:00 |
|
zty
|
74ece85b0a
|
fix: import edge_tts 在函数中引入
|
2024-10-09 10:00:46 +08:00 |
|
zty
|
7f9e2ad616
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2024-10-09 09:29:12 +08:00 |
|
zty
|
66af6475d9
|
feat: 修改采集时候出现0的处理
|
2024-10-09 09:26:29 +08:00 |
|
caoqianming
|
7c71eafa41
|
feat: 添加edge-tts语音生成
|
2024-10-08 15:10:59 +08:00 |
|
caoqianming
|
494b078a09
|
feat: save_voice_and_speak 优化
|
2024-10-08 15:10:42 +08:00 |
|
caoqianming
|
40c6479cf3
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2024-10-08 12:58:19 +08:00 |
|
caoqianming
|
4f73aa2030
|
feat: 检查相关方人员门禁到期设为离职
|
2024-10-08 12:58:17 +08:00 |
|
zty
|
924d7f2b61
|
feat: 百度语音的配置
|
2024-09-30 17:05:43 +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
|
9c6e8f5992
|
fix: 电表水表0值处理
|
2024-09-30 16:21:18 +08:00 |
|
zty
|
956500d3aa
|
fix :enm/serializer round
|
2024-09-26 15:56:18 +08:00 |
|
zty
|
9a3e15f926
|
feat: 优化mgroup_run_change
|
2024-09-26 11:51:36 +08:00 |
|
zty
|
9f90d84244
|
fix: em/bug
|
2024-09-26 11:02:59 +08:00 |
|
zty
|
7517da3e92
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2024-09-25 16:04:03 +08:00 |
|
zty
|
008219e9ba
|
fix : em enm wpm 修改更新设备运行状态
|
2024-09-25 16:03:59 +08:00 |
|
caoqianming
|
c0cb51a5b5
|
feat: utask生产任务提交
|
2024-09-25 13:24:48 +08:00 |
|
caoqianming
|
73aa186293
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2024-09-24 10:24:53 +08:00 |
|
caoqianming
|
49712b8211
|
feat: mio添加mgroup查询条件
|
2024-09-24 10:24:51 +08:00 |
|
zty
|
dd3c0d6f6b
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2024-09-23 10:04:46 +08:00 |
|
zty
|
d5e48c1ab8
|
fix: enm、fim 修改费用过滤和能源加入班组开始结束时间
|
2024-09-23 10:04:43 +08:00 |
|
caoqianming
|
8273a96597
|
fix: FtestWork 检验数据设置为非负整数
|
2024-09-20 09:16:03 +08:00 |
|
caoqianming
|
5628a1ff83
|
feat: ftestwork增加校验
|
2024-09-19 15:08:54 +08:00 |
|
caoqianming
|
305fda44c2
|
feat: wmaterialserializer 增加count_cando返回
|
2024-09-18 09:34:55 +08:00 |
|
zty
|
6c6a6ce440
|
fix: mtm/service note
|
2024-09-13 15:21:26 +08:00 |
|
zty
|
0453499ee5
|
add: new migrations file
|
2024-09-13 15:08:42 +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
|
2753c78997
|
feat: bi查询报错后打日志
|
2024-09-12 15:23:38 +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
|
bc92e90765
|
feat: ftestwork 增加shift字段
|
2024-09-11 16:39:09 +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
|
bb270d7105
|
feat: inm mio相关增加inout_date校验
|
2024-09-08 14:32:49 +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
|
c2e2465439
|
feat: 优化mtask list
|
2024-09-05 13:09:11 +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
|
f4f44be101
|
feat: add_mtaskb 增加校验
|
2024-09-04 17:52:37 +08:00 |
|
caoqianming
|
668fff3f2d
|
fix: add_mtaskb用错序列化器了4
|
2024-09-04 17:40:57 +08:00 |
|
caoqianming
|
fc855d2830
|
fix: add_mtaskb用错序列化器了3
|
2024-09-04 17:31:51 +08:00 |
|
caoqianming
|
4c57c6e9ee
|
feat: mtaskb 删除校验
|
2024-09-04 17:19:30 +08:00 |
|
caoqianming
|
8c56523285
|
feat: mlog 增加fmlog筛选条件
|
2024-09-04 17:01:08 +08:00 |
|
caoqianming
|
ea83d57129
|
fix: add_mtaskb用错序列化器了2
|
2024-09-04 16:55:55 +08:00 |
|
caoqianming
|
afa55df750
|
fix: add_mtaskb用错序列化器了
|
2024-09-04 16:52:23 +08:00 |
|
caoqianming
|
e12a1042b9
|
feat: 优化add_mtaskb
|
2024-09-04 16:40:37 +08:00 |
|
caoqianming
|
09b3f17025
|
fix: add_mtaskb perm错误
|
2024-09-04 16:38:55 +08:00 |
|
caoqianming
|
7afa494803
|
feat: mtask增加mtaskb接口
|
2024-09-04 16:38:21 +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
|
6694820dcd
|
fix: mtaskb查询条件错误
|
2024-09-04 16:00:00 +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
|
e77f3159f5
|
feat: mtaskb增加筛选条件
|
2024-09-04 10:34:45 +08:00 |
|
caoqianming
|
9ca66782b9
|
fix: FtestWorkCreateUpdate 缺少count_sampling_ok
|
2024-09-04 10:22:38 +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
|
9fee0b52d5
|
feat: 增加mtaskb
|
2024-09-03 16:41:51 +08:00 |
|
caoqianming
|
bc9a098cc8
|
feat: mtask_submit 校验是否有日志
|
2024-09-03 14:51: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
|
89af31a383
|
feat: 增加check_test_when_do_out配置参数
|
2024-09-03 09:48:10 +08:00 |
|
caoqianming
|
6a573dd4dd
|
feat: mlog经审批后提交
|
2024-09-03 09:10:28 +08:00 |
|
caoqianming
|
2a8254b581
|
feat: process添加mlog_need_ticket字段
|
2024-09-02 17:04:59 +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
|
fc2195eba1
|
feat: ftestwork增加是否更新库存字段
|
2024-09-02 15:29:41 +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
|
cff14fa042
|
feat: ftestwork添加抽检合格数
|
2024-08-30 13:36:53 +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
|
b8994b94c1
|
feat: ftestwork增加filter
|
2024-08-29 15:43:12 +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
|
81a90f31cd
|
feat: 计算测点可不指定物料2
|
2024-08-29 13:47:16 +08:00 |
|
caoqianming
|
1855e3ae67
|
feat: bind_routepack 时校验产出是否一致
|
2024-08-29 10:51:44 +08:00 |
|
caoqianming
|
0f0bc9bd37
|
feat: 计算测点可不指定物料
|
2024-08-29 10:28:59 +08:00 |
|
caoqianming
|
e94996471f
|
feat: 优化enstat2
|
2024-08-29 09:28:39 +08:00 |
|
caoqianming
|
cf10f02829
|
fix: xscript change_data 变更
|
2024-08-28 17:14:49 +08:00 |
|
caoqianming
|
da3b0f62e5
|
feat: 增加change_data字段
|
2024-08-28 17:09:24 +08:00 |
|
caoqianming
|
4ac5d1f1f7
|
feat: xscript添加logger
|
2024-08-28 16:27:35 +08:00 |
|
caoqianming
|
43d0d90e41
|
fix: tag_update 先判断是否本地时间
|
2024-08-28 16:17:14 +08:00 |
|
caoqianming
|
730aa68966
|
feat: tag_update 先判断是否本地时间
|
2024-08-28 16:12:31 +08:00 |
|
caoqianming
|
038e7f86cd
|
feat: xscript相关调整
|
2024-08-28 14:11:42 +08:00 |
|
caoqianming
|
42cf64e9f7
|
feat: mlog 添加不合格项
|
2024-08-28 10:58:46 +08:00 |
|
caoqianming
|
4bfa8a5460
|
feat: insert_mplogx_from_xscript 修改
|
2024-08-27 18:42:18 +08:00 |
|
caoqianming
|
417dae76fd
|
fix: xscript update bug
|
2024-08-27 17:40:05 +08:00 |
|
caoqianming
|
2be34d3caa
|
feat: enm添加xscript
|
2024-08-27 17:28:30 +08:00 |
|
caoqianming
|
e6e80f5d52
|
feat: base 增加code分析工具类
|
2024-08-27 17:26:29 +08:00 |
|
caoqianming
|
8828625346
|
feat: base dbconnection支持pg
|
2024-08-27 17:26:05 +08:00 |
|
caoqianming
|
1b19c02754
|
feat: base ptaskresult 更多filter
|
2024-08-27 17:25:46 +08:00 |
|
caoqianming
|
b57fd16d5a
|
fix: base basemodel handle_parent 处理bug
|
2024-08-26 15:28:13 +08:00 |
|
caoqianming
|
ac6fd28aba
|
feat: 增加棕圈作为不合格项
|
2024-08-26 14:25:26 +08:00 |
|
caoqianming
|
cdd879c583
|
feat: 添加不合格品小崩边
|
2024-08-26 14:15:01 +08:00 |
|
caoqianming
|
d83b5ec0d2
|
feat: myschedule createserializer 优化2
|
2024-08-26 13:49:27 +08:00 |
|
caoqianming
|
4739124cc8
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2024-08-26 13:28:40 +08:00 |
|
caoqianming
|
ba00580fec
|
feat: myschedule createserializer 优化
|
2024-08-26 13:27:09 +08:00 |
|
zty
|
c5e180944d
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2024-08-23 17:21:16 +08:00 |
|
zty
|
28834f88cd
|
fix ： 煤磨
|
2024-08-23 17:20:57 +08:00 |
|
caoqianming
|
6205ba682c
|
feat: gascheck增加字段
|
2024-08-22 15:08:45 +08:00 |
|
caoqianming
|
26172b767f
|
feat: utask mtask 增加筛选条件
|
2024-08-22 12:45:53 +08:00 |
|
zty
|
4960ee7fac
|
feat: 增加水泥包装
|
2024-08-21 17:55:23 +08:00 |
|
caoqianming
|
33a7e7320b
|
fix: daoru_material 增加校验
|
2024-08-21 14:12:52 +08:00 |
|
caoqianming
|
a48ee63679
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2024-08-21 09:27:40 +08:00 |
|
caoqianming
|
4a277eb954
|
feat: base 可使用跳板机转发错误邮件
|
2024-08-21 09:27:37 +08:00 |
|
zty
|
5a35ea6028
|
feat: 增加出厂水泥 和 计算
|
2024-08-21 08:59:24 +08:00 |
|
zty
|
bc38196f68
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2024-08-20 14:43:55 +08:00 |
|
zty
|
206e33d091
|
fix ：apps\enm filter
|
2024-08-20 14:43:53 +08:00 |
|
caoqianming
|
1e667e69ac
|
feat: daoru_material 增加校验
|
2024-08-20 14:39:38 +08:00 |
|
caoqianming
|
561c2a0c31
|
feat: materialbatch也不进行物理删除
|
2024-08-20 14:25:01 +08:00 |
|
caoqianming
|
592e34c07e
|
refector: mgroup_on_change时创建stlog优化
|
2024-08-20 08:56:08 +08:00 |
|
caoqianming
|
d102f01c26
|
feat: 增加check_opl_work_imgs
|
2024-08-19 16:51:46 +08:00 |
|
caoqianming
|
e2d652f9ef
|
fix: get_area_from_point 获取cache bug
|
2024-08-19 16:17:33 +08:00 |
|
caoqianming
|
28958b405c
|
fix: check_opl_audit_imgs bug
|
2024-08-19 13:41:47 +08:00 |
|
caoqianming
|
9ce56d3f34
|
feat: ftestwork增加关联仓库库存字段
|
2024-08-19 11:35:36 +08:00 |
|
caoqianming
|
c00f59f8d9
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2024-08-19 08:59:26 +08:00 |
|
caoqianming
|
808a1c825d
|
feat: check_opl_audit_imgs raise
|
2024-08-19 08:59:24 +08:00 |
|
zty
|
c3b62f1831
|
fix: equip_elec_data 计算
|
2024-08-16 18:45:31 +08:00 |
|
zty
|
62fb5aa54c
|
feat: sflog teamchange cal_quastat_sflog
|
2024-08-16 18:45:11 +08:00 |
|
zty
|
7a780ebd0d
|
fix: set coefficient
|
2024-08-16 18:44:50 +08:00 |
|
zty
|
cbce4998d9
|
feat: mpoint stat添加筛选条件
|
2024-08-16 18:44:30 +08:00 |
|
zty
|
a09343322e
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2024-08-16 18:44:02 +08:00 |
|
zty
|
4cdc48e549
|
fix: equip_elec_data 计算
|
2024-08-16 18:44:00 +08:00 |
|
caoqianming
|
c8db1ad29b
|
feat: base handle_parent报错调整
|
2024-08-15 15:53:42 +08:00 |
|
caoqianming
|
0aa0b051e9
|
fix: em ecate serializer 优化
|
2024-08-15 15:53:17 +08:00 |
|
caoqianming
|
c71624def0
|
fix: em serializer 优化
|
2024-08-15 11:36:38 +08:00 |
|
caoqianming
|
3976e3834e
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2024-08-15 11:17:51 +08:00 |
|
caoqianming
|
cb46d9bfc6
|
fix: ecate code 必填校验
|
2024-08-15 11:17:48 +08:00 |
|
zty
|
71dd916dbf
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2024-08-15 10:47:47 +08:00 |
|
zty
|
13fb91e83a
|
fix：enm/service 修改稿last_val
|
2024-08-15 10:47:43 +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
|
824dacf78d
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2024-08-15 09:47:06 +08:00 |
|
caoqianming
|
bcafe94e71
|
fix: base validate_password支持.号
|
2024-08-15 09:47:04 +08:00 |
|
zty
|
f52b501aa1
|
feat : enm/service 增加测点采集系数
|
2024-08-15 09:19:19 +08:00 |
|
zty
|
29ba9647b4
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2024-08-14 18:33:05 +08:00 |
|
zty
|
6a20445ddd
|
fix : em/service 修改update_time
|
2024-08-14 18:33:01 +08:00 |
|
caoqianming
|
42769e3abe
|
fix: mioitempurin bug
|
2024-08-14 18:17:31 +08:00 |
|
caoqianming
|
db792a2de5
|
feat: ftestwork增加检验人及不合格项
|
2024-08-14 18:07:12 +08:00 |
|
caoqianming
|
a9acf6d187
|
feat: 物料导入模板增加编号列
|
2024-08-14 17:42:27 +08:00 |
|
caoqianming
|
27c60ff973
|
feat: mio pur test 支持count_sampling自填
|
2024-08-13 17:28:39 +08:00 |
|
caoqianming
|
3bb3834c04
|
fix: miolist pu_order_number
|
2024-08-13 17:11:22 +08:00 |
|
caoqianming
|
cc5dcc9685
|
fix: gen_material_out bug
|
2024-08-13 16:29:59 +08:00 |
|
caoqianming
|
58ddc8dd0b
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2024-08-13 15:06:10 +08:00 |
|
caoqianming
|
ad1d0680b1
|
feat: mlogbupdate 校验
|
2024-08-13 15:06:07 +08:00 |
|
zty
|
779bd763a1
|
fix : em/service 修改运行设备更新状态 根据最后一次时间修改
|
2024-08-13 15:00:09 +08:00 |
|
caoqianming
|
bbac19c791
|
feat: notok option 其他
|
2024-08-13 14:47:26 +08:00 |
|
caoqianming
|
bfad89bf2f
|
feat: ftestwork_submit增加抽检逻辑
|
2024-08-13 14:31:38 +08:00 |
|
caoqianming
|
23dd745192
|
feat: ftestwork增加查询条件
|
2024-08-13 13:59:58 +08:00 |
|
caoqianming
|
0a0b6b72ba
|
feat: ftestworkcreate type2处理
|
2024-08-13 13:42:00 +08:00 |
|
caoqianming
|
8e7e60c600
|
fix: ftestwork_submit bug2
|
2024-08-12 17:36:12 +08:00 |
|
caoqianming
|
e6e4a61289
|
fix: ftestwork_submit bug
|
2024-08-12 17:31:19 +08:00 |
|
caoqianming
|
096ad540d4
|
feat: qm batch增加长度
|
2024-08-12 17:21:17 +08:00 |
|
caoqianming
|
f6f84533d1
|
fix: notokoption 修改3
|
2024-08-12 17:18:09 +08:00 |
|
caoqianming
|
38f052c015
|
fix: notokoption 修改2
|
2024-08-12 17:15:23 +08:00 |
|
caoqianming
|
cfbd79a206
|
fix: notokoption 修改
|
2024-08-12 17:12:22 +08:00 |
|
caoqianming
|
274a0df0eb
|
feat: 检验工作增加查询条件
|
2024-08-12 16:57:22 +08:00 |
|
caoqianming
|
b9dc211df3
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2024-08-12 16:46:14 +08:00 |
|
caoqianming
|
5fc38eabaa
|
fix: notokoption values
|
2024-08-12 16:46:12 +08:00 |
|
zty
|
7664dfefa4
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2024-08-12 16:04:57 +08:00 |
|
zty
|
47acf9ceb4
|
fix: enm/service 修改service
|
2024-08-12 16:04:55 +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
|
50c3efe39b
|
feat: ftestwork提交并更新车间库存
|
2024-08-12 12:58:27 +08:00 |
|
caoqianming
|
5821b6b7df
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2024-08-12 11:07:31 +08:00 |
|
caoqianming
|
562372b0b9
|
feat: mlog添加不合格项目
|
2024-08-12 11:07:29 +08:00 |
|
zty
|
345588b611
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2024-08-12 10:32:39 +08:00 |
|
zty
|
a6d5604acb
|
fix: em.service.py 更改状态变动
|
2024-08-12 10:32:34 +08:00 |
|
caoqianming
|
ae1099cbec
|
fix: base wf 工段的字段获取处理人时没找到返回0
|
2024-08-09 15:19:21 +08:00 |
|
caoqianming
|
1a42cf34f0
|
feat: wmaterial增加count_xtest/handover增加检验交接
|
2024-08-09 15:09:26 +08:00 |
|
caoqianming
|
a2b52e95a5
|
doc: drain view swagger 变动3
|
2024-08-08 15:07:05 +08:00 |
|
caoqianming
|
fff6c76cc6
|
doc: drain view swagger 变动2
|
2024-08-08 15:03:15 +08:00 |
|
caoqianming
|
758d403f5d
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2024-08-08 14:55:28 +08:00 |
|
caoqianming
|
f1aa402383
|
doc: drain view swagger 变动
|
2024-08-08 14:55:26 +08:00 |
|
zty
|
169a31da5a
|
fix : apps/em /enm 更改缓存存储
|
2024-08-08 14:52:36 +08:00 |
|
caoqianming
|
e2c44f06c4
|
feat: drain serializer增加返回序列化
|
2024-08-08 14:45:40 +08:00 |
|
caoqianming
|
3f32390fb2
|
feat: 自动生成物料时延续cate
|
2024-08-08 09:12:46 +08:00 |
|
caoqianming
|
1781dba630
|
feat: 更改testitem field type
|
2024-08-07 15:43:28 +08:00 |
|
caoqianming
|
c64387e5bc
|
Merge branch 'erp1'
|
2024-08-07 15:26:49 +08:00 |
|
caoqianming
|
1418141a67
|
feat: ftestwork返回material_cate
|
2024-08-07 15:25:48 +08:00 |
|
caoqianming
|
fe61081ec7
|
feat: ftestworkcreateupdate 支持更改
|
2024-08-07 14:52:53 +08:00 |
|
caoqianming
|
9136f7e87f
|
feat: 增加material cate 接口
|
2024-08-07 14:52:10 +08:00 |
|
caoqianming
|
ab9b1b7f27
|
feat: 增加testitem筛选条件
|
2024-08-07 14:51:57 +08:00 |
|
caoqianming
|
239f01a4ca
|
feat: qm添加字段2
|
2024-08-07 14:51:42 +08:00 |
|
caoqianming
|
b8dceb03a3
|
feat: qm添加字段
|
2024-08-07 14:51:30 +08:00 |
|
caoqianming
|
15043bbb49
|
feat: ftestworkcreateupdate 支持更改
|
2024-08-07 11:07:48 +08:00 |
|
caoqianming
|
211fd1ac77
|
feat: 增加material cate 接口
|
2024-08-07 10:54:00 +08:00 |
|
caoqianming
|
cf7007f8b8
|
feat: 增加testitem筛选条件
|
2024-08-07 10:18:11 +08:00 |
|
caoqianming
|
be8fbec24e
|
feat: edu添加字段
|
2024-08-07 10:01:41 +08:00 |
|
caoqianming
|
632c36edd0
|
feat: qm添加字段2
|
2024-08-07 10:01:22 +08:00 |
|
caoqianming
|
8aabf1fca0
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2024-08-07 09:46:20 +08:00 |
|
caoqianming
|
549ef24c70
|
feat: qm添加字段
|
2024-08-07 09:46:17 +08:00 |
|
zty
|
6bdc5a04aa
|
fix :enm service.py 修改缓存不存在直接返回
|
2024-08-07 09:30:56 +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
|
f97c99bf8a
|
fix: cal_mpointstat_hour对于is_unit的计算错误
|
2024-08-06 17:52:21 +08:00 |
|
zty
|
91e9ac38f6
|
fix: db_insert_mplogx_batch bug
|
2024-08-06 17:22:28 +08:00 |
|
zty
|
679165cbd0
|
feat: db_insert_mplogx 添加限制参数
|
2024-08-06 17:12:58 +08:00 |
|
zty
|
a24666b795
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2024-08-06 16:11:32 +08:00 |
|
zty
|
4d498f99a3
|
fix: enm/task 水泥批号插入
|
2024-08-06 16:11:27 +08:00 |
|
caoqianming
|
b2abf0128a
|
feat: pum sam 增加检索条件
|
2024-08-06 12:24:21 +08:00 |
|
caoqianming
|
06d2c5a096
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2024-08-06 12:21:11 +08:00 |
|
caoqianming
|
abccaf4c78
|
feat: pum sam 增加检索条件
|
2024-08-06 12:21:08 +08:00 |
|
zty
|
50cdbf9428
|
fix :enm/task 修改数据库连接
|
2024-08-06 10:53:01 +08:00 |
|
zty
|
f09a8fe4cd
|
add : db_ins_mplogx 增加测点插入数据库
|
2024-08-06 10:01:21 +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
|
6931c49b3b
|
feat: oplserializer 添加返回信息
|
2024-08-04 20:28:18 +08:00 |
|
caoqianming
|
fe97d36f54
|
feat: opl添加字段
|
2024-08-04 18:50:42 +08:00 |
|
caoqianming
|
1003e0aea7
|
feat: route添加filter
|
2024-08-02 21:13:15 +08:00 |
|
caoqianming
|
c58e34a7fd
|
feat: route添加filter
|
2024-08-02 21:00:13 +08:00 |
|
caoqianming
|
fa56d61ffc
|
feat: 修改nowx使用aware
|
2024-08-02 16:39:07 +08:00 |
|
caoqianming
|
4604809bf4
|
feat: bind_routepack 时取消第一步的批次校验
|
2024-08-02 13:52:14 +08:00 |
|
caoqianming
|
dc7e6f9d03
|
fix: get_total_sec_now及cal_exp_duration_sec 添加now参数
|
2024-08-02 13:50:05 +08:00 |
|
caoqianming
|
313e9ed1cd
|
fix: routeserializer优化routepack process校验3
|
2024-08-02 11:14:45 +08:00 |
|
caoqianming
|
f5482285f2
|
fix: routeserializer优化routepack process校验2
|
2024-08-02 11:11:08 +08:00 |
|
caoqianming
|
757bf89d71
|
fix: enstat hour_s查询时按真实事件查询
|
2024-08-02 10:50:22 +08:00 |
|
caoqianming
|
adffac48ad
|
fix: routeserializer优化routepack process校验
|
2024-08-02 09:13:00 +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 |
|
zty
|
c293dd068f
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2024-08-01 15:55:22 +08:00 |
|
zty
|
261ed40d94
|
fix: fim.py cost_unit 字段
|
2024-08-01 15:55:19 +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
|
3f62e8709f
|
feat: 采购计划和订单增加单价和总价
|
2024-07-31 19:18:51 +08:00 |
|
caoqianming
|
9e26f416a5
|
feat: 变更物料单价字段为小数
|
2024-07-31 19:18:24 +08:00 |
|
caoqianming
|
a589fec67e
|
feat: enstat2添加统计字段
|
2024-07-31 16:53:23 +08:00 |
|
caoqianming
|
0813a3b568
|
feat: mlogbin create时生成编号变更
|
2024-07-31 16:33:32 +08:00 |
|
caoqianming
|
9dcc4c0910
|
feat: 工序增加字段batch_append_equip
|
2024-07-31 16:30:00 +08:00 |
|
caoqianming
|
93b1a80cfb
|
feat: 供应商增加字段number
|
2024-07-31 16:29:11 +08:00 |
|
caoqianming
|
821d7613d1
|
fix: get_sflog 增加 sflog创建范围
|
2024-07-31 15:55:34 +08:00 |
|
caoqianming
|
19167887d5
|
fix: mgroup_run_change bug
|
2024-07-31 15:34:50 +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 |
|
caoqianming
|
166ae8b12c
|
feat: base user增加筛选条件
|
2024-07-31 13:43:32 +08:00 |
|
caoqianming
|
321be50323
|
feat: MaterialBatchSerializer 改变material_name
|
2024-07-30 17:06:28 +08:00 |
|
caoqianming
|
e3a276c634
|
feat: MaterialBatchSerializer 改变material_name
|
2024-07-30 17:05:55 +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 |
|
zty
|
a587e570f0
|
feat: mio 添加 mgroup字段
|
2024-07-30 11:40:18 +08:00 |
|
caoqianming
|
893781ec7f
|
feat: db_insert_mplogx不用thread
|
2024-07-30 10:01:42 +08:00 |
|
caoqianming
|
f5c22d460b
|
Merge branch 'erp1'
|
2024-07-29 17:24:42 +08:00 |
|
caoqianming
|
e853fe33b1
|
feat: gen_material_out 优化并变更物料信息
|
2024-07-29 17:24:25 +08:00 |
|
caoqianming
|
93d26ec100
|
Merge branch 'erp1'
|
2024-07-29 16:21:22 +08:00 |
|
caoqianming
|
a4417e7a4f
|
fix: gen_material_out bug
|
2024-07-29 16:20:43 +08:00 |
|
caoqianming
|
ebfb96b12e
|
feat: material delete 时 update 子物料
|
2024-07-29 16:16:20 +08:00 |
|
caoqianming
|
76c14460f5
|
fix: base handle_parent 错误
|
2024-07-29 11:12:53 +08:00 |
|
caoqianming
|
effffe34bf
|
fix: base handle_parent 错误
|
2024-07-29 11:12:13 +08:00 |
|
caoqianming
|
92c6939a9c
|
refactor: base 更新permission 描述
|
2024-07-29 10:32:36 +08:00 |
|
caoqianming
|
38eaefe3bb
|
refactor: base 更新permission 描述
|
2024-07-29 10:31:46 +08:00 |
|
caoqianming
|
05b46b5351
|
fix: EnvData get_or_create 避免报错
|
2024-07-29 08:38:57 +08:00 |
|
caoqianming
|
b428f36014
|
Merge branch 'erp1'
|
2024-07-26 17:41:09 +08:00 |
|
caoqianming
|
7f935dbf57
|
fix: datarecordviewset 继承错误
|
2024-07-26 17:40:54 +08:00 |
|
caoqianming
|
e78cdca9ae
|
Merge branch 'erp1'
|
2024-07-26 17:33:26 +08:00 |
|
caoqianming
|
02a9445596
|
feat: 添加dataset接口
|
2024-07-26 17:32:08 +08:00 |
|
caoqianming
|
ae55a62ced
|
Merge branch 'erp1'
|
2024-07-26 17:19:00 +08:00 |
|
caoqianming
|
2a225bdc86
|
feat: 添加定时执行bi的task和记录表
|
2024-07-26 17:18:42 +08:00 |
|
caoqianming
|
e5cd203e04
|
Merge branch 'erp1'
|
2024-07-26 16:57:04 +08:00 |
|
caoqianming
|
9c27ffd7dd
|
feat: testitem 增删改查
|
2024-07-26 16:56:29 +08:00 |
|
caoqianming
|
23d452fe2c
|
fix: mgroup_run_change 再从开到停时再查询一次last_stlog
|
2024-07-26 10:06:31 +08:00 |
|
caoqianming
|
b6d4b38103
|
fix: base get_ticket_state_participant_info 通过工单字段获取处理人错误2
|
2024-07-26 09:07:59 +08:00 |
|
caoqianming
|
7df2cbba1e
|
feat: base 处理父级引用parent_link bug
|
2024-07-26 09:04:46 +08:00 |
|
caoqianming
|
cab46ea229
|
fix: base handle_parent时要处理所有相关的父子关系
|
2024-07-26 09:03:54 +08:00 |
|
caoqianming
|
eb81c2db2d
|
fix: base get_ticket_state_participant_info 通过工单字段获取处理人错误
|
2024-07-26 09:03:35 +08:00 |