 Li xia
|
89018c5e59
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-09-19 09:34:56 +08:00 |
|
Li xia
|
f91ed595f2
|
fix:"摄像头"
|
2024-09-19 09:34:46 +08:00 |
 shijing
|
17c50f7b27
|
fix:车间物料检验时数量显示为count_cando
|
2024-09-18 14:50:28 +08:00 |
|
shijing
|
747c22fc02
|
fix:调整库存管理目录
|
2024-09-18 13:40:33 +08:00 |
|
shijing
|
5487e1f74d
|
fix:任务统计页面的请求报错
|
2024-09-18 13:31:33 +08:00 |
|
shijing
|
12abe192ad
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-09-13 15:43:20 +08:00 |
|
shijing
|
4b9b768647
|
fix:coding#481统计中心优化
|
2024-09-13 15:43:16 +08:00 |
 zty
|
659226e6ad
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-09-12 15:59:31 +08:00 |
|
zty
|
ba5c1b2129
|
fix bug
|
2024-09-12 15:58:20 +08:00 |
|
shijing
|
58bf615de3
|
fix:交接物料/按钮显示问题
|
2024-09-12 15:28:29 +08:00 |
|
shijing
|
a0013e00cc
|
fix:coding#481：合格数统计
|
2024-09-12 11:25:58 +08:00 |
|
shijing
|
ff9f751fef
|
fix:coding#481：合格数统计
|
2024-09-12 11:23:14 +08:00 |
|
shijing
|
7316da4504
|
fix:coding#4811.2任务进度
|
2024-09-12 10:44:54 +08:00 |
|
shijing
|
714e18e168
|
fix:检验部交接物料查询
|
2024-09-12 10:43:46 +08:00 |
|
shijing
|
4382057684
|
fix:统计分析—任务进度
|
2024-09-12 10:03:05 +08:00 |
|
shijing
|
1cb2c30d3e
|
fix:合格数统计每个模块添加工段名称
|
2024-09-11 16:56:19 +08:00 |
|
shijing
|
8a1cf4a25b
|
fix:成品检验中交接记录的筛选
|
2024-09-11 16:47:01 +08:00 |
|
shijing
|
2d5bbca578
|
fix:成品检验添加班次
|
2024-09-11 15:46:40 +08:00 |
|
shijing
|
744f78b621
|
fix:工段交接记录和库存修正
|
2024-09-11 15:28:35 +08:00 |
|
shijing
|
98b54e50d5
|
fix:黑化车间展示数据修正
|
2024-09-11 15:27:06 +08:00 |
|
shijing
|
6764381bad
|
fix:接收部门placeholder提示文案修正
|
2024-09-10 17:30:55 +08:00 |
|
shijing
|
654a7a3e86
|
fix:黑化车间看板调整
|
2024-09-10 17:30:00 +08:00 |
|
shijing
|
9a41a29f49
|
fix:coding#493保温时间和冷却时间可编辑
|
2024-09-10 16:59:39 +08:00 |
|
shijing
|
7f3c2f00f6
|
fix:其他出入库加编辑
|
2024-09-10 15:50:44 +08:00 |
|
shijing
|
d6c27697c4
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-09-10 15:06:37 +08:00 |
|
shijing
|
54678f9ffc
|
fix:添加wpm接口声明（车间看板用到）
|
2024-09-10 15:06:33 +08:00 |
|
zty
|
70b7427044
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-09-09 10:51:46 +08:00 |
|
zty
|
9eb6ffeff5
|
fix tkx
|
2024-09-09 10:51:19 +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
|
4ae990fbdb
|
fix:各类设备表单字段补全
|
2024-09-05 19:24:43 +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
|
a57b58c29c
|
fix:外协添加单位编号
|
2024-09-05 14:51:25 +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
|
25ca2a9e03
|
fix:mtaskbAdd接口声明
|
2024-09-05 09:10:31 +08:00 |
|
shijing
|
69333a2dcc
|
fix：添加mtaskb相关接口声明
|
2024-09-04 14:59:29 +08:00 |
|
shijing
|
a3b2c0a2b5
|
fix:退货放行单日志提交时上传excel文件，并存在日志里
|
2024-09-04 13:37:02 +08:00 |
|
shijing
|
67b5d82545
|
fix:原料检验时备注为保存修正
|
2024-09-04 11:38:14 +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
|
1a291c6a2e
|
fix:添加车间出入库记录中间页
|
2024-09-03 15:28:53 +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
|
54d00c660a
|
fix:退货放行单审批
|
2024-09-03 15:21:16 +08:00 |
|
shijing
|
abb4ea8d24
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-09-03 15:20:00 +08:00 |
|
shijing
|
ded2507d02
|
fix:mlog只有黑化和退火时添加保温时间和退火时间
|
2024-09-03 15:19:57 +08:00 |
 caoqianming
|
18fa08f3f2
|
feat: 改变主界面logo配置
|
2024-08-30 14:01:24 +08:00 |
|
shijing
|
25e4b9f5c9
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-30 09:10:57 +08:00 |
|
shijing
|
3274b9361e
|
fix:工艺路线添加时route的高度调整
|
2024-08-30 09:07:15 +08:00 |
|
caoqianming
|
f8c6e51a39
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-29 13:55:03 +08:00 |
|
caoqianming
|
4963645672
|
feat: 基础配置修改图标
|
2024-08-29 13:55:00 +08:00 |
|
shijing
|
ddb17c9df3
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-29 13:33:39 +08:00 |
|
shijing
|
eb56c827ef
|
fix:合格数统计工段展开
|
2024-08-29 13:33:35 +08:00 |
|
caoqianming
|
06bbc7c776
|
fix: 计算中心页面调整
|
2024-08-29 12:52:06 +08:00 |
|
caoqianming
|
dbc65739ce
|
feat: 计算公式字段加大
|
2024-08-29 12:51:20 +08:00 |
|
caoqianming
|
86dc38f847
|
fix: routeForm is_autotask默认为true
|
2024-08-29 11:47:32 +08:00 |
|
caoqianming
|
f636d549c0
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-28 17:18:23 +08:00 |
|
caoqianming
|
bb1a63437a
|
feat: 添加计算中心及相应的js
|
2024-08-28 17:18:14 +08:00 |
|
caoqianming
|
b6857c3ab8
|
feat: 添加空白控制台
|
2024-08-28 17:17:50 +08:00 |
|
caoqianming
|
1674f56a58
|
feat: 添加时间策略页面
|
2024-08-28 17:17:36 +08:00 |
|
shijing
|
3e146f7d26
|
fix:过程与成品检验添加不合格列
|
2024-08-28 16:02:53 +08:00 |
|
shijing
|
14e2fe211d
|
fix:光芯合格数统计
|
2024-08-28 14:02:07 +08:00 |
|
shijing
|
2a0bcc4692
|
fix:更改宽度
|
2024-08-28 14:01:28 +08:00 |
|
shijing
|
146a2e086c
|
fix:外观检验添加棕圈
|
2024-08-28 14:00:54 +08:00 |
|
shijing
|
d6cef78446
|
fix:物料清单下载模板时添加时间戳
|
2024-08-27 16:36:35 +08:00 |
|
shijing
|
880c655e63
|
fix:coding#4511
|
2024-08-27 16:09:04 +08:00 |
|
shijing
|
ce51133d4c
|
fix:黑化车间车间看板权限控制
|
2024-08-27 15:03:21 +08:00 |
|
shijing
|
5017710f33
|
fix:coding#445
|
2024-08-27 14:45:20 +08:00 |
|
shijing
|
826d7db102
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-27 14:18:32 +08:00 |
|
shijing
|
d56d6d22e1
|
fix:coding#446
|
2024-08-27 14:18:28 +08:00 |
|
Li xia
|
33a55ffa65
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-27 14:03:27 +08:00 |
|
Li xia
|
02dfecfcad
|
fest:"大屏界面调整"
|
2024-08-27 14:03:14 +08:00 |
|
shijing
|
97eab5f9a4
|
fix:光芯自检添加不合格项”小崩边“
|
2024-08-27 11:05:57 +08:00 |
|
shijing
|
c86ab8411e
|
feat:光芯库存统计
|
2024-08-27 10:27:10 +08:00 |
|
shijing
|
7af7efad94
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-27 10:26:24 +08:00 |
|
shijing
|
c836b3f545
|
fix:文案修改配帮管---->配棒管
|
2024-08-27 10:26:20 +08:00 |
|
caoqianming
|
05ecdf7623
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-26 15:38:14 +08:00 |
|
caoqianming
|
0671b19823
|
feat: 添加计算中心页面
|
2024-08-26 15:38:10 +08:00 |
|
caoqianming
|
3994d63728
|
feat: base menu页面优化
|
2024-08-26 15:36:39 +08:00 |
|
shijing
|
f810b751dd
|
feat:光子合格数统计
|
2024-08-26 10:58:50 +08:00 |
|
shijing
|
fabfe94738
|
feat:光子成品检验
|
2024-08-26 10:57:47 +08:00 |
|
shijing
|
d21dc253e4
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-26 09:59:57 +08:00 |
|
shijing
|
8c3bafcc19
|
fix:光子统计分析添加新页面
|
2024-08-26 09:59:53 +08:00 |