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

4270 Commits

Author SHA1 Message Date
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