Commit Graph

Select branches

Hide Pull Requests

base

dev_cqm

dev_sj

master

#2

#3

#4

#5

#6

#7

2.6.2025031919

2.6.2025033109

2.6.2025040115

2.6.2025040211

2.6.2025040316

2.6.2025040710

2.6.2025040813

2.6.2025040913

2.6.2025041113

2.6.2025041613

2.6.2025042311

2.6.2025042816

2.6.2025043014

2.6.2025050816

2.6.2025051208

2.6.2025051609

2.6.2025051913

2.6.2025052615

2.6.2025060409

2.6.2025060617

2.6.2025060913

2.6.2025061715

2.6.2025062015

2.7.2025062414

2.7.2025070310

2.7.2025071516

2.7.2025073110

2.7.2025080409

2.7.2025080716

2.7.2025081813

2.7.2025082616

2.7.2025082816

2.8.2025090815

2.8.2025091616

2.8.2025092816

2.8.2025101011

3.0.2025110710

3.0.2025122514

3.0.2026010716

3.1.2026031316

3.1.2026033008

3.1.2026042912

Mono Color

• 982247ee70 feat: count_n_jgqbl 改为count_pn_jgqbl caoqianming 2024-09-05 09:11:48 +0800
• eb5a8df7e0 feat: mlog create 时校验 caoqianming 2024-09-04 18:21:32 +0800
• f4f44be101 feat: add_mtaskb 增加校验 caoqianming 2024-09-04 17:52:37 +0800
• 668fff3f2d fix: add_mtaskb用错序列化器了4 caoqianming 2024-09-04 17:40:57 +0800
• fc855d2830 fix: add_mtaskb用错序列化器了3 caoqianming 2024-09-04 17:31:51 +0800
• 4c57c6e9ee feat: mtaskb 删除校验 caoqianming 2024-09-04 17:19:30 +0800
• 8c56523285 feat: mlog 增加fmlog筛选条件 caoqianming 2024-09-04 17:01:08 +0800
• ea83d57129 fix: add_mtaskb用错序列化器了2 caoqianming 2024-09-04 16:55:55 +0800
• afa55df750 fix: add_mtaskb用错序列化器了 caoqianming 2024-09-04 16:52:23 +0800
• e12a1042b9 feat: 优化add_mtaskb caoqianming 2024-09-04 16:40:37 +0800
• 09b3f17025 fix: add_mtaskb perm错误 caoqianming 2024-09-04 16:38:55 +0800
• 7afa494803 feat: mtask增加mtaskb接口 caoqianming 2024-09-04 16:38:21 +0800
• 22052d1d82 fix: fmlog validate 未返回attrs caoqianming 2024-09-04 16:21:00 +0800
• c2649ec963 feat: mtask增加mtaskb的返回并在日志填写时校验 caoqianming 2024-09-04 16:13:50 +0800
• 6694820dcd fix: mtaskb查询条件错误 caoqianming 2024-09-04 16:00:00 +0800
• 463390691a feat: wpm 添加mtaskb等字段 caoqianming 2024-09-04 15:53:04 +0800
• bae2b7b8f5 feat: mlogb 校验 caoqianming 2024-09-04 15:50:07 +0800
• 6e7e6c584e feat: 一二级日志录入 caoqianming 2024-09-04 15:25:14 +0800
• e77f3159f5 feat: mtaskb增加筛选条件 caoqianming 2024-09-04 10:34:45 +0800
• 9ca66782b9 fix: FtestWorkCreateUpdate 缺少count_sampling_ok caoqianming 2024-09-04 10:22:38 +0800
• 233591728a feat: fmlog创建时校验 caoqianming 2024-09-04 09:13:26 +0800
• 170f3db824 feat: 添加fmlog caoqianming 2024-09-04 09:04:37 +0800
• 044819815e fix: cal_mlog_count_from_mlogb 统计bug caoqianming 2024-09-03 17:57:23 +0800
• 9fee0b52d5 feat: 增加mtaskb caoqianming 2024-09-03 16:41:51 +0800
• bc9a098cc8 feat: mtask_submit 校验是否有日志 caoqianming 2024-09-03 14:51:23 +0800
• bb311999e8 feat: mlogb 添加字段以记录分层检验信息 caoqianming 2024-09-03 14:16:18 +0800
• 0148efba62 feat: process添加中间状态 caoqianming 2024-09-03 10:58:33 +0800
• 31f8f002aa feat: mlog 增加ticket查询条件 caoqianming 2024-09-03 10:25:59 +0800
• 3c99770477 feat: base get_sysconfig可返回默认参数 caoqianming 2024-09-03 09:50:43 +0800
• 89af31a383 feat: 增加check_test_when_do_out配置参数 caoqianming 2024-09-03 09:48:10 +0800
• 6a573dd4dd feat: mlog经审批后提交 caoqianming 2024-09-03 09:10:28 +0800
• 2a8254b581 feat: process添加mlog_need_ticket字段 caoqianming 2024-09-02 17:04:59 +0800
• b3e527e5a6 fix: count_n_jgqbl 字符错误 caoqianming 2024-09-02 16:58:16 +0800
• 65c1c8aa40 fix: mlogb update serializer caoqianming 2024-09-02 15:51:34 +0800
• fc2195eba1 feat: ftestwork增加是否更新库存字段 caoqianming 2024-09-02 15:29:41 +0800
• 40b012b962 feat: 加工前不良的日志提交和撤回 caoqianming 2024-09-02 15:27:38 +0800
• 91add9ec1d feat: 增加加工前不良的不合格项 caoqianming 2024-09-02 14:17:52 +0800
• cff14fa042 feat: ftestwork添加抽检合格数 caoqianming 2024-08-30 13:36:53 +0800
• 78dc923305 fix: 日志提交的校验 caoqianming 2024-08-30 13:31:37 +0800
• 5289e71280 feat: wmaterial添加外协字段及相关调整 caoqianming 2024-08-30 09:21:29 +0800
• b8994b94c1 feat: ftestwork增加filter caoqianming 2024-08-29 15:43:12 +0800
• 301535813b feat: mlogbout 校验不合格字段 caoqianming 2024-08-29 15:13:08 +0800
• ab759a76c9 feat: mog submit时产出为0 caoqianming 2024-08-29 15:05:53 +0800
• 54c7c65fe0 feat: 产出物为0时跳过revert caoqianming 2024-08-29 14:52:30 +0800
• 81a90f31cd feat: 计算测点可不指定物料2 caoqianming 2024-08-29 13:47:16 +0800
• 1855e3ae67 feat: bind_routepack 时校验产出是否一致 caoqianming 2024-08-29 10:51:44 +0800
• 0f0bc9bd37 feat: 计算测点可不指定物料 caoqianming 2024-08-29 10:28:59 +0800
• e94996471f feat: 优化enstat2 caoqianming 2024-08-29 09:28:39 +0800
• cf10f02829 fix: xscript change_data 变更 caoqianming 2024-08-28 17:14:49 +0800
• da3b0f62e5 feat: 增加change_data字段 caoqianming 2024-08-28 17:09:24 +0800
• 4ac5d1f1f7 feat: xscript添加logger caoqianming 2024-08-28 16:27:35 +0800
• 43d0d90e41 fix: tag_update 先判断是否本地时间 caoqianming 2024-08-28 16:17:14 +0800
• 730aa68966 feat: tag_update 先判断是否本地时间 caoqianming 2024-08-28 16:12:31 +0800
• 038e7f86cd feat: xscript相关调整 caoqianming 2024-08-28 14:11:42 +0800
• 42cf64e9f7 feat: mlog 添加不合格项 caoqianming 2024-08-28 10:58:46 +0800
• 4bfa8a5460 feat: insert_mplogx_from_xscript 修改 caoqianming 2024-08-27 18:42:18 +0800
• 417dae76fd fix: xscript update bug caoqianming 2024-08-27 17:40:05 +0800
• 2be34d3caa feat: enm添加xscript caoqianming 2024-08-27 17:28:30 +0800
• 066ddb59c9 feat: 添加gitignore caoqianming 2024-08-27 17:26:54 +0800
• e6e80f5d52 feat: base 增加code分析工具类 caoqianming 2024-08-27 17:26:29 +0800
• 8828625346 feat: base dbconnection支持pg caoqianming 2024-08-27 17:26:05 +0800
• 1b19c02754 feat: base ptaskresult 更多filter caoqianming 2024-08-27 17:25:46 +0800
• c3bb68acae fix: base basemodel handle_parent 处理bug caoqianming 2024-08-26 15:28:13 +0800
• f70fd4afd5 feat: base 可使用跳板机转发错误邮件 caoqianming 2024-08-21 09:27:37 +0800
• 7b2c8b3c4d feat: base handle_parent报错调整 caoqianming 2024-08-15 15:53:42 +0800
• 3e39503a7b fix: base validate_password支持.号 caoqianming 2024-08-15 09:47:04 +0800
• 674e63fdb0 fix: base wf 工段的字段获取处理人时没找到返回0 caoqianming 2024-08-09 15:19:21 +0800
• c4aeca135e feat: base user增加筛选条件 caoqianming 2024-07-31 13:43:32 +0800
• b57fd16d5a fix: base basemodel handle_parent 处理bug caoqianming 2024-08-26 15:28:13 +0800
• 94774a6187 feat: base auth authenticate移除不必须的employee caoqianming 2024-08-26 15:07:23 +0800
• ac6fd28aba feat: 增加棕圈作为不合格项 caoqianming 2024-08-26 14:25:26 +0800
• cdd879c583 feat: 添加不合格品小崩边 caoqianming 2024-08-26 14:15:01 +0800
• d83b5ec0d2 feat: myschedule createserializer 优化2 caoqianming 2024-08-26 13:49:27 +0800
• 4739124cc8 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server caoqianming 2024-08-26 13:28:40 +0800
• ba00580fec feat: myschedule createserializer 优化 caoqianming 2024-08-26 13:27:09 +0800
• c5e180944d Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server zty 2024-08-23 17:21:16 +0800
• 28834f88cd fix ： 煤磨 zty 2024-08-23 17:20:57 +0800
• 6205ba682c feat: gascheck增加字段 caoqianming 2024-08-22 15:08:45 +0800
• 26172b767f feat: utask mtask 增加筛选条件 caoqianming 2024-08-22 12:45:53 +0800
• 4960ee7fac feat: 增加水泥包装 zty 2024-08-21 17:55:23 +0800
• 33a7e7320b fix: daoru_material 增加校验 caoqianming 2024-08-21 14:12:52 +0800
• a48ee63679 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server caoqianming 2024-08-21 09:27:40 +0800
• 4a277eb954 feat: base 可使用跳板机转发错误邮件 caoqianming 2024-08-21 09:27:37 +0800
• 5a35ea6028 feat: 增加出厂水泥 和 计算 zty 2024-08-21 08:59:24 +0800
• bc38196f68 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server zty 2024-08-20 14:43:55 +0800
• 206e33d091 fix ：apps\enm filter zty 2024-08-20 14:43:53 +0800
• 1e667e69ac feat: daoru_material 增加校验 caoqianming 2024-08-20 14:39:38 +0800
• 561c2a0c31 feat: materialbatch也不进行物理删除 caoqianming 2024-08-20 14:25:01 +0800
• 592e34c07e refector: mgroup_on_change时创建stlog优化 caoqianming 2024-08-20 08:56:08 +0800
• d102f01c26 feat: 增加check_opl_work_imgs caoqianming 2024-08-19 16:51:46 +0800
• e2d652f9ef fix: get_area_from_point 获取cache bug caoqianming 2024-08-19 16:17:33 +0800
• 28958b405c fix: check_opl_audit_imgs bug caoqianming 2024-08-19 13:41:47 +0800
• 9ce56d3f34 feat: ftestwork增加关联仓库库存字段 caoqianming 2024-08-19 11:35:36 +0800
• c00f59f8d9 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server caoqianming 2024-08-19 08:59:26 +0800
• 808a1c825d feat: check_opl_audit_imgs raise caoqianming 2024-08-19 08:59:24 +0800
• c3b62f1831 fix: equip_elec_data 计算 zty 2024-08-16 18:45:31 +0800
• 62fb5aa54c feat: sflog teamchange cal_quastat_sflog zty 2024-08-16 18:45:11 +0800
• 7a780ebd0d fix: set coefficient zty 2024-08-16 18:44:50 +0800
• cbce4998d9 feat: mpoint stat添加筛选条件 zty 2024-08-16 18:44:30 +0800
• a09343322e Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server zty 2024-08-16 18:44:02 +0800