Commit Graph

2308 Commits

Author SHA1 Message Date
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