Commit Graph

220 Commits

Author SHA1 Message Date
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
shijing 8f3ef47bb1 fix:碳排放图表数据展示 2024-08-20 09:16:54 +08:00
shijing c08dc1b2d3 fix:日志不合格项合计 2024-08-15 17:49:21 +08:00
shijing 93ae6ac3da fix:日志检验中添加破损和其他 2024-08-15 17:23:44 +08:00
shijing b353166dda fix:日志中生产设备传dept 2024-08-15 17:08:03 +08:00
shijing 65f4502561 fix:白抛片-->改为 白片抛 2024-08-15 13:57:36 +08:00
shijing be1f643eef Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-08-15 13:28:42 +08:00
shijing 29e4bb2432 fix:添加工序工段对应页面,更改工段名称 2024-08-15 13:28:38 +08:00
caoqianming 60b277b86b Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-08-15 11:08:13 +08:00
caoqianming 705b15b833 feat: wmaterial增加state字段 2024-08-15 11:08:07 +08:00
shijing d001a98168 fix:添加不合格项,抽检添加检验人 2024-08-14 21:23:44 +08:00
caoqianming f2df4ddbb0 fix: wpm_gx handoverform getuserlist2 bug 2024-08-14 10:47:09 +08:00
shijing c7bd84f8ab fix:交接记录人员 2024-08-14 10:29:15 +08:00
shijing 1666728e9e fix:抽检 2024-08-13 15:42:24 +08:00
shijing 404b2b71cb fix:chengpinjianyan 2024-08-13 13:51:17 +08:00
shijing 7172a0e070 fix:二次、三次超洗 2024-08-13 11:15:05 +08:00
shijing 4ee3242fa9 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-08-13 10:49:35 +08:00
shijing 8e5a2f60ad fix:检验提交 2024-08-13 10:49:31 +08:00
caoqianming 1a0b85b9a1 feat: 界面字段优化 2024-08-13 10:46:03 +08:00
caoqianming 28516c89dd feat: wpm_gx mlog界面优化 2024-08-13 10:33:48 +08:00
caoqianming 009e2c05bb fix: handover form wm做筛选 2024-08-13 09:56:19 +08:00
shijing 1ec89273e5 fix:光芯成品检验 2024-08-12 17:21:31 +08:00
shijing 8ac1ad41b1 fix:关闭详情后刷新mlog 2024-08-01 18:12:35 +08:00
shijing 263a914fa9 fix:不合格校验 2024-08-01 17:38:43 +08:00
shijing df7ae9e7cd fix:交接记录按钮权限 2024-08-01 17:02:39 +08:00
shijing fa0cfddc3c fix:日志添加撤回 2024-08-01 15:28:49 +08:00
shijing 896cba6bc9 fix:返工物料名称标注 2024-08-01 15:25:58 +08:00
shijing ed4cc66303 fix:交接编辑人员显示bug修改 2024-08-01 15:25:14 +08:00
shijing cc0c0bc6d4 fix:日志开始/结束时间选择时不能超过当前时间 2024-08-01 11:04:26 +08:00
shijing e6b945b152 fix:交接单删除接口修正,以及状态判断 2024-08-01 10:41:21 +08:00
shijing dbec6f5396 fix:光芯生产日志中产出物详情展开 2024-08-01 10:27:09 +08:00
caoqianming 1de0d342d5 feat: 添加工段获取错误提示 2024-08-01 08:37:31 +08:00
shijing e4dfebee09 fix:交接记录中options展示样式 2024-07-30 15:30:14 +08:00
shijing 94e0ed014a feat:添加打印机名称保存 2024-07-30 15:22:25 +08:00
zty 8896a3927c feat: wpm_gx mlog_form user添加筛选条件 2024-07-30 14:15:11 +08:00
shijing 14ec636422 fix:活化改为扫边 2024-07-25 16:39:36 +08:00
shijing e67532d958 fix:交接记录展示不合格标记 2024-07-25 15:41:57 +08:00
shijing 1b6cf9a66b fix:交接记录 2024-07-25 14:58:01 +08:00
shijing 996759e60c fix: 2024-07-25 09:34:54 +08:00
shijing 42676ab855 fix:charts测试更改 2024-07-25 09:34:33 +08:00
shijing 7d7c5f2dcc fix:光芯-添加日志增加外协单位 2024-07-24 16:41:48 +08:00
shijing 75a0dc33ce fix:小问题修改 2024-07-24 15:01:59 +08:00
shijing 61a86d766a fix:测试文件改动 2024-07-24 13:48:58 +08:00
shijing 8a1c7cb11e fix:echarts动态壮壮图折线图测试demo 2024-07-23 09:18:36 +08:00
shijing ee809aa571 fix:工序页面完善 2024-07-22 16:55:59 +08:00
shijing d401e4b4dd feat:光芯 2024-07-22 13:35:39 +08:00
shijing f6e8b82101 添加光芯生产执行页面 2024-07-15 13:45:01 +08:00