Commit Graph

296 Commits

Author SHA1 Message Date
shijing 6ea0f6f378 fix:mlogb_check数据回显 2025-04-22 17:07:47 +08:00
shijing fd5ab5b2fd fix:日志编辑时设备不对应问题改正 2025-04-22 14:30:35 +08:00
shijing ff1ef7f213 fix:正常交接时不显示更改批次 2025-04-22 14:29:57 +08:00
shijing b3acb107e1 fix:已接受的交接添加退回功能 2025-04-22 11:34:59 +08:00
shijing 4e3d51ebf2 fix:已接受的交接添加退回功能 2025-04-22 11:26:37 +08:00
shijing 5752485618 fix:日志相关问题更改 2025-04-22 11:09:51 +08:00
shijing 2b57e31589 fix:日志列表中工艺路线改为工艺步骤 2025-04-22 09:32:00 +08:00
shijing 797d8d5981 fix:日志显示问题以及工艺路线改为工艺步骤 2025-04-22 09:17:59 +08:00
shijing 5b82dc8880 fix:mlog_form表单项调整位置 2025-04-21 11:16:52 +08:00
shijing 62b5acce3f fix:外协入库相关更改 2025-04-18 09:29:50 +08:00
shijing 9ee8d998a8 fix:光芯改动 2025-04-18 02:00:23 +08:00
shijing f183fc1349 fix:领料时select可筛选 2025-04-18 01:54:26 +08:00
shijing b51d58b023 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2025-04-18 01:46:10 +08:00
shijing ced71a8aaf fix:4.14-4.18日光子修改 2025-04-18 01:43:05 +08:00
shijing e1b30f92b1 fix:出入库记录文案修改 2025-04-17 11:01:05 +08:00
caoqianming 8e23efa4e1 feat: 单行日志添加batch 2025-04-15 10:56:26 +08:00
caoqianming f4b01abc0c feat: 黑化/退火日志层数显示调整 2025-04-14 22:08:43 +08:00
shijing e9177c2eec fix:fmlog日志添加时,物料只展示来料未完成 2025-04-11 15:24:29 +08:00
shijing 9a07a158f6 fix:玻纤交接调整 2025-04-10 17:05:36 +08:00
shijing de8b32f232 fix:交接扫码 2025-04-10 16:14:08 +08:00
shijing f80e3f730c fix:默认层数从1开始 2025-04-09 11:07:23 +08:00
shijing 484b692ec8 fix:fmlog结构层日志中扫码添加日志修改 2025-04-09 11:06:49 +08:00
shijing 9de8e67289 fix:gx交接扫码无工段修改 2025-04-09 08:36:22 +08:00
shijing aa850cfcc2 fix:光芯交接、日志、出入库时的扫码 2025-04-01 11:27:57 +08:00
shijing 6681b5baba fix:光芯日志pad添加扫码功能 2025-03-31 13:58:57 +08:00
shijing f6ffda0a8f fix:光芯日志pad添加扫码功能 2025-03-31 13:58:36 +08:00
shijing 5192fef484 fix:mlogs已提交和未提交区分显示 2025-03-26 09:38:30 +08:00
shijing b56e82df7a fix:分批合批报废交接更换接口 2025-03-24 16:54:48 +08:00
caoqianming 24d1e78a00 feat: 车间领料库存必传id 2025-03-21 17:44:04 +08:00
shijing 3602844e45 fix:fmlog->mlog结构日志中添加操作项 2025-03-20 16:11:04 +08:00
shijing 95b3ecad9a fix:日志mlog中添加操作项 2025-03-20 16:09:35 +08:00
shijing ca1e8c9cb0 fix:光芯放开车间库存检验 2025-03-20 16:06:35 +08:00
shijing a25e70c0a0 fix:光芯黑化、退火日志中层数存储;不合格判定 2025-03-19 09:51:07 +08:00
shijing 840a82b87f fix:光芯日志mlogb扫描物料二维码弹出新增表单 2025-03-17 10:25:15 +08:00
shijing 2549abe1b3 fix:光芯日志mlogb扫描物料二维码弹出新增表单 2025-03-17 09:52:18 +08:00
shijing 2d016d166d fix:光芯日志mlog扫描设备二维码弹出新增表单 2025-03-17 09:51:42 +08:00
shijing 14e39014e0 feat:fmlog=>mlog层日志,实现扫码自动弹出mlog表单功能 2025-03-14 16:30:13 +08:00
shijing 92143e53fe fix:生产日志中mgroup重复请求问题 2025-03-14 16:29:16 +08:00
shijing d8e2665bc4 fix:光芯车间库存分批操作时触发方法传参变动 2025-03-14 13:47:57 +08:00
shijing d74ab186d2 fix:光芯交接表单调整 2025-03-14 13:43:24 +08:00
shijing 65e5a9ac4b fix:光芯车间库存去掉检验 2025-03-14 10:21:56 +08:00
shijing bfca9d02bd fix:coding798使用数量默认为0 2025-03-14 10:18:51 +08:00
shijing b5162b034f fix:输入物料不合格样式 2025-03-13 11:12:48 +08:00
shijing 414ef4bbc7 fix:日志新增输入物料表单清空 2025-03-13 11:11:36 +08:00
shijing 94a15d41ed fix:合批时批次合并默认为true 2025-03-12 14:07:28 +08:00
shijing 604b526c11 fix:光芯交接表单中日期获取 2025-03-12 13:49:43 +08:00
shijing e3a810ebd4 fix:库存出入库去除编号,并默认当前日期 2025-03-12 09:35:47 +08:00
shijing ffeac53e07 fix:文案改动 2025-03-11 17:15:11 +08:00
shijing fdffd8a4ef fix:车间出入库不要编号,默认登录人 2025-03-11 17:12:56 +08:00
shijing f890ca086d fix:加工前不良关联检验表 2025-03-11 17:12:08 +08:00
shijing 9b6e9cc438 fix:fmlogdetail添加扫码 2025-03-11 17:11:18 +08:00
shijing e439a0d7c3 fix:过程检验关联检验表 2025-03-11 17:10:05 +08:00
shijing fc10c2eee0 fix:过程检验关联检验表 2025-03-11 17:09:43 +08:00
shijing 43e5dff859 fix:光子生产执行中日志列表传参变动;添加返工和启用 2025-03-11 17:02:37 +08:00
shijing 0a0229cfab fix:生产执行中车间库存变动,分为来料未完成&出料已完成(添加分批合批) 2025-03-11 16:54:53 +08:00
shijing 86921313d8 fix:交接表单变动,并添加分批合批功能(分批但拉出来了) 2025-03-11 16:53:02 +08:00
shijing aacdd0b892 fix:光芯交接记录添加扫码 2025-03-11 16:51:41 +08:00
shijing c0d336d85c fix:光芯动态路由后各工序页面抽离(分为fmlog>index2和mlog>index) 2025-03-11 16:49:58 +08:00
shijing a6008e4cdc fix:光芯:生产执行中的任务列表传参变动,操作去掉分配 2025-03-11 16:48:41 +08:00
shijing 9faeaef554 fix:光芯动态路由下的生产执行页面变动 2025-03-11 16:46:33 +08:00
shijing fcb0589a45 fix:光芯生产日志库存切分页面 2025-03-06 13:47:54 +08:00
shijing 9f7115ccca fix:光芯:车间库存检验中不合格标记改为defect_name 2025-03-04 14:42:13 +08:00
shijing 2cf878d31a fix:光芯:fmlog禁止编辑 2025-03-04 14:41:14 +08:00
shijing cf2f307ed1 fix:去除无用文件 2025-03-04 14:32:37 +08:00
shijing b8a476da0f fix:光芯成品和外观加到工序 2025-02-28 16:19:35 +08:00
shijing bb95b5228e feat:白片抛检验审批 2024-12-17 14:30:38 +08:00
shijing 5c139f0b7c fix:光芯生产执行恢复 2024-12-17 10:39:01 +08:00
shijing ce57e0c5e1 fix:光芯生产执行恢复 2024-12-17 10:28:41 +08:00
shijing 010298dd89 feat:废品库出库 2024-12-12 15:47:11 +08:00
shijing 69307c7590 fix:玻纤生产执行 2024-12-11 14:58:10 +08:00
shijing 148584b8aa fix:日志中工段问题修改 2024-12-03 09:45:01 +08:00
shijing 0d9afd42e0 fix:fmlog改动,以及大屏改动 2024-11-28 16:43:30 +08:00
shijing fe312b455c fix:coding#628 2024-11-27 17:14:08 +08:00
shijing 29597f1348 #502coding:13、添加批次序号 预备用 2024-11-27 09:28:24 +08:00
caoqianming ae365ee383 feat: 外协和磨抛一次抛 2024-11-26 22:23:04 +08:00
caoqianming 17dc188e25 fix: 车间入库时depts查询报错 2024-11-26 16:58:52 +08:00
shijing 78d82b6f3f fix:字段更正 2024-11-25 10:25:05 +08:00
shijing 5c0f9acf2f fix:gx获取工段用name查询 2024-11-22 11:32:47 +08:00
shijing b92937fb9b fix:交接记录手动添加时多选物料 2024-11-22 09:59:32 +08:00
shijing 0752000f24 fix:coding交接变动 2024-11-21 13:27:54 +08:00
shijing 4d8bf81be3 fix:成品检验车间库存放开检验 2024-11-21 13:27:18 +08:00
shijing 05649491ab Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-11-19 16:31:22 +08:00
shijing 38c84fa1e9 fix:高echarts改动 2024-11-19 16:31:18 +08:00
caoqianming 234e5ca216 feat: mtask查看可用批次 2024-11-15 18:31:35 +08:00
shijing bfd3f5e7f9 fix:coding#502-2 2024-11-14 11:21:46 +08:00
shijing 07958e9a57 fix:车间库存添加状态筛选 2024-11-13 17:00:43 +08:00
shijing 1b297de7bb fix:物料选择查询条件添加mtaskx 2024-11-07 11:09:44 +08:00
shijing d7965ef170 fix:coding507 2024-11-01 09:26:17 +08:00
shijing 7cb112bde8 fix:出入库后页面库存刷新 2024-11-01 09:24:04 +08:00
shijing 6f717b03ec fix:fmlog日志中编辑mlog时取消领料数量不能大于当前工段库存数的限制,且合格不合格禁用 2024-11-01 09:11:17 +08:00
shijing 9734d461cf fix:交接页面按钮修正 2024-10-30 10:03:34 +08:00
shijing 6f476c2740 fix:日志中物料标签的打印 2024-10-29 15:29:03 +08:00
shijing d91db25ed6 fix:fmlogs打印传参更改 2024-10-29 13:54:28 +08:00
shijing be8ee7b14b fix:更改日志打印标记 2024-10-29 10:12:22 +08:00
shijing 3349982650 fix:工段库存物料标签打印 2024-10-25 17:17:54 +08:00
shijing f53ab995fd feat:日志添加车间库存并打印物料标签 2024-10-25 11:14:19 +08:00
shijing f5860c42d5 feat:日志添加车间库存并打印物料标签 2024-10-25 11:13:28 +08:00
shijing 88fc695454 feat:工段交接记录新增时扫码添加物料 2024-10-24 17:21:37 +08:00
shijing 4acdc9f4cd feat:工段交接记录打印 2024-10-24 17:20:42 +08:00
shijing f02467a881 feat:车间入库记录打印 2024-10-24 17:19:53 +08:00
shijing bd873b3b32 feat:车间库存物料标签打印 2024-10-24 17:18:48 +08:00
shijing d07ff31f76 feat:日志打印 2024-10-24 17:18:15 +08:00
shijing 7956d72987 feat:任务分解打印 2024-10-24 17:17:31 +08:00
shijing b9a7cd6b66 fix:入库信息,生产领料、销售发发货打印导出初版测试 2024-10-15 10:49:28 +08:00
shijing 12133a3b37 fix:coding497、499 2024-10-08 13:52:50 +08:00
shijing e5b163dc59 fix:合格数统计柱状图修正,光芯mtask提交后刷新列表 2024-09-26 15:59:49 +08:00
shijing 753063ba47 fix:coding#492 2024-09-25 16:52:03 +08:00
shijing 4b7664296f fix:coding#495 2024-09-25 16:51:08 +08:00
shijing 14a079ae0b fix:日志中实际生产数和领料数以及加工前不良的计算 2024-09-25 14:11:44 +08:00
shijing 8118bec402 fix:工段页面添加出入库记录 2024-09-24 16:46:14 +08:00
shijing 4337fb7d1f fix:光芯车间出入库改正 2024-09-24 16:40:22 +08:00
shijing 414fad1602 fix:工段库存领料入库操作抽屉展示 2024-09-23 11:15:55 +08:00
shijing ffcbe833cf fix:交接记录显示问题&检验时物料批次的排序 2024-09-19 15:46:44 +08:00
shijing 17c50f7b27 fix:车间物料检验时数量显示为count_cando 2024-09-18 14:50:28 +08:00
shijing 58bf615de3 fix:交接物料/按钮显示问题 2024-09-12 15:28:29 +08:00
shijing 714e18e168 fix:检验部交接物料查询 2024-09-12 10:43:46 +08:00
shijing 8a1cf4a25b fix:成品检验中交接记录的筛选 2024-09-11 16:47:01 +08:00
shijing 744f78b621 fix:工段交接记录和库存修正 2024-09-11 15:28:35 +08:00
shijing 6764381bad fix:接收部门placeholder提示文案修正 2024-09-10 17:30:55 +08:00
shijing 9a41a29f49 fix:coding#493保温时间和冷却时间可编辑 2024-09-10 16:59:39 +08:00
shijing 709bd6d11b fix:水泥院动态图标改动 2024-09-09 08:47:07 +08:00
shijing 1510aee343 fix:交接页面添加打印机名称修改 2024-09-06 12:46:24 +08:00
shijing 408f83436c fix:车间库存报废,在库存管理里查看 2024-09-06 11:00:53 +08:00
shijing 2eca64bf93 fix:日志添加时,设备显示设别编号 2024-09-05 19:27:50 +08:00
shijing d17f336a89 fix:批量交接,并可查询 2024-09-05 19:26:26 +08:00
shijing 9d7dca9096 fix:mlog二级可编辑,并且展示batch 2024-09-05 19:25:48 +08:00
shijing 8eaf952916 fix:fmlog工艺路线显示routepack_name 2024-09-05 17:17:13 +08:00
shijing 997a1e71ef fix:退火审批问题修改 2024-09-05 17:02:28 +08:00
shijing 5cd34dd627 fix:mlog提交状态 2024-09-05 14:53:08 +08:00
shijing eac434c0ea fix: 2024-09-05 14:40:49 +08:00
shijing 04fd2c4899 fix:生产设备以mgroup筛选,添加设备工作进度条 2024-09-05 14:04:58 +08:00
shijing baaa9f9e2e fix:分配 2024-09-05 13:45:22 +08:00
shijing f93cfa8000 fix:黑化日志添加检验附件excel 2024-09-05 12:12:58 +08:00
shijing c45d39ff16 fix:除了切片、白片抛、黑化、退火、一次抛其他工序都成新的日志填写 2024-09-05 11:03:16 +08:00
shijing 93b3a053f2 feat:添加fmlog和第二大类的日志填写 2024-09-05 10:55:09 +08:00
shijing 23c9d67b7a fix:产出物料里的不合格显示小崩边 2024-09-05 10:53:25 +08:00
shijing 8ee097af9a fix:工改加工前不良对应字段 2024-09-05 10:15:47 +08:00
shijing b0777bdb12 fix:fmlog接口声明 2024-09-05 09:10:58 +08:00
shijing a3b2c0a2b5 fix:退货放行单日志提交时上传excel文件,并存在日志里 2024-09-04 13:37:02 +08:00
shijing 85e2bf1078 fix:车间库存添加检验记录页面,退火日志审批时控制页面按钮 2024-09-04 09:50:46 +08:00
shijing ee973ca0da fix:添加黑化工段库存检验 2024-09-03 17:31:48 +08:00
shijing 9675c51e49 fix:文案修改,冷却时间 2024-09-03 16:33:12 +08:00
shijing 8b2c575a2d fix:日志输入物料添加该批次所在层数的备注 2024-09-03 15:31:59 +08:00
shijing ed0d2a8cad fix:mlogb检验的form表单(全检/抽检) 2024-09-03 15:30:22 +08:00
shijing b69038d369 fix:工段库存检验可抽检,可全检 2024-09-03 15:27:18 +08:00
shijing c009cf68ec fix:退火工序日志交接时出发审批,破碎数改为加工前不良 2024-09-03 15:25:25 +08:00
shijing ded2507d02 fix:mlog只有黑化和退火时添加保温时间和退火时间 2024-09-03 15:19:57 +08:00
shijing 880c655e63 fix:coding#4511 2024-08-27 16:09:04 +08:00
shijing 5017710f33 fix:coding#445 2024-08-27 14:45:20 +08:00
shijing 97eab5f9a4 fix:光芯自检添加不合格项”小崩边“ 2024-08-27 11:05:57 +08:00