zcdsj
/
factory
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,412 Commits 4 Branches 47 Tags 16 MiB
Commit Graph

4234 Commits

Author SHA1 Message Date
caoqianming fa16694f9f feat(wpm): enrich handover detail records 2026-08-07 16:17:12 +08:00
caoqianming 94215df0b6 feat(wpm): enrich sub-process operation records 2026-08-07 14:29:56 +08:00
caoqianming 24ce008d3a perf(wpm): batch load handover inventory validation 2026-08-07 11:15:22 +08:00
caoqianming d98b7fada2 fix(wpm): allow qualified and grade b batch merges 2026-08-07 10:28:12 +08:00
caoqianming fd4de2bd4b fix(wpm): match historical numbers to active rule 2026-08-07 09:58:54 +08:00
caoqianming b365e06318 feat(inventory): add effective defect grade filtering 2026-08-06 10:31:37 +08:00
caoqianming ed952d2d3a feat(swagger): generate localized static API schema 2026-08-05 16:51:59 +08:00
caoqianming 4bf5f1e585 feat(bi): expose dataset query workflow 2026-08-05 15:01:44 +08:00
caoqianming 5fb179eb9e fix(develop): restrict unsafe debug endpoints 2026-08-04 16:33:27 +08:00
caoqianming 69b5346031 feat(wpm): sync wpr number from output edits 2026-08-04 14:32:24 +08:00
caoqianming ddb3cc6f3f fix(wpm): derive number date filters from rule 2026-08-04 13:45:29 +08:00
shijing 19271e8880 fix:ftestwork查询添加batch_contains 2026-08-04 11:12:36 +08:00
shijing cfcd6c2ba3 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory 2026-08-04 09:55:18 +08:00
shijing 62f5aaef21 fix:api/qm/ftestwork接口返回submit_user_name 2026-08-04 09:55:16 +08:00
caoqianming d86d70641d feat(wpm): add files to individual outputs 2026-08-03 10:23:52 +08:00
zty e23db9dc6c feat(hrm): 员工Excel导入支持全量覆盖(空单元格清空,不可空字段保留原值) 
Co-Authored-By: Claude <noreply@anthropic.com>
 2026-07-31 03:55:48 -04:00
zty cf2800daa0 feat(enm): 新增瓮福数据API（采集数据查询+测点列表分页） 
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
 2026-07-31 03:55:48 -04:00
caoqianming cee94f9f4a Centralize snowflake IDs for bulk create 2026-07-31 11:03:26 +08:00
caoqianming 1f98b81ce3 Fix bulk-created individual defect IDs 2026-07-31 11:00:01 +08:00
caoqianming 074e759c29 Allow clearing same-grade batch defects 2026-07-30 14:52:43 +08:00
caoqianming 89cc999c42 Prevent duplicate warehouse inventory creation 2026-07-30 13:22:28 +08:00
caoqianming 6068f2315d Expose independent material defect grades 2026-07-30 11:15:29 +08:00
caoqianming 298a32f744 Refine individual defect lifecycle 2026-07-30 09:40:29 +08:00
caoqianming bcbb27374f Support manual route output materials 2026-07-29 08:57:20 +08:00
caoqianming d5d940c5e4 Fix handover mgroup filtering 2026-07-28 16:11:11 +08:00
caoqianming 5f81ef9494 Prevent duplicate workshop inventory creation 2026-07-28 15:27:39 +08:00
caoqianming 8af19b8a9a Restrict global inventory handovers 2026-07-28 12:15:21 +08:00
caoqianming 1700a58409 统一车间库存归属策略 2026-07-28 09:26:25 +08:00
caoqianming dde5b0a6e8 Fix mlogbw creation for route-less rework 2026-07-27 17:36:24 +08:00
caoqianming c3f2c0f136 fix: unify workflow action permissions 2026-07-27 13:20:58 +08:00
caoqianming 1584763794 feat:单个编号规则支持c_day按天占位与按天归零;并发生成加工序级advisory锁防重号;流水号宽度按规则解析并对齐排序截取;超上限报错;工序保存时校验编号规则 
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
 2026-07-23 16:05:05 +08:00
caoqianming 3561a50647 feat:工艺路线Route创建/更新时未指定输出物料且工艺包无产品直接报错,不再静默生成残缺工序;补material_in_type字段供画布按物料真实类型着色 
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
 2026-07-23 09:15:26 +08:00
caoqianming c08b220d17 feat:工艺路线新增validate接口,供拖拽画布实时校验DAG结构(不存盘,返回valid/error) 
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
 2026-07-22 16:29:53 +08:00
caoqianming ea0fe7c312 feat:物料新增入库检验方式test_mode_in(免检/必检,默认必检),生产领料检验卡点支持物料级免检,明细过滤器支持material__test_mode_in 
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
 2026-07-22 16:20:18 +08:00
caoqianming 5881c32c38 perf:mlog/handover/mlogb列表消除N+1,select_related精简改prefetch,修Handover.handoverb属性绕过prefetch的bug 
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
 2026-07-16 14:41:46 +08:00
caoqianming 45c61efdc6 fix:发货编号获取接口number_out_last兼容无横杠格式避免明细重复编号 
number_out_last原按"前缀-数字"(带横杠)查询,LIKE prefix-%对无横杠
编号(如FS01/FS00025)命中0行返回null,前端遂每次从头重编导致同一
草稿明细出现重复对外编号。改为:
- LIKE去横杠(prefix%),用substring(...)~^[0-9]+$约束前缀后紧跟纯数字,
  既命中FS00025又排除FSM00027等更长前缀
- 按尾部数字数值排序取最大,避免补零位数不一致时取错
- lstrip(prefix)改为re.sub取尾部数字,与前端提取逻辑一致

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
 2026-07-16 13:25:12 +08:00
caoqianming 4050d41370 车间库存列表补齐关联字段select_related,消除剩余N+1 
WMaterialViewSet 列表序列化查询数从随行数线性增长降为常数1条:
- 补 mgroup/material_ofrom/material_origin/defect 的 select_related
- material_ofrom/material_origin 用 StringRelatedField(__str__ 取 process.name),
  故用 __process 嵌套路径带上工序表, 避免每行回查 mtm_process

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
 2026-07-16 12:03:47 +08:00
caoqianming 1e94027e17 perf:销售发货批次隐藏可发数量为0的批次,并用子查询消除在途量N+1 
- inm:MaterialBatchFilter 新增 count_canmio__gt 过滤,销售发货(sale_out)只展示可发>0的批次
- inm/wpm:count_mioing/count_working/count_handovering 改用关联子查询单次注解,
  消除列表逐行属性的N+1(纯访问101→1),并保留decimal精度(修正原IntegerField截断
  导致可发/可用量偏大的隐患)
- 新增 apps/utils/orm.py:inflight_sum(多聚合用子查询避免JOIN翻倍) + restql_wants
  (?query未取这些字段时跳过子查询)

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
 2026-07-16 11:57:21 +08:00
caoqianming 5c9bb530c7 feat:合格B类字段前端文案改为"记为合格"更准确表达 
clear_defect 在工序/日志上的实际语义是合格B类当合格品不记缺陷入库,原不拆批/合批清除缺陷描述机制且工序上名不副实,统一改为记为合格。

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
 2026-07-16 10:19:50 +08:00
caoqianming c93eb83ddd fix:销售发货获取编号number_out_last参数绑定错误导致500 
number_out_last重写为LIKE+translate双%s后,params仍以[params]传入,
2个占位符只收到1个参数,psycopg2抛IndexError。改为直接传params元组。

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
 2026-07-15 16:31:10 +08:00
caoqianming b541b46d3d feat:物料新增set_safe接口设置安全库存上下限 
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
 2026-07-15 08:18:23 +08:00
caoqianming 3c0088d18f feat:新增物料安全库存上限字段并支持仓库数量汇总报表 
- mtm_material 新增 count_safe_upper(安全库存上限), count_safe 语义明确为下限
- 迁移 0065

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
 2026-07-14 15:19:27 +08:00
caoqianming d68ca98f2c perf:大批计算提速与回刷脚本增强 
- 分子聚合改values_list按JSON键取值, 不再拉子批整份data
- 子批发现改按层批量查询(每层2次), 替代逐节点循环查询
- cal_zt_big加use_white_cache参数, fresh回刷不再额外读写大批data
- 脚本内关闭DEBUG(避免SQL日志内存累积拖慢长任务)
- 新增--skip-resolve跳过归属解析直接算大批; 默认起始2026-06-01

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
 2026-07-14 11:34:08 +08:00
caoqianming d0c38b98f2 fix:归属解析支持多级拆批爬链与未拆批直检大批 
- 孙批沿拆批链爬到顶层大批, 修复中间子批被错锁为大批
- 复检批合批来源统一按爬链顶层判定, 修复"来源大批不一致"误报
- 来源均为炉料链且批号为大批格式时自身即大批(未拆批直接检验);
  不良集中池等非大批格式不归属
- correct脚本--fresh忽略旧锁重新解析, 并清理错误的大批标记与直通键

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
 2026-07-14 10:54:47 +08:00
caoqianming a90351bb93 feat:correct_zt_gxerp逐批打印计算结果 
cal_zt_big返回计算摘要, 回刷脚本每个大批实时输出良率/白料/口径

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
 2026-07-14 10:34:56 +08:00
caoqianming cd3faa0ad7 docs:同步ZT_MAX_VISITS=300 
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
 2026-07-14 10:26:51 +08:00
caoqianming ae235a768b fix:白料回溯访问上限降为300 
实测正常批1~10次访问, 最重合法案例77次, 300已留4倍余量;
病态谱系最多浪费约20秒即放弃并负缓存

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
 2026-07-14 10:26:11 +08:00
caoqianming d1c7ffb598 fix:白料回溯记忆化+访问上限, 入库兜底汇总原料性入库 
- 回溯按批次号记忆化, 修复遗留无损批网状谱系导致的指数爆炸卡死
- 单次回溯超3000节点放弃并记口径"回溯规模超限"
- 入库兜底改为汇总pur_in/other_in全部入库明细, 修复多次入库低估
- save(update_fields)补update_time使auto_now生效

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
 2026-07-14 10:21:54 +08:00
caoqianming fb5f1d072d feat:出入库明细创建/导入时未传单价自动取物料主数据单价 
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
 2026-07-14 09:56:15 +08:00
caoqianming 3be0b09cd9 feat:batchst接口支持with_zt_big附带直通大批数据及zt_batch过滤 
小批查询时?with_zt_big=yes每行附zt_big=所属大批完整BatchSt(含直通_*);
zt_batch加入过滤字段, 可按大批号反查全部子批

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
 2026-07-13 22:43:30 +08:00