zcdsj
/
factory_web
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,447 Commits 4 Branches 6 Tags 364 MiB
Commit Graph

345 Commits

Author SHA1 Message Date
shijing f3a92cb296 fix：光芯生产执行中的检验记录可以撤回并删除 2026-07-24 08:59:53 +08:00
caoqianming 3ee5403ad9 fix:抽屉内打开的el-dialog统一加append-to-body(24文件28处),避免被pages.scss抽屉工作流表单样式误伤成卡片/灰底/底部留白 
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
 2026-07-22 15:03:55 +08:00
caoqianming c8f38e54b6 feat:合格B类字段文案改为记为合格更准确表达 
工序/日志提交处 clear_defect 开关文案由不拆批/合批清除缺陷统一改为合格B类记为合格,与后端同步。

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
 2026-07-16 10:21:10 +08:00
shijing 2028889587 fix:form表单冲突调整 2026-06-17 08:37:46 +08:00
shijing 18e7cef648 feat:禅道414 2026-05-19 15:23:51 +08:00
shijing 11216e2554 fix:来料未完成合批时也可选择清除缺陷 2026-05-15 17:06:12 +08:00
shijing 0b46efbced fix:工序添加clear_defect 2026-05-15 13:29:47 +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 2b6729fa4f fix:去除多余字段 2026-05-12 16:12:36 +08:00
shijing 275619fd30 feat:光芯出入库记录添加标记项 2026-05-12 16:11:59 +08:00
shijing 9733fcced6 fix:光芯工段出入库记录新增时id问题报错修改 2026-05-11 09:13:25 +08:00
shijing 7f148071d7 fix:光芯日志填写时不良项未清零问题修改 2026-05-08 08:44:38 +08:00
shijing ce49b9f9c4 fix:禅道392、393 2026-05-07 09:55:00 +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
shijing 185144e332 feat:禅道389志、交接记录、工段库存、原料半成品库存等需要回车搜索 2026-04-29 15:27:08 +08:00
shijing 0a727dd5a7 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web 2026-04-29 15:21:43 +08:00
shijing 3112462c7a fix:禅道376二次超洗后的外观检验想要新增撤回修改的功能，即检验作废 2026-04-29 15:21:40 +08:00
caoqianming 1b613f0d7f Refine defect labels in material selectors 2026-04-23 08:46:41 +08:00
caoqianming 79c579c55e Fix qct lookup type for mlogb input material 2026-04-22 12:48:33 +08:00
shijing 685985561b fix:日志新增输入物料表单，选择批次后，根据已选批次物料获取相应的工艺步骤 2026-04-16 09:48:30 +08:00
shijing 724d313185 fix:光芯入库物料查询改为“tag = 'done'”和mgroup 2026-04-15 09:41:57 +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 31df2e12a8 fix:光芯返工检测表修正 2026-03-12 09:05:54 +08:00
shijing 809c14c123 fix:光芯日志选择物料组件更换成el-select 2026-03-06 16:27:44 +08:00
shijing 061af195ec fix:光芯改版时不合批，不传new_batch 2026-03-06 10:58:57 +08:00
shijing ed4feb2f0c fix:交接类别完善 2026-03-06 09:09:23 +08:00
shijing fdacb84301 fix:光芯已完成退火检验恢复 2026-03-05 09:03:32 +08:00
shijing 1e0c88639f fix:光芯本工段检验表和加工前检验表getQct获取时传入type:'in'/'out' 2026-03-04 16:40:06 +08:00
shijing fb3a821673 fix:禅道343 2026-02-27 09:05:22 +08:00
shijing 7cb32833f1 fix:禅道347 2026-02-27 08:53:42 +08:00
shijing fe96ccde0f fix:禅道343 2026-02-10 14:23:29 +08:00
shijing 2f2928fcb0 fix:日志物料根据route的material_in筛选 2026-02-10 13:51:44 +08:00
shijing ffdb8e10b1 feat: 禅道314 2026-01-19 14:28:15 +08:00
shijing 2dfd9efdae fix:禅道262 2026-01-15 13:53:26 +08:00
shijing 00b3af30c1 fix:光芯合批时新批次号改动 2026-01-07 11:16:35 +08:00
shijing b63013d9a7 fix:检验记录可撤回删除 2025-12-31 10:00:10 +08:00
shijing 458c9a674d fix:mlogb_check检验人回显 2025-12-30 15:22:01 +08:00
caoqianming d3daab7ea8 feat: 标签打印支持ip传入 2025-12-30 10:43:40 +08:00
shijing fe464e6ba5 feat:禅道267 2025-12-29 16:32:51 +08:00
shijing 11f26a7e30 feat:禅道263 2025-12-29 15:34:56 +08:00
shijing 33844efb7c fix:“物料标签”统一改为“打签” 2025-12-29 13:38:35 +08:00
shijing ced6d4cb58 fix:光芯合批时批次号可用一使用过的批次号 2025-12-24 13:22:34 +08:00
shijing 0f90a845d0 fix: 2025-12-17 08:42:32 +08:00
shijing 2aa98e34d4 fix:光芯改版交接 2025-12-15 09:41:21 +08:00
shijing 8c712acfd9 fix:外协工段生产领料展示按钮 2025-12-05 09:35:40 +08:00