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

• c11132e38f feat: 添加drainequip及其返回envdata信息 caoqianming 2024-01-15 17:30:29 +0800
• 4a6aabd860 fix: do_in new_count为0时wm.delete caoqianming 2024-01-12 16:45:07 +0800
• c84ea3bdef feat: 增加timescaledb的支持 caoqianming 2024-01-12 14:32:08 +0800
• 7ca12228e2 feat: 库存减到0时删除该记录 caoqianming 2024-01-11 17:56:00 +0800
• 90e0513db6 refector: 取消未填写mlog的校验，由前端来做 caoqianming 2024-01-10 15:46:11 +0800
• c61507c7dd feat: 增加Drain cate help_text caoqianming 2024-01-10 15:35:23 +0800
• 4a7a8f98ae feat: 添加enp模块 caoqianming 2024-01-10 15:30:02 +0800
• da087ebace fix: base- put config 时update_dict的bug caoqianming 2024-01-10 10:54:58 +0800
• 1eec1c24b4 feat: base- 基于项目code返回或更改配置信息 caoqianming 2024-01-10 10:11:43 +0800
• a905118bdf feat: develop增加项目管理 caoqianming 2024-01-10 10:10:31 +0800
• 7078aee577 feat: 短信发送异常时的返回格式 caoqianming 2024-01-04 09:18:24 +0800
• 89215d4752 feat: 任务停止后日志不可再提交 caoqianming 2024-01-04 09:11:53 +0800
• e5bbb48ceb fix: 停止任务的bug caoqianming 2024-01-04 09:07:58 +0800
• ae0832010f feat: MtaskSerializer 返回submit_user_name caoqianming 2023-12-28 18:37:46 +0800
• 6165af7c47 feat: mlog_submit返回更详细的报错 caoqianming 2023-12-28 17:28:46 +0800
• 66f2623c24 refector: 修改access_token的时间 caoqianming 2023-12-28 15:36:57 +0800
• 1330b732c0 fix: base user phone校验可为空 caoqianming 2023-12-28 10:31:19 +0800
• 059aee0acf feat: material增加筛选条件 caoqianming 2023-12-28 09:55:24 +0800
• a09ae16fa0 fix: mtask_submit bug caoqianming 2023-12-27 15:13:18 +0800
• 1134fc3809 feat: equip增加工段等筛选条件 caoqianming 2023-12-27 11:06:05 +0800
• c91533a328 feat: mlog增加equipments字段 caoqianming 2023-12-27 09:51:04 +0800
• 6515324b5c feat: 更改gitignore caoqianming 2023-12-27 09:03:26 +0800
• 03d6a6c99f fix: mtask_submit时导致重复计算 caoqianming 2023-12-27 09:03:12 +0800
• 4697f30ef1 feat: mioitem返回inout_date caoqianming 2023-12-26 17:18:31 +0800
• 48fbcb5e9c feat: mioitem增加inout_date筛选 caoqianming 2023-12-26 13:10:42 +0800
• d131741f4b feat: handover返回material_name caoqianming 2023-12-25 13:04:37 +0800
• 4f318d823a feat: mio增加item_mio__material__type查询条件 caoqianming 2023-12-25 10:18:35 +0800
• ca7dc5c2ba feat: mtask增加查询条件 caoqianming 2023-12-25 10:06:35 +0800
• 90c7d0e5a1 feat: gen_material_out 优化 caoqianming 2023-12-23 20:58:31 +0800
• 9d3f006017 feat: MIOItemerializer返回物料全名 caoqianming 2023-12-22 13:58:45 +0800
• 93de5ea879 feat: wmaterialserializer返回全名 caoqianming 2023-12-22 13:47:59 +0800
• c80b486a00 feat: equipment_name 返回—的为__str__数据 caoqianming 2023-12-22 10:19:25 +0800
• eb4238b1ae feat: 设备返回full_name caoqianming 2023-12-22 10:15:04 +0800
• ecea592a2b feat: 设备增加筛选条件 caoqianming 2023-12-21 21:41:09 +0800
• 279be7fe9f fix: 矫正员工信息3 caoqianming 2023-12-21 12:02:57 +0800
• 94e0d006f1 fix: 矫正员工信息2 caoqianming 2023-12-21 12:00:52 +0800
• dc7cd3844d feat: 矫正员工信息 caoqianming 2023-12-21 11:45:18 +0800
• 6bfd5ea9c4 fix: send_sms因httperror不处理 caoqianming 2023-12-21 11:13:48 +0800
• 0b20386fcc fix: 取消带-中字样的 caoqianming 2023-12-21 09:41:10 +0800
• 00c860b001 fix: mlog update时mtask, mgroup不可变 caoqianming 2023-12-21 08:49:07 +0800
• 5c24465a41 feat: mtask utask增加返回信息 caoqianming 2023-12-21 00:37:34 +0800
• ef2975d05d feat: wmaterial增加筛选条件 caoqianming 2023-12-21 00:14:13 +0800
• ec3014d5ee feat: mlog增加返回数据 caoqianming 2023-12-20 23:30:27 +0800
• 354b76af75 fix: equipment的导入的bug caoqianming 2023-12-20 20:51:07 +0800
• b765e87517 feat: equipment的导入3 caoqianming 2023-12-20 17:17:46 +0800
• 6dddf17980 feat: equipment的导入2 caoqianming 2023-12-20 17:09:35 +0800
• 873dda9296 feat: equipment的导入 caoqianming 2023-12-20 17:02:18 +0800
• 0f2d2dbee9 feat: 其他生产记录增加查询handle_date caoqianming 2023-12-20 15:17:31 +0800
• 85a49c4b0f feat: material 返回 __str__修改 caoqianming 2023-12-20 15:05:22 +0800
• 570570b517 feat: materialserializer 也返回full_name caoqianming 2023-12-20 14:47:11 +0800
• 1e6faad79b feat: material_simple_serializer full_name完整信息 caoqianming 2023-12-20 14:41:28 +0800
• ea8465cb2e feat: route serializer增加返回数据 caoqianming 2023-12-20 14:31:26 +0800
• 4ac4da7959 fix: get_file_list 默认返回空列表 caoqianming 2023-12-19 20:50:20 +0800
• 7bfe74b97f feat: pu_orderitem权限修改 caoqianming 2023-12-19 17:20:58 +0800
• a9b81849b2 fix: opencv在启动时不import caoqianming 2023-12-19 12:40:42 +0800
• 0870b13ea3 feat: mioitem增加入厂检验 caoqianming 2023-12-18 15:52:54 +0800
• 043869e828 feat: mlog增加不合格原因字段 caoqianming 2023-12-18 14:21:56 +0800
• 1de76ffc33 fix: create_auditlog update不记录的bug caoqianming 2023-12-18 13:24:49 +0800
• 0a3e434a7e fix: create_auditlog bug caoqianming 2023-12-18 13:07:49 +0800
• a1e2f12df7 fix: compare_lists_of_dicts的bug caoqianming 2023-12-18 13:01:19 +0800
• bf5d62e99d fix: mlog提交时如有mtask则handle_date为mtask日期2 caoqianming 2023-12-18 12:25:19 +0800
• 6182ef3c58 feat: mlog提交时如有mtask则handle_date为mtask日期 caoqianming 2023-12-18 11:20:51 +0800
• a9c16c4a9d feat: 日志提交和撤回返回序列化信息 caoqianming 2023-12-18 11:12:33 +0800
• 94c026f23f feat: create_auditlog bug caoqianming 2023-12-18 10:25:48 +0800
• 625074049e feat: mlog日志撤回 caoqianming 2023-12-18 09:18:06 +0800
• 845a510068 fix: mlog撤回1未完成 caoqianming 2023-12-18 08:08:42 +0800
• 8c43f8ec62 fix: handover update validate更严谨一些 caoqianming 2023-12-17 19:55:45 +0800
• e954b37404 feat: 添加与任务相关的日志信息peifen_kg caoqianming 2023-12-17 19:55:01 +0800
• 1b5c910cf8 fix: 交接记录的提交bug caoqianming 2023-12-16 13:00:56 +0800
• dff1e412b6 feat: 修改material __str__ caoqianming 2023-12-16 12:00:20 +0800
• aa2dc2e0fc feat: 增加materialsimpleserializer的返回full_name caoqianming 2023-12-16 11:56:51 +0800
• 4f1ae6ddc6 fix: mlogsubmit bug caoqianming 2023-12-16 11:46:57 +0800
• bd6b4a5f82 fix: gen_by_wm需提供send_mgroup caoqianming 2023-12-16 11:42:38 +0800
• 19a53931c4 fix: mtask update在已提交状态下只更改peifen_kg bug caoqianming 2023-12-16 10:32:48 +0800
• e5d2d5ef84 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server caoqianming 2023-12-16 09:56:48 +0800
• b8b106dc2e feat: mtask update在已提交状态下只更改peifen_kg caoqianming 2023-12-16 09:56:46 +0800
• eadf36c1d1 fix: mioitem修改字段名 caoqianming 2023-12-15 19:39:17 +0800
• 128dc2a7e3 feat: utask mtask状态submit调整 caoqianming 2023-12-15 09:05:08 +0800
• 4916ae5cff feat: audit_log返回增加change_user_name caoqianming 2023-12-14 17:14:29 +0800
• 6b6ff7cd3c feat: mlog更新时更新日志 caoqianming 2023-12-14 10:36:47 +0800
• 768a07a39a feat: mio增加筛选条件 caoqianming 2023-12-13 16:08:16 +0800
• ea63c29a69 feat: mlog有mtask时固定handle_date caoqianming 2023-12-07 10:55:06 +0800
• bdb7a9ec2d
  Update conf_e.py 曹前明 2023-12-07 10:01:37 +0800
• 80f789bab9 feat: base 增加了get_model_info caoqianming 2023-12-07 09:37:12 +0800
• 86fff7902f feat: base 修改版本号 caoqianming 2023-12-05 08:54:30 +0800
• 944817c371 feat: base 做到celery在项目间完全隔离 caoqianming 2023-12-05 08:51:07 +0800
• f62ca1bf96 feat: base redis配置加入conf.py caoqianming 2023-12-04 17:08:04 +0800
• 06351acf91 fix: base permission去除数据库约束 caoqianming 2023-12-04 08:37:35 +0800
• ac4c40f096 feat: base 部门查询增加contains caoqianming 2023-11-27 22:55:32 +0800
• 179782c73b feat: auditlog增加筛选条件 caoqianming 2023-12-07 09:40:13 +0800
• 2d8169849f feat: 将mlog添加审计日志 caoqianming 2023-12-07 09:39:52 +0800
• ba34b26928 feat: 添加审计日志auditlog表 caoqianming 2023-12-07 09:38:24 +0800
• d9ddefe5db feat: base 添加了对比字典及其嵌套内容的方法 caoqianming 2023-12-07 09:37:54 +0800
• 5dab6b0815 feat: base 增加了get_model_info caoqianming 2023-12-07 09:37:12 +0800
• 539a71ba59 fix: base 去除不必要的耦合逻辑 caoqianming 2023-12-06 09:24:24 +0800
• 33ea769ad4 feat: 增加任务类型 mass caoqianming 2023-12-05 17:25:09 +0800
• 95f67b6543 feat: is_hidden的物料也需要进行车间库存管理 caoqianming 2023-12-05 13:02:14 +0800
• 1ef6826776 feat: base 修改版本号 caoqianming 2023-12-05 08:54:30 +0800
• b744ac4591 feat: base 做到celery在项目间完全隔离 caoqianming 2023-12-05 08:51:07 +0800
• 1a09787853 feat: base redis配置加入conf.py caoqianming 2023-12-04 17:08:04 +0800