zcdsj
/
factory
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,279 Commits 3 Branches 41 Tags 14 MiB
Commit Graph

4279 Commits

Author SHA1 Message Date
caoqianming cafecd4d4a feat: add contract settlement workflows 2026-04-20 16:56:11 +08:00
caoqianming a111f493e1 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory 2026-04-14 14:16:18 +08:00
caoqianming 3c931040cf feat: batch_bxerp添加子工序操作人 2026-04-14 14:16:17 +08:00
TianyangZhang 159b644126 feat: 修改 hrm & rpm 代码 2026-04-07 13:42:30 +08:00
TianyangZhang a82405e451 feat:修改光芯人员导入功能 2026-03-31 11:08:12 +08:00
caoqianming 44c0787d12 release: 3.1.2026033008 2026-03-30 08:38:38 +08:00
caoqianming b3d0b34719 perf: 优化 Material 可用物料过滤，改为 DB 子查询 
- 新增 filter_process_todo 过滤器替代原 todo tag 逻辑
- 避免将 ID 列表加载到 Python 内存，改用两个子查询 OR 合并

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
 2026-03-27 14:40:07 +08:00
caoqianming 68191dc305 fix: WMaterialCreateSerializer 所有字段设为必填 
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
 2026-03-27 10:10:18 +08:00
caoqianming 320822019a feat: WMaterialViewSet 添加手动来料创建和删除接口 
- 新增 WMaterialCreateSerializer，validate 中自动推导 belong_dept
- ViewSet 使用 create_serializer_class，perform_create 设置 is_manual=True
- 删除校验逻辑移至模型 delete 方法，校验 is_manual 及关联记录（mlogb/handoverb/ftestwork/mioitem）

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
 2026-03-27 10:08:42 +08:00
caoqianming 61f70d4907 feat: Ptest添加中温粘度规格和结论字段 
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
 2026-03-27 08:58:33 +08:00
caoqianming 3e1a087258 feat: WMaterialViewSet 添加手动创建和删除接口 
- WMaterial 新增 is_manual 字段标记手动创建的库存
- WMaterialViewSet 添加 create 接口，创建时自动设置 is_manual=True
- WMaterialViewSet 添加 destroy 接口，仅允许删除手动创建的记录

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
 2026-03-26 22:07:42 +08:00
TianyangZhang 6d43b412b7 feat: 修改光芯OA审批的BUG与新增导出功能 2026-03-23 09:50:20 +08:00
TianyangZhang c5e545f5e5 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory 2026-03-13 16:59:13 +08:00
TianyangZhang e3dcb492d7 feat:恢复ichat 功能和 defaut 下的文件 2026-03-13 16:59:12 +08:00
caoqianming 296bccbd3f release: 3.1.2026031316 2026-03-13 16:40:12 +08:00
caoqianming 409972ba88 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory 2026-03-13 16:35:48 +08:00
caoqianming 4acd80718d fix: avoid duplicate rows in complex reverse queries 
Add an optional distinct flag to complex query payload and deduplicate by primary key before annotate/order flow, so reverse-join filtering does not return repeated records.

Made-with: Cursor
 2026-03-13 16:35:12 +08:00
TianyangZhang d657c9fd26 feat: 删除-ichat 2026-03-13 10:01:05 +08:00
TianyangZhang 8541905a5c feat:mpr-物资管理模块（申购单、入库单、物料库存、领用记录） 
- 新增 mpr app，包含物资申购单、仓库入库单、物料库存、物资领用单四个业务模型
- 物资申购单/入库单支持 TicketMixin 审批工作流，明细随主表一次性提交
- 入库单审批通过后自动生成物料库存记录
- 物料库存增加状态字段（闲置/领用中/已领用/已领完），数量为0时显示已领完
- 物资领用单提交时自动扣减库存并标记领用中，审批通过改为已领用，拒绝时恢复库存
- 包含 models、serializers、views、filters、urls 完整后端代码

Made-with: Cursor
 2026-03-12 16:56:12 +08:00
TianyangZhang 7e052b7b71 feat:hrm-人员合同变更 2026-03-12 08:48:52 +08:00
TianyangZhang 416aa50a67 feat:hrm-migration 修改迁移文件 2026-03-06 11:14:16 +08:00
caoqianming c99e74eee8 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory 2026-03-06 11:05:03 +08:00
caoqianming 8b22084c0a feat: qctmat create update 校验唯一 2026-03-06 11:05:03 +08:00
TianyangZhang 0c66931154 feat:gx-hrm-employee 人员导入功能 2026-03-04 15:39:46 +08:00
TianyangZhang c3605ff1db feat: hrm-views 修改employee 人员导入 2026-03-04 13:56:00 +08:00
TianyangZhang 743c724d79 feat:hrm-employee 增加人员导入功能 2026-03-03 14:45:53 +08:00
caoqianming bf5cfbe7e6 feat: fmlog返回route_material_in 2026-02-10 10:27:43 +08:00
caoqianming 80a3dbd72b Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory 2026-02-04 15:45:13 +08:00
caoqianming cffea3e1ea feat: 加工前不良当合格品处理 2026-02-04 15:45:12 +08:00
TianyangZhang 4690a78ac6 feat: hrm - 修改 人员调岗后更新部门和岗位 2026-01-29 10:43:52 +08:00
TianyangZhang beef2b3e54 feat:人员调岗申请 修改 2026-01-28 09:57:13 +08:00
TianyangZhang 987a53005c Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory 2026-01-26 11:00:21 +08:00
TianyangZhang c9089eeb27 feat: hrm-新增人员岗位调动 2026-01-26 11:00:19 +08:00
caoqianming d29fcce935 fix: base user_exist完善 2026-01-23 16:18:17 +08:00
caoqianming a534bde086 feat: wmaterial根据current_merged查询3 2026-01-22 16:12:35 +08:00
caoqianming 63002f27c8 feat: wmaterial根据current_merged查询2 2026-01-22 16:00:59 +08:00
caoqianming 4bbae8b7df feat: wmaterial根据current_merged查询 2026-01-21 11:09:53 +08:00
caoqianming dc26c7cc46 feat: handoverb添加oinfo_json字段 2026-01-16 15:29:58 +08:00
caoqianming 0d80e182cd feat: base user增加has_perm筛选条件 2026-01-16 14:48:08 +08:00
caoqianming 2759114ede feat: base 升级后同步数据库 2026-01-16 14:42:42 +08:00
caoqianming 80f832aa85 feat: 光子添加工段数据统计 2026-01-16 14:01:13 +08:00
caoqianming 70e49eb27e fix: batchst支持返回source_near修复 2026-01-16 14:00:52 +08:00
caoqianming e99b2ecbbc fix: base complexquerymixin支持add_info_for_list 2026-01-16 14:00:11 +08:00
caoqianming 146e842642 feat: with_source_near筛选体现在swagger里 2026-01-15 16:47:15 +08:00
caoqianming 47b1887c4b feat: base 调整asgi导入以保证正常启动 2026-01-15 09:13:09 +08:00
caoqianming 1ffbe0cc44 feat: wpr 返回wpr_from_ 2026-01-13 15:02:52 +08:00
caoqianming 3e173f7a72 feat: base cquery支持add_info_for_list 2026-01-13 14:57:13 +08:00
caoqianming fce66da1d9 feat: wpr 添加筛选条件wpr_from 2026-01-13 14:15:16 +08:00
caoqianming feb8bd6770 feat: wpr_bxerp优化 2026-01-13 10:29:41 +08:00
caoqianming 43f5f11ca8 feat: 未有ftest的也触发单个统计 2026-01-13 09:05:19 +08:00