factory

Commit Graph

Select branches

Hide Pull Requests

base

dev_cqm

dev_sj

master

#2

#3

#4

#5

#6

#7

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

3.1.2026033008

3.1.2026042912

68b70476ba feat:wpr/cquery返回子工序的使用设备 master shijing 2026-06-24 16:03:02 +0800
e5bf9d58c0 fix: 处理PG 连接泄漏隐患 shijing 2026-06-18 10:22:21 +0800
e77c1ac820 fix:库存出入库记录mioitems创建时可以多选批次 shijing 2026-06-17 16:06:27 +0800
652555ef01 feat(cm): 新增大族激光打标机(Hanslaser)单件打标接口 caoqianming 2026-06-08 10:42:52 +0800
301e886a9e fix(hrm): 导入部门改为仅新增必填，修复更新被拦截 zty 2026-06-03 14:45:01 +0800
b395db7a28 feat(hrm): 完善员工导入导出 zty 2026-06-03 14:12:17 +0800
1e920296e0 fix:get_tyy_data返回数据 shijing 2026-06-03 13:34:24 +0800
b21c48b90c fix: get_tyy_data方法调整 shijing 2026-06-03 10:50:57 +0800
beddfe98ba feat: get_tyy_data单独处理 shijing 2026-06-03 09:22:32 +0800
2f8beec37f feat(cd): get_tyy_data 支持并行获取维视智造SVS识别字符 caoqianming 2026-06-01 10:13:15 +0800
804746fde8 fix:喷码时偶尔出现不属于队列项的调整 shijing 2026-05-29 09:32:47 +0800
39ae839692 fix: 移除mlogbw pre_info shijing 2026-05-28 11:22:28 +0800
c7515052cf Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory shijing 2026-05-28 11:20:45 +0800
95605be52f fix: pre_info可为空 shijing 2026-05-28 11:20:43 +0800
7ef9763a50 feat(cd): out_service/cd.py 支持任意 host:port, 去掉 IP 白名单 caoqianming 2026-05-27 14:14:12 +0800
86a8110a5e perf(cd): out_service/cd.py 改 ThreadingHTTPServer + per-host 锁, drain 改非阻塞 caoqianming 2026-05-27 13:47:44 +0800
8de4d1197b fix:工装调整 shijing 2026-05-27 10:18:07 +0800
53f6082071 fix:wpr更新添加pre_info字段 shijing 2026-05-26 09:27:45 +0800
dab1da0b05 feat: send_to_coder 支持传入 coder_jobname 切换喷码机信息模板 caoqianming 2026-05-25 14:30:22 +0800
0dd78f09b9 fix:锁定 MIO 行，防止多人同时撤销不同明细时并发漏删 MIO,若该出入库记录已无明细，自动删除 shijing 2026-05-22 09:43:43 +0800
b108b48714 feat:wpm/mloguser返回设备名称 shijing 2026-05-22 09:42:03 +0800
7d91682e8a fix:禅道413 shijing 2026-05-21 16:18:01 +0800
99e2909514 feat: send_to_coder 统一走 CQI+JDI 队列, 单/批共用 tdata_list caoqianming 2026-05-18 15:57:21 +0800
2b3aaf8879 feat: 写指令也短读0.3s捕获机器的ERR回包 caoqianming 2026-05-18 15:16:27 +0800
3304371560 fix: 1880 无参查询指令(GST/GFT/GJD)去掉多余的 '|' caoqianming 2026-05-18 15:15:04 +0800
f8b6f084d4 feat: 重写喷码通讯为伟迪捷1880 ASCII协议, 配置改由前端传入 caoqianming 2026-05-18 13:48:52 +0800
43b2a4c7f7 fix: 移除LabelTemplate不必要的字段 caoqianming 2026-05-18 10:49:49 +0800
96f5133152 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory caoqianming 2026-05-18 09:16:28 +0800
2b77a469dd feat: 简化打码器 caoqianming 2026-05-18 09:16:16 +0800
d480595415 feat: 修改光芯bug TianyangZhang 2026-05-15 17:07:58 +0800
dadfd9669a feat: 标签模板增加打码器用户区配置, 支持同一信息内切换码型 caoqianming 2026-05-15 15:08:25 +0800
1299bddc6a fix:工序添加clear_defect shijing 2026-05-15 13:39:22 +0800
92c3fd60ca Merge pull request 'dev_cqm' (#7) from dev_cqm into master caoqianming 2026-05-14 09:48:39 +0800
8327a5d125 Merge pull request 'master' (#6) from master into dev_cqm #7 dev_cqm caoqianming 2026-05-14 09:45:01 +0800
2c1b0f7b83 feat: mlog 提交支持 clear_defect，合格 B 类与合格品合并入库 caoqianming 2026-05-14 09:22:40 +0800
b03b42ad23 Merge pull request 'feat: 合批支持 clear_defect，合格品多 defect 合批后置空' (#5) from dev_cqm into master #6 caoqianming 2026-05-13 08:09:01 +0800
651366257c feat: 合批支持 clear_defect，合格品多 defect 合批后置空 #5 caoqianming 2026-05-12 18:02:33 +0800
4d60c2c7bd Merge pull request 'feat: mioitem 返回 defect/defect_name/okcate 并优化 mio 详情 items 序列化' (#4) from dev_cqm into master caoqianming 2026-05-12 09:28:25 +0800
a0739a9351 Merge branch 'master' into dev_cqm #4 caoqianming 2026-05-12 09:28:06 +0800
bb64c89d76 feat: mioitem 返回 defect/defect_name/okcate 并优化 mio 详情 items 序列化 caoqianming 2026-05-12 09:23:22 +0800
08d9b7c7a7 Merge pull request 'feat: inm 生产领料/入库支持带 defect 物料并按 okcate 推导 state' (#3) from fix/inm-defect-do-out into master caoqianming 2026-05-12 08:59:57 +0800
70f2d0d2dd feat: inm 生产领料/入库支持带 defect 物料并按 okcate 推导 state #3 caoqianming 2026-05-12 08:51:08 +0800
5354557f4a Merge pull request 'fix:分支提交测试' (#2) from dev_sj into master caoqianming 2026-05-11 15:27:37 +0800
2c35390430 fix:分支提交测试 #2 dev_sj shijing 2026-05-11 15:18:36 +0800
1d4af9e52f fix: mlog 撤回后回退 utask 已提交状态避免无法删除 caoqianming 2026-05-08 15:32:46 +0800
85cfb8f680 fix: LabelTemplate 序列化器允许 coder_ip 为空字符串/null caoqianming 2026-05-08 13:45:34 +0800
9c220dbc1d feat: cm 新增 1000 系列喷码机网口下发接口 caoqianming 2026-05-08 11:24:00 +0800
7e9b559723 feat: mlog/mlogb 列表返回 wm_in 状态及缺陷标识 caoqianming 2026-04-30 14:03:53 +0800
40ebf720f7 perf: mlogb 列表预取 mlogbdefect 与 defect 消除 N+1 caoqianming 2026-04-30 13:47:25 +0800
46c9eba306 feat: mlogb 列表返回 wm_in 缺陷标识 caoqianming 2026-04-30 13:41:41 +0800
1f7e17b6c1 fix: 撤回 is_fix 日志时兜底清理误带入的继承缺陷 caoqianming 2026-04-30 11:44:29 +0800
d2581d8500 fix: is_fix 日志不再继承输入物料的缺陷标识 caoqianming 2026-04-30 09:09:30 +0800
881e16626d chore: 添加 release slash command 与 .claude 目录约定 caoqianming 2026-04-29 14:28:49 +0800
d177cae663 release: 3.1.2026042912 3.1.2026042912 caoqianming 2026-04-29 12:19:42 +0800
13c9d8a258 fix: 批次统计修复小/大日期反向并增强除零兜底 caoqianming 2026-04-29 12:14:07 +0800
3129cc0e54 feat: mio 列表接口新增 total_price 返回明细金额合计 caoqianming 2026-04-29 11:19:44 +0800
4d2a88ab1e feat: handover移除search包含id caoqianming 2026-04-29 10:42:17 +0800
32b0313349 feat: shift 视图改为完整 CRUD 以支持班次管理页 caoqianming 2026-04-29 10:37:06 +0800
e2b1f266aa fix: mlogdefect 空列表时仍同步继承缺陷 caoqianming 2026-04-24 15:43:00 +0800
c2ee88d2bf Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory TianyangZhang 2026-04-24 15:00:48 +0800
7577a46900 feat: enm 修改重跑能源计算不用从mplogx 开始计算 TianyangZhang 2026-04-24 15:00:47 +0800
f6d934bbb1 fix: 重建wpr caoqianming 2026-04-24 14:52:01 +0800
b6b79da3b1 Inherit batch output defect markers caoqianming 2026-04-23 16:32:40 +0800
48305ed6fb Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory TianyangZhang 2026-04-21 16:05:08 +0800
949620809a feat:光芯科技主要修改采购功能 TianyangZhang 2026-04-21 16:05:07 +0800
cafecd4d4a feat: add contract settlement workflows caoqianming 2026-04-20 16:56:11 +0800
a111f493e1 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory caoqianming 2026-04-14 14:16:18 +0800
3c931040cf feat: batch_bxerp添加子工序操作人 caoqianming 2026-04-14 14:16:17 +0800
159b644126 feat: 修改 hrm & rpm 代码 TianyangZhang 2026-04-07 13:42:30 +0800
a82405e451 feat:修改光芯人员导入功能 TianyangZhang 2026-03-31 11:08:12 +0800
44c0787d12 release: 3.1.2026033008 3.1.2026033008 caoqianming 2026-03-30 08:38:38 +0800
b3d0b34719 perf: 优化 Material 可用物料过滤，改为 DB 子查询 caoqianming 2026-03-27 14:40:07 +0800
68191dc305 fix: WMaterialCreateSerializer 所有字段设为必填 caoqianming 2026-03-27 10:10:18 +0800
320822019a feat: WMaterialViewSet 添加手动来料创建和删除接口 caoqianming 2026-03-27 10:08:42 +0800
61f70d4907 feat: Ptest添加中温粘度规格和结论字段 caoqianming 2026-03-27 08:58:33 +0800
3e1a087258 feat: WMaterialViewSet 添加手动创建和删除接口 caoqianming 2026-03-26 22:07:25 +0800
843ed2807a refactor(wf): route ticket notifications through celery base caoqianming 2026-03-24 10:08:46 +0800
6d43b412b7 feat: 修改光芯OA审批的BUG与新增导出功能 TianyangZhang 2026-03-23 09:50:20 +0800
2bca239af3 refactor(cache): use exception short-circuit in viewsets caoqianming 2026-03-20 19:08:07 +0800
d21e9907e9 perf(wf): serialize ticket sn generation by prefix caoqianming 2026-03-20 10:43:44 +0800
77616b37d2 fix(ops): validate log and backup paths caoqianming 2026-03-20 09:00:15 +0800
e153ee6d54 perf(permission): batch load dept scopes caoqianming 2026-03-20 08:43:23 +0800
6c8a029456 fix: cache sms codes only after successful send caoqianming 2026-03-19 22:00:28 +0800
f17d9aec5b fix: return cached responses from idempotent decorator caoqianming 2026-03-19 21:58:30 +0800
fcfe76bb6d fix: align websocket app configuration caoqianming 2026-03-19 21:57:19 +0800
71e91efe29 fix: stabilize idempotent decorator cache key caoqianming 2026-03-19 21:55:09 +0800
fbe12249f8 fix: handle missing user agent in request logs caoqianming 2026-03-19 21:52:23 +0800
4a053143f4 fix: avoid re-raising after save retry succeeds caoqianming 2026-03-19 21:50:49 +0800
e1020f4a96 fix: clone workflow custom fields correctly caoqianming 2026-03-19 21:49:06 +0800
076eb4fc98 fix: correct queryset filtering for dept scope caoqianming 2026-03-19 21:46:08 +0800
27ae86462a fix: stabilize and short-circuit viewset response cache caoqianming 2026-03-19 21:43:07 +0800
25955fb674 Merge branch 'base' of https://github.com/caoqianming/xt_server into base caoqianming 2026-03-19 21:05:17 +0800
705dff193c fix: avoid duplicate rows in complex reverse queries caoqianming 2026-03-13 16:35:12 +0800
805fc59100 fix: base user_exist完善 caoqianming 2026-01-23 16:18:17 +0800
c5e545f5e5 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory TianyangZhang 2026-03-13 16:59:13 +0800
e3dcb492d7 feat:恢复ichat 功能和 defaut 下的文件 TianyangZhang 2026-03-13 16:59:12 +0800
296bccbd3f release: 3.1.2026031316 3.1.2026031316 caoqianming 2026-03-13 16:40:12 +0800
409972ba88 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory caoqianming 2026-03-13 16:35:48 +0800
4acd80718d fix: avoid duplicate rows in complex reverse queries caoqianming 2026-03-13 16:35:12 +0800
d657c9fd26 feat: 删除-ichat TianyangZhang 2026-03-13 10:01:05 +0800