 caoqianming
|
5b7d906d44
|
feat: 部分页面调整
|
2025-02-11 17:17:40 +08:00 |
 zty
|
f51655b416
|
feat: 修改生成日报和月报表
|
2025-02-11 14:26:08 +08:00 |
|
caoqianming
|
b52c990fb5
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2025-02-11 11:31:47 +08:00 |
|
caoqianming
|
f19911987d
|
feat: 原料入库显示是否检验
|
2025-02-11 11:31:44 +08:00 |
 shijing
|
a819e4d4a3
|
fix:coding#787、2
|
2025-02-10 17:19:17 +08:00 |
|
shijing
|
bfb154dace
|
fix:coding#787、2
|
2025-02-10 17:18:39 +08:00 |
|
shijing
|
853048a473
|
fix:交接记录扫码后批次交接详情列表全部展示
|
2025-02-10 17:17:55 +08:00 |
|
shijing
|
0c7ce37ed8
|
fix:coding#786、2
|
2025-02-10 16:58:24 +08:00 |
|
shijing
|
97d2cb40b5
|
fix:coding#787、1
|
2025-02-10 16:57:26 +08:00 |
|
shijing
|
2e3857a9b9
|
fix:wprList去掉分页，page=0
|
2025-02-10 16:56:16 +08:00 |
|
shijing
|
f1ec1efa64
|
fix:减薄车间看板
|
2025-02-10 16:55:10 +08:00 |
|
shijing
|
89b64277f9
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2025-02-08 16:47:32 +08:00 |
|
shijing
|
a12c395405
|
fix:wpr打印标签更换成number，以及交接扫码处理
|
2025-02-08 16:47:29 +08:00 |
|
zty
|
91c1b9a0a4
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2025-02-08 15:39:44 +08:00 |
|
zty
|
a8e071d886
|
feat:修改生成日报表 enm_report/reportDay
|
2025-02-08 15:39:39 +08:00 |
|
shijing
|
f4ecb03144
|
fix:车间库存领料时扫码问题修正
|
2025-02-07 16:59:09 +08:00 |
|
shijing
|
f3aea5bf88
|
fix:扫码弹窗接收立即关闭参数
|
2025-02-07 16:58:31 +08:00 |
|
shijing
|
0fbd17810d
|
fix:采购入库时默认数量为1
|
2025-02-07 16:11:03 +08:00 |
|
shijing
|
8c7b900af0
|
fix:领料不合格不显示
|
2025-02-07 15:19:32 +08:00 |
|
shijing
|
37eeb45242
|
fix:根据交接物料限制交接工段
|
2025-02-07 15:16:30 +08:00 |
|
shijing
|
9a9be3857e
|
fix:wpm新增接口声明
|
2025-02-07 14:57:20 +08:00 |
|
shijing
|
e8449383c8
|
fix:bwcheck优化
|
2025-02-07 10:12:13 +08:00 |
|
shijing
|
8eeb78199c
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2025-02-07 10:09:15 +08:00 |
|
shijing
|
9b0d63bcd6
|
fix:routepack编辑按钮显示
|
2025-02-07 10:09:11 +08:00 |
|
caoqianming
|
b53fd04088
|
feat: 证书状态查询
|
2025-02-06 11:54:04 +08:00 |
|
caoqianming
|
f550b1391d
|
feat: 在线考试详情页调整2
|
2025-02-06 09:03:57 +08:00 |
|
caoqianming
|
37f9c9fa3f
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2025-02-05 17:54:39 +08:00 |
|
caoqianming
|
046d544872
|
feat: 在线考试详情页调整
|
2025-02-05 17:54:21 +08:00 |
|
shijing
|
423a390c4f
|
fix:玻纤交接改版
|
2025-02-05 16:57:47 +08:00 |
|
shijing
|
7eac479d9c
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2025-02-05 16:55:44 +08:00 |
|
shijing
|
5788b746cd
|
fix:玻纤route中批次校验默认false
|
2025-02-05 16:55:40 +08:00 |
|
caoqianming
|
9a7dea317b
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2025-02-05 15:50:22 +08:00 |
|
caoqianming
|
44db345ae7
|
feat: 证书管理增加状态展示
|
2025-02-05 15:50:10 +08:00 |
|
zty
|
5594b2c982
|
feat: tkx 修改质量报表
|
2025-01-26 11:26:22 +08:00 |
|
zty
|
e7b4df54ce
|
feat: tkx 修改质量 报表
|
2025-01-26 09:44:31 +08:00 |
|
zty
|
08b5c0550f
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2025-01-24 17:17:09 +08:00 |
|
zty
|
1d837b9b0a
|
feat: 修改质量报表
|
2025-01-24 17:17:04 +08:00 |
|
shijing
|
3d273844bc
|
fix:排版添加跟随检验值
|
2025-01-24 16:32:00 +08:00 |
|
zty
|
2a75517a19
|
feat: fix 修改质量报表
|
2025-01-24 09:21:52 +08:00 |
|
zty
|
56334fc718
|
feat: 修改质量报表
|
2025-01-23 14:24:02 +08:00 |
|
shijing
|
ae3e6aa1ec
|
fix:曲阳更改ip地址
|
2025-01-23 09:54:58 +08:00 |
|
shijing
|
e7c983001b
|
fix:mlogb扫wpr码时，若以有该批次的使用数量显示更正
|
2025-01-22 16:46:15 +08:00 |
|
shijing
|
9399fd3b17
|
fix:交接批物料时修改
|
2025-01-22 16:33:18 +08:00 |
|
shijing
|
c4b28f8d5e
|
fix:打印接口
|
2025-01-22 14:34:35 +08:00 |
|
shijing
|
af13ba23af
|
fix:检验表中的检测项添加加入物料信息字段
|
2025-01-22 14:25:09 +08:00 |
|
shijing
|
e8508bfc67
|
fix:mlogbw输出物料检验
|
2025-01-22 09:42:05 +08:00 |
|
shijing
|
14170dbc56
|
fix:任务mtask添加删除
|
2025-01-22 09:18:06 +08:00 |
|
shijing
|
94ec97c7ef
|
fix:玻纤物料显示追踪方式
|
2025-01-21 15:34:08 +08:00 |
|
shijing
|
6efc502ccf
|
fix:工单处理调整
|
2025-01-21 15:33:05 +08:00 |
|
shijing
|
c5d6e6fcf7
|
fix:mlogbw样式调整
|
2025-01-21 11:07:06 +08:00 |
|
shijing
|
dfdecc01bd
|
fix:bug修复
|
2025-01-21 10:42:30 +08:00 |
|
shijing
|
24b4781f53
|
fix:mlogbw检测保存和编辑
|
2025-01-21 10:40:04 +08:00 |
|
shijing
|
397587bbeb
|
fix:玻纤原料入库检验
|
2025-01-20 17:37:18 +08:00 |
|
shijing
|
eff75a7c86
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2025-01-20 17:13:51 +08:00 |
|
shijing
|
53eb08d218
|
fix:缺陷项不合格分类去掉合格选择项
|
2025-01-20 17:13:48 +08:00 |
|
zty
|
a97abd2f2c
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2025-01-17 17:32:45 +08:00 |
|
zty
|
29f7d0ecc4
|
feat:修改 enm/report
|
2025-01-17 17:32:40 +08:00 |
|
shijing
|
f16f649dc4
|
fix:库存交接时新增表单验证
|
2025-01-17 11:20:04 +08:00 |
|
shijing
|
f83983578f
|
fix:原料库添加类型和不合格标记
|
2025-01-17 11:02:02 +08:00 |
|
shijing
|
07e45047e4
|
fix:隐掉库存里的入库按钮
|
2025-01-17 09:36:37 +08:00 |
|
shijing
|
caf2f09c00
|
fix:检验记录与检验按钮只在批次追踪物料显示
|
2025-01-17 09:31:34 +08:00 |
|
shijing
|
ab987c0b8b
|
fix:wpr显示不合格标记
|
2025-01-17 09:23:58 +08:00 |
|
shijing
|
5d58d0c8fc
|
fix:日志详情里添加一个传参
|
2025-01-17 09:21:41 +08:00 |
|
shijing
|
3de4874cf4
|
fix:mlog中添加操作项
|
2025-01-17 09:20:19 +08:00 |
|
shijing
|
29c5eeb514
|
fix:车间库存领料时mioitem可删除
|
2025-01-17 09:13:30 +08:00 |
|
shijing
|
c99e2c8d1b
|
fix:交接记录可以更改批次号，以及解决扫码重复的情况
|
2025-01-17 09:12:23 +08:00 |
|
shijing
|
d3db926789
|
fix:原料库添加物料类型
|
2025-01-17 09:08:31 +08:00 |
|
shijing
|
23570fd84b
|
fix:日志中物料显示问题修正
|
2025-01-16 11:01:49 +08:00 |
|
shijing
|
b6b92fc451
|
fix:半成品添加图纸
|
2025-01-16 11:00:40 +08:00 |
|
shijing
|
ddcaae1bf9
|
fix:缺陷项去掉合格类型
|
2025-01-16 11:00:07 +08:00 |
|
shijing
|
8269c96159
|
fix:inmjs更新
|
2025-01-16 10:59:01 +08:00 |
|
shijing
|
cf8cb6726b
|
feat:添加操作项页面，操作项添加类型
|
2025-01-16 10:58:37 +08:00 |
|
shijing
|
29a9af5312
|
fix:车间库存检验记录
|
2025-01-15 15:52:51 +08:00 |
|
shijing
|
7831d87869
|
fix:mlogb中批次输入扫码（wm||wb）
|
2025-01-15 15:51:56 +08:00 |
|
shijing
|
6088b9c633
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2025-01-15 15:47:56 +08:00 |
|
shijing
|
e32c12b2da
|
fix:车间库存修改
|
2025-01-15 15:47:52 +08:00 |
|
zty
|
efd82972af
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2025-01-14 16:28:19 +08:00 |
|
zty
|
bf736966b6
|
feat: 修改 report 报表
|
2025-01-14 16:28:14 +08:00 |
|
shijing
|
88f1ea7af7
|
fix:玻纤日志改动
|
2025-01-14 14:16:36 +08:00 |
|
shijing
|
ddb82670ad
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2025-01-14 10:31:36 +08:00 |
|
shijing
|
70ca59a680
|
fix:mlogb和handoverb扫码添加
|
2025-01-14 10:31:33 +08:00 |
|
zty
|
5f116bed5f
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2025-01-13 18:03:05 +08:00 |
|
zty
|
8d22019fd4
|
feat:修改班组排名
|
2025-01-13 18:03:02 +08:00 |
|
shijing
|
2dc9099409
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2025-01-13 16:48:53 +08:00 |
|
shijing
|
80f36a0e6f
|
fix:玻纤改动
|
2025-01-13 16:48:50 +08:00 |
|
zty
|
b31ae9403c
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2025-01-13 11:30:40 +08:00 |
|
zty
|
b63b5c12db
|
feat：enm/bug fix
|
2025-01-13 11:30:37 +08:00 |
|
shijing
|
2a5183defd
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2025-01-13 09:12:14 +08:00 |
|
shijing
|
fe4e537ef8
|
fix:交接时物料选项工序展示；库存添加动态物料展示
|
2025-01-13 09:12:11 +08:00 |
|
zty
|
64c738acd2
|
feat: 修改 enm 报表
|
2025-01-10 17:32:01 +08:00 |
|
shijing
|
c1a4150080
|
fix:mlogb变动更新改动
|
2025-01-10 15:50:57 +08:00 |
|
shijing
|
49c3fdaae3
|
fix:bx日志相关改动
|
2025-01-10 15:23:17 +08:00 |
|
shijing
|
f01b1a6c9d
|
fix:mlogbw
|
2025-01-10 10:58:01 +08:00 |
|
shijing
|
f1c363ed23
|
fix:光芯日志输出物料编辑
|
2025-01-10 10:43:08 +08:00 |
|
shijing
|
4765754890
|
fix:日志详情输入无聊去掉加工前不良
|
2025-01-09 13:41:52 +08:00 |
|
shijing
|
2a282c5b63
|
fix:mlobw编辑时传参调整以及生产领料时物料标签的打印
|
2025-01-09 13:29:26 +08:00 |
|
shijing
|
faf6358eab
|
fix:mlogbdefectjiekoushengming
|
2025-01-09 11:35:24 +08:00 |
|
shijing
|
f93eb0fe89
|
fix:mlogbw提交
|
2025-01-09 10:52:11 +08:00 |
|
shijing
|
2dfc51b67d
|
fix:日志改动
|
2025-01-07 17:16:12 +08:00 |
|
shijing
|
4b02b7c00f
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2025-01-07 16:11:05 +08:00 |
|
shijing
|
0ffabc4438
|
fix:采购入库检验调整
|
2025-01-07 16:11:02 +08:00 |
|
zty
|
84c05428be
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2025-01-07 14:19:22 +08:00 |
|
zty
|
95bba723b0
|
feat:修改车间工序单耗查询问题
|
2025-01-07 14:19:16 +08:00 |
|
shijing
|
251a96d083
|
fix:mio必填项提示
|
2025-01-07 11:29:01 +08:00 |
|
shijing
|
a42c674fcc
|
fix:领料添加mb
|
2025-01-07 11:28:21 +08:00 |
|
shijing
|
46372aa7ca
|
feat:接口声明（route中的辅料）
|
2025-01-07 11:03:25 +08:00 |
|
shijing
|
1fb2942e44
|
feat:route中添加辅料
|
2025-01-07 11:02:36 +08:00 |
|
shijing
|
295ed27bac
|
fix:玻纤日志相关调整
|
2025-01-07 09:47:06 +08:00 |
|
shijing
|
36a7c029b0
|
fix:mlogbw.js改动声明
|
2025-01-07 09:42:23 +08:00 |
|
shijing
|
81cf3eda13
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2025-01-07 09:40:58 +08:00 |
|
shijing
|
08872064c5
|
fix:bx交接页面调整
|
2025-01-07 09:40:54 +08:00 |
|
zty
|
97af55e294
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2025-01-06 17:39:20 +08:00 |
|
zty
|
b84d64b2f4
|
feat: 修改大屏内容和生产报告查询
|
2025-01-06 17:39:17 +08:00 |
|
shijing
|
d1215b6b05
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2025-01-06 14:58:04 +08:00 |
|
shijing
|
e75dfe67be
|
fix:交接记录查看时总计错误纠正
|
2025-01-06 14:58:00 +08:00 |
|
zty
|
fd770c2562
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2025-01-06 10:28:31 +08:00 |
|
zty
|
7fd709b7a6
|
feat: tkx/enm 修改班组 和 生产日报报表增加 目标值等功能
|
2025-01-06 10:28:28 +08:00 |
|
shijing
|
0877bd03d3
|
fix:动态产品接口声明
|
2025-01-06 09:10:41 +08:00 |
|
shijing
|
75f2906cf7
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2025-01-03 13:51:20 +08:00 |
|
shijing
|
400dfb27dd
|
fix:coding737
|
2025-01-03 13:51:17 +08:00 |
|
zty
|
553f2761bb
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2025-01-02 18:04:35 +08:00 |
|
zty
|
6584c82499
|
feat:修改班组得分
|
2025-01-02 18:04:30 +08:00 |
|
shijing
|
e3acce3f09
|
fix:mlogbw
|
2025-01-02 17:45:32 +08:00 |
|
shijing
|
eb025fbeb2
|
fix:库存交接记录检验改动
|
2025-01-02 17:21:52 +08:00 |
|
shijing
|
3f90ddf8f0
|
fix:玻纤日志改动物料标签改动
|
2025-01-02 17:17:04 +08:00 |
|
shijing
|
6824494817
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2025-01-02 17:15:26 +08:00 |
|
shijing
|
6102c682f9
|
fix:mlogbw接口声明
|
2025-01-02 17:15:23 +08:00 |
|
zty
|
ce9e15f83d
|
feat: 修改班组对比bug 和新增 生料工序
|
2025-01-02 16:22:00 +08:00 |
|
shijing
|
20328ab6ae
|
fix:bx日志详情及过程检验
|
2024-12-31 16:27:49 +08:00 |
|
shijing
|
ac7f5d7471
|
feat:添加bx入库检验
|
2024-12-31 16:26:51 +08:00 |
|
shijing
|
81889ef149
|
fix:inm添加接口声明
|
2024-12-31 16:25:41 +08:00 |
|
shijing
|
780a088642
|
fix:bx页面方法变动
|
2024-12-31 09:20:39 +08:00 |
|
shijing
|
beb6343180
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-12-31 09:18:54 +08:00 |
|
shijing
|
ec021374ca
|
fix:bx页面方法变动
|
2024-12-31 09:18:50 +08:00 |
|
zty
|
4bca9e4179
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-12-30 17:53:01 +08:00 |
|
zty
|
8f5c6d3c31
|
feat:修改生产报告内容
|
2024-12-30 17:52:56 +08:00 |
|
shijing
|
75b09a9ce1
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-12-30 16:11:58 +08:00 |
|
shijing
|
08a1d50c08
|
fix:coding737 3、合同金额字段加单位 （元）
|
2024-12-30 16:11:13 +08:00 |
|
zty
|
d34b781d9f
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-12-30 15:20:41 +08:00 |
|
zty
|
fedbe82bbf
|
feat: 修改各个工段的里的 电量 分布电耗等名称
|
2024-12-30 15:19:47 +08:00 |
|
caoqianming
|
3df65b5a2b
|
feat:添加通过给定时间获取班年月日接口
|
2024-12-30 15:08:06 +08:00 |
|
caoqianming
|
d0b79ab921
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-12-30 15:04:44 +08:00 |
|
caoqianming
|
022d95e3d8
|
feat: 主要设备单号查询条件处理
|
2024-12-30 15:04:18 +08:00 |
|
zty
|
44fef5170d
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-12-30 14:07:06 +08:00 |
|
zty
|
574431ccb5
|
feat：修改水 压缩空气，电量的 时间范围选择
|
2024-12-30 14:07:03 +08:00 |
|
caoqianming
|
a55b5612a4
|
feat: 退出大屏
|
2024-12-30 14:05:39 +08:00 |
|
caoqianming
|
e0e043398f
|
feat: 生产报告图表优化
|
2024-12-30 13:55:59 +08:00 |
|
shijing
|
589d30de9b
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-12-30 13:32:03 +08:00 |
|
shijing
|
2d4e3998a4
|
fix:coding#765
|
2024-12-30 13:31:59 +08:00 |
|
zty
|
f75d122ada
|
峰谷平增加时间段选择
|
2024-12-30 13:08:19 +08:00 |