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

3699 Commits

Author SHA1 Message Date
shijing 396c7343be feat:禅道399装炉压板出炉板段打签加炉号 2026-05-09 14:05:42 +08:00
shijing a0b50cdc63 fix:洁净车间（洗）调整 2026-05-08 16:34:37 +08:00
shijing badafb2d8e fix:玻纤中检一批次统计调整，添加开台人员查询 2026-05-08 15:55:52 +08:00
caoqianming c8fe283ff5 fix: labeltemplate 列表打码器列合并展示, 提交时空 IP 转 null 
- 列表 IP 与端口合并为单列, 无 IP 则整列留空
- submitHandle 提交前空 coder_ip 转 null, 避免后端 IPAddressField 拒空串

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
 2026-05-08 13:45:37 +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
shijing 8f120e4a1c fix:玻纤工时统计/扭转统计接口参数纠正 2026-05-08 13:19:20 +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 bb52129444 feat:洗棒大屏页面布局 2026-04-30 10:42:11 +08:00
shijing 4f373edb48 feat:禅道379成品统计、半成品统计需要实际仓库库存进行单独区分，与生产车间区分开来 2026-04-29 15:30:40 +08:00
shijing 7b3e3f0fb6 feat:禅道381辅料库-在出入库记录中带出单价与此次出入库记录的总金额 2026-04-29 15:29:35 +08:00
shijing fd9b34c558 feat:禅道381辅料库-在出入库记录中带出单价与此次出入库记录的总金额 2026-04-29 15:29:06 +08:00
shijing 185144e332 feat:禅道389志、交接记录、工段库存、原料半成品库存等需要回车搜索 2026-04-29 15:27:08 +08:00
shijing 6020f9a541 feat:禅道383黑化车间看板-投产分析时间改为早7-晚7 2026-04-29 15:26:04 +08:00
shijing d47bf5fc49 fix:禅道378质检表格中，抽检部分的数据没有显示 2026-04-29 15:25:21 +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 adef0b9b24 feat: 新增班次管理页面 
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
 2026-04-29 10:37:08 +08:00
caoqianming 8230773736 fix: srule 修复 that 未定义并完善排班规则交互 
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
 2026-04-29 10:29:06 +08:00
caoqianming ddc8ef889d Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web 2026-04-27 15:39:16 +08:00
caoqianming e62f28bbaa feat: 原料库添加do_in查询2 2026-04-27 15:39:15 +08:00
TianyangZhang 657fe9c17a Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web 2026-04-27 13:18:46 +08:00
TianyangZhang 6b5485b848 feat: 需要凌源大屏内容 2026-04-27 13:18:45 +08:00
caoqianming f48458b7ba feat: 原料库添加do_in查询2 2026-04-27 12:05:46 +08:00
caoqianming 373a39b096 feat: 原料库添加do_in查询 2026-04-27 10:17:17 +08:00
caoqianming d26c8d776d Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web 2026-04-23 08:48:50 +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
caoqianming a0c7ea7097 Add material filter to qct page 2026-04-22 12:19:09 +08:00
TianyangZhang f360fa4d21 feat: 修改光芯供应商审批 2026-04-22 10:58:58 +08:00
TianyangZhang dc58a447f3 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web 2026-04-21 16:04:34 +08:00
TianyangZhang b135d6eb9c feat:光芯 更改前端页面 主要是采购审批管理 2026-04-21 16:04:33 +08:00
caoqianming 4b3217e208 feat: add contract settlement pages 2026-04-20 16:56:44 +08:00
shijing 80c20c222b fix:禅道371，372 2026-04-20 10:47:46 +08:00
shijing 0902cf8c42 fix:中检一批次统计添加开台人员 2026-04-20 10:46:03 +08:00
shijing cb7fcb1556 fix:洁净车间页面调整 2026-04-20 09:07:28 +08:00
shijing 30059973de Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web 2026-04-16 13:20:55 +08:00
shijing d722dba114 fix:批次追踪页面交接记录中添加new_batch 2026-04-16 13:20:52 +08:00
TianyangZhang 5e77c90e04 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web 2026-04-16 10:57:21 +08:00
TianyangZhang df3ac44d03 feat: 光芯-加入导出功能 2026-04-16 10:57:20 +08:00
shijing 1f10186c10 fix:禅道364完善，添加排一次棒 2026-04-16 10:50:41 +08:00
shijing 685985561b fix:日志新增输入物料表单，选择批次后，根据已选批次物料获取相应的工艺步骤 2026-04-16 09:48:30 +08:00
shijing 19f8accc8c fix:工艺步骤中输出物料可以选择原料 2026-04-15 13:50:32 +08:00
shijing 4c6a7fc2bc feat:禅道367 2026-04-15 11:14:45 +08:00
shijing 4a9555f034 feat:禅道367 2026-04-15 11:12:20 +08:00
shijing 724d313185 fix:光芯入库物料查询改为“tag = 'done'”和mgroup 2026-04-15 09:41:57 +08:00
shijing b307103ba8 fix:禅道338待改善 2026-04-14 16:59:31 +08:00
shijing f3ff8c5942 fix:禅道357 洁净车间（洗）页面调整 2026-04-13 15:37:16 +08:00
shijing d423cee74c fix:禅道339 2026-04-13 09:10:40 +08:00
shijing ae943f6b15 fix:热压统计（扭转）调整 2026-04-10 16:02:40 +08:00
shijing c6288d19aa Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web 2026-04-10 13:41:34 +08:00
shijing ad79102320 fix:禅道更新 2026-04-10 13:41:32 +08:00
TianyangZhang 79fc4201fd Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web 2026-03-31 11:08:45 +08:00
TianyangZhang a3fe47384b feat:修改光芯人员导入功能 2026-03-31 11:08:44 +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 33eb661295 feat:光子性能检验添加两个字段（中温粘度规格、结论），修改两个文案 2026-03-27 09:44:26 +08:00
shijing 0f46fb6b53 fix:6车间新增报工时，无法多次修改领用数量问题修改 2026-03-26 17:06:01 +08:00
shijing be10887892 fix:统计分析-管综合统计中，六车间中检会出现有合格率，但是没有检验数，字段引用错了，已纠正 2026-03-26 16:37:19 +08:00
shijing 17b4a16def fix:有时出现加工-发货合格率有数，但发货数为0的情况问题修改为当有发货数的时候再计算两个合格率 2026-03-26 16:26:14 +08:00
shijing a035cf979b fix:7车间生产大屏：本月生产统计横坐标改成1-10炉号 2026-03-26 15:49:21 +08:00
shijing 0b4ae3d042 feat:10车间看板：人员到岗模块删除，不需要了 2026-03-26 15:34:00 +08:00
shijing 0f680491a3 feat:扭转统计 2026-03-26 10:02:49 +08:00
shijing 7dd188ce94 fix:文件名修改 2026-03-25 13:25:21 +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 4565b7ccca fix:禅道361 2026-03-24 14:55:09 +08:00
shijing f47bcebbbb fix:禅道353 2026-03-24 14:07:50 +08:00
shijing 3643a2a95c fix:禅道362 2026-03-23 15:40:28 +08:00
shijing d1f7209469 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web 2026-03-23 14:49:24 +08:00
shijing afb86b1cec fix:热压统计（毛）检测数据修正 2026-03-23 14:47:49 +08:00
TianyangZhang a994cbc10d feat: 修改光芯OA审批的BUG与新增导出功能 2026-03-23 09:50:09 +08:00
TianyangZhang 12b0f280d9 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web 2026-03-23 09:48:11 +08:00
shijing 29263a4f1b fix:禅道356点击数据没有显示列表 2026-03-20 14:47:11 +08:00
shijing a5b124576e fix:禅道360工艺编辑的时候输入输出物料没有显示 2026-03-20 13:40:51 +08:00
shijing 493a9289fe fix:输出检验表固定前几列和操作列 2026-03-20 11:11:08 +08:00
TianyangZhang b0e4dc830a Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web 2026-03-20 09:21:07 +08:00
TianyangZhang ab030d2487 feat:mpr-物资管理前端（申购单、入库单、物料库存、领用记录） 
- 新增 mpr API 接口定义（申购单、入库单、物料库存、领用单 CRUD）
- 新增申购单列表页与表单页，支持明细内联编辑和一次性提交审批
- 新增入库单列表页与表单页，支持仓库下拉选择和入库明细管理
- 新增物料库存列表页，支持状态筛选（闲置/领用中/已领用/已领完）
- 新增领用记录列表页与表单页，支持从库存选择物品和非清单物品两类领用
- 注册物资管理路由菜单（申购单管理、入库单管理、物料库存、领用记录）

Made-with: Cursor
 2026-03-12 16:57:12 +08:00
shijing d2befea659 fix:玻纤输出检验表格表头文案靠左对齐 2026-03-12 09:08:16 +08:00
shijing 122e73fee2 fix：玻纤排板统计2添加物料名 2026-03-12 09:07:26 +08:00
shijing 0a9b1bdf1f Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web 2026-03-12 09:05:58 +08:00
shijing 31df2e12a8 fix:光芯返工检测表修正 2026-03-12 09:05:54 +08:00
TianyangZhang 35d105baf8 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web 2026-03-11 13:31:31 +08:00
TianyangZhang 48be57422a feat: hrm-empcontract 劳动合同 2026-03-11 13:31:30 +08:00
shijing 809c14c123 fix:光芯日志选择物料组件更换成el-select 2026-03-06 16:27:44 +08:00
shijing 2aec38201a fix:禅道312开台人拆头人显示问题 2026-03-06 14:35:03 +08:00
shijing bc15b06fa4 fix:禅道298 2026-03-06 14:32:34 +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 281ff811c8 fix:禅道341 2026-03-05 14:11:13 +08:00
shijing fdacb84301 fix:光芯已完成退火检验恢复 2026-03-05 09:03:32 +08:00
shijing 04ae10aa40 fix:质检统计查询问题修复 2026-03-04 16:52:35 +08:00
shijing 625df22d50 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web 2026-03-04 16:40:08 +08:00
shijing 1e0c88639f fix:光芯本工段检验表和加工前检验表getQct获取时传入type:'in'/'out' 2026-03-04 16:40:06 +08:00
TianyangZhang 42bc028585 feat:gx-hrm 人员转正等修改 2026-03-04 16:36:57 +08:00
shijing 17bc6c8428 fix:排扳统计查询条件文案提示 2026-03-04 10:50:55 +08:00