Commit Graph

Select branches

Hide Pull Requests

base

gzerp

master

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

Mono Color

• d0b13ac215 feat: do_in时增加更完整的提示信息 caoqianming 2024-01-25 09:49:37 +0800
• 30dbeacdd0 fix: 修改mio查询条件以支持materials为空的情况 caoqianming 2024-01-25 09:45:12 +0800
• 1d2f9f09eb feat: mioviewset prefetch_related_fields优化 caoqianming 2024-01-24 12:35:50 +0800
• 6cb22744c2 fix: 增加materials__type__in筛选 caoqianming 2024-01-24 12:31:36 +0800
• 4a0f73c783 feat: 增加materials 筛选 caoqianming 2024-01-24 11:48:33 +0800
• 20e209ced2 fix: update_mb更新物料库存的bug caoqianming 2024-01-23 18:03:05 +0800
• e81acb7aa7 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server caoqianming 2024-01-22 08:27:28 +0800
• ddd0d2a6df feat: enp调整 caoqianming 2024-01-22 08:27:27 +0800
• 204730e2c8 Merge branch 'base' of https://github.com/caoqianming/django-vue-admin into base caoqianming 2024-01-21 22:44:55 +0800
• fce6d86f07 fix: 处理合并的bug caoqianming 2024-01-10 10:11:43 +0800
• 8e96afac4c feat: 添加gitignore caoqianming 2024-01-21 22:30:38 +0800
• e4a258088b fix: 处理合并的bug caoqianming 2024-01-10 10:11:43 +0800
• 7973a0093b feat: base 添加了对比字典及其嵌套内容的方法 caoqianming 2023-12-07 09:37:54 +0800
• 479eb91b99 feat: base 增加最大获取列表数 caoqianming 2024-01-21 00:23:49 +0800
• 6827b72231 feat: base 增加最大获取列表数 caoqianming 2024-01-21 00:23:49 +0800
• e193a663c6 feat: 取消dataset exec 日志记录及可直接抛出错误 caoqianming 2024-01-21 00:06:19 +0800
• 6f8c7c0567 feat: mlog validate时计算count_notok caoqianming 2024-01-20 23:30:09 +0800
• c88f33ad4d feat: 增加material name查询条件 caoqianming 2024-01-19 14:56:48 +0800
• 679e6bac4f feat: 增加物料导入功能 caoqianming 2024-01-19 14:36:08 +0800
• 61801784fc feat: equip增加tags字段 caoqianming 2024-01-19 11:37:57 +0800
• 318a39c948 fix: 成品检验 perform_create的bug caoqianming 2024-01-19 09:57:44 +0800
• 387bb66914 feat: 增加equip的name contains查询条件 caoqianming 2024-01-19 09:45:25 +0800
• ec70aceb76 feat: count_sampling 默认为0 caoqianming 2024-01-18 15:14:48 +0800
• 78fd0c9721 feat: 日志撤回后修改任务状态 caoqianming 2024-01-18 10:55:41 +0800
• a4d23f534a fix: mlog validate bug caoqianming 2024-01-18 10:27:38 +0800
• 67d8ede2a4 feat: 计算count_sampling caoqianming 2024-01-17 16:56:07 +0800
• e5ba779b00 feat: 增加产品检验 caoqianming 2024-01-17 15:55:42 +0800
• 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