zcdsj
/
factory_web
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,322 Commits 4 Branches 2 Tags 363 MiB
Commit Graph

453 Commits

Author SHA1 Message Date
caoqianming e9e4a253b0 feat: 喷码配置独立到顶栏设置, 命名统一为"喷码" 
- 顶栏新增独立"喷码设置"图标与弹窗, 与打印机解耦
- coder_ip/port/field 持久化到 localStorage (新增 tool.setCoder)
- 标签模板编辑页移除 coder_* 三个字段 (后端已删除)
- wprList 喷码下发改为从 localStorage 读取配置, 显式带 body 下发
- 全部界面文案统一为"喷码", API 字段名 coder_* 不变

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
 2026-05-18 13:58:18 +08:00
shijing 4e31c74766 fix:禅道397 2026-05-14 16:07:28 +08:00
shijing 0e6b3e2d79 fix:玻纤子工序列宽固定且调小 2026-05-14 15:29:28 +08:00
shijing ac45b9726a feat:玻纤板未完成段列表搜索前置并选中，添加批量喷码 2026-05-14 14:38:57 +08:00
shijing fcb7474f17 fix:禅道409，子工序操作记录表格高度调整 2026-05-14 09:51:01 +08:00
shijing 9ec1c19b58 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web 2026-05-14 09:25:35 +08:00
shijing 8df5d97916 fix:禅道406 2026-05-14 09:25:32 +08:00
caoqianming ff01e3ec3e feat: mlog 提交前可勾选「合格 B 类不拆批」 
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
 2026-05-14 09:24:24 +08:00
shijing f61cfd4448 fix:handoverb中state 2026-05-13 15:08:36 +08:00
caoqianming 23dc249d1d feat: 合批弹框联动显示"清除缺陷"勾选 
源批次 state 均为合格(10)、defect 不一致时，合批弹框显示"清除缺陷"
勾选框，提交带 clear_defect=true；条件失效或重新打开时自动复位。

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
 2026-05-12 18:03:59 +08:00
shijing dbb3ede81b feat:禅道375 2026-05-11 15:56:32 +08:00
shijing 396c7343be feat:禅道399装炉压板出炉板段打签加炉号 2026-05-09 14:05:42 +08:00
caoqianming ecd8fd8bec feat: cm 标签模板支持配置打码器并增加喷码下发 
- labeltemplate 弹窗与列表新增 打码器IP/端口 字段
- cm.js 增加 sendToCoder API 调用
- wpm_bx/wprList 操作列新增"喷码"按钮, 按"喷码模板"模板下发产品编号到打码器, 含 per-row loading 防重入

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
 2026-05-08 13:27:49 +08:00
shijing 315a513c01 feat:禅道351日志able显示的列可以选择是隐藏还是显示 2026-05-08 13:21:41 +08:00
caoqianming 72a9f0eef3 refactor: 缺陷标识与库存状态改为批次号 inline tag 
合并独立的缺陷与状态列到批次号列，作为内联标签紧跟批次字符显示，节省横向空间并增强归属关联。

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
 2026-04-30 14:05:25 +08:00
caoqianming 17127c352b feat: 生产日志详情展示 wm_in 库存状态与缺陷标识 
输入物料表新增"库存状态"列；mlog 头部基本信息新增"投入库存缺陷"与"投入库存状态"描述项，仅在有值时显示。

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
 2026-04-30 14:04:24 +08:00
caoqianming 2651ca5633 feat: 生产日志详情输入物料表展示 wm_in 缺陷标识 
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
 2026-04-30 13:42:03 +08:00
caoqianming 1b613f0d7f Refine defect labels in material selectors 2026-04-23 08:46:41 +08:00
shijing 80c20c222b fix:禅道371，372 2026-04-20 10:47:46 +08:00
caoqianming 9e3ebb5a46 fix: 修复手动来料物料选择和 mgroup 传递问题 
- 修正 xtSelect @change 回调签名，正确赋值 material_name
- createForm 初始化时默认填入当前 mgroup，提交时从 createForm 读取

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
 2026-03-27 16:41:24 +08:00
caoqianming 5e77d575b8 feat: 来料未完成界面添加手动来料和删除功能 
- wpm_gx/inm.vue、wpm_bx/inmIn.vue 添加来料按钮（v-auth wmaterial.create）
- 操作列添加删除按钮，仅 is_manual 记录显示（v-auth wmaterial.delete）
- 新增手动来料 dialog，支持选择物料、填写批次号和数量
- wpm.js wmaterial 添加 create/delete 接口

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
 2026-03-27 10:28:01 +08:00
shijing b3c42b5876 fix:日志中针对扭转的检验表（用material_in）做特殊处理 2026-03-25 13:24:14 +08:00
shijing 9023d3b34a fix:禅道359 2026-03-25 11:15:34 +08:00
shijing 493a9289fe fix:输出检验表固定前几列和操作列 2026-03-20 11:11:08 +08:00
shijing d2befea659 fix:玻纤输出检验表格表头文案靠左对齐 2026-03-12 09:08:16 +08:00
shijing 281ff811c8 fix:禅道341 2026-03-05 14:11:13 +08:00
shijing 6df332211c fix:禅道350 2026-03-04 10:50:17 +08:00
shijing f8ef6300b3 fix:this指向问题修正 2026-02-05 10:23:38 +08:00
shijing 0faf237e43 fix:扭转日期变动时添加是否为空的判断 2026-02-04 10:38:06 +08:00
shijing 82f4b5aaa4 fix: 禅道329 2026-01-23 16:11:01 +08:00
shijing 9147e6cd86 feat：上盘平磨合批时批次号默认：HP+模板+年月日 2026-01-23 10:55:00 +08:00
shijing 2225d79500 fix: 排一次棒日志详情中oinfo_json中imageUrl不显示 2026-01-23 10:52:33 +08:00
shijing c19540d9f5 fix: 查询修正 2026-01-22 16:25:54 +08:00
shijing ca6b14c2fd feat: 禅道279 2026-01-21 16:50:34 +08:00
shijing 2f192f4107 feat: 禅道321 2026-01-21 15:51:49 +08:00
shijing 0f0620e8db feat: 禅道323 2026-01-21 15:27:48 +08:00
shijing f93f7d3095 fix: 扭转输出中时间列调宽 2026-01-21 14:48:17 +08:00
shijing c9b6e7bb31 feat: 禅道324 2026-01-21 14:32:19 +08:00
shijing dfedb67cb8 feat: 禅道310 2026-01-21 11:22:27 +08:00
shijing 0977713d66 fix:日志输出检验表问题 2026-01-15 08:49:08 +08:00
shijing 2072004c00 fix:禅道308 2026-01-14 15:01:03 +08:00
shijing 702ef1e296 fix:玻纤交接记录撤消按钮文案改为撤回 2026-01-13 13:35:25 +08:00
shijing 392f979ff5 feat：禅道282 2026-01-13 10:26:16 +08:00
shijing 057fa9af75 fix:交接记录中传参mgroupx 2026-01-12 11:12:32 +08:00
shijing d686d54eb8 feat：禅道280日志中保存工艺图片 2026-01-12 11:07:23 +08:00
shijing d3e788ffe0 fix:placehoder文案修正 2026-01-12 08:49:59 +08:00
shijing d83944f00d fix:禅道294 2026-01-09 15:55:55 +08:00
shijing 9a10bc78e8 feat:禅道282 2026-01-08 10:29:11 +08:00
shijing cbc940b8df fix:工艺步骤排一次棒时添加工艺图纸，并在‘排一次棒‘日志中展示第一张图片 2026-01-07 15:46:01 +08:00
shijing 99f320d80b fix:玻纤子工序中不需要选择班次 2026-01-07 13:44:21 +08:00