Commit Graph

3483 Commits

Author SHA1 Message Date
caoqianming 83edbad12d feat: 优化routepack 添加wf组件 2025-09-23 13:24:15 +08:00
caoqianming a293bfe1ae Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web 2025-09-23 13:23:29 +08:00
caoqianming 8dab72dbcd feat: base 增加wf ticketd组件可在业务组件里加载 2025-09-23 13:23:28 +08:00
shijing bc873ccb66 fix:日志报错修正 2025-09-22 15:12:58 +08:00
shijing 5ce3889f3d fix:脱模测量日志详情获取板段滚圆的切片数 2025-09-22 14:40:17 +08:00
shijing 4deeb0fc54 fix:标签中的切片数量展示 2025-09-19 13:40:30 +08:00
shijing 6b05f21ce6 fix:标签中的切片数量展示 2025-09-19 11:27:21 +08:00
shijing d353df9c1d Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web 2025-09-19 11:23:45 +08:00
shijing 67b6678033 fix:温度监测数据图表y轴从最小值开始 2025-09-19 11:23:43 +08:00
caoqianming 94516f4b47 feat: base wf添加myticket页面 2025-09-19 09:21:31 +08:00
caoqianming 2a3fa5b96f Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web 2025-09-19 09:21:08 +08:00
caoqianming d1d4c6e7f1 feat: base 完善原有wf页面 2025-09-19 09:21:06 +08:00
shijing 422bb84990 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web 2025-09-18 15:21:56 +08:00
shijing 89bd60c547 fix:去除冗余依赖 2025-09-18 15:21:54 +08:00
shijing 235e221606 fix:光芯大屏定时刷新页面 2025-09-18 13:54:22 +08:00
shijing 4984c6a9a4 fix:routepack方便以后修改 2025-09-18 10:11:20 +08:00
shijing cefd2173ff fix:快速创建调整 2025-09-18 09:30:44 +08:00
shijing 9f66afc6b2 fix:已提交日志详情关闭时,不刷新日志列表 2025-09-18 09:06:36 +08:00
shijing d108437769 fix:光芯质量统计添加两列班次 2025-09-17 16:58:29 +08:00
shijing c11ef69667 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web 2025-09-17 13:37:06 +08:00
shijing 368f080981 fix:日志详情按钮调整,wpr列表工序字段更新 2025-09-17 13:37:04 +08:00
caoqianming 2f1910fed6 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web 2025-09-17 11:02:01 +08:00
caoqianming 575a120e56 feat: base log添加耗时列 2025-09-17 11:02:00 +08:00
shijing 24104ca69c fix:日志输出物料编辑后只更新当前行 2025-09-17 10:18:46 +08:00
shijing 7abdfc7fc1 fix:日志输入物料表格高度自适应 2025-09-17 10:10:19 +08:00
shijing a32a4be6fa fix:已完成、未完成物料列表工序展示字段变更 2025-09-17 09:50:54 +08:00
shijing d7cc7a9065 fix:输出详情列表采集数据报错调整 2025-09-17 09:49:46 +08:00
shijing b128751889 fix:清除多余请求 2025-09-17 09:25:14 +08:00
shijing a49ea52d90 fix:输入物料详情table高度调整 2025-09-16 15:18:52 +08:00
shijing b31a325e1a fix:禅道65初步页面 2025-09-16 15:18:03 +08:00
shijing 6ff7e79c22 fix:排一次棒日志展示棒号 2025-09-16 10:08:01 +08:00
shijing 8c885e4cfc fix:监测数据测点展示nickname,坐标轴从小到大 2025-09-15 16:38:37 +08:00
shijing 34b2d4b4f0 fix:光子采购入库时批次默认为“无” 2025-09-15 16:27:15 +08:00
shijing f95fcaed90 fix:测点表单改变设备选择组件 2025-09-15 15:31:21 +08:00
shijing 8147af1d3c fix:玻纤9.13问题修改 2025-09-15 14:11:40 +08:00
shijing b363333029 fix:设备数据采集问题 2025-09-15 10:57:11 +08:00
shijing abaff8fe20 fix:选项检验提交时缺陷项的规则验证 2025-09-15 10:27:18 +08:00
shijing 96d0202421 fix:bx日志新增时工艺路线必选,日志提交可以没有结束时间 2025-09-12 15:03:33 +08:00
shijing 54e4732483 fix:交接总数计算 2025-09-12 10:10:54 +08:00
shijing 56489db00e fix:快速报工提交后操作微调 2025-09-12 10:10:24 +08:00
shijing 68d346bc42 fix:bug修正 2025-09-12 09:25:41 +08:00
shijing 6981147670 fix:日志提交时若无结束时间,则获取服务器当前时间,更新后再提交日志 2025-09-11 15:23:10 +08:00
shijing 3d53796fa5 fix:wpr抽屉先清空,再获取 2025-09-11 14:09:06 +08:00
shijing a30e7e0dcc fix:车间物料可以批次&板段切换查询 2025-09-11 14:08:26 +08:00
shijing 5d4b61e893 fix:防止网络慢时扫码乱批处理 2025-09-11 14:07:24 +08:00
shijing 4b27653e18 fix:更新结束时间后再执行提交 2025-09-11 14:06:25 +08:00
shijing 8a81741716 fix:特殊switch颜色 2025-09-11 14:05:23 +08:00
shijing 9c9a96a499 fix:交接记录显示接收工段 2025-09-10 14:08:35 +08:00
shijing 830f414c8c fix:日志列表中设备只在固定几个工段显示 2025-09-10 14:05:39 +08:00
shijing 0626b52641 fix:交接记录可多选 2025-09-10 09:56:06 +08:00
shijing 718660faaf fix:交接记录调整 2025-09-10 09:55:31 +08:00
shijing 333fbfaf84 fix:玻纤日志列表展示板段号 2025-09-09 14:58:18 +08:00
shijing b20337454c fix:只有合批才展示更改批次 2025-09-09 14:57:47 +08:00
shijing c85bac30e4 fix:模板添加横压 2025-09-09 13:27:01 +08:00
shijing 0c7fe5bfed fix:若无结束日期日志提交前,先保存结束时间 2025-09-09 13:26:07 +08:00
shijing eef14ca7eb fix:玻纤工段列表显示班次规则 2025-09-09 13:25:06 +08:00
shijing 67794e1669 fix:日志中主要批次和次要批次展示问题修改 2025-09-08 17:02:45 +08:00
shijing e092dacb4d fix:交接中数量延时统计 2025-09-08 17:01:51 +08:00
shijing 29f67226fa fix:批次统计中生产日志以工序排序 2025-09-08 17:01:00 +08:00
shijing 44d7a0856f fix:点击批次号分批只在光锥一体刀可以 2025-09-08 16:44:11 +08:00
shijing 03b386d6fe fix:若日志没有结束时间,提交时间作为结束时间和处理时间 2025-09-08 09:46:18 +08:00
shijing a3711e577f fix:日志展示原料棒号 2025-09-08 08:58:06 +08:00
shijing aea714bca7 fix:玻纤输出物料编号可编辑 2025-09-08 08:54:38 +08:00
shijing 460a69efee fix:玻纤日志设备获取班组设备 2025-09-08 08:53:01 +08:00
shijing abdf6c64ec fix:光芯原料库去掉检验 2025-09-05 15:11:30 +08:00
shijing 519c370cee fix:辅料库物料名称只显示name 2025-09-05 14:52:02 +08:00
shijing fa1265f100 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web 2025-09-05 14:34:38 +08:00
shijing cd918e0e11 fix:默认参数null 2025-09-05 14:34:36 +08:00
zty c87363a58a Merge branch 'master' of http://10.0.11.51:3000/zcdsj/factory_web 2025-09-05 10:47:15 +08:00
zty adeacb865e fix: merge 2025-09-05 10:47:10 +08:00
zty b0063b6052 feat: 添加会议预定相关页面 2025-09-05 10:44:15 +08:00
shijing b37296f460 fix:辅料库出入库明细筛选修正 2025-09-04 14:42:28 +08:00
shijing 4784a996f5 fix:员工工时统计 2025-09-04 14:01:39 +08:00
shijing 60f00d62de fix:监测数据图表中数字保留三位小数 2025-09-04 11:08:24 +08:00
shijing 9040ed8f8e fix:车间物料筛选 2025-09-04 08:42:55 +08:00
shijing 392d6129d1 feat:iqc检验列表 2025-09-03 17:05:25 +08:00
shijing 8c545f3705 fix: 检验大表需按照班次筛选 2025-09-03 16:29:40 +08:00
shijing bb67831a61 fix:禅道85、86 2025-09-03 11:28:35 +08:00
shijing 1d9fa46ba9 fix:禅道85、86 2025-09-03 10:55:15 +08:00
shijing 5f8886265d fix:统计页面 2025-09-02 16:27:22 +08:00
shijing 71638d4fc4 fix:routec查询参数变动 2025-09-02 16:26:53 +08:00
shijing 64dc7ccfea fix:fmlog->mlog创建时batch传参 2025-09-02 11:22:08 +08:00
shijing 66204d79ff fix:展示字段引用错误修正 2025-09-02 09:48:31 +08:00
shijing 546a51fd2d fix:光芯日志中工作开始时间必传 2025-09-02 09:33:47 +08:00
shijing dc5c0ebd49 fix:原料检验提交 2025-09-02 09:01:31 +08:00
shijing ec2310b821 fix:原料库添加检验 2025-09-01 16:53:41 +08:00
shijing 1332fed2c9 fix:陶瓷放开追踪方式 2025-09-01 16:51:39 +08:00
shijing 5823759669 fix:光芯车间库存物料状态筛选传参问题修正 2025-09-01 13:12:44 +08:00
shijing 0443ee42e9 fix:输出物料检验为空白数据时提示报错的修改 2025-09-01 10:40:12 +08:00
shijing 9b43129147 fix:that替换 2025-09-01 09:14:53 +08:00
shijing e5b80c3c8c fix:bx大箱标签控制显示 2025-09-01 09:12:57 +08:00
shijing 8624657790 fix:出版毛坯检测统计 2025-08-29 14:56:10 +08:00
shijing 8cee440559 fix:光芯交接记录编辑按钮错误修改 2025-08-29 14:55:51 +08:00
shijing b5279f43c1 fix:bug修复 2025-08-29 09:09:24 +08:00
shijing 70af588001 fix: 抽取wprList 2025-08-28 17:14:25 +08:00
shijing 8aa32be6dd fix: 抽取wprList 2025-08-28 16:57:32 +08:00
shijing 1d19527864 fix: 抽取wprList 2025-08-28 16:27:44 +08:00
shijing a2a0b75c09 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web 2025-08-28 16:27:07 +08:00
shijing bff9408474 fix:删除多余文件 2025-08-28 16:27:04 +08:00
zty 8cd7bdb879 Merge branch 'master' of http://10.0.11.51:3000/zcdsj/factory_web 2025-08-28 16:21:41 +08:00
zty 5c13647aba feat: 修改凌源首页内容 2025-08-28 16:17:32 +08:00
shijing d79066168c fix:光芯日志修改为不启用后就会隐藏,填写的班组需要显示出来,fmlog可以根据批次号搜索对应日志 2025-08-28 11:12:51 +08:00
shijing af66fe7c26 fix:账户管理添加 人员二维码查看 2025-08-28 10:32:29 +08:00
shijing b188b7b977 fix:输入物料批次隐藏详情按钮 2025-08-28 09:12:02 +08:00
shijing 3798213398 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web 2025-08-28 08:47:45 +08:00
shijing bb372c2b93 fix:毛坯检测汇总传参变动 2025-08-28 08:47:43 +08:00
caoqianming e0fc8be16b Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web 2025-08-27 17:39:30 +08:00
caoqianming aed96df1c9 feat: 增加xtScanInput组件2 2025-08-27 17:39:30 +08:00
shijing cf6ac5dba3 fix:bx变更检验提交接口 2025-08-27 15:37:48 +08:00
shijing f9e8206290 fix:bug修复 2025-08-27 15:36:59 +08:00
shijing 3ed68831bd fix:bx毛坯检测底部添加两行统计 2025-08-27 15:36:36 +08:00
shijing 1323dbd396 feat 2025-08-27 15:35:11 +08:00
zty 605d05e7c0 feat:增加凌源箱线图 和更改 tkx的测点 2025-08-27 14:00:39 +08:00
shijing c6422ed99e fix:禅道82 2025-08-26 15:03:59 +08:00
shijing 5b12029d20 fix:玻纤输出列表调整 2025-08-26 14:55:52 +08:00
shijing a4c15ba6d7 fix:禅道81 2025-08-26 14:32:24 +08:00
shijing c54942ea58 fix:玻纤一次排棒批次以及单个打印修改 2025-08-26 14:30:58 +08:00
shijing 3472d39894 fix:版本号变更 2025-08-25 17:14:02 +08:00
shijing c261aed544 fix:玻纤排一次棒工艺步骤添加工艺参数 2025-08-25 15:39:07 +08:00
shijing ee37dee001 fix:辅料库物料清单添加筛选项 2025-08-25 14:00:27 +08:00
shijing 90f717c625 fix:物料照片用img字段 2025-08-25 13:50:50 +08:00
shijing 84c96748c3 fix:光芯辅料类型添加到enumerate.js 2025-08-25 13:49:39 +08:00
shijing 4bdb9db361 fix:玻纤扫码时输入法提示 2025-08-22 16:51:52 +08:00
shijing f28fa85ff3 fix:玻纤日志列表中”预计工时不显示“ 2025-08-22 14:34:47 +08:00
shijing 468164ebe6 fix:输出详情表中把物料所属批次展示出来 2025-08-22 14:33:56 +08:00
shijing a637ab19bf fix:快速创建日志时展示操作项 2025-08-22 11:18:30 +08:00
shijing 97daddeef6 fix:导入接口引用问题调整 2025-08-22 09:17:14 +08:00
shijing f997f8d449 fix:新日志详情输出物料刷新 2025-08-22 09:04:15 +08:00
caoqianming 7641469088 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web 2025-08-21 12:15:26 +08:00
caoqianming e145086167 feat: 增加xtScanInput组件 2025-08-21 12:15:26 +08:00
shijing 5bc39180c1 fix:玻纤大箱发货标签放到详情里,并展示已有数据 2025-08-21 11:16:04 +08:00
shijing 353871c2d8 fix:玻纤大箱发货标签放到详情里 2025-08-21 09:49:07 +08:00
shijing 9f35d79424 fix:快速报工单间扫码问题修复 2025-08-20 17:18:53 +08:00
shijing 45062e3333 fix:快速报工调整 2025-08-20 15:37:01 +08:00
shijing a94c30deff fix:玻纤快速创建日志 2025-08-20 11:28:34 +08:00
shijing 583cecd238 fix:毛坯检验汇总表头 2025-08-19 15:54:20 +08:00
shijing 6ccdd4f438 fix:快速日志后,打开日志详情 2025-08-19 15:50:54 +08:00
shijing 9b00d9205c fix:bx日志详情中显示操作日期 2025-08-19 11:08:30 +08:00
shijing 5ef8274eaf fix:玻纤车间物料物料获取时,传参mgroupx代替mgroup 2025-08-19 11:07:34 +08:00
shijing 780caff788 fix:打印时原料和其他物料模板区分 2025-08-19 09:28:08 +08:00
shijing 335e6b2e12 fix:bug修复 2025-08-19 09:26:51 +08:00
shijing ccde240653 fix:禅道56 2025-08-18 16:28:47 +08:00
shijing a9e87ee859 fix:禅道59 2025-08-18 16:27:15 +08:00
shijing bc8673b85b fix:禅道61 2025-08-18 16:26:43 +08:00
shijing cad994e7e2 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web 2025-08-18 16:03:01 +08:00
shijing 07ea5f9a23 fix:光芯领料数量问题 2025-08-18 16:02:58 +08:00
caoqianming 1e82e0eb7d feat: 导入出入库明细 2025-08-18 13:42:24 +08:00
shijing 6b9962a8ee fix:玻纤快速报工 2025-08-18 11:08:53 +08:00
shijing 44672d2778 fix:禅道51 2025-08-18 09:43:43 +08:00
shijing da61734445 fix:禅道51 2025-08-18 09:42:55 +08:00