zcdsj
/
factory
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,362 Commits 4 Branches 46 Tags 15 MiB
Commit Graph

4196 Commits

Author SHA1 Message Date
caoqianming 1d4af9e52f fix: mlog 撤回后回退 utask 已提交状态避免无法删除 
update_mtask 原本只单向把 utask 推进到已提交，mlog_revert 把 mtask
退回已下达后未反向校正 utask，导致 utask 卡在已提交且无法删除。
两处 fill_way 分支均补充反向回退逻辑，按 count_ok 退回生产中或已下达。

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
 2026-05-08 15:32:46 +08:00
caoqianming 85cfb8f680 fix: LabelTemplate 序列化器允许 coder_ip 为空字符串/null 
Why: DRF IPAddressField 默认拒绝空串, 前端清空 IP 保存时报 400

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
 2026-05-08 13:45:34 +08:00
caoqianming 9c220dbc1d feat: cm 新增 1000 系列喷码机网口下发接口 
- LabelTemplate 增加 coder_ip/coder_port 字段, 模板即指定目标喷头
- 新增 CoderClient 封装 STX/ETX 帧, 支持更新用户区/选择信息/查状态
- LabelTemplateViewSet 新增 send_to_coder action, 复用 gen_commands 拼内容下发, 用户区名默认 1, 可在 body 临时覆盖

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
 2026-05-08 11:24:00 +08:00
caoqianming 7e9b559723 feat: mlog/mlogb 列表返回 wm_in 状态及缺陷标识 
MlogbDetailSerializer 增加 wm_in_state；MlogListSerializer 与 MlogSerializer 增加 wm_in_defect / wm_in_defect_name / wm_in_state；MlogViewSet 在 select_related 中追加 wm_in__defect。

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
 2026-04-30 14:03:53 +08:00
caoqianming 40ebf720f7 perf: mlogb 列表预取 mlogbdefect 与 defect 消除 N+1 
将 Mlogb.mlogbdefect 改为反向管理器 self.mlogbdefect_set.all() 以便 prefetch_related 命中缓存；MlogbViewSet 增加对 mlogbdefect_set + defect 的预取。

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
 2026-04-30 13:47:25 +08:00
caoqianming 46c9eba306 feat: mlogb 列表返回 wm_in 缺陷标识 
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
 2026-04-30 13:41:41 +08:00
caoqianming 1f7e17b6c1 fix: 撤回 is_fix 日志时兜底清理误带入的继承缺陷 
- sync_inherited_defect 早返回路径删除继承记录后补算 mlogb 数量
- mlog_revert 末尾针对 is_fix 已残留继承缺陷的产出 mlogb 触发 sync 并刷新 mlog 汇总

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
 2026-04-30 11:44:29 +08:00
caoqianming d2581d8500 fix: is_fix 日志不再继承输入物料的缺陷标识 
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
 2026-04-30 09:09:30 +08:00
caoqianming 13c9d8a258 fix: 批次统计修复小/大日期反向并增强除零兜底 
- 三个 batch_*erp 脚本将 小日期=min、大日期=max，与中文语义一致
- get_f_l_date 改为先解析为 date 再比较，移除对字符串字典序的依赖
- 合格率/直通率兜底 except 同时捕获 decimal.InvalidOperation 与 ZeroDivisionError
- 新增 batch_gxerp.md 整理计算规则与字段

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
 2026-04-29 12:14:07 +08:00
caoqianming 3129cc0e54 feat: mio 列表接口新增 total_price 返回明细金额合计 
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
 2026-04-29 11:19:44 +08:00
caoqianming 4d2a88ab1e feat: handover移除search包含id 2026-04-29 10:42:17 +08:00
caoqianming 32b0313349 feat: shift 视图改为完整 CRUD 以支持班次管理页 
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
 2026-04-29 10:37:06 +08:00
caoqianming e2b1f266aa fix: mlogdefect 空列表时仍同步继承缺陷 
前端传 mlogdefect: [] 时，原 is not None 判断会走进 need_mdfect 分支，
既不创建真实缺陷也跳过 sync_inherited_defect，导致 mlogb 无任何缺陷标识。
改为无论哪个分支都兜底调用 sync_inherited_defect，由其内部判断互斥。
 2026-04-24 15:45:58 +08:00
TianyangZhang c2ee88d2bf Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory 2026-04-24 15:00:48 +08:00
TianyangZhang 7577a46900 feat: enm 修改重跑能源计算 不用从mplogx 开始计算 2026-04-24 15:00:47 +08:00
caoqianming f6d934bbb1 fix: 重建wpr 2026-04-24 14:52:01 +08:00
caoqianming b6b79da3b1 Inherit batch output defect markers 2026-04-23 16:32:40 +08:00
TianyangZhang 48305ed6fb Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory 2026-04-21 16:05:08 +08:00
TianyangZhang 949620809a feat:光芯科技 主要修改采购功能 2026-04-21 16:05:07 +08:00
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 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 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 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
caoqianming d5ea72a021 feat: 交接记录子项需保证工段/车间一致2 2026-01-12 15:44:48 +08:00
caoqianming 143d9cb719 fix: base locked_get_or_create优化 2026-01-12 15:30:55 +08:00
caoqianming cf6633592a feat: 交接记录子项需保证工段/车间一致 2026-01-12 13:44:08 +08:00
caoqianming b39b0e7923 fix: mlog并发优化的bug 2026-01-12 13:27:29 +08:00
caoqianming 70563a6c02 feat: mlog 并发优化 2026-01-12 11:16:04 +08:00
caoqianming def22f6b18 feat: handover可以查看仅交接到车间的记录 2026-01-12 10:28:51 +08:00
caoqianming f9eee5a523 feat: handover_revert 并发优化 2026-01-12 10:21:15 +08:00
caoqianming 2ecaeadff7 feat: handover_submit 并发优化2 2026-01-09 16:59:53 +08:00
caoqianming 6eee0e1e53 feat: handover_submit 并发优化 2026-01-09 16:54:24 +08:00
caoqianming 3417515e72 feat: base 添加locked_get_or_create 2026-01-09 16:53:57 +08:00
caoqianming 43abcbaa48 feat: 查询-n批次从正则改用like以优化性能 2026-01-09 15:55:56 +08:00
caoqianming 02e3265133 feat: 升级依赖包 2026-01-08 09:59:39 +08:00
TianyangZhang f7a78431c5 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory 2026-01-07 16:03:19 +08:00
TianyangZhang 5b60318bfb feat: gx-人员请假申请与审批 2026-01-07 16:03:18 +08:00
caoqianming 0127e2a149 feat: get_shift需要报错 2026-01-07 14:19:43 +08:00
caoqianming f5b1b13a63 feat: 添加rem模块 2026-01-06 14:19:37 +08:00
caoqianming f7b09ab1df fix: wpr list annotate明确number指向 2026-01-06 09:22:38 +08:00
caoqianming b362fc3b89 feat: 捕获除0异常 2026-01-05 08:19:38 +08:00
caoqianming 8f791ac8de feat: 按需求修改光芯批次统计分析 2026-01-04 15:55:03 +08:00
caoqianming afa3b8b9ad Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory 2026-01-04 14:41:37 +08:00
caoqianming 3d6fcfac8a feat: 批次统计数据支持返回source_near 2026-01-04 14:41:36 +08:00
TianyangZhang db910f0804 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory 2026-01-04 14:16:43 +08:00
TianyangZhang 7dc7a78695 feat:光芯OA 审批系统新增报价单审核 2026-01-04 14:16:41 +08:00
caoqianming 952cdb1bc7 feat: get_batch_dag还是只返回直接前后级别 2026-01-04 13:55:09 +08:00
caoqianming 9ed78f8d32 feat: mlogbbpatch修改批次号 2026-01-04 11:10:54 +08:00
caoqianming 52ebac68a0 feat: 出入库记录返回子表部分信息 2026-01-04 10:10:26 +08:00
caoqianming 81770e89fa feat: 统一撤回和撤销的表述2 2025-12-30 14:34:34 +08:00
caoqianming 6ac7c020bd feat: 统一撤回和撤销的表述 2025-12-30 14:32:29 +08:00
caoqianming e385a558e9 feat: 车间库存检验支持撤回 2025-12-30 14:28:20 +08:00
caoqianming c37e71d60f feat: wpr添加material_name查询条件 2025-12-30 10:07:41 +08:00
caoqianming c3c7675ac5 feat: 优化mlog_submit 返工后产品放在本工段下2 2025-12-29 15:54:14 +08:00
caoqianming 29f4e2f76a feat: 优化mlog_submit 返工后产品放在本工段下 2025-12-29 15:09:45 +08:00
caoqianming ec13b8b166 fix: 正常交接支持new_wm且支持不合格品 2025-12-29 14:41:06 +08:00
caoqianming c56f908b42 feat: mlogbin qct 可依据fix选择 2025-12-26 17:00:00 +08:00