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

4327 Commits

Author SHA1 Message Date
shijing 53f6082071 fix:wpr更新添加pre_info字段 2026-05-26 09:27:45 +08:00
caoqianming dab1da0b05 feat: send_to_coder 支持传入 coder_jobname 切换喷码机信息模板 
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
 2026-05-25 14:30:22 +08:00
shijing 0dd78f09b9 fix:锁定 MIO 行，防止多人同时撤销不同明细时并发漏删 MIO,若该出入库记录已无明细，自动删除 2026-05-22 09:43:43 +08:00
shijing b108b48714 feat:wpm/mloguser返回设备名称 2026-05-22 09:42:03 +08:00
shijing 7d91682e8a fix:禅道413 2026-05-21 16:18:01 +08:00
caoqianming 99e2909514 feat: send_to_coder 统一走 CQI+JDI 队列, 单/批共用 tdata_list 
- 入参只接 tdata_list (列表, 至少一条), 单条就是长度=1
- 每次先 CQI 清队列, 再按顺序 JDI 入 N 条
- 一次光电触发消费一条, 与"一行=一个产品"的业务语义对齐
- 不再保留单条 tdata, 开发期清理掉

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
 2026-05-18 15:57:21 +08:00
caoqianming 2b3aaf8879 feat: 写指令也短读0.3s捕获机器的ERR回包 
之前 expect_reply=False 直接关 socket, 机器若回 ERR 完全感知不到,
表现就是"接口200但实际没动作"。改为写完后短读最多一行, 拿到
ERR/'!' 开头直接报错; 超时则照旧视为成功放行。

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
 2026-05-18 15:16:27 +08:00
caoqianming 3304371560 fix: 1880 无参查询指令(GST/GFT/GJD)去掉多余的 '|' 
PDF 标题里的 'GST|<CR>' 是排版分隔, 实际帧是 'GST<CR>'。
之前多发了一个 '|' 导致机器回 'ERR\r'。
CQI 之前已是正确写法, 有参指令(JDA/SLA/JDI/SST)不变。

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
 2026-05-18 15:15:04 +08:00
caoqianming f8b6f084d4 feat: 重写喷码通讯为伟迪捷1880 ASCII协议, 配置改由前端传入 
- 原 CoderClient 用的是 Domino 1000 系列 STX/ETX 二进制帧, 不适用于 1880
- 改为 ASCII '|' 分隔 + <CR> 结尾, 实现 SLA/JDA/CQI/JDI/SST/GST 等指令
- send_to_coder 把多条 commands 合并成单帧 JDA 一次下发
- 配合模型字段移除, IP/端口/用户区由请求 body 提供, 不再走模板回退

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
 2026-05-18 13:48:52 +08:00
caoqianming 43b2a4c7f7 fix: 移除LabelTemplate不必要的字段 2026-05-18 10:49:49 +08:00
caoqianming 96f5133152 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory 2026-05-18 09:16:28 +08:00
caoqianming 2b77a469dd feat: 简化打码器 2026-05-18 09:16:16 +08:00
TianyangZhang d480595415 feat: 修改光芯bug 2026-05-15 17:07:58 +08:00
caoqianming dadfd9669a feat: 标签模板增加打码器用户区配置, 支持同一信息内切换码型 
LabelTemplate 新增 coder_field 字段(默认"1"), 喷码机一条信息里插入多个不同
码型的用户区时, 不同模板填不同用户区名即可打不同码型(条码/二维码/文本),
无需走 T 指令。coder.py 通讯编码放宽到 latin-1 并校验帧内控制字符。

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
 2026-05-15 15:08:54 +08:00
shijing 1299bddc6a fix:工序添加clear_defect 2026-05-15 13:39:22 +08:00
caoqianming 92c3fd60ca Merge pull request 'dev_cqm' (#7) from dev_cqm into master 
Reviewed-on: http://gitea.xxhhcty.xyz:8080/zcdsj/factory/pulls/7
 2026-05-14 09:48:39 +08:00
caoqianming 8327a5d125 Merge pull request 'master' (#6) from master into dev_cqm 
Reviewed-on: http://gitea.xxhhcty.xyz:8080/zcdsj/factory/pulls/6
 2026-05-14 09:45:01 +08:00
caoqianming 2c1b0f7b83 feat: mlog 提交支持 clear_defect，合格 B 类与合格品合并入库 
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
 2026-05-14 09:22:40 +08:00
caoqianming b03b42ad23 Merge pull request 'feat: 合批支持 clear_defect，合格品多 defect 合批后置空' (#5) from dev_cqm into master 
Reviewed-on: http://gitea.xxhhcty.xyz:8080/zcdsj/factory/pulls/5
 2026-05-13 08:09:01 +08:00
caoqianming 651366257c feat: 合批支持 clear_defect，合格品多 defect 合批后置空 
新增 Handover.clear_defect 字段：合批时若源批次 state 均为 WM_OK 且
defect 不一致，可由前端显式勾选开启，落库后目标 defect 为 None；默认
false 保持原有严格校验。

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
 2026-05-12 18:03:36 +08:00
caoqianming 4d60c2c7bd Merge pull request 'feat: mioitem 返回 defect/defect_name/okcate 并优化 mio 详情 items 序列化' (#4) from dev_cqm into master 
Reviewed-on: http://gitea.xxhhcty.xyz:8080/zcdsj/factory/pulls/4
 2026-05-12 09:28:25 +08:00
caoqianming a0739a9351 Merge branch 'master' into dev_cqm 2026-05-12 09:28:06 +08:00
caoqianming bb64c89d76 feat: mioitem 返回 defect/defect_name/okcate 并优化 mio 详情 items 序列化 
- MIOItemSerializer 新增 defect/defect_name/okcate,取数优先级 wm.defect>mb.defect,
  与 services.py 中 do_out/do_in 的取数逻辑保持一致
- MIOItemViewSet.select_related_fields 加 wm__defect/mb__defect 消除 N+1
- MIODetailSerializer.items 改用 MIOItemForMioDetailSerializer 轻量序列化器
  (仅含前端实际消费的 id/mio/material/material_/batch/count/pack_index),
  避开 MIOItemSerializer 中 assemb/mioitemw 的 N+1
- MIOViewSet.retrieve 时挂 Prefetch('item_mio') 进一步减少查询

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
 2026-05-12 09:23:22 +08:00
caoqianming 08d9b7c7a7 Merge pull request 'feat: inm 生产领料/入库支持带 defect 物料并按 okcate 推导 state' (#3) from fix/inm-defect-do-out into master 
Reviewed-on: http://gitea.xxhhcty.xyz:8080/zcdsj/factory/pulls/3
 2026-05-12 08:59:57 +08:00
caoqianming 70f2d0d2dd feat: inm 生产领料/入库支持带 defect 物料并按 okcate 推导 state 
去除 do_out 对 defect 非空的硬拦截,do_out/do_in 中查询与创建
MaterialBatch、WMaterial 时按 defect.okcate==DEFECT_NOTOK 推导
state=WM_NOTOK,与 update_mb_item 保持一致,撤销路径同步打通。

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
 2026-05-12 08:57:38 +08:00
caoqianming 5354557f4a Merge pull request 'fix:分支提交测试' (#2) from dev_sj into master 
Reviewed-on: http://gitea.xxhhcty.xyz:8080/zcdsj/factory/pulls/2
 2026-05-11 15:27:37 +08:00
shijing 2c35390430 fix:分支提交测试 2026-05-11 15:18:36 +08:00
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 881e16626d chore: 添加 release slash command 与 .claude 目录约定 
- .claude/commands/release.md：发布流程的 slash command（/release）
- .gitignore：忽略 .claude/settings.local.json（本机权限白名单不入库）

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
 2026-04-29 14:28:49 +08:00
caoqianming d177cae663 release: 3.1.2026042912 
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
 2026-04-29 12:19:42 +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