Commit Graph

3748 Commits

Author SHA1 Message Date
shijing b2f0a4f74a fix:喷码时可以选择设备 2025-12-02 11:01:26 +08:00
shijing 99f6c740c8 fix: 子工序操作记录更改 2025-12-01 16:49:27 +08:00
shijing 97c7172306 fix:玻纤勾选后点击“合批”后获取wpr列表展示 2025-12-01 14:33:21 +08:00
shijing 973d3485ed Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web 2025-12-01 14:23:20 +08:00
shijing ccad811e32 fix:玻纤混批加料原理为改版,撤销变动(有可能是不同工段的板段合批) 2025-12-01 14:23:18 +08:00
caoqianming 61bfe8c21c Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web 2025-12-01 13:49:04 +08:00
caoqianming 15d3e64f02 fix: mroombooking在初始状态编辑时slot问题 2025-12-01 13:49:03 +08:00
shijing 22c8f79cc3 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web 2025-12-01 13:14:58 +08:00
shijing 5d4300fcb6 fix:玻纤混批加料 2025-12-01 13:14:56 +08:00
caoqianming c1c5968875 feat: base ticketd_b先创建再提交防止连续接口报错 2025-12-01 10:50:08 +08:00
shijing c037c56347 fix:禅道199 2025-11-28 17:10:56 +08:00
shijing 7ecafc6495 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web 2025-11-28 16:15:58 +08:00
shijing 682f5a2052 fix:工艺路线变更组件 2025-11-28 16:15:56 +08:00
caoqianming 1d27409939 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web 2025-11-28 15:37:15 +08:00
caoqianming fbd3fd5ad0 feat: materials列表去除总库存列 2025-11-28 15:37:14 +08:00
shijing e18a9544dc fix:玻纤日志输入物料列表隐藏刷新按钮 2025-11-28 14:35:49 +08:00
shijing 39f080a629 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web 2025-11-28 14:25:54 +08:00
shijing 49b18aa41e fix:玻纤日志输出物料展示table改为原生 2025-11-28 14:25:52 +08:00
caoqianming 94066ee14d feat: resignatioin添加查询条件 2025-11-28 10:08:18 +08:00
caoqianming c603210fdb feat: handover_form优化 2025-11-28 10:06:18 +08:00
caoqianming 9d25731707 feat: 优化sc-upload-file 2025-11-28 10:02:57 +08:00
caoqianming da21d42968 feat: 黑化大屏统计修改为7:00 2025-11-28 08:43:24 +08:00
shijing f1889ac062 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web 2025-11-26 16:47:29 +08:00
shijing fe3b653890 fix:玻纤输出物料表单元格宽度调整 2025-11-26 16:47:26 +08:00
TianyangZhang 5eeb4fd498 fix : srm 修改论文审批 反存 论文台账 2025-11-26 09:35:46 +08:00
TianyangZhang 00dd3473dc Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web 2025-11-25 16:47:12 +08:00
TianyangZhang 4a6b604e88 fix : srm 修改 提交专利审批和论文同时生成台账 2025-11-25 16:47:10 +08:00
shijing 98886813e1 fix:禅道205 2025-11-25 15:41:41 +08:00
shijing 906f59aa52 fix:光芯日志oinfo_json保存 2025-11-25 14:05:27 +08:00
shijing 4b361a734c fix:光芯车间看板车间库存展示前100条,并传入query 2025-11-25 13:47:58 +08:00
shijing 5f00dc2b0c fix:光芯黑化、退火日志reminder_interval_list列表 2025-11-25 13:33:24 +08:00
shijing 3538d68c9c Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web 2025-11-25 13:19:03 +08:00
shijing 30cd56f6fc fix:光芯退火日志结束时间 2025-11-25 13:19:01 +08:00
caoqianming 8794e6a4b4 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web 2025-11-25 11:00:03 +08:00
caoqianming febde751c3 fix: base user界面显示优化 2025-11-25 11:00:02 +08:00
shijing 6a64f944ff fix:输出手动添加bw 2025-11-25 10:36:06 +08:00
shijing faacaa8d8e Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web 2025-11-24 16:02:26 +08:00
shijing f25380f64b fix:光芯采购入库时数量max不能为0 2025-11-24 16:02:24 +08:00
caoqianming 3dca361325 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web 2025-11-24 14:26:40 +08:00
caoqianming 544c5f2b43 feat: resignation改成ticketmixin形式 2025-11-24 14:26:39 +08:00
shijing 1049053a82 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web 2025-11-24 11:06:11 +08:00
shijing 3f86291791 fix:工艺路线中params_json复现 2025-11-24 11:06:07 +08:00
caoqianming b56f1e9b32 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web 2025-11-24 09:00:34 +08:00
caoqianming bc9effd983 feat: base ticket_b退化到setTimeout后执行 2025-11-24 09:00:33 +08:00
shijing ade3cb8398 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web 2025-11-21 16:51:25 +08:00
shijing 3ec61d3bd3 fix:禅道183 2025-11-21 16:51:23 +08:00
caoqianming 2b63930012 fix: base ticketd_b 非操作人也显示出按钮 2025-11-21 16:41:35 +08:00
caoqianming a3b2913e1e feat: base ticketd添加提交人 2025-11-21 16:25:08 +08:00
caoqianming 606bc5e9a7 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web 2025-11-21 16:09:42 +08:00
caoqianming 8b2bd9adff feat: mroombooking wf_key 2025-11-21 16:09:41 +08:00
shijing e92d35ee52 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web 2025-11-21 14:38:01 +08:00
shijing 60ed2579d6 feat:光芯成品出库mioitem列表底部添加统计行 2025-11-21 14:37:25 +08:00
TianyangZhang 4bd3007e0d Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web 2025-11-21 14:33:21 +08:00
TianyangZhang af82feb7dc add : ofm -vehicle 修改车辆信息 2025-11-21 14:33:19 +08:00
caoqianming 171545b918 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web 2025-11-21 14:27:55 +08:00
caoqianming 0f0bd39e7b feat: 修改mroombooking表单名称 2025-11-21 14:27:33 +08:00
TianyangZhang f0b4d5f0bf fix: ofm 修改form name 2025-11-21 14:19:11 +08:00
TianyangZhang 46fbdef199 fix: ofm && srm 修改 form 名称 2025-11-21 14:10:24 +08:00
shijing 74cea98572 feat:光芯成品出库添加几个字段 2025-11-21 10:43:06 +08:00
shijing 102c03b1e9 fix:禅道187 2025-11-21 10:40:57 +08:00
shijing 76f2dcac81 fix:禅道196 2025-11-20 15:16:40 +08:00
shijing 870049f6ff Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web 2025-11-20 14:55:47 +08:00
shijing 9b3f504a82 fix:禅道195 2025-11-20 14:55:45 +08:00
caoqianming 274b8125a0 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web 2025-11-20 11:09:49 +08:00
caoqianming b778ab7574 feat: 库存统计里添加饼图配置 2025-11-20 11:09:47 +08:00
shijing 83dbf67911 fix:成品库可打印成品标签 2025-11-20 10:46:11 +08:00
shijing 13007d7642 fix:禅道177 2025-11-20 10:26:04 +08:00
shijing 2a839d0803 fix:禅道177 2025-11-20 10:25:51 +08:00
shijing e673838e36 fix:bug 修正 2025-11-20 09:41:30 +08:00
shijing 15a4ac27d6 fix:placeholder错误修正 2025-11-19 16:00:52 +08:00
shijing f6c24f3902 feat:某批次物料加入wpr(改版) 2025-11-19 15:30:22 +08:00
TianyangZhang a0189dbe95 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web 2025-11-19 13:49:35 +08:00
TianyangZhang ae8bd96320 fix: ofm 模块bug 修改已经功能完善 2025-11-19 13:49:33 +08:00
shijing 6186f8b2f8 feat:光芯车间看板其他车间看板调整 2025-11-19 11:08:54 +08:00
shijing 5718e20d7a fix:光芯质检统计外径发货片(B)不显示修改 2025-11-19 10:14:18 +08:00
shijing 10d6519568 feat:分批时,复制板段号进去的时候,将不在本批次的号提示出来 2025-11-19 09:07:50 +08:00
shijing 98e610113c feat:上盘平魔合批时,handoverbw列表展示格式改成多选形式 2025-11-19 09:06:10 +08:00
shijing 9ed081e5be Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web 2025-11-18 13:41:27 +08:00
shijing 2d64e3baeb fix:玻纤检验设备名称没有带出来修改 2025-11-18 13:41:24 +08:00
caoqianming 0567d98b93 feat: base 添加工作流分组select 2025-11-18 11:24:58 +08:00
caoqianming cea821e592 feat: base 发起流程分组 2025-11-18 11:13:25 +08:00
caoqianming 8fa81f1f76 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web 2025-11-18 09:47:51 +08:00
caoqianming 2408903b95 feat: base myticket获取权限内的流程 2025-11-18 09:47:50 +08:00
shijing 3a317a03d3 feat:玻纤后面的几个成品检验工序添加出入库记录 2025-11-17 17:09:17 +08:00
shijing 153ccb2cf3 fix玻纤交接弹窗标题 2025-11-17 17:08:11 +08:00
shijing a2acf33d3f fix玻纤未完成合批修整 2025-11-17 16:48:35 +08:00
shijing 82b6d7ced1 feat:光芯剩余车间看板页面文件(待调) 2025-11-17 16:18:48 +08:00
shijing 6d3d0403cb fix:光芯销售发货时,仓库已有批次可以查询筛选 2025-11-17 16:17:39 +08:00
shijing 369af3a3ab fix:玻纤统计分析页面进入报错修改 2025-11-17 09:42:25 +08:00
shijing 07e4c2749b feat:分检汇总页面 2025-11-17 08:45:41 +08:00
shijing 306564d106 fix:质检统计底部合计行底色明显,字体加粗 2025-11-14 16:32:28 +08:00
shijing 194901d536 fix:质检统计(简)统计错误修改 2025-11-14 15:51:19 +08:00
shijing 2ae9ccf974 fix:禅道110 2025-11-14 15:25:31 +08:00
shijing fb42cc177a feat:禅道152辅料库添加待采购列 2025-11-14 13:44:44 +08:00
shijing 1e639ac5ff fix:外观检验已完成添加检验 2025-11-14 09:29:42 +08:00
shijing d15b34d050 fix:玻纤物料报废可选任何状态的物料 2025-11-14 09:26:17 +08:00
shijing e057678be3 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web 2025-11-13 16:44:59 +08:00
shijing 22ea2230c8 feat:光芯交接记录筛选添加”合批“ 2025-11-13 16:44:57 +08:00
caoqianming c8e1b732bc Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web 2025-11-13 16:43:24 +08:00
caoqianming 98a8b1fe24 feat: 修改supplieraudit为新的工单绑定流程2 2025-11-13 16:43:23 +08:00