Commit Graph

3438 Commits

Author SHA1 Message Date
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
shijing 38e29148a5 fix:玻纤监测数据不更新修复 2025-08-18 08:39:19 +08:00
shijing 631cba19a0 fix:快速创建日志接口声明 2025-08-18 08:36:14 +08:00
shijing 977f5b0584 fix:发货打印 2025-08-08 17:02:21 +08:00
shijing bc582323ab fix:变更版本号 2025-08-07 16:54:48 +08:00
shijing be1448c25d fix:发货选择物料批次时默认最多显示50个 2025-08-07 16:37:00 +08:00
shijing f55e2d6a80 fix:输出物料详情若有对外编号就显示 2025-08-07 15:23:01 +08:00
shijing 07f369198a fix:禅道37 2025-08-07 14:27:44 +08:00
shijing cc391f27b0 fix:禅道24 2025-08-07 10:36:28 +08:00
shijing b1cf055bf8 fix:禅道25 2025-08-07 10:13:20 +08:00
shijing 2503653d28 fix:玻纤交接调整 2025-08-06 16:50:12 +08:00
shijing e3c085beec fix:发货编号调整 2025-08-06 15:19:28 +08:00
shijing 8a445429ad fix:已完成物料分配发货编号完善 2025-08-06 10:41:19 +08:00
shijing bb517ff967 fix:光芯大屏饼状图圆角调整 2025-08-06 10:31:14 +08:00
shijing 7a1168239d fix:光芯大屏工段图标坐标轴变动 2025-08-06 08:59:15 +08:00
shijing bf0a9fd5a2 fix:退火已完成物料也加检验 2025-08-06 08:40:41 +08:00
shijing 3e124050c4 fix:日志mlogs显示team_name 2025-08-05 15:54:13 +08:00
caoqianming ceea2e2674 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web 2025-08-05 15:28:00 +08:00
shijing 4c8a3b0cc2 fix:若无qct表单,则直接获取list 2025-08-05 15:18:35 +08:00
shijing 92bdac7ea2 fix:wpm中index调整 2025-08-05 15:06:01 +08:00
shijing 7141516f3a fix:检验记录中合格率保留两位小数 2025-08-05 14:25:40 +08:00
caoqianming 58403f3fb8 feat: ichat获取返回结果 2025-08-05 14:24:14 +08:00
shijing a0d8982b6b fix:检验记录搜索框调整 2025-08-05 14:08:28 +08:00
shijing 0dae17ca66 fix:黑化检验增加检验记录 2025-08-05 13:57:53 +08:00
shijing 61ccbb2e78 fix:交接物料状态备注 2025-08-05 13:46:18 +08:00
shijing 06eb2de6d4 fix:入厂检验传入test_date__isnull 2025-08-05 10:36:45 +08:00
shijing 29cbafb3cf fix:入厂检验传入test_date__isnull 2025-08-05 10:22:41 +08:00
shijing 05e9c2faa7 fix:光芯辅料库出库code改为borrow_out 2025-08-05 10:01:19 +08:00
shijing 65aa1979f1 fix:物料分类:完全合格、合格B类、不合格、返工 2025-08-05 09:27:31 +08:00
shijing e934018c85 fix:任务分级 2025-08-05 09:24:10 +08:00
shijing af77ee8b38 fix:禅道036 2025-08-04 15:46:02 +08:00
shijing e588516177 fix: 2025-08-04 15:42:40 +08:00
shijing 5bd5021a16 fix:交接物料时有缺陷的显示缺陷项 2025-08-04 15:39:00 +08:00
shijing d0a257ce2e fix:任务添加等级 2025-08-04 15:36:48 +08:00
shijing 1cbfc1986b fix:发货编号获取后自动编号 2025-08-04 10:54:54 +08:00
shijing eb1376deae fix:光芯返工交接不能退回 2025-08-04 10:46:37 +08:00
shijing 32c630ca42 fix:禅道044 2025-08-04 09:50:24 +08:00
shijing 64045138fc fix:光芯检验时不合格数不可编辑 2025-08-04 08:53:12 +08:00
shijing 7b341ebb78 fix:日志输出物料检验时批量操作 2025-08-01 15:42:39 +08:00
shijing b53eb289ee fix:销售发货,发货编号 2025-08-01 14:03:46 +08:00
shijing 0352195245 fix:玻纤日志输入输出bug修正 2025-08-01 13:48:07 +08:00
shijing 921bf52761 fix:分配出库对外编号接口声明 2025-07-31 16:08:04 +08:00
shijing 73b657c5de fix:车间出入库记录bug修复 2025-07-31 09:56:26 +08:00
shijing 96eaa89722 fix:将工段放到部门前面,选中工段后,工段默认为该工段所属的部门 2025-07-30 16:41:39 +08:00
shijing 8c071dafbc FIX 2025-07-30 15:55:33 +08:00
shijing 8778dc7ebd fix; 2025-07-30 15:54:39 +08:00