hujiaying
b1a08be57b
bfm加工订单隐藏字段 ,待发货明细中,接单日期、发货日期顺序改变,欠单如果没有发货不要显示发货时间 、更改逾期状态逻辑。
2024-09-23 12:27:31 +08:00
禹翔辉
a3356fe195
Accept Merge Request #1324 : (feature/库存优化 -> develop)
...
Merge Request: 库存优化
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1324
2024-09-19 17:29:29 +08:00
yuxianghui
3c70e1623e
Merge branch 'feature/工单状态优化' into feature/库存优化
2024-09-19 17:27:44 +08:00
yuxianghui
51628c081a
1、禁用超级管理员之外的角色通过库存概览跳转到调拨单界面的调拨单创建按钮,隐藏制造作业类型的单据;2、优化移动历史记录。
2024-09-19 17:27:02 +08:00
杨金灵
18ebe6bcb4
Accept Merge Request #1323 : (feature/优化返工 -> develop)
...
Merge Request: 优化返工
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1323
2024-09-19 17:25:05 +08:00
jinling.yang
63ac4f2b44
返工工单添加标签字段
2024-09-19 17:23:01 +08:00
马广威
2966260f51
Accept Merge Request #1322 : (feature/优化制造功能 -> develop)
...
Merge Request: 解除装夹处,扫码同步打印成品条码
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1322?initial=true
2024-09-19 15:03:30 +08:00
mgw
c4069995e0
解除装夹处,扫码同步打印成品条码
2024-09-19 14:38:24 +08:00
管欢
54920982a2
Accept Merge Request #1319 : (feature/org_info_synchronous -> develop)
...
Merge Request: 员工信息企微id同步
Created By: @管欢
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @管欢
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1319
2024-09-19 13:52:30 +08:00
廖丹龙
f947a3ed58
Accept Merge Request #1321 : (feature/tax_sync -> develop)
...
Merge Request: bom清单问题修复
Created By: @廖丹龙
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1321?initial=true
2024-09-19 13:50:43 +08:00
liaodanlong
5e86d67316
bom清单问题修复
2024-09-19 13:42:52 +08:00
马广威
7354a19696
Accept Merge Request #1320 : (feature/优化制造功能 -> develop)
...
Merge Request: 扫码获取装夹检测结果
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1320?initial=true
2024-09-19 10:51:20 +08:00
mgw
78e3d77000
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造功能
2024-09-19 10:50:06 +08:00
mgw
47ad2410cf
调整agv参数位置
2024-09-19 10:16:09 +08:00
mgw
fa2eb7b3cf
增加是否获取文件判断
2024-09-19 10:07:26 +08:00
guanhuan
0cee6ebd77
员工信息同步
2024-09-19 09:48:01 +08:00
杨金灵
73f161ffa4
Accept Merge Request #1318 : (feature/消息模版添加时间节点 -> develop)
...
Merge Request: 消息模版添加时间节点
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1318?initial=true
2024-09-19 09:34:41 +08:00
jinling.yang
ff06d5c3be
消息模版添加时间节点
2024-09-19 09:32:04 +08:00
liaodanlong
78cb177ac5
Merge remote-tracking branch 'origin/develop' into develop
2024-09-19 09:14:33 +08:00
liaodanlong
9601502360
视图菜单与action顺序调整
2024-09-19 09:12:38 +08:00
mgw
739b7e600c
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造功能
2024-09-19 09:04:20 +08:00
mgw
27da7639b2
增加扫码点击按钮功能
2024-09-19 09:04:05 +08:00
mgw
258e3bdb9f
一般设置页增加重新获取检测文件配置项目
2024-09-19 09:03:07 +08:00
jinling.yang
7f3e9927d5
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-09-19 08:52:34 +08:00
jinling.yang
927f726030
Merge branch 'feature/优化消息模版' into develop
2024-09-19 08:52:25 +08:00
杨金灵
7576200fc4
Accept Merge Request #1315 : (feature/优化消息模版 -> develop)
...
Merge Request: 优化消息模版
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1315?initial=true
2024-09-19 08:52:10 +08:00
胡尧
4ffb9d636f
Accept Merge Request #1316 : (feature/流程用扫码完成 -> develop)
...
Merge Request: 修改扫码判断起点接驳站逻辑
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1316?initial=true
2024-09-19 08:51:03 +08:00
jinling.yang
24f0547343
消息模块添加销售依赖
2024-09-19 08:50:24 +08:00
胡尧
402a323673
修改扫码判断起点接驳站逻辑
2024-09-19 08:49:23 +08:00
jinling.yang
5e1685417f
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-09-19 08:46:01 +08:00
jinling.yang
9dfe34ce9a
还原注释代码
2024-09-19 08:45:50 +08:00
jinling.yang
190d6da217
还原代码
2024-09-18 17:59:08 +08:00
胡嘉莹
8946b44280
Accept Merge Request #1313 : (feature/update_production_line -> develop)
...
Merge Request: 修改计划排程,新增处理排程计划订单交货时间为null数据处理的方法
Created By: @胡嘉莹
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @胡嘉莹
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1313
2024-09-18 17:44:45 +08:00
廖丹龙
f21d085462
Accept Merge Request #1314 : (feature/tax_sync -> develop)
...
Merge Request: 适用刀具物料类型字段 设置只能去选择。取消必填
Created By: @廖丹龙
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1314
2024-09-18 17:42:28 +08:00
jinling.yang
43f53197c4
优化消息模版
2024-09-18 17:39:06 +08:00
liaodanlong
ac43be1262
适用刀具物料类型字段 设置只能去选择。取消必填
2024-09-18 16:36:52 +08:00
jinling.yang
8bf1c56efd
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化消息模版
...
# Conflicts:
# sf_tool_management/models/base.py
2024-09-18 15:40:54 +08:00
jinling.yang
d66791dc41
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-09-18 15:39:50 +08:00
jinling.yang
ce6b36a77e
12
2024-09-18 15:39:42 +08:00
hujiaying
4acae01009
修改计划排程,新增处理排程计划订单交货时间为null数据处理的方法
2024-09-18 15:34:04 +08:00
胡尧
213b76a280
Accept Merge Request #1312 : (feature/流程用扫码完成 -> develop)
...
Merge Request: 解除装夹工单页面进入时失去焦点
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1312
2024-09-18 15:15:10 +08:00
胡尧
c675e1d67c
解除装夹工单页面进入时失去焦点
2024-09-18 15:13:20 +08:00
胡嘉莹
8a9f6ab34f
Accept Merge Request #1311 : (feature/update_production_line -> develop)
...
Merge Request: 修改计划排程甘特图界面不显示已经排程的制造订单
Created By: @胡嘉莹
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @胡嘉莹
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1311
2024-09-18 14:14:50 +08:00
hujiaying
8aca6ce084
修改计划排程甘特图界面不显示已经排程的制造订单
2024-09-18 14:03:04 +08:00
禹翔辉
cb0c093006
Accept Merge Request #1310 : (feature/工单状态优化 -> develop)
...
Merge Request: 工单状态优化
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1310?initial=true
2024-09-18 11:56:37 +08:00
yuxianghui
1e7d7008b4
Merge branch 'feature/工单优化' into feature/工单状态优化
2024-09-18 11:55:02 +08:00
yuxianghui
ef453dbc1e
工单状态优化
2024-09-18 11:53:46 +08:00
jinling.yang
9f1e635c8d
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-09-18 10:23:51 +08:00
jinling.yang
92037f3f04
注释OCC代码
2024-09-18 10:23:42 +08:00
禹翔辉
4ba0566d27
Accept Merge Request #1309 : (feature/工单优化 -> develop)
...
Merge Request: 工单状态优化
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1309?initial=true
2024-09-18 09:46:36 +08:00
yuxianghui
5d870d53f6
Merge branch 'feature/刀具拆解单优化' into feature/工单优化
2024-09-18 09:30:49 +08:00
yuxianghui
6a674cdb5b
工单状态优化
2024-09-18 09:28:36 +08:00
胡嘉莹
fbce132173
Accept Merge Request #1308 : (feature/update_production_line -> develop)
...
Merge Request: 修改排程计划开始时间修改
Created By: @胡嘉莹
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @胡嘉莹
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1308
2024-09-14 17:45:18 +08:00
guanhuan
98e13cba99
员工信息企微id同步
2024-09-14 17:45:00 +08:00
liaodanlong
7ce2f6c797
历史销售订单价格问题
2024-09-14 17:40:45 +08:00
hujiaying
7502792438
修改计划排程列表进入待排程的制造订单详情进行排程-报错
2024-09-14 17:26:24 +08:00
hujiaying
9efb13cf01
修改排程计划开始时间修改
2024-09-14 16:34:47 +08:00
管欢
b14e263a2e
Accept Merge Request #1306 : (feature/优化设备维保标准 -> develop)
...
Merge Request: 快速订单上传模型文件检查文件后缀
Created By: @管欢
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @管欢
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1306
2024-09-14 14:40:58 +08:00
马广威
6f41ef3047
Accept Merge Request #1307 : (feature/优化制造功能 -> develop)
...
Merge Request: 增加拉取文件之前的检查
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1307?initial=true
2024-09-14 14:34:02 +08:00
mgw
de29f0c938
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造功能
2024-09-14 14:32:55 +08:00
mgw
589a24f595
增加拉取文件之前的检查
2024-09-14 14:32:40 +08:00
胡嘉莹
85186f94f5
Accept Merge Request #1302 : (feature/update_production_line -> develop)
...
Merge Request: 优化计划开始时间默认往后延迟10分钟
Created By: @胡嘉莹
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @胡嘉莹
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1302
2024-09-14 14:31:56 +08:00
廖丹龙
ffc363a31c
Accept Merge Request #1305 : (feature/tax_sync -> develop)
...
Merge Request: 功能刀具清单 bom添加查询排序与清单明细行删除校验
Created By: @廖丹龙
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1305?initial=true
2024-09-14 14:30:59 +08:00
胡尧
a047ad3bb6
Accept Merge Request #1304 : (feature/流程用扫码完成 -> develop)
...
Merge Request: 去掉多余的js引用,将工件配送页面起点接驳站修改为当前接驳站
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1304?initial=true
2024-09-14 14:09:29 +08:00
胡尧
cc3289c834
将工件配送页面起点接驳站修改为当前接驳站
2024-09-14 13:49:46 +08:00
胡尧
e1093a3c69
去掉多余的js引用
2024-09-14 13:42:38 +08:00
guanhuan
ba955ca658
快速订单上传模型文件检查文件后缀
2024-09-14 08:46:32 +08:00
禹翔辉
946abc5cf7
Accept Merge Request #1303 : (feature/刀具拆解单优化 -> develop)
...
Merge Request: 优化刀具拆解单
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1303?initial=true
2024-09-13 17:42:16 +08:00
yuxianghui
57ea9ed8f4
Merge branch 'feature/组装单重构_2' into feature/刀具拆解单优化
2024-09-13 17:38:19 +08:00
hujiaying
f8a12b1fe3
优化计划开始时间默认往后延迟10分钟
2024-09-13 17:37:57 +08:00
yuxianghui
722f6257ae
1、优化刀具拆解单
2024-09-13 17:37:20 +08:00
guanhuan
ccbe311c58
快速订单填写的零件图号和零件图纸传给制造订单
2024-09-13 10:45:08 +08:00
管欢
0f6ca0876c
Accept Merge Request #1300 : (feature/优化设备维保标准 -> develop)
...
Merge Request: 快速订单填写的零件图号和零件图纸传给制造订单
Created By: @管欢
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @管欢
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1300
2024-09-13 10:41:19 +08:00
马广威
bb60fd0339
Accept Merge Request #1301 : (feature/优化制造功能 -> develop)
...
Merge Request: 优化dashboard接口,及装夹bug
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1301?initial=true
2024-09-13 10:40:58 +08:00
mgw
eefbd5939b
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造功能
2024-09-13 10:38:23 +08:00
mgw
7c01196f17
修复“装夹预调工单没有测量数据时点击左上角的【完成】按钮直接完成工单了”
2024-09-13 10:37:50 +08:00
guanhuan
4c58f4d7f3
快速订单填写的零件图号和零件图纸传给制造订单
2024-09-13 10:22:14 +08:00
胡嘉莹
c741587341
Accept Merge Request #1299 : (feature/update_production_line -> develop)
...
Merge Request: 修改销售,采购,制造,仓库产品设置产品类型为默认分组
Created By: @胡嘉莹
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @胡嘉莹
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1299?initial=true
2024-09-13 10:21:11 +08:00
hujiaying
6ad2fa80f1
修改销售,采购,制造,仓库产品设置产品类型为默认分组
2024-09-13 10:15:26 +08:00
胡尧
55694ae303
Merge branch 'develop' into feature/流程用扫码完成
2024-09-13 08:53:16 +08:00
禹翔辉
8423b12119
Accept Merge Request #1298 : (feature/组装单重构_2 -> develop)
...
Merge Request: 组装单重构
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1298?initial=true
2024-09-12 17:27:42 +08:00
jinling.yang
5a7ba7f87e
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-09-12 17:24:43 +08:00
jinling.yang
d36da3df24
Merge branch 'feature/新增消息提醒模版' into develop
2024-09-12 17:24:35 +08:00
杨金灵
302a5f0cf1
Accept Merge Request #1297 : (feature/新增消息提醒模版 -> develop)
...
Merge Request: 新增消息提醒模版
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1297
2024-09-12 17:24:18 +08:00
yuxianghui
b4fef421dd
Merge branch 'feature/功能刀具重构_1' into feature/组装单重构_2
2024-09-12 17:24:13 +08:00
jinling.yang
5f5e991d33
优化页面
2024-09-12 17:24:01 +08:00
yuxianghui
43a49242c5
1、组装单布局调整
2024-09-12 17:21:37 +08:00
yuxianghui
2e5694cd1a
1、优化组装单扫描验证物料方法;2、对组装单物料批次进行调整,删除部分字段和方法;优化获取BOM并自动初始化物料数据方法;3、货位批次模型新增物料字段,新增tree视图,并且除刀柄外物料点击【更多】时跳转至不同的货位批次模型tree视图;4、添加刀柄和其他物料在点击【更多】按钮后选取新物料点击【确认】后回填物料信息到组装单并给出提示信息;5、添加组装物料信息校验功能,初始化或重新选取物料后需进行验证才能进行组装;6、组装单form视图布局调整;
2024-09-12 17:20:58 +08:00
jinling.yang
3c123a07ea
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增消息提醒模版
2024-09-12 17:06:33 +08:00
jinling.yang
dec5ddd154
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-09-12 17:06:24 +08:00
jinling.yang
22864b9669
新增消息提醒模版
2024-09-12 17:06:16 +08:00
管欢
528fa483a2
Accept Merge Request #1296 : (feature/优化设备维保标准 -> develop)
...
Merge Request: 设备维保标准
Created By: @管欢
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @管欢
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1296
2024-09-12 16:48:28 +08:00
guanhuan
b5a3815f1f
设备维保标准筛选添加已归档
2024-09-12 16:43:54 +08:00
mgw
1719e0394e
去掉run_time返回
2024-09-12 16:33:55 +08:00
mgw
eae902ee92
调整设备运行时长
2024-09-12 15:36:30 +08:00
liaodanlong
01c57a8691
去除无用代码添加描述信息
2024-09-12 15:17:47 +08:00
liaodanlong
2808005ce9
错误处理
2024-09-12 15:17:09 +08:00
mgw
06c5f65df2
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造功能
2024-09-12 11:08:41 +08:00
mgw
e0bad6ed40
优化当班计划量,完成量数据
2024-09-12 11:08:24 +08:00
jinling.yang
35c8b9316e
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/new
2024-09-12 10:46:40 +08:00
jinling.yang
2ddfbb0dde
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-09-12 10:46:29 +08:00
guanhuan
988c4a460d
2D加工图纸改为pdf
2024-09-12 10:24:45 +08:00
guanhuan
c050e2f11a
供应商详情的采购员去掉必填
2024-09-12 10:14:38 +08:00
mgw
95e49c7b0f
优化打印输出
2024-09-12 09:17:52 +08:00
管欢
e46a13889e
Accept Merge Request #1295 : (feature/优化设备维保标准 -> develop)
...
Merge Request: 快速订单
Created By: @管欢
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @管欢
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1295
2024-09-12 08:38:01 +08:00
mgw
335151f6ca
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造功能
2024-09-11 18:11:07 +08:00
mgw
908e4a3df6
调整通过数量取值
2024-09-11 18:07:21 +08:00
胡嘉莹
6b403f2c1e
Accept Merge Request #1294 : (feature/update_production_line -> develop)
...
Merge Request: 修改计划排程,已取消的不占用小时或日产数量
Created By: @胡嘉莹
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @胡嘉莹
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1294?initial=true
2024-09-11 17:58:51 +08:00
yuxianghui
da5e322229
1、组装单新增五种物料的【更多】按钮,点击按钮跳转至新的弹窗界面,根据功能刀具清单BOM的配置,搜索出全部满足条件的刀柄产品或者其他刀具物料对应的批次、货位,使用tree视图提供选择。2、新增产品tree、search视图
2024-09-11 17:49:43 +08:00
hujiaying
4f9ac16a07
修改计划排程,已取消的不占用小时或日产数量
2024-09-11 17:48:08 +08:00
mgw
4342844845
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造功能
2024-09-11 17:41:49 +08:00
guanhuan
8bc68e1edd
表面工艺参数取消必填
2024-09-11 17:40:28 +08:00
mgw
763d64a1ca
增加设备运行时长效率接口
2024-09-11 14:57:42 +08:00
胡嘉莹
8a10d18f37
Accept Merge Request #1293 : (feature/update_production_line -> develop)
...
Merge Request: 修改计划排程时间范围内判断取值向上取整
Created By: @胡嘉莹
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @胡嘉莹
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1293?initial=true
2024-09-11 12:15:17 +08:00
hujiaying
181f490d47
修改计划排程时间范围内判断取值向上取整
2024-09-11 11:53:17 +08:00
mgw
322718d19a
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造功能
2024-09-11 11:45:36 +08:00
mgw
96eeb1cab7
调整检测量、合格量
2024-09-11 11:45:14 +08:00
胡尧
d5c82e4a28
修改代码问题
2024-09-11 10:40:26 +08:00
liaodanlong
436adc5ff6
功能刀具清单 bom添加查询排序与清单明细行删除校验
2024-09-11 10:39:27 +08:00
廖丹龙
97a5d91fce
Accept Merge Request #1292 : (feature/tax_sync -> develop)
...
Merge Request: 功能刀具清单 bom添加查询排序与清单明细行删除校验
Created By: @廖丹龙
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1292?initial=true
2024-09-11 10:30:08 +08:00
liaodanlong
9eee8557c2
功能刀具清单 bom添加查询排序与清单明细行删除校验
2024-09-11 10:23:02 +08:00
mgw
4394dd023e
增加交付准时率
2024-09-11 10:11:22 +08:00
胡尧
d39bbe4f99
Accept Merge Request #1291 : (feature/流程用扫码完成 -> develop)
...
Merge Request: 工件配送,解除装夹使用扫码完成
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1291
2024-09-11 09:15:48 +08:00
胡尧
b188c8adfe
修改异常提示
2024-09-11 09:14:00 +08:00
guanhuan
ea6fd42b2e
SF快速订单优化
2024-09-11 09:01:24 +08:00
guanhuan
625499f758
SF快速订单优化
2024-09-11 08:59:44 +08:00
guanhuan
0c2d6dd582
SF快速订单优化
2024-09-11 08:52:28 +08:00
mgw
f6a9c97e7f
优化产量部分
2024-09-11 08:51:01 +08:00
yuxianghui
e2d741937e
1、实现功能刀具点击开始组装时,自动获取功能刀具清单BOM信息,并根据规则匹配刀具物料信息进行信息初始化;2、对组装单form界面进行调整,并隐藏夹头物料的所以信息;
2024-09-10 17:52:40 +08:00
胡尧
9a3404f4b8
去掉屏蔽的代码
2024-09-10 17:51:27 +08:00
胡尧
d000aa095f
对于测试用例进行修改
2024-09-10 17:49:52 +08:00
胡尧
8945801db8
解决冲突
2024-09-10 16:16:30 +08:00
胡尧
40f327ea17
修改工件拆卸
2024-09-10 16:13:57 +08:00
mgw
44a2604dbd
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造功能
2024-09-10 16:13:17 +08:00
mgw
0ae7424f04
获取数据按钮增加调用服务功能
2024-09-10 16:12:24 +08:00
胡嘉莹
091af92e8d
Accept Merge Request #1290 : (feature/update_production_line -> develop)
...
Merge Request: 修改计划-生产订单列表只显示制造订单
Created By: @胡嘉莹
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @胡嘉莹
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1290
2024-09-10 15:56:16 +08:00
hujiaying
3ed338ed64
修改计划-生产订单列表只显示制造订单
2024-09-10 14:50:24 +08:00
hujiaying
65781570e7
修改计划-生产订单列表只显示制造订单
2024-09-10 14:38:25 +08:00
liaodanlong
e1f7aeaa96
修改字段位置
2024-09-10 13:53:23 +08:00
胡嘉莹
a0a580588c
Accept Merge Request #1289 : (feature/update_production_line -> develop)
...
Merge Request: 修改计划排程单小时产能取值字段
Created By: @胡嘉莹
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @胡嘉莹
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1289?initial=true
2024-09-10 11:26:52 +08:00
mgw
a2f2a21a4c
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造功能
2024-09-10 11:17:23 +08:00
hujiaying
1ddb446bc6
修改计划排程单小时产能取值
2024-09-10 11:15:00 +08:00
廖丹龙
dcdc6851b6
Accept Merge Request #1288 : (feature/tax_sync -> develop)
...
Merge Request: bom物料清单添加错误信息,添加刀具物料字段展示
Created By: @廖丹龙
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1288
2024-09-10 09:23:31 +08:00
liaodanlong
ece4e56118
Merge branch 'refs/heads/develop' into feature/tax_sync
2024-09-10 09:19:48 +08:00
liaodanlong
7cd104c047
bom物料清单添加错误信息,添加刀具物料字段展示
2024-09-10 09:18:43 +08:00
yuxianghui
80a7dd75c8
Merge branch 'feature/功能刀具重构' into feature/功能刀具重构_1
2024-09-10 08:28:47 +08:00
hujiaying
ec2ef752b3
补充模块注释
2024-09-09 18:04:10 +08:00
廖丹龙
57d5c57048
Accept Merge Request #1287 : (feature/tax_sync -> develop)
...
Merge Request: bom物料清单,sf与cloud数据同步
Created By: @廖丹龙
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1287
2024-09-09 18:00:55 +08:00
yuxianghui
9b7c22c35e
1、对组装单物料批次号获取逻辑进行优化,更改form视图批次字段显示条件;2、开发 寿命到期功能刀具完成拆解后关联生成并跳转到组装单的需求 需求
2024-09-09 17:54:10 +08:00
liaodanlong
6711f6f6e6
Merge branch 'refs/heads/develop' into feature/tax_sync
2024-09-09 17:37:21 +08:00
liaodanlong
7ac7077f8c
bom物料清单
2024-09-09 17:36:23 +08:00
胡尧
ed20249988
Accept Merge Request #1286 : (feature/流程用扫码完成 -> develop)
...
Merge Request: 扫码触发页面按钮,解除装夹起始站点根据下产线终点站点自动赋值
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1286
2024-09-09 17:31:25 +08:00
liaodanlong
dba8d23348
销售订单价格问题
2024-09-09 17:11:33 +08:00
胡嘉莹
ab9062983c
Accept Merge Request #1285 : (feature/update_production_line -> develop)
...
Merge Request: 计划排程优化
Created By: @胡嘉莹
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @胡嘉莹
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1285?initial=true
2024-09-09 14:16:31 +08:00
hujiaying
37493a4688
sf计划排程计算排程时间日排程的制造订单总数量不能超过产线日产能数量,计算排程时间制造订单每小时排程不能超过产线小时产能
2024-09-09 14:08:39 +08:00
胡嘉莹
689d149edc
Accept Merge Request #1282 : (feature/仓库发货下发bfm -> develop)
...
Merge Request: 修改打印日志
Created By: @胡嘉莹
Reviewed By: @胡尧 @管欢
Approved By: @胡尧
Accepted By: @胡嘉莹
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1282
2024-09-09 11:02:17 +08:00
管欢
9b9106c5da
Accept Merge Request #1283 : (feature/优化设备维保标准 -> develop)
...
Merge Request: 建立设备维保标准,建立设备维保标准修复
Created By: @管欢
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @管欢
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1283
2024-09-09 10:53:20 +08:00
liaodanlong
9a43af98c3
cloud 与 sf 静态资源同步问题
2024-09-09 10:46:05 +08:00
yuxianghui
1eae92f2b2
1、功能刀具组装单添加物料校验标签字段、新增扫描校验功能、优化相关计算方法;2、添加新旧、粗中精字段值根据所选物料自动计算方法,伸出长自动计算方法;3、去除部分字段的校验方法;4、组装单form、tree视图布局调整,tree视图状态字段添加背景颜色,变更筛选条件;
2024-09-06 17:55:59 +08:00
hujiaying
4560bbc0ed
sf计划排程计算生产线是否配置生产线,计算排程时间是否在工作时间内,计算生产线是否有可排程的资源,
2024-09-06 17:48:27 +08:00
胡尧
2d5ef0aae4
解除装夹起点从下产线agv调度任务关联带出
2024-09-06 15:34:30 +08:00
胡尧
096542c8ff
扫码触发按键功能
2024-09-06 09:37:05 +08:00
hujiaying
d123ca5173
修改日有效工作时长计算规则
2024-09-06 09:13:38 +08:00
胡尧
388929f207
扫码触发按键功能
2024-09-05 17:59:55 +08:00
yuxianghui
29b9223a14
1、将功能刀具组装弹窗模型的组装流程以及其中相关的业务逻辑,移动到组装单模型并进行优化;2、功能刀具组装单模型新增部分字段的自动计算方法;新增部分物料字段;
2024-09-05 17:57:23 +08:00
hujiaying
cf283377cd
计划排程考虑CNC生产线日产能的优化需求,新增可用机台数量,单台小时产能,日有效工作时长计算规则
2024-09-05 17:39:36 +08:00
hujiaying
5f218e69d4
计划排程考虑CNC生产线日产能的优化需求,新增可用机台数量,单台小时产能,日有效工作时长计算规则
2024-09-05 17:39:09 +08:00
mgw
7f5fb165de
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造功能
2024-09-05 10:30:21 +08:00
mgw
eec79d7d3e
优化图片返回为url
2024-09-05 10:30:04 +08:00
hujiaying
00809d88f6
修改打印日志
2024-09-05 09:53:32 +08:00
hujiaying
18b0cc6ea0
Merge remote-tracking branch 'origin/develop' into feature/仓库发货下发bfm
2024-09-05 09:38:40 +08:00
hujiaying
54d9902ae4
撤回修改
2024-09-05 09:26:05 +08:00
hujiaying
eff39a39e3
修改 cloud端新建表面工艺参数必填参数不能填写
2024-09-05 09:24:45 +08:00
guanhuan
005a7bb68e
建立设备维保标准,建立设备维保标准修复
2024-09-05 08:51:36 +08:00
胡嘉莹
afc1701150
Accept Merge Request #1281 : (feature/仓库发货下发bfm -> develop)
...
Merge Request: 工厂发货下发bfm
Created By: @胡嘉莹
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @胡嘉莹
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1281?initial=true
2024-09-04 18:24:24 +08:00
yuxianghui
72eada0639
1、功能刀具组装tree、form视图布局调整;2、部分字段内容进行调整;3、功能刀具组装单编码自动生成方法添加新逻辑;
2024-09-04 17:55:24 +08:00
jinling.yang
979e8a47ab
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-09-04 17:45:02 +08:00
jinling.yang
e119a364c1
Merge branch 'feature/优化返工-保留装夹测量数据' into develop
2024-09-04 17:44:50 +08:00
杨金灵
c7b9bbb18d
Accept Merge Request #1280 : (feature/优化返工-保留装夹测量数据 -> develop)
...
Merge Request: 优化返工-保留装夹测量数据
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1280
2024-09-04 17:44:07 +08:00
jinling.yang
3cb3dce247
优化返工代码
2024-09-04 17:43:48 +08:00
jinling.yang
a7e1c89e66
还原代码
2024-09-04 17:36:41 +08:00
jinling.yang
ca1060ada5
去掉注释代码
2024-09-04 17:33:54 +08:00
hujiaying
69578ab054
bfm新增库存菜单,代发货菜单,处理sf一次性发货,bfm生成代发货名字规则
2024-09-04 17:28:26 +08:00
jinling.yang
511bed47ff
优化返工-保留装夹测量数据
2024-09-04 16:58:55 +08:00
jinling.yang
26a0412649
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-09-04 15:00:47 +08:00
杨金灵
4989ff773c
Accept Merge Request #1279 : (feature/接口暂时去掉身份验证 -> develop)
...
Merge Request: 接口暂时去掉身份验证
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1279
2024-09-04 14:59:59 +08:00
jinling.yang
04c0d68763
接口暂时去掉身份验证
2024-09-04 14:58:04 +08:00
hujiaying
589035d42b
处理采购订单代发货数量修改及创建欠单,处理sf发货单下发不需要创建欠单,处理bfm发货单下发内部管理,内部管理处理不需要创建欠单
2024-09-03 19:14:48 +08:00
mgw
5726d50106
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造功能
2024-09-03 17:26:56 +08:00
liaodanlong
6e9c326a52
智能工厂数据同步任务的错误提示优化
2024-09-03 13:56:16 +08:00
hujiaying
fc1cdf4d0e
联调接口数据,处理修改sf下发代发货,bfm接收代发货消息,下发到内部管理,处理采购订单代发货数量修改及创建欠单
2024-09-02 19:02:53 +08:00
杨金灵
45178ac38b
Accept Merge Request #1278 : (hotfix/修复报废-外协入库验证 -> develop)
...
Merge Request: 修复报废-外协入库验证
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1278
2024-09-02 17:48:53 +08:00
jinling.yang
09ee1c26b1
修复报废-外协入库验证
2024-09-02 17:33:06 +08:00
liaodanlong
64180ca57f
Merge branch 'refs/heads/develop' into feature/tax_sync
2024-09-02 15:43:25 +08:00
jinling.yang
0c052a118c
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-09-02 14:44:59 +08:00
mgw
cb9fd43f11
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造功能
2024-09-02 09:04:59 +08:00
mgw
1dc55c2770
调整不良工单逻辑
2024-09-02 09:04:42 +08:00
hujiaying
0ca6d46a7b
修改sf下发欠单,bfm接收下发欠单,及处理发货单的关系
2024-08-31 21:09:56 +08:00
liaodanlong
3624ef4755
销售订单价格问题处理
2024-08-30 16:30:34 +08:00
胡尧
f07a003f2c
Accept Merge Request #1277 : (hotfix/修改agv回调接口授权 -> develop)
...
Merge Request: 将agv回调接口授权改为none
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1277?initial=true
2024-08-30 09:46:45 +08:00
胡尧
0ef46407dd
将agv回调接口授权改为none
2024-08-30 09:35:08 +08:00
jinling.yang
f7f3c005f8
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-08-30 08:59:09 +08:00
马广威
cae5e14587
Accept Merge Request #1276 : (release/release_2.3 -> master)
...
Merge Request: SPRINT-MES-2024-05
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1276?initial=true
2024-08-29 22:02:45 +08:00
胡尧
a2990b8f2e
Accept Merge Request #1275 : (feature/agv_dispatch -> develop)
...
Merge Request: 修改agv相关接口请求授权用户
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1275
2024-08-29 20:21:33 +08:00
胡尧
5121e455d2
修改agv相关接口请求授权用户
2024-08-29 20:20:39 +08:00
马广威
4a14fa6bf6
Accept Merge Request #1274 : (feature/优化表面工艺排序 -> develop)
...
Merge Request: 优化表面工艺排序
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1274
2024-08-29 19:55:09 +08:00
jinling.yang
f251878637
优化工单工序,优化表面工艺排序
2024-08-29 19:53:37 +08:00
jinling.yang
9a5aa52801
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-08-29 19:45:53 +08:00
jinling.yang
5b3193d3ff
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/new
2024-08-29 19:45:44 +08:00
禹翔辉
52befb6233
Accept Merge Request #1273 : (feature/工单优化_2 -> develop)
...
Merge Request: 电解电镀-电解电镀
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1273
2024-08-29 19:25:22 +08:00
yuxianghui
9ce1963d44
Merge branch 'feature/工单优化_1' into feature/工单优化_2
2024-08-29 19:23:55 +08:00
yuxianghui
1b710b205f
工单优化
2024-08-29 19:23:15 +08:00
禹翔辉
0d253c54c8
Accept Merge Request #1272 : (feature/工单优化_1 -> develop)
...
Merge Request: 优化工单
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1272
2024-08-29 18:19:22 +08:00
yuxianghui
d2c5fdb509
优化工单
2024-08-29 18:18:19 +08:00
马广威
40209958f2
Accept Merge Request #1271 : (feature/优化制造功能 -> develop)
...
Merge Request: 修复验证代码
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1271?initial=true
2024-08-29 17:53:39 +08:00
mgw
778896a670
修复验证代码
2024-08-29 17:52:56 +08:00
禹翔辉
fcacf609e9
Accept Merge Request #1270 : (feature/工单优化_1 -> develop)
...
Merge Request: 优化工单工序排序方法
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1270
2024-08-29 17:36:11 +08:00
yuxianghui
5cd134758a
Merge branch 'feature/工单工序排序方法优化' into feature/工单优化_1
2024-08-29 17:33:06 +08:00
yuxianghui
b8f8e90444
Merge branch 'feature/刀具组装扫码优化' into feature/工单工序排序方法优化
2024-08-29 17:31:39 +08:00
jinling.yang
b50a852f77
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-08-29 17:31:38 +08:00
yuxianghui
ea94d74657
优化工单工序排序方法
2024-08-29 17:30:54 +08:00
jinling.yang
b5bea1f811
Merge branch 'feature/修复销售-表面工艺外协' into develop
2024-08-29 17:30:47 +08:00
杨金灵
8416630593
Accept Merge Request #1269 : (feature/修复销售-表面工艺外协 -> develop)
...
Merge Request: 修复销售-表面工艺外协
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1269
2024-08-29 17:30:32 +08:00
jinling.yang
6572ca25fe
优化提示
2024-08-29 17:30:16 +08:00
jinling.yang
6a7e6ee5c5
修复销售-表面工艺外协
2024-08-29 17:24:09 +08:00
杨金灵
aff35f2dd4
Accept Merge Request #1268 : (feature/修复外协采购 -> develop)
...
Merge Request: 修复外协采购
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1268
2024-08-29 15:25:11 +08:00
jinling.yang
8ead5655cf
修复外协采购
2024-08-29 15:23:28 +08:00
jinling.yang
d6b3a5a3f1
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-08-29 14:26:34 +08:00
jinling.yang
19d8f6ae73
Merge branch 'feature/优化工单' into develop
2024-08-29 14:26:24 +08:00
杨金灵
ae8e304d7f
Accept Merge Request #1267 : (feature/优化工单 -> develop)
...
Merge Request: 优化工单
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1267
2024-08-29 14:25:52 +08:00
jinling.yang
e154f5b763
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化工单
...
# Conflicts:
# sf_manufacturing/models/mrp_workorder.py
2024-08-29 14:22:50 +08:00
jinling.yang
804bdb60e8
修复外协采购单
2024-08-29 14:21:18 +08:00
马广威
302636635c
Accept Merge Request #1266 : (feature/优化制造功能 -> develop)
...
Merge Request: 翻译持久化
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1266?initial=true
2024-08-28 20:32:23 +08:00
mgw
c465822774
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造功能
2024-08-28 20:31:35 +08:00
mgw
f9063bf3d9
翻译持久化
2024-08-28 20:31:20 +08:00
马广威
ea6fb5e570
Accept Merge Request #1265 : (feature/优化制造功能 -> develop)
...
Merge Request: 修复装夹判断逻辑
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1265?initial=true
2024-08-28 18:08:16 +08:00
mgw
0e672aef79
修复装夹判断逻辑
2024-08-28 18:07:34 +08:00
马广威
11ec04de5b
Accept Merge Request #1264 : (feature/优化制造功能 -> develop)
...
Merge Request: 修改装夹提示词
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1264?initial=true
2024-08-28 17:43:15 +08:00
mgw
efe98b5133
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造功能
2024-08-28 17:42:38 +08:00
mgw
2d2abfce25
修改提示词
2024-08-28 17:42:23 +08:00
jinling.yang
821a7a63be
优化工单
2024-08-28 17:30:46 +08:00
廖丹龙
de221ba67e
Accept Merge Request #1263 : (feature/tax_sync -> develop)
...
Merge Request: 多面工艺排程问题
Created By: @廖丹龙
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1263
2024-08-28 14:55:40 +08:00
liaodanlong
c5bb9a32d0
多面工艺排程问题
2024-08-28 14:50:39 +08:00
杨金灵
925fc2f2b3
Accept Merge Request #1262 : (feature/优化下发编程单 -> develop)
...
Merge Request: 优化下发编程单
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1262
2024-08-28 10:42:53 +08:00
jinling.yang
41f379ef5f
优化下发编程单
2024-08-28 10:41:16 +08:00
jinling.yang
acc791978d
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-08-28 10:39:11 +08:00
jinling.yang
f24c1ab4a5
Merge branch 'feature/修复报废-下发编程单' into develop
2024-08-28 10:31:04 +08:00
杨金灵
179899e483
Accept Merge Request #1261 : (feature/修复报废-下发编程单 -> develop)
...
Merge Request: 修复报废-下发编程单
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1261
2024-08-28 10:30:45 +08:00
jinling.yang
b8d21b7fa5
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复报废-下发编程单
2024-08-28 10:29:14 +08:00
jinling.yang
295f7ecae3
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-08-28 10:28:10 +08:00
jinling.yang
d2a76a03d2
修复报废-下发编程单
2024-08-28 10:28:01 +08:00
hujiaying
1e172cb4e3
处理代发货下发
2024-08-27 17:24:04 +08:00
马广威
4424cb58f4
Accept Merge Request #1260 : (feature/优化制造功能 -> develop)
...
Merge Request: 接口优化
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1260?initial=true
2024-08-27 17:08:35 +08:00
jinling.yang
cd0ea08b21
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-08-27 17:00:57 +08:00
jinling.yang
10065e95d3
Merge branch 'feature/修复报废-时间' into develop
2024-08-27 17:00:45 +08:00
杨金灵
2c06c6f6a1
Accept Merge Request #1259 : (feature/修复报废-时间 -> develop)
...
Merge Request: 修复报废-时间
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1259?initial=true
2024-08-27 17:00:09 +08:00
jinling.yang
1eeaf2f85d
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-08-27 16:58:41 +08:00
jinling.yang
aa96e63fff
修复报废-时间
2024-08-27 16:58:32 +08:00
胡尧
7ac09653c3
Accept Merge Request #1258 : (feature/agv_dispatch -> develop)
...
Merge Request: 修改日期序列的bug
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1258
2024-08-27 16:49:35 +08:00
胡尧
9c3ed0166b
修改日期序列的bug
2024-08-27 16:49:04 +08:00
廖丹龙
3c8ce870df
Accept Merge Request #1257 : (feature/tax_sync -> develop)
...
Merge Request: 错误处理
Created By: @廖丹龙
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1257?initial=true
2024-08-27 16:38:22 +08:00
liaodanlong
d8e65a20d5
Merge branch 'refs/heads/develop' into feature/tax_sync
2024-08-27 16:34:57 +08:00
liaodanlong
10a622b52d
错误处理
2024-08-27 16:34:27 +08:00
禹翔辉
c1ffd3f870
Accept Merge Request #1255 : (feature/刀具组装扫码优化 -> develop)
...
Merge Request: 解决刀具组装时,扫描刚刚拆解完的刀柄状态没有实时更新为可用的问题。
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1255
2024-08-27 16:18:05 +08:00
jinling.yang
a98b7456c0
Merge branch 'feature/修复报废-坯料序列号' into develop
2024-08-27 16:16:01 +08:00
杨金灵
7e3d40bd38
Accept Merge Request #1256 : (feature/修复报废-坯料序列号 -> develop)
...
Merge Request: 修复报废-坯料序列号
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1256
2024-08-27 16:15:12 +08:00
jinling.yang
83d45b6d3f
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复报废-坯料序列号
2024-08-27 16:13:06 +08:00
jinling.yang
fe237dc742
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-08-27 16:12:57 +08:00
jinling.yang
35c13dc51c
修复报废-坯料序列号
2024-08-27 16:12:48 +08:00
yuxianghui
08477e4d94
Merge branch 'feature/收藏无法删除缺陷优化' into feature/刀具组装扫码优化
2024-08-27 14:43:16 +08:00
yuxianghui
069d1f50b0
解决刀具组装时,扫描刚刚拆解完的刀柄状态没有实时更新为可用的问题。
2024-08-27 14:39:49 +08:00
廖丹龙
dd60dee22d
Accept Merge Request #1254 : (feature/tax_sync -> develop)
...
Merge Request: 多面加工工单排程优化
Created By: @廖丹龙
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1254
2024-08-27 14:10:43 +08:00
liaodanlong
e49362e2e3
Merge branch 'refs/heads/develop' into feature/tax_sync
2024-08-27 14:04:13 +08:00
liaodanlong
d5b5231873
多面加工工单排程优化
2024-08-27 14:03:41 +08:00
mgw
2b080c1639
优化完成量接口
2024-08-27 11:43:56 +08:00
jinling.yang
bd3bfc979e
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-08-27 11:39:48 +08:00
jinling.yang
5a3233d539
Merge branch 'feature/优化表面工艺排序' into develop
2024-08-27 11:39:04 +08:00
杨金灵
3e8f045a40
Accept Merge Request #1253 : (feature/优化表面工艺排序 -> develop)
...
Merge Request: 优化表面工艺排序
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1253
2024-08-27 11:38:47 +08:00
jinling.yang
d1fab6aab0
还原代码
2024-08-27 11:38:30 +08:00
jinling.yang
a3357e01aa
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化表面工艺排序
...
# Conflicts:
# sf_manufacturing/models/stock.py
# sf_mrs_connect/controllers/controllers.py
2024-08-27 11:34:39 +08:00
jinling.yang
c46a148856
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-08-27 11:33:33 +08:00
jinling.yang
5794f75f0b
Merge branch 'feature/修复报废' into develop
2024-08-27 11:33:04 +08:00
杨金灵
01d9d4a636
Accept Merge Request #1252 : (feature/修复报废 -> develop)
...
Merge Request: 修复报废
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1252
2024-08-27 11:32:46 +08:00
jinling.yang
2931d6a92d
去掉不要的代码
2024-08-27 11:32:16 +08:00
jinling.yang
5e6ae1ff55
去掉设置token代码
2024-08-27 11:29:17 +08:00
jinling.yang
d7a0dc578b
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复报废
...
# Conflicts:
# sf_manufacturing/models/mrp_workorder.py
2024-08-27 11:27:42 +08:00
jinling.yang
44a11c839f
修复下发编程单(报废)
2024-08-27 11:25:12 +08:00
jinling.yang
9808f49b3d
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-08-27 11:24:13 +08:00
jinling.yang
b40a87df88
修复报废
2024-08-27 11:24:04 +08:00
胡尧
72e9443048
Accept Merge Request #1251 : (feature/agv_dispatch -> develop)
...
Merge Request: 修复工件配送后没有同步任务下发时间的bug,AGV配置中增加是否下发AGV任务
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1251?initial=true
2024-08-27 10:43:44 +08:00
胡尧
c6f6927d57
修复工件配送后没有同步任务下发时间的bug,AGV配置中增加是否下发AGV任务
2024-08-27 10:42:24 +08:00
mgw
ade7588a9c
修改返回数据顺序
2024-08-27 10:23:53 +08:00
mgw
281f03670e
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造功能
2024-08-27 10:20:13 +08:00
mgw
7356e0afb7
接口优化
2024-08-27 10:19:53 +08:00
胡尧
fcd86e230a
Accept Merge Request #1250 : (feature/update_process_start_time -> develop)
...
Merge Request: 文字优化
Created By: @胡嘉莹
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1250
2024-08-27 10:05:55 +08:00
guanhuan
bf1271a742
Merge remote-tracking branch 'origin/feature/update_process_start_time' into feature/update_process_start_time
2024-08-27 10:02:31 +08:00
guanhuan
324ed283c4
员工对象内”工作电子邮件“字段变为必填项
2024-08-27 10:01:22 +08:00
hujiaying
ebb8007549
销售订单内”取消“按钮变为”拒绝接单“按钮
2024-08-27 09:46:34 +08:00
胡尧
361f187026
Accept Merge Request #1249 : (feature/agv_dispatch -> develop)
...
Merge Request: 修改人工报价流程
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1249
2024-08-27 09:23:50 +08:00
胡尧
b35f444e49
修改人工报价流程
2024-08-27 09:23:18 +08:00
马广威
9b2a2d644d
Accept Merge Request #1248 : (feature/优化制造功能 -> develop)
...
Merge Request: 优化运行信息接口、优化次数接口;增加oee接口
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1248?initial=true
2024-08-27 08:57:22 +08:00
mgw
93ca2000a1
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造功能
2024-08-27 08:56:13 +08:00
胡尧
ca43aa836e
Accept Merge Request #1247 : (feature/agv_dispatch -> develop)
...
Merge Request: 修改人工报价流程
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1247?initial=true
2024-08-27 08:55:15 +08:00
mgw
26ad5b5b3f
优化运行信息接口、优化次数接口
2024-08-27 08:55:01 +08:00
胡尧
937ea42af3
修改人工报价流程
2024-08-27 08:54:33 +08:00
jinling.yang
9b957848c2
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复报废
2024-08-27 08:53:29 +08:00
jinling.yang
36579d22ac
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-08-27 08:53:15 +08:00
jinling.yang
e662490cb5
修复报废
2024-08-26 17:31:14 +08:00
mgw
038ce8e139
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造功能
2024-08-26 17:21:02 +08:00
mgw
e1a4784092
增加设备oee数据
2024-08-26 17:20:46 +08:00
禹翔辉
6d4d393b9b
Accept Merge Request #1246 : (feature/收藏无法删除缺陷优化 -> develop)
...
Merge Request: 解决 【库存概览内增加收藏的默认筛选项后,删除报错(原生报错)】 缺陷
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1246?initial=true
2024-08-26 17:08:53 +08:00
yuxianghui
c956b06f57
Merge branch 'feature/线边料架接口优化' into feature/收藏无法删除缺陷优化
2024-08-26 17:00:48 +08:00
yuxianghui
da02d68c12
1、将销售单的【取消】改为【拒绝接单】;2、取消功能刀具拆解单的刀柄是否报废按钮;
2024-08-26 16:58:54 +08:00
yuxianghui
eb9b43dc91
解决 【库存概览内增加收藏的默认筛选项后,删除报错(原生报错)】 缺陷
2024-08-26 16:11:40 +08:00
胡嘉莹
ab66e24c9d
Accept Merge Request #1244 : (feature/update_process_start_time -> develop)
...
Merge Request: 修改同步加工时间返回格式,以及同步表面工艺及参数新增字段
Created By: @胡嘉莹
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @胡嘉莹
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1244?initial=true
2024-08-26 15:06:43 +08:00
hujiaying
fbbce6332d
修改表面工艺同步测试,删除同步交期,同步周期菜单及同步接口
2024-08-26 15:02:33 +08:00
马广威
554b86e641
Accept Merge Request #1245 : (feature/优化制造功能 -> develop)
...
Merge Request: 修复coding问题,增加机床类型返回
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1245
2024-08-26 13:25:08 +08:00
mgw
54317a529e
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造功能
2024-08-26 13:24:00 +08:00
mgw
78d00e9157
修复coding问题,增加机床类型返回
2024-08-26 13:23:44 +08:00
hujiaying
89cb61f244
修改同步表面工艺
2024-08-26 12:47:15 +08:00
hujiaying
deef246a6d
修改表面工艺字段同步
2024-08-26 11:10:52 +08:00
hujiaying
9de201705f
Merge branch 'develop' into feature/update_process_start_time
2024-08-26 10:35:59 +08:00
廖丹龙
8f8d83d4cb
Accept Merge Request #1243 : (feature/tax_sync -> develop)
...
Merge Request: 会计凭证处理
Created By: @廖丹龙
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1243
2024-08-26 10:34:58 +08:00
liaodanlong
c703012ec4
会计凭证处理
2024-08-26 10:08:40 +08:00
jinling.yang
f1780181fa
修复报废向导
2024-08-25 17:36:07 +08:00
jinling.yang
f5e36f601c
还原注释代码
2024-08-25 15:01:11 +08:00
jinling.yang
6c0b84ec43
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复报废
2024-08-25 14:58:57 +08:00
jinling.yang
3e438a10ee
优化表面工艺排序
2024-08-25 14:58:40 +08:00
jinling.yang
9218633a5e
优化表面工艺
2024-08-23 17:32:35 +08:00
hujiaying
c646e70a66
Merge branch 'develop' into feature/update_process_start_time
2024-08-23 16:28:42 +08:00
jinling.yang
40521e06a8
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-08-23 16:13:35 +08:00
jinling.yang
7fee98cdee
修复报废
2024-08-23 16:13:03 +08:00
马广威
4b7c277a25
Accept Merge Request #1242 : (feature/优化制造功能 -> develop)
...
Merge Request: cnc工单开始二次确认
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1242?initial=true
2024-08-23 12:05:03 +08:00
mgw
064397b32b
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造功能
2024-08-23 12:04:03 +08:00
mgw
048155bc9c
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造功能
2024-08-23 12:03:48 +08:00
马广威
d439c9140d
Accept Merge Request #1241 : (feature/优化制造功能 -> develop)
...
Merge Request: 增加异常明细
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1241?initial=true
2024-08-23 11:44:51 +08:00
mgw
296659ebb0
增加异常明细
2024-08-23 11:44:05 +08:00
马广威
a82063d078
Accept Merge Request #1233 : (feature/优化制造功能 -> develop)
...
Merge Request: 增加工单相关接口
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1233
2024-08-23 10:07:41 +08:00
mgw
f17ff2bc57
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造功能
2024-08-23 10:05:30 +08:00
mgw
5df3de7dcd
增加返工数量等
2024-08-23 10:05:17 +08:00
胡尧
b37738fbc3
Accept Merge Request #1240 : (feature/agv_dispatch -> develop)
...
Merge Request: 屏蔽下发agv小车任务
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1240?initial=true
2024-08-22 15:57:49 +08:00
胡尧
79f3dce0ec
屏蔽下发agv小车任务
2024-08-22 15:57:17 +08:00
胡尧
4b87ea3f0e
Accept Merge Request #1239 : (feature/agv_dispatch -> develop)
...
Merge Request: 修改下发agv任务逻辑
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1239?initial=true
2024-08-22 15:43:01 +08:00
胡尧
098ac0e7e9
修改下发agv任务逻辑
2024-08-22 15:42:34 +08:00
jinling.yang
6825364a2b
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-08-22 11:33:53 +08:00
jinling.yang
0cac8fbb4f
Merge branch 'feature/修复报废-拣货单(sfp)' into develop
2024-08-22 10:55:12 +08:00
杨金灵
dce748c6a7
Accept Merge Request #1238 : (feature/修复报废-拣货单(sfp) -> develop)
...
Merge Request: 修复报废-拣货单(sfp)
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1238
2024-08-22 10:54:59 +08:00
jinling.yang
536c766272
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复报废-拣货单(sfp)
2024-08-22 10:52:38 +08:00
jinling.yang
422edbcb02
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-08-22 10:52:28 +08:00
jinling.yang
d13961ff5f
修复报废-拣货单(sfp)
2024-08-22 10:52:19 +08:00
禹翔辉
b603934637
Accept Merge Request #1237 : (feature/线边料架接口优化 -> develop)
...
Merge Request: 1、优化货位信息接口、库位变更接口。
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1237?initial=true
2024-08-22 10:36:34 +08:00
yuxianghui
62d303168e
Merge branch 'feature/销售、刀具模块优化_1' into feature/线边料架接口优化
2024-08-22 10:32:47 +08:00
yuxianghui
39bc206344
1、优化货位信息接口、库位变更接口。
2024-08-22 10:31:22 +08:00
胡尧
715d835633
Accept Merge Request #1236 : (feature/agv_dispatch -> develop)
...
Merge Request: 修改接驳站状态接口
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1236
2024-08-22 10:23:52 +08:00
胡尧
9e356682dc
修改接驳站状态接口
2024-08-22 10:22:35 +08:00
胡尧
5dc392a27b
Accept Merge Request #1235 : (feature/agv_dispatch -> develop)
...
Merge Request: 修复配送完成修改工件配送单的bug
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1235
2024-08-21 20:19:13 +08:00
胡尧
3d2c62f5db
修复配送完成修改工件配送单的bug
2024-08-21 20:16:41 +08:00
mgw
1e3f0d5ee5
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造功能
2024-08-21 17:44:37 +08:00
mgw
b26919a40d
优化接口,使其易于取值
2024-08-21 17:44:22 +08:00
jinling.yang
9ffe338532
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-08-21 17:00:01 +08:00
jinling.yang
08d333e4e2
Merge branch 'feature/修复报废-工单状态' into develop
2024-08-21 16:59:29 +08:00
杨金灵
47c501c6c6
Accept Merge Request #1234 : (feature/修复报废-工单状态 -> develop)
...
Merge Request: 修复报废-工单状态
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1234
2024-08-21 16:59:13 +08:00
jinling.yang
335c79e618
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-08-21 16:54:11 +08:00
jinling.yang
ba986995ed
修复报废-工单状态
2024-08-21 16:53:32 +08:00
马广威
2a45cdd53a
Accept Merge Request #1232 : (feature/agv_dispatch -> develop)
...
Merge Request: 修改接口名字
Created By: @胡尧
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1232#mr-1232-review-178956
2024-08-21 16:25:05 +08:00
胡尧
0cdf37bb50
修改接口名字
2024-08-21 16:20:45 +08:00
mgw
bae2592587
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造功能
2024-08-21 15:38:21 +08:00
mgw
c86cc27510
增加工单相关接口
2024-08-21 15:38:05 +08:00
胡尧
2dded43e39
Accept Merge Request #1231 : (feature/agv_dispatch -> develop)
...
Merge Request: 开启agv任务下发代码
Created By: @胡尧
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1231
2024-08-21 15:10:07 +08:00
胡尧
eb6e638018
开启agv任务下发代码
2024-08-21 15:06:06 +08:00
jinling.yang
f64c21dacd
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-08-21 14:50:12 +08:00
jinling.yang
426aa78ed4
Merge branch 'feature/修复报废bug' into develop
2024-08-21 14:49:59 +08:00
杨金灵
42c65496ff
Accept Merge Request #1230 : (feature/修复报废bug -> develop)
...
Merge Request: 修复报废bug
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1230
2024-08-21 14:47:23 +08:00
jinling.yang
e893abd83e
还原接口代码
2024-08-21 14:46:37 +08:00
jinling.yang
78e2e7184e
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复报废bug
2024-08-21 14:43:44 +08:00
jinling.yang
ce575adc88
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-08-21 14:43:33 +08:00
jinling.yang
6668e0ee2f
还原OCC代码
2024-08-21 14:43:22 +08:00
胡尧
647d21dea3
Accept Merge Request #1229 : (feature/agv_dispatch -> develop)
...
Merge Request: 放开下发agv小车任务代码
Created By: @胡尧
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1229
2024-08-21 11:32:50 +08:00
胡尧
0e13e2190e
屏蔽agv任务下发代码
2024-08-21 11:31:09 +08:00
胡尧
7f3d50a130
开启agv小车任务下发代码
2024-08-21 10:03:03 +08:00
jinling.yang
7b2908defa
修复报废bug
2024-08-20 17:52:36 +08:00
胡尧
a8211171b0
增加以日、月、年为日期期间的序列,工件配送单状态同步,返工时不生成工件配送单
2024-08-20 16:18:47 +08:00
yuxianghui
c57daa2c52
1、处理销售订单确认接单后,确认接单、取消按钮没有隐藏问题
2024-08-20 16:13:30 +08:00
jinling.yang
4ed7ecf628
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-08-20 14:45:39 +08:00
jinling.yang
8a6ebb331a
Merge branch 'feature/优化最新版报废' into develop
2024-08-20 14:39:21 +08:00
杨金灵
b333e27c51
Accept Merge Request #1228 : (feature/优化最新版报废 -> develop)
...
Merge Request: 优化最新版报废
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1228
2024-08-20 14:39:03 +08:00
jinling.yang
6761851407
还原代码
2024-08-20 14:38:42 +08:00
胡尧
ada7936d1b
Accept Merge Request #1227 : (feature/agv_dispatch -> develop)
...
Merge Request: 增加可以移除焦点的controller
Created By: @胡尧
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1227
2024-08-20 14:36:43 +08:00
胡尧
9c40aa9a7e
修复更新agv站点同时下发任务的bug
2024-08-20 14:36:02 +08:00
jinling.yang
0694541653
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-08-20 14:34:34 +08:00
jinling.yang
e4e2dca22c
还原注释代码
2024-08-20 14:34:25 +08:00
jinling.yang
e259fd0c05
优化报废
2024-08-20 14:30:42 +08:00
胡尧
a767c6491f
增加移除焦点的controller
2024-08-20 14:05:05 +08:00
马广威
6c2045d0c3
Accept Merge Request #1222 : (feature/优化制造功能 -> develop)
...
Merge Request: 运行日志数据接入;大屏对接
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1222
2024-08-20 11:28:33 +08:00
mgw
6fe56605ab
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造功能
2024-08-20 11:27:34 +08:00
mgw
bf2c7fd3c5
增加解绑托盘功能
2024-08-20 11:27:18 +08:00
胡尧
54fc91baa2
去掉js中的日志
2024-08-20 10:50:55 +08:00
黄焱
376f2b3079
Accept Merge Request #1226 : (feature/前端样式修改 -> develop)
...
Merge Request: 保存、取消按钮增加文字提示
Created By: @黄焱
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @黄焱
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1226?initial=true
2024-08-20 10:50:39 +08:00
hy
3c50f19e2d
保存、取消按钮增加文字提示
2024-08-20 10:48:42 +08:00
胡尧
08622b10b9
Accept Merge Request #1225 : (feature/agv_dispatch -> develop)
...
Merge Request: 生产总监、机床操作岗增加agv调度菜单权限,AGV下发任务界面需二次确认
Created By: @胡尧
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1225
2024-08-20 10:48:35 +08:00
胡尧
dc5b68cca0
生产总监、机床操作岗增加agv调度菜单权限,AGV下发任务界面需二次确认
2024-08-20 10:45:31 +08:00
mgw
1d399527e0
增加装夹预调工单扫码开启
2024-08-20 10:42:36 +08:00
禹翔辉
b3bfa69656
Accept Merge Request #1224 : (feature/销售、刀具模块优化_1 -> develop)
...
Merge Request: 销售、刀具模块优化
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1224?initial=true
2024-08-20 09:05:57 +08:00
yuxianghui
96e226836e
Merge branch 'feature/销售、刀具模块优化' into feature/销售、刀具模块优化_1
2024-08-20 09:02:52 +08:00
yuxianghui
062ca66328
1、库位变更接口、库位信息接口优化;2、功能刀具模型from页面按钮样式及显示优化;
2024-08-19 17:29:09 +08:00
胡尧
7ab8269088
Accept Merge Request #1223 : (feature/agv_dispatch -> develop)
...
Merge Request: 修复agv调度bug
Created By: @胡尧
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1223
2024-08-19 14:40:04 +08:00
胡尧
1241737dea
修改agv调度搜索条件
2024-08-19 14:37:55 +08:00
mgw
813e424ec9
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造功能
2024-08-19 14:25:43 +08:00
mgw
8c08893aa1
修复“制造订单详情多了一个没有文案的按钮”
2024-08-19 14:25:26 +08:00
胡尧
5ad35de76b
修复agv调度bug
2024-08-19 11:22:30 +08:00
jinling.yang
3c8dac799d
修复报废
2024-08-16 17:28:21 +08:00
mgw
29c1c7a54d
调整日志顺序;增加订单名返回
2024-08-16 17:19:54 +08:00
胡尧
2c27a9b575
Accept Merge Request #1221 : (feature/agv_dispatch -> develop)
...
Merge Request: 装夹工单完成后生成工件配送单同时绑定rfid
Created By: @胡尧
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1221
2024-08-16 17:13:46 +08:00
胡尧
0e4b9e44f8
修改下发agv调度任务参数
2024-08-16 17:12:34 +08:00
mgw
a07a1ba268
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造功能
2024-08-16 16:57:47 +08:00
mgw
f537fbc597
运行日志数据接入
2024-08-16 16:57:32 +08:00
胡尧
a6b7167f3b
修改创建调度任务逻辑,不匹配的路线返回错误信息
2024-08-16 16:49:30 +08:00
胡尧
c4de966dea
装夹工单完成后生成工件配送单同时绑定rfid
2024-08-16 16:31:54 +08:00
yuxianghui
03cfc00be5
Merge branch 'feature/销售单优化' into feature/销售、刀具模块优化
2024-08-16 16:02:19 +08:00
yuxianghui
cc05e8423e
1、注释重写的销售单交货按钮代码
2024-08-16 16:01:24 +08:00
yuxianghui
e78516f73c
1、 完成 功能刀具组装和拆解页面扫描操作优化需求
2024-08-16 15:59:24 +08:00
胡尧
a277bb402e
Accept Merge Request #1220 : (feature/agv_dispatch -> develop)
...
Merge Request: 装夹预调绑定rfid时,不绑定工件配送单的rfid
Created By: @胡尧
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1220?initial=true
2024-08-16 15:24:27 +08:00
胡尧
e5793638f7
屏蔽开始装夹预调绑定rfid时,不绑定工件配送的rfid
2024-08-16 15:21:08 +08:00
胡尧
9673fd165d
Accept Merge Request #1219 : (feature/agv_dispatch -> develop)
...
Merge Request: agv任务调度功能
Created By: @胡尧
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1219?initial=true
2024-08-16 10:41:30 +08:00
胡尧
e92905fe32
修改agv小车相关接口
2024-08-16 10:36:01 +08:00
胡尧
1b521ae460
解决冲突
2024-08-16 09:50:31 +08:00
胡尧
4e0d8f1c88
修改AGV调度
2024-08-16 09:43:03 +08:00
胡尧
aecf2121a1
agv调度开发
2024-08-15 17:41:25 +08:00
jinling.yang
e2d7576a5e
优化报废
2024-08-15 17:31:37 +08:00
mgw
cc13e5cd9a
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造功能
2024-08-15 17:14:40 +08:00
mgw
271f34a03b
增加开动率采集
2024-08-15 17:14:07 +08:00
yuxianghui
366e816268
1、优化货位变更接口、优化同步库存信息接口;2、隐藏已取消状态的销售订单的【确认接单】和【取消】按钮;3、处理功能刀具从线边刀库到刀具房没有生成移动历史问题;
2024-08-15 16:45:39 +08:00
胡尧
1532184008
Merge branch 'feature/agv_dispatch' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/agv_dispatch
2024-08-15 15:02:16 +08:00
胡尧
9f180e307d
agv调度开发
2024-08-15 15:02:13 +08:00
hy
f0a4cf1d0f
弹窗取消聚焦
2024-08-15 15:01:10 +08:00
胡尧
6c734eead4
agv调度开发
2024-08-15 11:34:38 +08:00
胡尧
f7e4ce416a
AGV任务调度开发
2024-08-14 17:34:50 +08:00
hujiaying
5a60eed5b1
联调加工订单从待确认到加工中,经过的内部管理系统,bfm,sf接口测试联调,修改对应接收的参数值改变。采购订单加工中同步到内部管理系统失败,则新增到同步表,由同步表定时发起接口重试
2024-08-14 12:48:40 +08:00
yuxianghui
bf34de58fc
1、优化功能刀具预警记录跳转功能刀具拆解单链接方法;2、优化功能刀具预警界面及搜索等方法;3、优化拆解单功能及界面;4、处理功能刀具组装时,刀柄状态不实时变更问题
2024-08-13 17:30:19 +08:00
jinling.yang
cccc2f8493
优化报废
2024-08-12 17:30:53 +08:00
yuxianghui
894d3b9ea3
1、功能刀具拆解单添加功能刀具唯一校验;2、功能刀具模型tree视图的状态字段根据不同状态添加不同颜色;当功能刀具状态为报警时,自动创建拆解单和预警记录,并添加拆解单链接按钮;添加tree视图按状态排序,将报警状态刀具记录显示在最前面;3、优化功能刀具预警模型字段及关联关系,添加预警记录跳转到对应由该功能刀具生成的拆解单链接;
2024-08-12 17:25:56 +08:00
胡尧
0b85f29262
修改agv调度
2024-08-12 11:08:04 +08:00
胡尧
9dbea66b73
修改AGV调度系统
2024-08-09 17:32:46 +08:00
jinling.yang
9a7ac4dfa6
优化制造订单报废向导
2024-08-09 17:26:57 +08:00
yuxianghui
e6ca4c27ac
1、库位变更接口、库位信息接口优化;2、功能刀具预警模型优化;
2024-08-09 17:19:03 +08:00
jinling.yang
a8560a0684
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化最新版报废
2024-08-09 15:45:11 +08:00
jinling.yang
4f74996f24
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-08-09 15:44:48 +08:00
jinling.yang
5b26abc203
Merge branch 'feature/优化表面工艺外协' into develop
2024-08-09 15:43:52 +08:00
杨金灵
49654f1ff6
Accept Merge Request #1218 : (feature/优化表面工艺外协 -> develop)
...
Merge Request: 修复表面工艺外协
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1218
2024-08-09 15:43:33 +08:00
jinling.yang
a9b7f99944
修复表面工艺外协
2024-08-09 15:39:58 +08:00
jinling.yang
34e858ffe4
添加表面工艺服务产品验证
2024-08-09 11:31:30 +08:00
jinling.yang
41efe81119
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化表面工艺外协
2024-08-09 10:43:34 +08:00
jinling.yang
7cab8cd287
调拨单新增表面工艺参数字段
2024-08-09 10:42:59 +08:00
jinling.yang
5f9c5961a5
报废
2024-08-09 10:39:48 +08:00
胡尧
a79500d0ad
增加agv调度系统
2024-08-08 17:47:03 +08:00
jinling.yang
4399700c3d
优化报废向导
2024-08-08 17:24:41 +08:00
yuxianghui
36fd17b6c7
1、处理 智能工厂,销售角色与采购角色权限更新 需求
2024-08-08 17:03:36 +08:00
杨金灵
9d52466f61
Accept Merge Request #1217 : (feature/修复表面工艺外协采购 -> develop)
...
Merge Request: 修复表面工艺外协采购
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1217?initial=true
2024-08-08 16:24:06 +08:00
jinling.yang
112efccb7c
修复表面工艺外协采购
2024-08-08 16:21:15 +08:00
jinling.yang
45b9177da4
优化工单
2024-08-08 16:09:00 +08:00
jinling.yang
745658eff2
1.制造订单添加报废状态,
...
2.返工操作制造订单添加过滤条件:状态为报废
3.cnc工单完成检测结果添加报废
2024-08-08 15:40:29 +08:00
jinling.yang
ce8b0127b8
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-08-08 15:08:17 +08:00
jinling.yang
f58fb2ea13
Merge branch 'feature/优化表面工艺' into develop
2024-08-08 15:08:08 +08:00
杨金灵
d333621c7a
Accept Merge Request #1216 : (feature/优化表面工艺 -> develop)
...
Merge Request: 优化表面工艺
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1216
2024-08-08 15:07:37 +08:00
jinling.yang
563023fa3c
中控接口身份验证放开
2024-08-08 15:07:22 +08:00
jinling.yang
3d2c7425c4
还原代码
2024-08-08 15:03:45 +08:00
jinling.yang
aaa19b96fd
还原注释代码
2024-08-08 14:57:55 +08:00
胡尧
5d8f0f83b2
增加AGV调度功能,工单页面增加自定义筛选字段
2024-08-07 17:44:43 +08:00
jinling.yang
1547a6064f
优化表面工艺
2024-08-07 17:30:29 +08:00
禹翔辉
55b2daa0a3
Accept Merge Request #1215 : (feature/销售单优化 -> develop)
...
Merge Request: 销售、制造模块优化
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1215
2024-08-07 17:13:57 +08:00
yuxianghui
d469c09f15
Merge branch 'feature/制造订单优化' into feature/销售单优化
2024-08-07 17:11:57 +08:00
yuxianghui
a03cb31b29
1、处理 SF销售单需求优化 需求
2024-08-07 17:11:12 +08:00
廖丹龙
d2b20761b5
Accept Merge Request #1214 : (feature/tax_sync -> develop)
...
Merge Request: bom原材料查询出现多条会导致bfm 分配工厂时报错
Created By: @廖丹龙
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1214
2024-08-07 09:49:20 +08:00
liaodanlong
0f47b4b8c3
bom原材料查询限制只拿一条
2024-08-07 09:44:04 +08:00
liaodanlong
0cfb16b9d9
Merge remote-tracking branch 'origin/develop' into develop
2024-08-06 09:09:59 +08:00
廖丹龙
8ec5e05739
Accept Merge Request #1213 : (feature/tax_sync -> develop)
...
Merge Request: bfm 加工订单税信息同步
Created By: @廖丹龙
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1213
2024-08-06 09:09:37 +08:00
jinling.yang
5393ef686a
优化表面工艺
2024-08-05 17:28:48 +08:00
yuxianghui
e92c9675b6
1、 处理 内部调拨单,在选择目标货位时,隐藏带循环货位标签的货位不进行展示
2024-08-05 17:18:54 +08:00
liaodanlong
e6bad80031
Merge branch 'refs/heads/feature/tax_sync' into develop
2024-08-05 17:12:37 +08:00
yuxianghui
070890e3b6
解决 SF,根据制造订单生成的采购单坯料入库时到原材料库BUG
2024-08-05 16:26:54 +08:00
mgw
6e50774b23
调整机床列表接口位置;增加机床品牌型号返回
2024-08-05 16:23:27 +08:00
mgw
fc18d34495
增加大屏用获取cnc机床列表接口
2024-08-05 16:04:53 +08:00
jinling.yang
ed0d57c364
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化表面工艺
...
# Conflicts:
# sf_manufacturing/models/mrp_production.py
# sf_manufacturing/models/mrp_workorder.py
2024-08-02 14:41:42 +08:00
禹翔辉
3f27ae0f35
Accept Merge Request #1212 : (feature/bug优化 -> develop)
...
Merge Request: 修改夹具重量单位为kg
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1212
2024-08-02 11:22:06 +08:00
yuxianghui
cec426920b
Merge branch 'feature/优化工单状态' into feature/bug优化
2024-08-02 11:19:45 +08:00
mgw
09a6255d9c
去掉无用文件夹及未用po
2024-08-02 09:57:52 +08:00
马广威
d187bb2bba
Accept Merge Request #1211 : (release/release_2.2 -> master)
...
Merge Request: SPRINT-MES-F-2024-04、05版本更新
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1211
2024-08-01 21:58:11 +08:00
杨金灵
0a6cf74bc2
Accept Merge Request #1210 : (feature/去掉工单输出 -> develop)
...
Merge Request: 去掉工单输出
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1210?initial=true
2024-08-01 16:41:49 +08:00
jinling.yang
c0202330f8
去掉工单输出
2024-08-01 16:40:46 +08:00
杨金灵
1dabdd157e
Accept Merge Request #1209 : (feature/注释及还原代码 -> develop)
...
Merge Request: 注释及还原代码
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1209
2024-08-01 15:20:54 +08:00
jinling.yang
36dc8070fa
注释及还原代码
2024-08-01 15:18:57 +08:00
yuxianghui
a5da18bbc7
1、修改夹具重量单位为kg
2024-08-01 11:34:20 +08:00
liaodanlong
510e8d49fb
功能刀具拆解失败问题
2024-08-01 10:46:14 +08:00
liaodanlong
051273017d
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/tax_sync
2024-08-01 10:45:09 +08:00
yuxianghui
f49557090a
1、优化刀具拆解单拆解时生成的调拨单单据验证出现数据缺失问题
2024-08-01 10:40:25 +08:00
杨金灵
d1656278ea
Accept Merge Request #1208 : (feature/优化制造订单列表 -> develop)
...
Merge Request: 优化制造订单列表
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1208?initial=true
2024-07-31 17:02:05 +08:00
jinling.yang
0675937588
优化制造订单列表
2024-07-31 17:00:14 +08:00
马广威
c0d006d139
Accept Merge Request #1207 : (feature/优化工单状态 -> develop)
...
Merge Request: 调整代码
Created By: @禹翔辉
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1207
2024-07-31 15:07:51 +08:00
yuxianghui
2fa47eae27
1
2024-07-31 15:06:55 +08:00
yuxianghui
cb2e1ecabe
1
2024-07-31 15:06:14 +08:00
yuxianghui
9f1233d20e
1
2024-07-31 15:04:37 +08:00
禹翔辉
a783f7ec7b
Accept Merge Request #1206 : (feature/优化工单状态 -> develop)
...
Merge Request: 优化工单状态
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1206?initial=true
2024-07-31 15:02:31 +08:00
yuxianghui
db50253100
Merge branch 'feature/优化工单_6' into feature/优化工单状态
2024-07-31 15:00:48 +08:00
yuxianghui
5f7f905540
优化工单状态
2024-07-31 14:59:57 +08:00
杨金灵
1c86cc1421
Accept Merge Request #1205 : (feature/优化ftp(pdf路径) -> develop)
...
Merge Request: 优化ftp(pdf路径)
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1205
2024-07-31 14:56:14 +08:00
jinling.yang
1ea6f649f0
优化ftp(pdf路径)
2024-07-31 14:54:15 +08:00
liaodanlong
115a3e0712
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/tax_sync
2024-07-31 14:41:02 +08:00
jinling.yang
f0421b873c
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-07-31 11:55:55 +08:00
jinling.yang
913feea2a9
Merge branch 'feature/优化三次元检测报告' into develop
2024-07-31 11:55:46 +08:00
杨金灵
5d36513e59
Accept Merge Request #1204 : (feature/优化三次元检测报告 -> develop)
...
Merge Request: 优化三次元检测报告
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1204
2024-07-31 11:54:40 +08:00
jinling.yang
94d6085f92
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-07-31 11:51:31 +08:00
jinling.yang
f361106c40
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化三次元检测报告
2024-07-31 11:51:16 +08:00
jinling.yang
a46cd0f515
优化三次元检测报告
2024-07-31 11:51:04 +08:00
禹翔辉
2c6e1a40f5
Accept Merge Request #1203 : (feature/优化工单_6 -> develop)
...
Merge Request: 1、刀具组装功能添加开始完成日志;2、库存概览看板按作业类型分组默认优化展示;3、优化工单状态。
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1203?initial=true
2024-07-31 11:49:10 +08:00
yuxianghui
ffb775abb7
1、优化工单状态
2024-07-31 11:45:59 +08:00
yuxianghui
2c15532c73
Merge branch 'feature/优化调拨单' into feature/优化工单_6
2024-07-31 11:02:24 +08:00
jinling.yang
1980ee2a9a
优化三次元检测报告
2024-07-31 10:59:35 +08:00
yuxianghui
bba4e55770
1、刀具组装功能添加开始完成日志;2、库存概览看板按作业类型分组默认优化展示。
2024-07-31 10:40:03 +08:00
jinling.yang
a9bbe98e8f
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-07-31 09:07:50 +08:00
马广威
11e3bbddd8
Accept Merge Request #1202 : (feature/修复返工-功能刀具 -> develop)
...
Merge Request: 修复返工-功能刀具
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1202
2024-07-30 17:47:59 +08:00
jinling.yang
c01dfddfb4
修复返工-功能刀具
2024-07-30 17:45:41 +08:00
jinling.yang
50dcc9f7ba
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/new
2024-07-30 14:37:19 +08:00
jinling.yang
41a7aea01e
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-07-30 14:37:07 +08:00
马广威
066b256b0c
Accept Merge Request #1201 : (feature/优化制造功能 -> develop)
...
Merge Request: 同步修改引用位置
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1201
2024-07-30 11:09:20 +08:00
mgw
754047bf02
同步修改引用位置
2024-07-30 11:08:27 +08:00
禹翔辉
f5bf95ab6e
Accept Merge Request #1200 : (feature/优化调拨单 -> develop)
...
Merge Request: 修复当有功能刀具组装或拆解生成调拨单单据后,销售订单创建制造订单时报调拨单单号重复问题
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1200?initial=true
2024-07-30 10:55:53 +08:00
yuxianghui
5ea25fae73
Merge branch 'feature/修复工单bug' into feature/优化调拨单
2024-07-30 10:54:13 +08:00
yuxianghui
c367e39d5f
修复当有功能刀具组装或拆解生成调拨单单据后,销售订单创建制造订单时报调拨单单号重复问题
2024-07-30 10:53:25 +08:00
马广威
dfec70081b
Accept Merge Request #1199 : (feature/优化制造功能 -> develop)
...
Merge Request: 修改制造订单状态翻译、修改配置字段类型
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1199?initial=true
2024-07-30 10:34:03 +08:00
mgw
d0c35695d5
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造功能
2024-07-30 10:33:19 +08:00
mgw
95eb6bd18b
修改制造订单状态翻译、修改配置字段类型
2024-07-30 10:33:03 +08:00
jinling.yang
599d2280f5
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-07-30 10:19:16 +08:00
禹翔辉
e1397f4b93
Accept Merge Request #1198 : (feature/修复工单bug -> develop)
...
Merge Request: 解决 制造订单提交返工-申请重新编程-第一张工单状态不对 bug
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1198
2024-07-30 09:25:48 +08:00
liaodanlong
d49e8779f9
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/tax_sync
2024-07-30 09:24:48 +08:00
yuxianghui
71c606974c
Merge branch 'feature/工单优化_2' into feature/修复工单bug
2024-07-30 09:23:24 +08:00
yuxianghui
a0ed14aed1
解决 制造订单提交返工-申请重新编程-第一张工单状态不对 bug
2024-07-30 09:21:08 +08:00
jinling.yang
be3d4979b7
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-07-29 17:16:46 +08:00
jinling.yang
373ce89a2c
Merge branch 'feature/修复返工-cmm' into develop
2024-07-29 17:16:36 +08:00
禹翔辉
56317ab111
Accept Merge Request #1197 : (feature/工单优化_2 -> develop)
...
Merge Request: 恢复制造订单的功能刀具备注字段自动计算方法代码
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1197
2024-07-29 17:05:01 +08:00
yuxianghui
683d79a4e3
恢复制造订单的功能刀具备注字段自动计算方法代码
2024-07-29 17:03:25 +08:00
杨金灵
362801f527
Accept Merge Request #1196 : (feature/修复返工-cmm -> develop)
...
Merge Request: 修复返工-cmm
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1196?initial=true
2024-07-29 16:43:46 +08:00
jinling.yang
a81ad08740
修复功能刀具
2024-07-29 16:43:37 +08:00
jinling.yang
d2d5702125
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复返工-cmm
2024-07-29 16:42:13 +08:00
jinling.yang
9c47a6bdba
修复返工-cmm
2024-07-29 16:36:46 +08:00
禹翔辉
f0a887887e
Accept Merge Request #1195 : (feature/工单优化_1 -> develop)
...
Merge Request: 优化功能刀具组装·时生成的调拨单单号名称取值
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1195?initial=true
2024-07-29 16:05:41 +08:00
yuxianghui
fffe0a230b
1
2024-07-29 15:40:44 +08:00
liaodanlong
81dbbf980c
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/tax_sync
2024-07-29 15:09:37 +08:00
禹翔辉
2600d15e2b
Accept Merge Request #1194 : (feature/工单优化_1 -> develop)
...
Merge Request: 1、处理大批量修改cnc编程单的工单状态时,导致工单状态的自动计算方法进行递归而产生的栈溢出问题
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1194?initial=true
2024-07-29 11:35:53 +08:00
yuxianghui
c60b91c315
Merge branch 'feature/优化工单_5' into feature/工单优化_1
2024-07-29 11:33:35 +08:00
yuxianghui
639dd4e78d
1、处理大批量修改cnc编程单的工单状态时,导致工单状态的自动计算方法进行递归而产生的栈溢出问题
2024-07-29 11:32:33 +08:00
马广威
3c4286319f
Accept Merge Request #1193 : (feature/优化工单_5 -> develop)
...
Merge Request: 1、添加工单状态自动计算方法的触发条件
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1193
2024-07-28 16:37:33 +08:00
yuxianghui
55016918eb
1、添加工单状态自动计算方法的触发条件
2024-07-28 16:35:17 +08:00
禹翔辉
4236600b39
Accept Merge Request #1192 : (feature/优化工单_5 -> develop)
...
Merge Request: 1、功能刀具状态备注值自动计算方法优化
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1192
2024-07-28 16:24:18 +08:00
yuxianghui
e84842d0a3
1、功能刀具状态备注值自动计算方法优化
2024-07-28 16:23:17 +08:00
禹翔辉
60df55d71e
Accept Merge Request #1191 : (feature/优化工单_5 -> develop)
...
Merge Request: 1、优化工单状态;2、添加功能刀具位置字段自动计算方法触发条件
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1191?initial=true
2024-07-28 16:09:23 +08:00
yuxianghui
6643684e9b
Merge branch 'feature/优化工单_4' into feature/优化工单_5
2024-07-28 16:06:20 +08:00
yuxianghui
f77a1f6167
1、优化工单状态;2、添加功能刀具位置字段自动计算方法触发条件
2024-07-28 16:05:09 +08:00
杨金灵
a467aef925
Accept Merge Request #1190 : (feature/修复多次返工报依赖问题 -> develop)
...
Merge Request: 修复多次返工报依赖问题
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1190?initial=true
2024-07-28 15:21:12 +08:00
jinling.yang
b1b805959a
修复多次返工报依赖问题
2024-07-28 15:20:12 +08:00
jinling.yang
e602095b50
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-07-28 11:47:19 +08:00
jinling.yang
39214e5352
注释代码
2024-07-28 11:47:12 +08:00
禹翔辉
ba05827126
Accept Merge Request #1189 : (feature/优化工单_4 -> develop)
...
Merge Request: 处理 无效刀触发返工-更新程序后-第一张工单的状态不对 bug
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1189
2024-07-28 10:26:42 +08:00
yuxianghui
89bd9533d7
Merge branch 'feature/优化工单_3' into feature/优化工单_4
2024-07-28 10:24:32 +08:00
jinling.yang
fd2228ba59
Merge branch 'feature/修复返工' into develop
2024-07-28 10:13:02 +08:00
jinling.yang
2758817048
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-07-28 10:12:45 +08:00
yuxianghui
2e916337e9
1
2024-07-26 17:25:01 +08:00
马广威
47b8a0051b
Accept Merge Request #1188 : (feature/优化制造功能 -> develop)
...
Merge Request: 设备oee界面优化;增加由dashboard调用的接口
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1188?initial=true
2024-07-26 17:24:10 +08:00
mgw
76e6502afe
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造功能
2024-07-26 17:22:59 +08:00
mgw
1b96f420ec
增加由dashboard调用的接口
2024-07-26 17:22:44 +08:00
jinling.yang
00645364b3
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复返工
2024-07-26 16:55:07 +08:00
杨金灵
fdad5100ae
Accept Merge Request #1187 : (feature/修复返工 -> develop)
...
Merge Request: 修复返工
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1187?initial=true
2024-07-26 16:54:32 +08:00
jinling.yang
8cd03a1040
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复返工
2024-07-26 16:53:05 +08:00
jinling.yang
41c2523201
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-07-26 16:52:55 +08:00
jinling.yang
22a1ae11a6
修复返工
2024-07-26 16:52:48 +08:00
禹翔辉
4939c6d6db
Accept Merge Request #1186 : (feature/优化工单_3 -> develop)
...
Merge Request: 优化工单状态方法
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1186?initial=true
2024-07-26 16:27:58 +08:00
yuxianghui
460670843f
Merge branch 'feature/优化工单_2' into feature/优化工单_3
2024-07-26 16:25:54 +08:00
yuxianghui
66caeee1cd
1、优化工单状态方法
2024-07-26 16:25:16 +08:00
jinling.yang
28041cbef9
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-07-26 15:49:32 +08:00
jinling.yang
36a2bcca6e
优化表面工yi
2024-07-26 15:49:25 +08:00
黄焱
fddddf1649
Accept Merge Request #1185 : (feature/前端样式修改 -> develop)
...
Merge Request: 修改刀具拆解时选择目标货位会出现重叠的现象
Created By: @黄焱
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @黄焱
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1185?initial=true
2024-07-26 15:49:22 +08:00
hy
3e61e31314
修改刀具拆解时选择目标货位会出现重叠的现象
2024-07-26 15:44:52 +08:00
禹翔辉
549a64b012
Accept Merge Request #1184 : (feature/优化工单_2 -> develop)
...
Merge Request: 优化工单状态
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1184?initial=true
2024-07-26 14:53:37 +08:00
yuxianghui
dbaad85670
Merge branch 'feature/优化工单_1' into feature/优化工单_2
2024-07-26 14:52:08 +08:00
yuxianghui
b731ffba33
1、优化工单状态
2024-07-26 14:51:23 +08:00
禹翔辉
9048b32405
Accept Merge Request #1183 : (feature/优化工单_1 -> develop)
...
Merge Request: 1、解决 功能刀具是无效刀时-制造订单提交返工【申请重新编程】要做成必选
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1183?initial=true
2024-07-26 11:50:59 +08:00
yuxianghui
98d2aa756a
1、解决 功能刀具是无效刀时-制造订单提交返工【申请重新编程】要做成必选
2024-07-26 11:49:33 +08:00
禹翔辉
3749872780
Accept Merge Request #1182 : (feature/优化工单_1 -> develop)
...
Merge Request: 1、添加制造订单的刀具备注字段自动计算逻辑及方法;2、优化工单状态自动计算方法;
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1182?initial=true
2024-07-26 10:59:05 +08:00
yuxianghui
de8bebc1f9
1、添加制造订单的刀具备注字段自动计算逻辑及方法;2、优化工单状态自动计算方法;
2024-07-26 10:57:11 +08:00
jinling.yang
b468ac216c
Merge branch 'feature/修复返工bug' into develop
2024-07-26 09:47:14 +08:00
杨金灵
05f5b10833
Accept Merge Request #1181 : (feature/修复返工bug -> develop)
...
Merge Request: 修复返工bug
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1181
2024-07-26 09:46:15 +08:00
jinling.yang
8686d93651
还原注释代码
2024-07-26 09:43:28 +08:00
jinling.yang
258e24eb05
修复返工bug
2024-07-25 17:30:33 +08:00
jinling.yang
19c4b99bae
创建制造订单后生成询价单
2024-07-25 17:21:44 +08:00
jinling.yang
cc4b58b136
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-07-25 15:44:10 +08:00
jinling.yang
33fdd0f051
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化表面工艺
2024-07-25 15:44:01 +08:00
jinling.yang
d36250aa48
Merge branch 'feature/修复工件配送目的生产线' into develop
2024-07-25 15:43:13 +08:00
杨金灵
ad43b43beb
Accept Merge Request #1180 : (feature/修复工件配送目的生产线 -> develop)
...
Merge Request: 修复工件配送目的生产线
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1180
2024-07-25 15:42:57 +08:00
jinling.yang
f9ace6da7c
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复工件配送目的生产线
2024-07-25 15:41:01 +08:00
jinling.yang
12b4b418ea
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-07-25 15:40:54 +08:00
jinling.yang
60b77e09d6
修复工件配送目的生产线
2024-07-25 15:40:44 +08:00
禹翔辉
891fe257e1
Accept Merge Request #1179 : (feature/修复工单cnc校验bug_3 -> develop)
...
Merge Request: 1、解决 缺刀状态第一张工单状态不对 bug
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1179?initial=true
2024-07-25 15:31:18 +08:00
yuxianghui
6859458db2
Merge branch 'feature/修复工单cnc校验bug_2' into feature/修复工单cnc校验bug_3
...
# Conflicts:
# sf_manufacturing/models/mrp_workorder.py
2024-07-25 15:29:39 +08:00
禹翔辉
ca7c3867cd
Accept Merge Request #1178 : (release/release_2.1 -> develop)
...
Merge Request: 1、货架、货位添加循环货位标签;2、功能刀具拆解选取法人货位添加只能选择循环货位的过滤条件
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1178
2024-07-25 15:26:45 +08:00
jinling.yang
4bcf8236ef
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-07-25 15:25:43 +08:00
jinling.yang
74d557a0fc
Merge branch 'feature/修复返工-工件配送' into develop
2024-07-25 15:25:34 +08:00
禹翔辉
3686c0e070
Merge branch refs/heads/develop into refs/heads/release/release_2.1
2024-07-25 15:25:07 +08:00
杨金灵
536d7e9e79
Accept Merge Request #1177 : (feature/修复返工-工件配送 -> develop)
...
Merge Request: 修复返工-工件配送
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1177?initial=true
2024-07-25 15:24:59 +08:00
jinling.yang
67e79c5fb8
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复返工-工件配送
2024-07-25 15:23:03 +08:00
jinling.yang
0c3217824e
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-07-25 15:22:55 +08:00
jinling.yang
9eddfe36d6
修复返工-工件配送
2024-07-25 15:22:48 +08:00
yuxianghui
9655281b67
1、解决 缺刀状态第一张工单状态不对 bug
2024-07-25 15:21:36 +08:00
mgw
18b584438a
设备oee界面优化
2024-07-25 15:08:26 +08:00
jinling.yang
2deaffb4eb
添加表面工艺产品校验
2024-07-25 14:07:36 +08:00
马广威
709f29185d
Accept Merge Request #1175 : (feature/优化制造功能 -> develop)
...
Merge Request: 设备日志、oee优化
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1175?initial=true
2024-07-25 14:06:38 +08:00
mgw
886de3195c
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造功能
2024-07-25 14:05:49 +08:00
mgw
d9e5ffa68d
设备日志、oee优化
2024-07-25 14:05:35 +08:00
liaodanlong
8996297521
Merge branch 'refs/heads/master' into feature/tax_sync
2024-07-25 11:43:01 +08:00
jinling.yang
030a900580
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-07-25 10:39:10 +08:00
jinling.yang
0d1cb49cb7
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化表面工艺
2024-07-25 10:35:52 +08:00
jinling.yang
4370236edf
Merge branch 'feature/修复中控对接接口' into develop
2024-07-25 10:35:41 +08:00
杨金灵
e01209f343
Accept Merge Request #1174 : (feature/修复中控对接接口 -> develop)
...
Merge Request: 修复中控对接接口
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1174?initial=true
2024-07-25 10:34:29 +08:00
jinling.yang
b4803f03fa
修复制造订单完成生产数量问题
2024-07-25 10:34:12 +08:00
jinling.yang
c9d4f0667a
修复中控对接接口
2024-07-25 10:27:07 +08:00
马广威
8840e9642d
Accept Merge Request #1173 : (release/release_2.1 -> master)
...
Merge Request: 1、货架、货位添加循环货位标签;2、功能刀具拆解时选择的货位添加只能为循环货位的过滤条件
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1173?initial=true
2024-07-24 20:23:31 +08:00
jinling.yang
96c22a5d46
添加表面工艺服务产品验证
2024-07-24 17:30:59 +08:00
杨金灵
30c823189c
Accept Merge Request #1172 : (feature/修复更新程序 -> develop)
...
Merge Request: 修复更新程序
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1172?initial=true
2024-07-24 17:16:28 +08:00
jinling.yang
3ed503391e
修复更新程序
2024-07-24 17:10:35 +08:00
jinling.yang
121861863f
优化销售订单确认方法
2024-07-24 16:57:50 +08:00
jinling.yang
c2c8d63848
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化表面工艺
2024-07-24 16:41:19 +08:00
杨金灵
befe0c2b00
Accept Merge Request #1171 : (feature/修复批量更新程序 -> develop)
...
Merge Request: 修复批量更新程序
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1171?initial=true
2024-07-24 16:40:48 +08:00
jinling.yang
44a9ad340b
修复批量更新程序
2024-07-24 16:39:38 +08:00
jinling.yang
55bac0020f
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-07-24 16:34:21 +08:00
jinling.yang
a5d8e88f1d
注释OCC代码
2024-07-24 16:33:47 +08:00
禹翔辉
d3124bb9fe
Accept Merge Request #1170 : (feature/修复工单cnc校验bug_2 -> develop)
...
Merge Request: 根据制造订单功能刀具状态变更第一个装夹预调工单的工单状态
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1170
2024-07-24 16:24:13 +08:00
yuxianghui
64fd6ef5dc
Merge branch 'feature/修复工单cnc校验bug_1' into feature/修复工单cnc校验bug_2
2024-07-24 16:21:40 +08:00
yuxianghui
001b2ead57
1、更具制造订单功能刀具状态变更第一个装夹预调工单的工单状态
2024-07-24 16:20:48 +08:00
mgw
d0be097a9b
设备加工参数等页面修改
2024-07-24 16:19:29 +08:00
jinling.yang
0be8d0fbb2
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-07-24 15:09:57 +08:00
jinling.yang
71faa8a835
Merge branch 'feature/修复工件配送按钮显示' into develop
2024-07-24 15:09:49 +08:00
杨金灵
12afc1ef83
Accept Merge Request #1169 : (feature/修复工件配送按钮显示 -> develop)
...
Merge Request: 修复工件配送按钮显示
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1169?initial=true
2024-07-24 15:08:49 +08:00
jinling.yang
34624e6592
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复工件配送按钮显示
2024-07-24 15:07:05 +08:00
jinling.yang
a16effd8db
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-07-24 15:06:58 +08:00
jinling.yang
f59299d4d5
修复工件配送按钮显示
2024-07-24 15:06:50 +08:00
禹翔辉
c7cef27ad6
Accept Merge Request #1168 : (feature/修复工单cnc校验bug_1 -> develop)
...
Merge Request: 工单开始时增加新校验
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1168?initial=true
2024-07-24 12:38:21 +08:00
yuxianghui
b88b0fc38a
Merge branch 'feature/修复工单cnc校验bug' into feature/修复工单cnc校验bug_1
...
# Conflicts:
# sf_tool_management/models/mrp_workorder.py
2024-07-24 12:35:31 +08:00
yuxianghui
4297d41dda
添加工单开始校验
2024-07-24 12:32:33 +08:00
马广威
3f85d058cc
Accept Merge Request #1167 : (feature/优化制造功能 -> develop)
...
Merge Request: 修复“同一个产品多个制造订单时-只有一张制造订单有组件”
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1167?initial=true
2024-07-24 12:18:54 +08:00
mgw
680bed9944
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造功能
2024-07-24 12:18:04 +08:00
mgw
d3e307d195
修复“同一个产品多个制造订单时-只有一张制造订单有组件”
2024-07-24 12:17:32 +08:00
jinling.yang
86a011343d
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-07-24 11:53:08 +08:00
jinling.yang
fe4bd3834e
Merge branch 'feature/修复cnc工单按钮显示问题' into develop
2024-07-24 11:52:42 +08:00
杨金灵
d3992c2a2e
Accept Merge Request #1166 : (feature/修复cnc工单按钮显示问题 -> develop)
...
Merge Request: 修复cnc工单按钮显示问题
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1166
2024-07-24 11:52:12 +08:00
jinling.yang
e62ed636e7
还原注释代码
2024-07-24 11:42:34 +08:00
jinling.yang
f0fdeff699
修复cnc工单按钮显示问题
2024-07-24 11:40:16 +08:00
mgw
dec85dc92f
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造功能
2024-07-24 09:26:35 +08:00
mgw
f4f9591f35
设备机床信息tab调整,修复打印返回action问题
2024-07-24 09:26:19 +08:00
jinling.yang
efb7334486
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-07-23 17:20:59 +08:00
jinling.yang
b9c1224442
Merge branch 'feature/修复返工向导' into develop
2024-07-23 17:20:49 +08:00
杨金灵
ca1a3ff120
Accept Merge Request #1165 : (feature/修复返工向导 -> develop)
...
Merge Request: 修复返工向导
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1165
2024-07-23 17:20:22 +08:00
jinling.yang
da8e543819
修复返工向导
2024-07-23 17:18:31 +08:00
禹翔辉
eb236fea11
Accept Merge Request #1164 : (feature/修复工单cnc校验bug -> develop)
...
Merge Request: 1、修复feature/修复工单cnc校验bug
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1164?initial=true
2024-07-23 16:00:39 +08:00
yuxianghui
1d271d9167
1、修复feature/修复工单cnc校验bug
2024-07-23 15:46:15 +08:00
禹翔辉
c5cf614645
Accept Merge Request #1163 : (feature/修复工单cnc校验bug -> develop)
...
Merge Request: 修复工单cnc校验bug
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1163?initial=true
2024-07-23 11:54:58 +08:00
yuxianghui
167c280fa4
修复工单cnc校验bug
2024-07-23 11:53:47 +08:00
杨金灵
69157a7b1f
Accept Merge Request #1162 : (feature/修复功能刀具 -> develop)
...
Merge Request: 修复功能刀具
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1162?initial=true
2024-07-23 11:48:47 +08:00
jinling.yang
2939e6bf82
修复功能刀具
2024-07-23 11:47:48 +08:00
杨金灵
96bbf3a677
Accept Merge Request #1161 : (feature/修复返工(CNC加工) -> develop)
...
Merge Request: 修复返工(CNC加工)
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1161?initial=true
2024-07-23 10:48:29 +08:00
jinling.yang
e3580d9ac8
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复返工(CNC加工)
2024-07-23 10:33:37 +08:00
jinling.yang
ded1789813
修复返工(CNC加工)
2024-07-23 10:33:22 +08:00
禹翔辉
759f947fa7
Accept Merge Request #1160 : (feature/NC程序和功能刀具校验_1 -> develop)
...
Merge Request: 完成 NC程序和功能刀具校验需求
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1160
2024-07-23 09:13:22 +08:00
yuxianghui
302aed16ec
Merge branch 'feature/NC程序和功能刀具校验' into feature/NC程序和功能刀具校验_1
2024-07-23 09:08:33 +08:00
yuxianghui
7d1db793b1
Merge branch 'feature/NC程序和功能刀具校验' into feature/NC程序和功能刀具校验_1
...
# Conflicts:
# sf_manufacturing/models/mrp_workorder.py
2024-07-23 09:06:57 +08:00
jinling.yang
83396f5434
修复返工(CNC加工)
2024-07-22 17:32:31 +08:00
禹翔辉
fe9baf08f0
Merge branch refs/heads/develop into refs/heads/feature/NC程序和功能刀具校验
2024-07-22 17:11:41 +08:00
杨金灵
b47cd0cdfe
Accept Merge Request #1159 : (feature/修复返工多面 -> develop)
...
Merge Request: 修复返工多面
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1159?initial=true
2024-07-22 15:10:13 +08:00
jinling.yang
251e289fd1
修复返工多面
2024-07-22 15:08:14 +08:00
jinling.yang
1d4ecb9895
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-07-22 14:47:12 +08:00
yuxianghui
f3a7dcc6a4
Merge branch 'feature/无效刀返工' into feature/NC程序和功能刀具校验
...
# Conflicts:
# sf_manufacturing/models/mrp_workorder.py
2024-07-22 11:36:29 +08:00
jinling.yang
ebd56eb5e0
Merge branch 'feature/修复返工bug' into develop
2024-07-22 11:01:57 +08:00
杨金灵
4f99a162b5
Accept Merge Request #1157 : (feature/修复返工bug -> develop)
...
Merge Request: 修复返工bug
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1157?initial=true
2024-07-22 11:01:41 +08:00
jinling.yang
28843b0733
修复返工bug
2024-07-22 10:57:43 +08:00
jinling.yang
8a0c968b10
修复返工bug
2024-07-19 17:25:51 +08:00
liaodanlong
ef1c7b6b25
多余字符串信息
2024-07-19 17:23:01 +08:00
liaodanlong
03fe730c50
产品添加税信息
2024-07-19 16:46:53 +08:00
liaodanlong
a0d3b40548
添加工厂订单和产品创建时的错误日志
2024-07-19 16:46:31 +08:00
liaodanlong
dfba055019
添加bfm同步时产品创建填充税值
2024-07-19 16:45:46 +08:00
jinling.yang
9d3c4f8163
修复返工按钮
2024-07-19 09:17:35 +08:00
jinling.yang
08831812ae
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复返工bug
...
# Conflicts:
# sf_manufacturing/models/mrp_production.py
2024-07-18 16:56:54 +08:00
jinling.yang
8b75658787
添加注释代码
2024-07-18 16:55:59 +08:00
yuxianghui
25ac346cb7
1、cnc编程单tree视图展示刀具状态字段;2、优化制造订单的功能刀具状态字段自动更新方法,同时当工单刀具状态变化时变更缺刀备注信息,添加状态为无效刀的备注字段;3、优化当功能刀具从【刀具房】到【制造前】时进行校验,校验是否为制造订单所缺的刀,如果是则修改cnc编程单刀具状态为正常;4、优化cnc用刀校验:添加对无效刀的处理(无效刀时触发返工流程,并生成检测结果数据),优化生成的待处理数据的数据结构;
2024-07-18 16:33:41 +08:00
jinling.yang
2d15782228
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-07-18 16:30:51 +08:00
jinling.yang
856237c4cb
Merge branch 'feature/优化最新版报废' into develop
2024-07-18 16:30:41 +08:00
杨金灵
a47c751b04
Accept Merge Request #1155 : (feature/优化最新版报废 -> develop)
...
Merge Request: 修复部分返工bug及优化部分报废
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1155
2024-07-18 16:29:58 +08:00
jinling.yang
9bec39f4e6
还原注释代码
2024-07-18 16:25:19 +08:00
jinling.yang
33bf88968c
修复返工bug
2024-07-18 16:17:19 +08:00
jinling.yang
7163e025d2
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化最新版报废
...
# Conflicts:
# sf_manufacturing/security/ir.model.access.csv
2024-07-17 19:32:21 +08:00
杨金灵
11ec448e81
Accept Merge Request #1154 : (feature/修复更新程序后制造订单状态 -> develop)
...
Merge Request: 修复更新程序后制造订单状态
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1154?initial=true
2024-07-17 19:30:45 +08:00
jinling.yang
6c2fb043c4
修复更新程序后制造订单状态
2024-07-17 19:29:21 +08:00
jinling.yang
1dcecea3d5
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-07-17 19:07:35 +08:00
jinling.yang
88f3ac3d4e
Merge branch 'feature/修复多面返工工单状态变更错误' into develop
2024-07-17 19:06:58 +08:00
杨金灵
983618d798
Accept Merge Request #1153 : (feature/修复多面返工工单状态变更错误 -> develop)
...
Merge Request: 修复多面返工工单状态变更错误
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1153?initial=true
2024-07-17 19:06:42 +08:00
jinling.yang
7a9c0ff163
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-07-17 19:03:14 +08:00
jinling.yang
77f7602b23
修复多面返工工单状态变更错误
2024-07-17 19:03:07 +08:00
yuxianghui
70b8521b90
Merge branch 'feature/销售订单、工单优化' into feature/无效刀返工
...
# Conflicts:
# sf_manufacturing/models/mrp_production.py
# sf_manufacturing/models/mrp_workorder.py
2024-07-17 16:57:11 +08:00
jinling.yang
1b89642dae
Merge branch 'feature/修复检测报告添加权限' into develop
2024-07-17 15:39:00 +08:00
杨金灵
1968ee17cb
Accept Merge Request #1152 : (feature/修复检测报告添加权限 -> develop)
...
Merge Request: 修复检测报告添加权限
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1152
2024-07-17 15:37:57 +08:00
jinling.yang
5e83fb382f
还原rfid代码
2024-07-17 15:37:20 +08:00
jinling.yang
974671ee07
修复解除装夹
2024-07-17 15:33:49 +08:00
jinling.yang
d8b4797ffe
检测报告添加机床操作岗权限
2024-07-17 15:31:47 +08:00
jinling.yang
b07e7707c7
添加计划调度岗,机床操作岗
2024-07-17 15:30:38 +08:00
jinling.yang
8726f8cac3
添加报废向导;添加重新生成制造订单
2024-07-17 15:20:31 +08:00
杨金灵
cb7960387b
Accept Merge Request #1151 : (feature/修复返工向导 -> develop)
...
Merge Request: 修复返工向导
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1151?initial=true
2024-07-17 10:17:42 +08:00
jinling.yang
6eaf92b841
修复调用更新程序
2024-07-17 10:15:05 +08:00
jinling.yang
ec0b5e88b6
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-07-17 09:47:30 +08:00
jinling.yang
f1b8ee41bc
Merge branch 'feature/优化最新版返工' into develop
2024-07-17 09:47:18 +08:00
杨金灵
97c0b95e2d
Accept Merge Request #1150 : (feature/优化最新版返工 -> develop)
...
Merge Request: 优化最新版返工
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1150
2024-07-17 09:47:03 +08:00
jinling.yang
7ac342bfd4
返工向导隐藏工序
2024-07-17 09:46:23 +08:00
jinling.yang
6c820ead44
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化最新版返工
...
# Conflicts:
# sf_manufacturing/models/mrp_production.py
2024-07-16 17:25:24 +08:00
jinling.yang
c536dde2cc
去掉注释代码
2024-07-16 17:24:15 +08:00
马广威
801ff9e076
Accept Merge Request #1149 : (feature/优化制造功能 -> develop)
...
Merge Request: 修复制造订单状态
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1149?initial=true
2024-07-16 16:32:11 +08:00
mgw
d0e049e881
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造功能
2024-07-16 16:31:33 +08:00
mgw
81158e2fb4
修复制造订单状态
2024-07-16 16:31:18 +08:00
yuxianghui
3404cccdc8
1、货架、货位添加循环货位标签;2、功能刀具拆解选取法人货位添加只能选择循环货位的过滤条件
2024-07-16 15:33:27 +08:00
禹翔辉
45bb78d7e9
Accept Merge Request #1148 : (feature/表面工艺优化 -> develop)
...
Merge Request: 1、表面工艺及同步接口添加‘加工天数’、‘路途天数’字段;2、表面工艺可选参数及同步接口添加‘工艺描述’、‘加工天数’、‘路途天数’字段
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1148?initial=true
2024-07-16 14:11:57 +08:00
yuxianghui
83334e2915
1、表面工艺及同步接口添加‘加工天数’、‘路途天数’字段;2、表面工艺可选参数及同步接口添加‘工艺描述’、‘加工天数’、‘路途天数’字段
2024-07-16 14:10:14 +08:00
禹翔辉
d4c30f645b
Accept Merge Request #1147 : (feature/销售订单接口优化 -> develop)
...
Merge Request: 创建销售订单接口添加销售明细信息‘备注’字段
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1147?initial=true
2024-07-16 10:46:37 +08:00
yuxianghui
bd642812a9
创建销售订单接口添加销售明细信息‘备注’字段
2024-07-16 10:45:00 +08:00
yuxianghui
3eca74518a
Merge branch 'feature/CNC功能刀具用刀校验' into feature/销售订单、工单优化
2024-07-16 10:41:56 +08:00
yuxianghui
37977be862
1、工单解绑时添加二次校验是否解绑成功;2、销售订单创建接口添加详情信息‘备注’字段;
2024-07-16 10:40:18 +08:00
jinling.yang
a0bd214118
修复返工操作时工单状态及制造订单更新程序
2024-07-15 17:34:18 +08:00
jinling.yang
7885794322
1.优化制造订单的检测结果:新增处理结果字段
...
2.优化制造订单的返工向导:加工面字段类型改为多对多,且该字段需根据处理结果为待处理的检测结果的加工面进行过滤
3.优化工单工件下产线接口:工单状态为待检测
4,.优化工单状态方法(_compute_state)
2024-07-12 17:32:53 +08:00
jinling.yang
7152b54017
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化最新版返工
...
# Conflicts:
# sf_manufacturing/views/mrp_workorder_view.xml
2024-07-11 17:38:38 +08:00
jinling.yang
0fef714d61
1.注释mrp_workcenter.xml文件和res.config添加不要的字段:lost_agent_id
...
2.制造订单新增“重新编程次数”字段,新增更新程序方法及对应的接口,优化返工且编程中的制造订单定时获取Cloud编程单状态的方法
3.优化返工向导页面及新增“重复编程次数”和“编程状态”字段
2024-07-11 17:37:35 +08:00
禹翔辉
6a2ff72dce
Accept Merge Request #1146 : (feature/销售单优化 -> develop)
...
Merge Request: 1、在销售订单内产品列表内增加备注字段
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1146?initial=true
2024-07-11 16:40:39 +08:00
yuxianghui
3094379e86
1、在销售订单内产品列表内增加备注字段
2024-07-11 16:38:41 +08:00
yuxianghui
77815c45a0
1、当检测到缺刀工单需要的功能刀具从刀具房出库到线边刀架时,更改cnc编程单的功能刀具状态为正常;
2024-07-11 16:37:20 +08:00
马广威
dd7c69ce1b
Accept Merge Request #1145 : (feature/优化制造功能 -> develop)
...
Merge Request: 修改订单状态
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1145?initial=true
2024-07-11 11:23:05 +08:00
mgw
e02f792300
修改订单状态
2024-07-11 11:22:25 +08:00
jinling.yang
9aca786522
1.优化工单排序2.新增调取cloud编程单的状态方法3.制造订单添加状态为返工及编程状态为"已编程",“已编程未下发”的过滤条件4,新增返工且编程中的制造订单定时获取Cloud编程单状态的定时器
2024-07-10 17:36:26 +08:00
yuxianghui
134e23ea2f
1、重构工单工序的生成方法;
2024-07-10 16:25:18 +08:00
yuxianghui
129f8a4d7d
1、重构工单cnc编程用刀校验方法;制造订单、工单、cnc编程单添加刀具状态字段,并且根据cnc编程单刀具状态自动计算制造订单、工单刀具状态字段的值;制造订单form页新增展示功能刀具状态字段;2、功能刀具拆解单刀具物料选择目标货位添加过滤添加为只选择所属货区是刀具房的货位;
2024-07-10 16:23:24 +08:00
马广威
79e3006cdb
Accept Merge Request #1144 : (feature/优化制造功能 -> develop)
...
Merge Request: 优化工单模块,增加企微模块
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1144?initial=true
2024-07-10 16:05:49 +08:00
mgw
6b140fe6dd
优化工单模块,增加企微模块
2024-07-10 15:58:47 +08:00
jinling.yang
7533d23d3e
1.工单状态新增‘返工’,2,在制造订单上点击返工选择加工面确认后,新增加工面的对应工单及新增重置cloud的编程单的状态3.优化返工向导
2024-07-09 17:36:47 +08:00
马广威
e8512b23e4
Accept Merge Request #1143 : (feature/优化制造功能 -> develop)
...
Merge Request: 增加工单模块
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1143?initial=true
2024-07-09 17:32:54 +08:00
mgw
b582bfbafa
增加工单模块
2024-07-09 17:32:03 +08:00
马广威
11907d4c5e
Accept Merge Request #1142 : (feature/优化制造功能 -> develop)
...
Merge Request: 解除装夹处打印成品二维码
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1142
2024-07-09 10:19:20 +08:00
mgw
ed4903b6f1
解除装夹处打印成品二维码
2024-07-09 10:18:13 +08:00
jinling.yang
b383a6d229
1.新增加工面模型2.制造订单详情页面的返工操作上的加工面根据产品的加工面板进行过滤
2024-07-08 17:33:04 +08:00
禹翔辉
27eb959a2a
Accept Merge Request #1141 : (feature/功能刀具拆解单库存优化 -> develop)
...
Merge Request: 1、功能刀具组装/拆解单库存优化;2、完成 SF材料材料型号缺陷优化 bug
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1141
2024-07-08 09:57:04 +08:00
yuxianghui
1672a3982e
1、完成 SF材料材料型号缺陷优化 bug
2024-07-05 17:09:32 +08:00
黄焱
40f8392bd3
Accept Merge Request #1140 : (feature/前端样式修改 -> develop)
...
Merge Request: 去除 根据进度条设置水印 修复切换产品3D图bug 修改表格下拉框会被表格下面数据框覆盖的bug
Created By: @黄焱
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @黄焱
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1140?initial=true
2024-07-05 16:05:38 +08:00
hy
1c8644983b
去除 根据进度条设置水印
...
修复切换产品3D图bug
修改表格下拉框会被表格下面数据框覆盖的bug
2024-07-05 16:02:32 +08:00
马广威
566d9fce9c
Accept Merge Request #1139 : (feature/优化制造功能 -> develop)
...
Merge Request: 优化展示效果
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1139?initial=true
2024-07-05 11:37:24 +08:00
mgw
b071b14bbd
优化展示效果
2024-07-05 11:36:48 +08:00
马广威
9d95442720
Accept Merge Request #1138 : (feature/优化制造功能 -> develop)
...
Merge Request: 工作中心的参数修改需增加sns模块("记录备注")
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1138?initial=true
2024-07-05 11:27:02 +08:00
mgw
fd225fa0e1
工作中心的参数修改需增加sns模块("记录备注")
2024-07-05 11:26:02 +08:00
jinling.yang
52fa229896
优化制造订单菜单
2024-07-04 17:31:03 +08:00
马广威
937efa5f0f
Accept Merge Request #1137 : (feature/优化制造功能 -> develop)
...
Merge Request: 前置检测文件命名增加加工面标识,避免检测文件覆盖
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1137?initial=true
2024-07-04 17:22:25 +08:00
mgw
87153fab3f
前置检测文件命名增加加工面标识,避免检测文件覆盖
2024-07-04 17:21:39 +08:00
马广威
21c33bb662
Accept Merge Request #1136 : (feature/优化制造功能 -> develop)
...
Merge Request: 修复“已经排程的制造订单取消排程后状态没有回退”
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1136?initial=true
2024-07-04 16:19:46 +08:00
mgw
b0da7977f5
修复“已经排程的制造订单取消排程后状态没有回退”
2024-07-04 16:19:20 +08:00
马广威
ae6764495e
Accept Merge Request #1135 : (feature/优化制造功能 -> develop)
...
Merge Request: 修复”制造订单完工后对应的成品入库单还是等待状态-应该是就绪状态“
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1135?initial=true
2024-07-04 16:13:30 +08:00
mgw
869e3e4b4f
修复”制造订单完工后对应的成品入库单还是等待状态-应该是就绪状态“
2024-07-04 16:12:27 +08:00
jinling.yang
050e82673a
优化cnc工单
2024-07-04 15:38:43 +08:00
杨金灵
1210625cfc
Accept Merge Request #1134 : (release/release_2.0 -> develop)
...
Merge Request: 修复工件多面工单上下产线状态
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1134?initial=true
2024-07-04 15:37:25 +08:00
马广威
804b401a87
Accept Merge Request #1133 : (release/release_2.0 -> master)
...
Merge Request: 修复多面工单产线状态
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1133?initial=true
2024-07-03 21:33:49 +08:00
jinling.yang
a7a8e73616
新增返工向导
2024-07-03 17:35:29 +08:00
yuxianghui
d60fefb2ec
1
2024-07-03 17:33:29 +08:00
yuxianghui
4a86871039
1、功能刀具组装单添加对应调拨单跳转按钮;功能刀具拆解单添加调拨单跳转按钮和功能刀具移动跳转按钮;2、功能刀具拆解模型,form视图添加报废page页存放刀具物料报废单,优化拆解流程添加功能刀具拆解移动记录;3、功能刀具出入库列表视图添加拆解单跳转链接;4、功能刀具安全库存模型添加名称唯一验证,优化字段计算方法;5、优化功能刀具同步到cloud的同步接口,解决编码问题;
2024-07-03 17:17:48 +08:00
jinling.yang
93c3548b40
注释OCC代码
2024-07-03 11:05:55 +08:00
jinling.yang
6c6fe44d45
制造订单去掉上/下产线字段
2024-07-03 10:53:29 +08:00
jinling.yang
bb33a1d093
修复多面工单产线状态
2024-07-03 10:37:02 +08:00
杨金灵
396084a498
Accept Merge Request #1132 : (feature/修复多面加工产线状态 -> develop)
...
Merge Request: 修复多面加工产线状态
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1132
2024-07-03 10:32:42 +08:00
jinling.yang
73cc244994
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复多面加工产线状态
2024-07-03 10:30:27 +08:00
jinling.yang
fa6303bbef
修复多面工单加工产线状态
2024-07-03 10:30:13 +08:00
杨金灵
5ca555c520
Accept Merge Request #1131 : (feature/修复多面加工产线状态 -> develop)
...
Merge Request: 修复多面加工产线状态
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1131?initial=true
2024-07-03 10:00:29 +08:00
jinling.yang
487f6c2054
修复多面加工产线状态
2024-07-03 09:55:47 +08:00
jinling.yang
9ec37f5d5b
修复多面加工产线状态
2024-07-03 09:45:55 +08:00
yuxianghui
cbc8a41984
1、添加拆解的仓库管理地点;2、优化功能刀具拆解库存管理;3、代码迁移
2024-07-02 17:32:27 +08:00
yuxianghui
025ad213d6
Merge branch 'feature/功能刀具组装库存优化' into feature/功能刀具拆解单库存优化
2024-07-02 10:24:52 +08:00
yuxianghui
0b267cc88a
1
2024-07-02 09:32:50 +08:00
马广威
0bc4072a8f
Accept Merge Request #1130 : (release/release_1.9 -> master)
...
Merge Request: SPRINT-MES-2024-03迭代优化升级
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1130?initial=true
2024-07-01 22:35:53 +08:00
马广威
957c5583bd
Accept Merge Request #1129 : (feature/修复制造订单数量 -> develop)
...
Merge Request: 修复制造订单数量
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1129#mr-1129-review-164092
2024-07-01 20:13:10 +08:00
jinling.yang
9c4c2b85dd
修复制造订单数量
2024-07-01 20:08:46 +08:00
jinling.yang
56af286500
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-07-01 18:30:18 +08:00
jinling.yang
cc83029c72
Merge branch 'feature/修复工单完成接口' into develop
2024-07-01 18:30:06 +08:00
杨金灵
79ab1cc573
Accept Merge Request #1128 : (feature/修复工单完成接口 -> develop)
...
Merge Request: 修复工单完成接口
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1128?initial=true
2024-07-01 18:29:29 +08:00
jinling.yang
bda3df7806
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-07-01 18:29:16 +08:00
马广威
150b684354
Accept Merge Request #1127 : (feature/sf物流方面缺陷与优化 -> develop)
...
Merge Request: Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/sf物流方面缺陷与优化
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1127?initial=true
2024-07-01 18:28:37 +08:00
jinling.yang
d69dc20fd1
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复工单完成接口
2024-07-01 18:28:11 +08:00
jinling.yang
e9c9b77112
修复所有工单完成报库存问题
2024-07-01 18:27:59 +08:00
mgw
495f92bd80
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/sf物流方面缺陷与优化
2024-07-01 18:27:52 +08:00
马广威
8a97fd08e2
Accept Merge Request #1126 : (feature/sf物流方面缺陷与优化 -> develop)
...
Merge Request: 状态补充条件
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1126?initial=true
2024-07-01 18:18:19 +08:00
mgw
1551ea4b12
状态补充条件
2024-07-01 18:17:48 +08:00
jinling.yang
75c5cca9a0
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-07-01 18:12:25 +08:00
jinling.yang
6b6be85057
去掉更改制造订单的状态等相关代码
2024-07-01 18:12:15 +08:00
jinling.yang
7fb3c32d07
修复工单完成接口
2024-07-01 17:48:45 +08:00
马广威
8203975142
Accept Merge Request #1125 : (feature/sf物流方面缺陷与优化 -> develop)
...
Merge Request: 优化订单状态条件及物流的容错处理
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1125?initial=true
2024-07-01 17:28:45 +08:00
mgw
449cf5bfb1
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/sf物流方面缺陷与优化
2024-07-01 17:28:07 +08:00
mgw
d7d5ccc142
优化订单状态条件及物流的容错处理
2024-07-01 17:27:52 +08:00
jinling.yang
8710df6dc2
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-07-01 17:14:42 +08:00
jinling.yang
f5c1457707
Merge branch 'feature/优化解绑rfid' into develop
2024-07-01 17:13:57 +08:00
杨金灵
5155135cb4
Accept Merge Request #1124 : (feature/优化解绑rfid -> develop)
...
Merge Request: 优化解绑rfid
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1124
2024-07-01 17:13:38 +08:00
jinling.yang
4421eed1d0
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-07-01 17:11:47 +08:00
yuxianghui
5be5e8b3ec
1、功能刀具组装完成时,自动生成内部调拨单以及所有的刀具物料的库存移动和移动历史记录,并自动完成该调拨单;优化功能刀具的刀具组装入库单的生成,简化入库步骤。
2024-07-01 17:11:44 +08:00
jinling.yang
46e3a23492
优化解绑rfid
2024-07-01 17:11:34 +08:00
马广威
675b09390b
Accept Merge Request #1123 : (feature/sf物流方面缺陷与优化 -> develop)
...
Merge Request: 优化订单状态
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1123?initial=true
2024-07-01 16:57:22 +08:00
mgw
34251b4027
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/sf物流方面缺陷与优化
2024-07-01 16:56:43 +08:00
mgw
c4621d36a3
优化订单状态
2024-07-01 16:56:19 +08:00
jinling.yang
7bdc4b463a
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-07-01 15:42:22 +08:00
jinling.yang
ea88b5418f
Merge branch 'feature/优化cnc工单接口' into develop
2024-07-01 15:42:10 +08:00
杨金灵
f5a64caf81
Accept Merge Request #1122 : (feature/优化cnc工单接口 -> develop)
...
Merge Request: 优化cnc工单接口
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1122?initial=true
2024-07-01 15:41:52 +08:00
jinling.yang
1e5f26d645
工单开始和结束接口增加rfid_code不为空的条件
2024-07-01 15:29:55 +08:00
jinling.yang
ace32d9490
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-07-01 14:03:23 +08:00
马广威
5db2f1fc70
Accept Merge Request #1121 : (feature/sf物流方面缺陷与优化 -> develop)
...
Merge Request: 优化物流提示
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1121?initial=true
2024-07-01 11:51:37 +08:00
mgw
960c940505
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/sf物流方面缺陷与优化
2024-07-01 11:50:49 +08:00
mgw
ee1629b40a
优化物流提示
2024-07-01 11:47:51 +08:00
jinling.yang
06de5f6a2d
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-07-01 10:50:19 +08:00
jinling.yang
c1eff705c2
Merge branch 'feature/修复表面工艺' into develop
2024-07-01 10:49:57 +08:00
杨金灵
8e3c7f9732
Accept Merge Request #1120 : (feature/修复表面工艺 -> develop)
...
Merge Request: 修复表面工艺
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1120?initial=true
2024-07-01 10:49:38 +08:00
jinling.yang
2591e627f0
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复表面工艺
2024-07-01 10:47:33 +08:00
jinling.yang
4c66d86ee6
修复表面工艺
2024-07-01 10:47:05 +08:00
禹翔辉
d4bc1c13ea
Accept Merge Request #1119 : (feature/工单优化-2 -> develop)
...
Merge Request: 优化工单扫描绑定托盘的提示信息
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1119
2024-07-01 09:55:21 +08:00
yuxianghui
4c845ee9fd
Merge branch 'feature/工单优化-1' into feature/工单优化-2
2024-07-01 09:53:11 +08:00
yuxianghui
726c3aede1
1、优化工单扫描绑定托盘的提示信息
2024-07-01 09:52:16 +08:00
黄焱
871c406c09
Accept Merge Request #1118 : (feature/前端样式修改 -> develop)
...
Merge Request: // 修复表格内容覆盖表头bug
Created By: @黄焱
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @黄焱
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1118?initial=true
2024-07-01 09:49:05 +08:00
hy
2ba9695c34
// 修复表格内容覆盖表头bug
2024-07-01 09:47:50 +08:00
杨金灵
e1db34f25d
Accept Merge Request #1117 : (feature/修复无外协单和程序单 -> develop)
...
Merge Request: 修复无外协单和程序单
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1117
2024-07-01 09:31:43 +08:00
jinling.yang
e496555ff3
去掉注释代码
2024-06-30 19:29:36 +08:00
jinling.yang
404a41294c
修复表面工艺外协单状态
2024-06-30 19:16:48 +08:00
jinling.yang
e124560089
修复无外协单和程序单
2024-06-30 17:52:02 +08:00
jinling.yang
fd3a363bf6
修复无外协单和程序单
2024-06-30 16:51:40 +08:00
杨金灵
9f6563186c
Accept Merge Request #1116 : (feature/优化工单页面 -> develop)
...
Merge Request: 优化工单页面
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1116
2024-06-30 14:47:44 +08:00
jinling.yang
1b174c5805
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-06-30 14:41:38 +08:00
jinling.yang
849b7be20d
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-06-30 14:09:34 +08:00
jinling.yang
9d32bf8363
Merge branch 'feature/修复制造订单状态和多个编程单问题' into develop
2024-06-30 12:46:48 +08:00
杨金灵
998daaa7f7
Accept Merge Request #1115 : (feature/修复制造订单状态和多个编程单问题 -> develop)
...
Merge Request: 修复制造订单状态和多个编程单问题
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1115?initial=true
2024-06-30 12:45:54 +08:00
jinling.yang
b23cb9af6e
优化编程状态字段的样式
2024-06-30 12:09:09 +08:00
jinling.yang
56adaddefc
1.修复编程状态字段类型2.优化工单rfid排放位置
2024-06-30 12:01:48 +08:00
jinling.yang
4a648fbd7b
1,修复制造订单状态:第一张装夹工单未就绪是,状态需为:待加工;所有工单完成后,状态需为:完成;2.修复多个产品确认制造订单未生产多个编程单问题3.优化工单页面:去掉非必要的字段
2024-06-30 11:45:52 +08:00
mgw
a3bf451d83
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/sf物流方面缺陷与优化
2024-06-28 17:03:06 +08:00
mgw
2919a3c159
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/sf物流方面缺陷与优化
2024-06-28 17:02:47 +08:00
马广威
8f6e2bc13d
Accept Merge Request #1114 : (feature/sf物流方面缺陷与优化 -> develop)
...
Merge Request: 排程单甘特图界面订单的hover提示中订单交期字段没有翻译成日期格式
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1114?initial=true
2024-06-28 17:01:43 +08:00
mgw
909230c1cc
排程单甘特图界面订单的hover提示中订单交期字段没有翻译成日期格式
2024-06-28 17:00:50 +08:00
马广威
db8c338588
Accept Merge Request #1113 : (feature/sf物流方面缺陷与优化 -> develop)
...
Merge Request: 工单增加默认产品分组,组内排序从小到大
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1113?initial=true
2024-06-28 16:02:09 +08:00
mgw
f319a9adf4
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/sf物流方面缺陷与优化
2024-06-28 16:01:05 +08:00
mgw
172e420939
增加分组内排序
2024-06-28 16:00:50 +08:00
mgw
0c3727540e
工单增加默认产品分组
2024-06-28 14:51:53 +08:00
禹翔辉
5668722109
Accept Merge Request #1112 : (feature/工单优化-1 -> develop)
...
Merge Request: 工单优化
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1112
2024-06-28 14:25:01 +08:00
杨金灵
2d80355559
Accept Merge Request #1111 : (feature/修复cmm程序接口 -> develop)
...
Merge Request: 修复cmm程序接口
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1111?initial=true
2024-06-28 14:24:23 +08:00
jinling.yang
d281026086
修复cmm程序接口
2024-06-28 14:23:03 +08:00
yuxianghui
5c35a8c38d
Merge branch 'feature/添加权限、解决bug' into feature/工单优化-1
2024-06-28 14:22:35 +08:00
yuxianghui
3b24f90385
1、工单添加按Rfid搜索,隐藏多余的Rfid字段;2、优化程序创建日期;
2024-06-28 14:20:57 +08:00
杨金灵
14355606c7
Accept Merge Request #1110 : (feature/优化ftp -> develop)
...
Merge Request: ftp优化
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1110
2024-06-28 12:03:05 +08:00
jinling.yang
5997cbcb0e
download_program_file方法添加关闭ftp
2024-06-28 12:00:29 +08:00
jinling.yang
f07d7611d0
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-06-28 10:10:46 +08:00
马广威
b106d56f3f
Accept Merge Request #1109 : (feature/sf物流方面缺陷与优化 -> develop)
...
Merge Request: 修复隐藏项目
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1109?initial=true
2024-06-28 09:52:58 +08:00
mgw
3156052604
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/sf物流方面缺陷与优化
2024-06-28 09:51:50 +08:00
mgw
c8de75ceae
修复隐藏项目
2024-06-28 09:51:31 +08:00
马广威
d4b1f8f1a1
Accept Merge Request #1108 : (feature/sf物流方面缺陷与优化 -> develop)
...
Merge Request: Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/sf物流方面缺陷与优化
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1108?initial=true
2024-06-28 09:45:59 +08:00
mgw
5378d62551
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/sf物流方面缺陷与优化
2024-06-28 09:44:24 +08:00
马广威
424f7196f8
Accept Merge Request #1107 : (feature/sf物流方面缺陷与优化 -> develop)
...
Merge Request: 处理unlink传参问题2
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1107?initial=true
2024-06-28 09:19:58 +08:00
mgw
c2723d9d05
处理unlink传参问题2
2024-06-28 09:19:09 +08:00
jinling.yang
7bf001927a
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-06-28 09:17:56 +08:00
杨金灵
84d67d285e
Accept Merge Request #1106 : (feature/修复制造订单无采购单问题 -> develop)
...
Merge Request: 修复制造订单无采购单问题
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1106?initial=true
2024-06-28 09:16:32 +08:00
jinling.yang
a583b483e3
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复制造订单无采购单问题
2024-06-27 20:10:22 +08:00
jinling.yang
719a96f983
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-06-27 20:10:01 +08:00
jinling.yang
08fd0b01d3
去掉程序下发按钮
2024-06-27 20:09:45 +08:00
jinling.yang
db7fbed177
去掉重新编程下发相关代码,修复多制造订单无采购调拨单,去掉程序下发按钮
2024-06-27 20:09:28 +08:00
马广威
ad149a58ea
Accept Merge Request #1105 : (feature/sf物流方面缺陷与优化 -> develop)
...
Merge Request: 处理unlink()参数问题
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1105?initial=true
2024-06-27 17:32:18 +08:00
mgw
0d96cd070c
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/sf物流方面缺陷与优化
2024-06-27 17:31:21 +08:00
mgw
37f030c2db
处理unlink()参数问题
2024-06-27 17:31:03 +08:00
禹翔辉
e2a62325f8
Accept Merge Request #1104 : (feature/添加权限、解决bug -> develop)
...
Merge Request: 添加权限、解决bug
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1104?initial=true
2024-06-27 17:26:20 +08:00
yuxianghui
0db103cfc7
Merge branch 'feature/调拨单优化1' into feature/添加权限、解决bug
2024-06-27 17:22:42 +08:00
yuxianghui
05f2cb553d
1、完成 采购/采购总监岗位权限增加 需求;2、完成 刀具出入库列表缺少单据跳转 需求;3、完成 设备详情的机内装刀时间比当前时间还晚 bug;
2024-06-27 17:21:37 +08:00
黄焱
c597471949
Accept Merge Request #1103 : (feature/前端样式修改 -> develop)
...
Merge Request: 甘特修改背景颜色和不可拖拽模块
Created By: @黄焱
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @黄焱
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1103?initial=true
2024-06-27 10:14:10 +08:00
hy
70ffbafac4
甘特修改背景颜色和不可拖拽模块
2024-06-27 09:57:12 +08:00
jinling.yang
1cb7af072e
注释OCC代码
2024-06-27 09:52:20 +08:00
禹翔辉
4f6b1d0342
Accept Merge Request #1102 : (feature/调拨单优化1 -> develop)
...
Merge Request: 1、完成 内部调拨单优化项 需求;2、解决 不同序列号调拨单选择同一个货位可以确认成功 bug;3、收货入库时扫描录入Rfid方法添加日志
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1102?initial=true
2024-06-26 17:10:25 +08:00
yuxianghui
9bdcf0dd92
Merge branch 'feature/调拨单优化' into feature/调拨单优化1
2024-06-26 17:08:39 +08:00
yuxianghui
bcb60425b2
1、完成 内部调拨单优化项 需求;2、解决 不同序列号调拨单选择同一个货位可以确认成功 bug;3、收货入库时扫描录入Rfid方法添加日志
2024-06-26 17:07:09 +08:00
jinling.yang
22643368fa
Merge branch 'feature/修复工单完成报错库存问题' into develop
2024-06-26 16:41:23 +08:00
jinling.yang
aeb100923f
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复工单完成报错库存问题
2024-06-26 16:41:05 +08:00
杨金灵
53c6d6015e
Accept Merge Request #1101 : (feature/修复工单完成报错库存问题 -> develop)
...
Merge Request: 修复制造订单生成时没有采购单
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1101?initial=true
2024-06-26 16:40:40 +08:00
jinling.yang
131e9329de
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-06-26 16:37:05 +08:00
jinling.yang
dbd5c488f8
修复制造订单生成时没有采购单
2024-06-26 16:36:51 +08:00
马广威
f8ba414229
Accept Merge Request #1100 : (feature/sf物流方面缺陷与优化 -> develop)
...
Merge Request: sf物流优化
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1100?initial=true
2024-06-26 16:34:52 +08:00
mgw
7fd3647afb
sf物流优化
2024-06-26 16:34:04 +08:00
马广威
f5be9c6e65
Accept Merge Request #1099 : (feature/制造订单列表页及详情页优化需求 -> develop)
...
Merge Request: 制造订单列表页及详情页优化需求
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1099?initial=true
2024-06-26 14:13:06 +08:00
mgw
c275a39a15
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造订单列表页及详情页优化需求
2024-06-26 14:11:45 +08:00
mgw
d07ab53aeb
制造订单列表页及详情页优化需求
2024-06-26 14:10:57 +08:00
jinling.yang
55accb714a
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-06-26 11:25:47 +08:00
jinling.yang
5bd3eddfd5
Merge branch 'feature/修复编程单下发ftp路径' into develop
2024-06-26 11:24:58 +08:00
杨金灵
c8bcd4d0f5
Accept Merge Request #1098 : (feature/修复编程单下发ftp路径 -> develop)
...
Merge Request: 修复编程单下发ftp路径
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1098?initial=true
2024-06-26 11:24:40 +08:00
jinling.yang
2cbe5ed394
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复编程单下发ftp路径
2024-06-26 11:11:26 +08:00
jinling.yang
1f1cb17a40
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-06-26 11:11:08 +08:00
jinling.yang
2ff935f68d
修复编程单下发ftp路径
2024-06-26 11:10:54 +08:00
杨金灵
098745ec50
Accept Merge Request #1097 : (feature/修复编程单下发ftp路径 -> develop)
...
Merge Request: 修复编程单下发ftp路径
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1097?initial=true
2024-06-26 10:21:25 +08:00
jinling.yang
94175f2039
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-06-26 10:17:27 +08:00
jinling.yang
1940116a35
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复编程单下发ftp路径
2024-06-26 10:17:14 +08:00
jinling.yang
f4eb378bea
修复制造订单:无工单时,工单page需隐藏
2024-06-26 10:17:00 +08:00
jinling.yang
dcbb60b088
修复编程单下发ftp路径:去掉注释
2024-06-25 18:11:45 +08:00
jinling.yang
88ef9c106d
修复编程单下发ftp路径
2024-06-25 17:54:08 +08:00
马广威
0f7f12008f
Accept Merge Request #1096 : (feature/【计划】模块的【排程单】页面优化需求 -> develop)
...
Merge Request: 处理"打印的二维码信息与界面的二维码信息不一致"等
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1096?initial=true
2024-06-25 16:51:47 +08:00
mgw
f44836705b
放出程序下载按钮
2024-06-25 16:50:09 +08:00
mgw
35ac51bc10
取消默认分组展示
2024-06-25 14:22:51 +08:00
mgw
eb2851391b
处理"打印的二维码信息与界面的二维码信息不一致"
2024-06-25 12:06:28 +08:00
jinling.yang
86f67556ce
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-06-25 11:07:41 +08:00
禹翔辉
e437875a92
Accept Merge Request #1095 : (release/release_1.8 -> develop)
...
Merge Request: 功能刀具、工件状态优化
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1095
2024-06-25 09:53:14 +08:00
禹翔辉
f005a29beb
Merge branch refs/heads/develop into refs/heads/release/release_1.8
2024-06-25 09:47:34 +08:00
马广威
6a24776701
Accept Merge Request #1094 : (feature/【计划】模块的【排程单】页面优化需求 -> develop)
...
Merge Request: 计划模块后端优化
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1094?initial=true
2024-06-25 09:04:10 +08:00
mgw
09d06980b5
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/【计划】模块的【排程单】页面优化需求
2024-06-25 09:03:13 +08:00
mgw
8b492fc093
计划模块后端优化
2024-06-25 09:02:54 +08:00
马广威
9e56aeda67
Accept Merge Request #1093 : (release/release_1.8 -> master)
...
Merge Request: 功能刀具、工件状态优化
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1093?initial=true
2024-06-24 21:38:15 +08:00
jinling.yang
b4535e88c9
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-06-24 17:31:08 +08:00
禹翔辉
ba03790832
Accept Merge Request #1092 : (hotfix/优化工单工序 -> develop)
...
Merge Request: 1、重构工单工序的生成规则
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1092
2024-06-24 17:30:28 +08:00
jinling.yang
be94cd0d54
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-06-24 17:30:03 +08:00
禹翔辉
3148cd55b8
Accept Merge Request #1091 : (feature/单据跳转2 -> develop)
...
Merge Request: 1、重新下发NC程序按键添加权限
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1091?initial=true
2024-06-24 17:29:17 +08:00
yuxianghui
665ebaab9e
1、重新下发NC程序按键添加权限
2024-06-24 17:28:06 +08:00
jinling.yang
65e209fe2a
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-06-24 17:20:18 +08:00
禹翔辉
40969adc2c
Accept Merge Request #1090 : (feature/单据跳转2 -> develop)
...
Merge Request: 1、功能刀具清单做编辑控制;2、刀具拆解——报废优化;3、功能刀具出入库添加刀具跳转;
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1090
2024-06-24 17:15:55 +08:00
yuxianghui
95e89d8979
1
2024-06-24 17:10:39 +08:00
yuxianghui
5b400b746e
Merge branch 'feature/单据跳转' into feature/单据跳转2
2024-06-24 17:09:40 +08:00
jinling.yang
828b4b0f6b
修复功能刀具清单列表
2024-06-24 16:55:42 +08:00
jinling.yang
27ba002b51
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-06-24 16:54:28 +08:00
jinling.yang
2cd83c87e2
Merge branch 'feature/优化重新下发程序' into develop
2024-06-24 16:52:48 +08:00
jinling.yang
ba87d07af7
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-06-24 16:52:24 +08:00
杨金灵
7d2c705c35
Accept Merge Request #1089 : (feature/优化重新下发程序 -> develop)
...
Merge Request: 优化重新下发程序
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1089?initial=true
2024-06-24 16:51:56 +08:00
jinling.yang
f3c2db7add
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化重新下发程序
2024-06-24 16:49:19 +08:00
jinling.yang
0af6d7f4cd
优化重新下发程序:装夹预调,cnc加工工单展示
2024-06-24 16:48:58 +08:00
yuxianghui
a82a54c464
1、功能刀具清单做编辑控制;2、刀具拆解——报废优化;3、功能刀具出入库添加刀具跳转;
2024-06-24 15:40:51 +08:00
马广威
d4253b21fe
Accept Merge Request #1088 : (feature/工单功能优化 -> develop)
...
Merge Request: 工件装夹预调工单页面优化需求-1
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1088
2024-06-24 15:05:53 +08:00
mgw
8356e898aa
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/工单功能优化
...
# Conflicts:
# sf_manufacturing/views/mrp_workorder_view.xml
2024-06-24 15:04:09 +08:00
mgw
f67d08fc88
工件装夹预调工单页面优化需求-1
2024-06-24 15:00:54 +08:00
jinling.yang
0a40409c6c
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-06-24 14:56:31 +08:00
jinling.yang
927f74213e
Merge branch 'feature/优化工单(cnc和cmc)涉及多个加工面' into develop
2024-06-24 14:56:14 +08:00
杨金灵
8b8570a901
Accept Merge Request #1087 : (feature/优化工单(cnc和cmc)涉及多个加工面 -> develop)
...
Merge Request: 优化工单(cnc和cmc)涉及多个加工面
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1087
2024-06-24 14:55:49 +08:00
jinling.yang
ec30a07394
修复创建移动历史记录
2024-06-24 14:54:33 +08:00
jinling.yang
9110c81c73
还原OCC代码
2024-06-24 14:46:47 +08:00
jinling.yang
5f4ecf8ff9
修复生成制造订单
2024-06-24 14:46:02 +08:00
jinling.yang
e453508f17
修改功能刀具清单查询列表:部分字段不可更改
2024-06-24 14:18:42 +08:00
jinling.yang
733b554942
no message
2024-06-24 14:16:53 +08:00
jinling.yang
eff2032762
修改fetchCNC方法·
2024-06-24 14:16:42 +08:00
jinling.yang
16a00bdb10
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化工单(cnc和cmc)涉及多个加工面
2024-06-24 10:53:53 +08:00
jinling.yang
de6014d1dd
修复工件上下产线接口:当RFID不为空时,更改制造订单上下产线状态
2024-06-21 17:39:15 +08:00
jinling.yang
66b66a935f
优化工单页面和下发编程单接口
2024-06-21 17:15:05 +08:00
jinling.yang
612906e01d
修改根据多面生成工单逻辑
2024-06-21 16:00:04 +08:00
禹翔辉
21f94e5523
Accept Merge Request #1086 : (feature/单据跳转 -> develop)
...
Merge Request: 完成 工件装夹预调工单页面优化需求-3
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1086?initial=true
2024-06-20 17:34:24 +08:00
yuxianghui
f8c1d75b63
1、刀具过滤优化
2024-06-20 17:30:23 +08:00
yuxianghui
fcba3b18b7
Merge branch 'feature/工件装夹预调工单页面优化' into feature/单据跳转
2024-06-20 09:46:15 +08:00
禹翔辉
c6a509c6f4
Accept Merge Request #1085 : (release/release1.7 -> develop)
...
Merge Request: 迭代库存、制造逻辑
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1085
2024-06-20 09:31:50 +08:00
马广威
ecf265fee7
Accept Merge Request #1084 : (release/release1.7 -> master)
...
Merge Request: 迭代库存、制造逻辑
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1084?initial=true
2024-06-19 20:24:20 +08:00
yuxianghui
60560fe195
1、优化工单解绑Rfid
2024-06-19 17:40:49 +08:00
jinling.yang
67b48814f6
优化制造订单和生成工单逻辑
2024-06-19 17:35:13 +08:00
yuxianghui
21f2a704db
1、对刀仪接口获取的功能刀具半径值乘二后再赋值
2024-06-19 17:03:44 +08:00
yuxianghui
1f32aafc9b
1、完成 工件装夹预调工单页面优化需求-3
2024-06-19 16:38:30 +08:00
jinling.yang
b390712308
优化编程单下发接口
2024-06-19 15:39:28 +08:00
jinling.yang
c035ab8156
注释OCC代码
2024-06-19 15:32:03 +08:00
yuxianghui
c0b673bfd0
添加注释
2024-06-19 11:23:25 +08:00
yuxianghui
6dae144d76
1、功能刀具拆解单优化;2、完成 需求坯料序列号生成规则优化2;
2024-06-19 11:19:47 +08:00
jinling.yang
25dddb5b3b
优化制造订单:生成制造订单的同时不生成工单
2024-06-18 17:35:41 +08:00
yuxianghui
4497fb04c1
1、优化 托盘绑定工单逻辑优化 ;2 完成 整体式刀具批次/序列号生成的优化需求; 3、完成 坯料序列号生成规则优化需求1。
2024-06-18 17:19:41 +08:00
杨金灵
bc4dc82beb
Accept Merge Request #1083 : (feature/优化预调装夹工单 -> develop)
...
Merge Request: 优化预调装夹工单
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1083?initial=true
2024-06-18 17:19:16 +08:00
jinling.yang
47305a2e61
添加'是否重新下发NC程序'字段
2024-06-18 17:17:09 +08:00
jinling.yang
9e58835082
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-06-18 11:41:24 +08:00
jinling.yang
63fa0e0c37
Merge branch 'feature/优化装夹预调工单' into develop
2024-06-18 11:41:12 +08:00
杨金灵
c6c9974326
Accept Merge Request #1082 : (feature/优化装夹预调工单 -> develop)
...
Merge Request: 优化装夹预调工单
Created By: @杨金灵
Reviewed By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1082?initial=true
2024-06-18 11:40:49 +08:00
jinling.yang
d63c3b76bf
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化装夹预调工单
2024-06-18 11:36:01 +08:00
jinling.yang
3793d0a174
优化装夹预调工单
2024-06-18 11:35:50 +08:00
马广威
903fdee420
Accept Merge Request #1081 : (release/release1.6 -> master)
...
Merge Request: 功能升级
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1081?initial=true
2024-06-17 21:34:41 +08:00
禹翔辉
ee17889fe8
Accept Merge Request #1080 : (feature/预调仪接口 -> develop)
...
Merge Request: 1、添加日志
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1080?initial=true
2024-06-17 17:27:27 +08:00
yuxianghui
5bec3d6061
1
2024-06-17 17:24:23 +08:00
杨金灵
0fc5b12894
Accept Merge Request #1079 : (feature/修复快速订单 -> develop)
...
Merge Request: 修复快速订单
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1079?initial=true
2024-06-17 16:39:55 +08:00
jinling.yang
3258b6cc75
修复快速订单
2024-06-17 16:38:14 +08:00
jinling.yang
017404fe45
Merge branch 'feature/优化工单结束接口' into develop
2024-06-17 16:17:54 +08:00
杨金灵
cde6c76f83
Accept Merge Request #1078 : (feature/优化工单结束接口 -> develop)
...
Merge Request: 优化工单结束接口
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1078?initial=true
2024-06-17 16:16:39 +08:00
jinling.yang
7dea8c7c1e
去掉返工和报废的代码
2024-06-17 16:16:22 +08:00
jinling.yang
8ade3b43c4
中控新增是否完成字段,该接口根据该字段对cnc加工工单进行完成操作
2024-06-17 16:06:49 +08:00
禹翔辉
c2b7abaae1
Accept Merge Request #1077 : (hotfix/功能刀具出入库处理 -> develop)
...
Merge Request: 新增功能刀具出入库线边刀库记录
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1077
2024-06-17 14:40:14 +08:00
禹翔辉
c1f33c5e14
Merge branch refs/heads/develop into refs/heads/hotfix/功能刀具出入库处理
2024-06-17 14:36:00 +08:00
杨金灵
01f55350e2
Accept Merge Request #1076 : (feature/去掉返工报废的代码 -> develop)
...
Merge Request: 去掉返工报废的代码
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1076?initial=true
2024-06-17 11:56:45 +08:00
jinling.yang
9202409a89
去掉返工报废的代码
2024-06-17 11:53:38 +08:00
jinling.yang
2e779c4a68
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-06-17 11:50:25 +08:00
禹翔辉
5751837ddd
Accept Merge Request #1075 : (feature/刀具同步接口优化 -> develop)
...
Merge Request: 优化动态刀具按批次管理的数据同步接口
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1075?initial=true
2024-06-17 11:46:22 +08:00
yuxianghui
e2f86097a0
Merge branch 'feature/模型优化' into feature/刀具同步接口优化
2024-06-17 11:42:25 +08:00
yuxianghui
77ad0dd635
优化动态刀具按批次管理的数据同步接口
2024-06-17 11:40:12 +08:00
jinling.yang
73e03bd815
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-06-17 11:00:33 +08:00
jinling.yang
51cd156e75
Merge branch 'feature/去掉客户部分字段必填校验和返工报废代码' into develop
2024-06-17 11:00:02 +08:00
杨金灵
b447db1b13
Accept Merge Request #1074 : (feature/去掉客户部分字段必填校验和返工报废代码 -> develop)
...
Merge Request: 去掉客户部分字段必填校验和返工报废代码
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1074?initial=true
2024-06-17 10:50:27 +08:00
jinling.yang
e3911c8f5a
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-06-17 09:52:43 +08:00
jinling.yang
2892cdd99f
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/去掉客户部分字段必填校验和返工报废代码
2024-06-17 09:52:30 +08:00
jinling.yang
2862c5a888
去掉客户部分字段必填校验和返工报废代码
2024-06-17 09:52:18 +08:00
禹翔辉
ad8927fb83
Accept Merge Request #1073 : (feature/模型优化 -> develop)
...
Merge Request: 1、对模型的添加筛选和分组,优化界面
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1073?initial=true
2024-06-17 09:44:52 +08:00
yuxianghui
e1f4e1e701
Merge branch 'feature/刀具接口调整' into feature/模型优化
2024-06-17 09:43:00 +08:00
yuxianghui
1e90b9a18a
1、功能刀具位置计算方法添加触发条件
2024-06-14 17:01:02 +08:00
jinling.yang
24edef023f
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-06-14 16:53:26 +08:00
马广威
4894576d25
Accept Merge Request #1072 : (release/release_1.5 -> develop)
...
Merge Request: 添加刀具按批次管理
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1072
2024-06-14 16:21:38 +08:00
yuxianghui
904c63bfcb
1、优化功能刀具安全库存数量计算方法;2、货位看板模型添加功能刀具Rfid、名称字段
2024-06-14 15:38:52 +08:00
yuxianghui
a86ceb951b
1、优化功能刀具安全库存数量计算方法;2、货位看板模型添加功能刀具Rfid、名称字段
2024-06-14 15:00:30 +08:00
jinling.yang
dd9015dff9
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-06-14 09:31:18 +08:00
yuxianghui
642877ff45
去除整体式刀产品的【粗/中/精】字段的必填
2024-06-13 17:28:44 +08:00
yuxianghui
c1935e62b9
1、重构工单工序的生成规则
2024-06-13 17:24:46 +08:00
yuxianghui
aa0b6a9b21
1、新增功能刀具移动到线边刀库的出入库记录
2024-06-13 16:01:27 +08:00
yuxianghui
9c6ca3758b
1
2024-06-13 14:59:49 +08:00
yuxianghui
42644d449f
1、新增功能刀具移动历史,新增功能刀具入库到线边刀库
2024-06-13 14:45:29 +08:00
马广威
519c534a89
Accept Merge Request #1071 : (release/release_1.5 -> master)
...
Merge Request: 添加刀具物料整个生命周期按批次管理
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1071?initial=true
2024-06-13 10:49:36 +08:00
马广威
741c5cf3d6
Accept Merge Request #1070 : (feature/增加批量调拨功能 -> develop)
...
Merge Request: 修改线边库位名称
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1070?initial=true
2024-06-12 16:54:00 +08:00
yuxianghui
0ad7e72b15
1、解决 刀具组装选择的批次号队友物料只剩下1个时-组装完该单据详情不显示批次信息 的bug;2、调整拆解单界面布局
2024-06-12 16:28:42 +08:00
mgw
fa7e023dd1
修改线边库位名称
2024-06-12 16:19:33 +08:00
yuxianghui
07c7ed6dba
1、优化组装时重复选取货位时,批次号消失的问题
2024-06-12 14:20:15 +08:00
yuxianghui
0f32b0acb1
1、新增功能刀具出入库
2024-06-12 14:08:21 +08:00
yuxianghui
42cded8c64
1、优化功能刀具序列号
2024-06-12 10:24:16 +08:00
yuxianghui
469839f38e
1、处理二维码问题
2024-06-12 10:02:15 +08:00
jinling.yang
6a7fa89b67
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-06-11 17:31:59 +08:00
jinling.yang
c13078291f
Merge branch 'feature/工件配送添加sns' into develop
2024-06-11 17:25:23 +08:00
杨金灵
a3580411d6
Accept Merge Request #1069 : (feature/工件配送添加sns -> develop)
...
Merge Request: 工件配送及工单添加sns
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1069
2024-06-11 17:23:45 +08:00
yuxianghui
7d7f0348d2
1、优化产品按批量采购入库时,没有生成二维码问题;
2024-06-11 17:00:25 +08:00
jinling.yang
d7779cdb58
修改生成制造订单时未生成编程单
2024-06-11 16:57:56 +08:00
jinling.yang
adafce85bd
1.工单,工件配送新增sns及给部分字段添加tracking(跟踪)及优化页面
...
2.优化agv:部分字段不可编辑
2024-06-11 16:56:20 +08:00
yuxianghui
bae947bdca
1、添加采购入库时对需要录入的Rfid进行重复校验;
2024-06-11 15:18:13 +08:00
yuxianghui
14d823ab6e
1、增加是否使用刀具预调仪的配置;
2024-06-11 11:58:58 +08:00
yuxianghui
ae953c7ad6
1、更新功能刀具编码生成规则;
2024-06-11 10:15:54 +08:00
jinling.yang
7be5b53767
工件配送添加sns
2024-06-07 17:29:49 +08:00
yuxianghui
2cc91eea75
1、对模型的添加筛选和分组,优化界面
2024-06-07 17:27:25 +08:00
yuxianghui
2065625cd6
1、组装单添加校验
2024-06-07 09:42:09 +08:00
马广威
8c285c0eb5
Accept Merge Request #1068 : (feature/增加批量调拨功能 -> develop)
...
Merge Request: 库存处增加批量调拨功能
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1068
2024-06-06 15:45:51 +08:00
mgw
22e24c5ed3
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/增加批量调拨功能
2024-06-06 15:44:38 +08:00
mgw
4459ed2e81
库存处增加批量调拨功能
2024-06-06 15:44:20 +08:00
禹翔辉
52bf899a1f
Accept Merge Request #1067 : (feature/刀具接口调整 -> develop)
...
Merge Request: 1、产品的成品、制造订单、工单添加零件图号字段;
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1067?initial=true
2024-06-06 14:41:30 +08:00
yuxianghui
002727070d
1、产品的成品、制造订单、工单添加零件图号字段;
2024-06-06 14:38:10 +08:00
杨金灵
81327f04de
Accept Merge Request #1065 : (hotfix/优化多次编程单下发 -> develop)
...
Merge Request: 优化多次编程单下发
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1065
2024-06-06 09:40:06 +08:00
杨金灵
e8c86c6306
Accept Merge Request #1066 : (hotfix/刀具预调仪 -> develop)
...
Merge Request: 刀具预调仪
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1066
2024-06-06 09:37:10 +08:00
杨金灵
fd6b579e2a
Merge branch refs/heads/develop into refs/heads/hotfix/刀具预调仪
2024-06-06 09:30:50 +08:00
杨金灵
0b2b162d85
Merge branch refs/heads/develop into refs/heads/hotfix/优化多次编程单下发
2024-06-06 09:29:39 +08:00
yuxianghui
206fc7bb21
Merge branch 'hotfix/新增刀具按批次管理' into hotfix/新增刀具按批次管理_1.1
...
# Conflicts:
# sf_tool_management/controllers/controllers.py
2024-06-06 09:17:32 +08:00
马广威
07b1c3cceb
Accept Merge Request #1063 : (release/release_1.4 -> master)
...
Merge Request: 流程优化,功能增加
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1063?initial=true
2024-06-05 21:43:21 +08:00
jinling.yang
f9c697d2a7
Merge branch 'hotfix/优化多次编程单下发' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into release/release_1.4
2024-06-05 18:04:10 +08:00
jinling.yang
2eaec4fa58
修复编程单下发时,删除容器内tmp目录下模型编码已有的文件
2024-06-05 18:03:08 +08:00
黄焱
e306d02ff2
Accept Merge Request #1062 : (feature/前端样式修改 -> develop)
...
Merge Request: 设置表单页面label文本不换行
Created By: @黄焱
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @黄焱
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1062
2024-06-05 17:42:54 +08:00
黄焱
09c56b2c07
设置表单页面label文本不换行
2024-06-05 17:35:07 +08:00
jinling.yang
8a1a06c3ad
Merge branch 'hotfix/刀具预调仪' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into release/release_1.4
2024-06-05 17:28:33 +08:00
yuxianghui
f4926820fe
1、清除刀具物料的自动调用同步方法;
2024-06-05 17:18:18 +08:00
jinling.yang
2055d70e27
Merge branch 'hotfix/优化多次编程单下发' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into release/release_1.4
2024-06-05 17:15:00 +08:00
jinling.yang
5361fa7678
修复create_cam_work_plan方法
2024-06-05 17:14:20 +08:00
jinling.yang
edf8e1004e
修改条件
2024-06-05 17:00:17 +08:00
jinling.yang
17e2a3ffc3
cnc程序的程序单更新
2024-06-05 16:26:34 +08:00
jinling.yang
7a539d7916
Merge branch 'hotfix/刀具预调仪' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into release/release_1.4
2024-06-05 16:11:24 +08:00
jinling.yang
e258e43b51
优化多次编程单下发
2024-06-05 16:09:56 +08:00
杨金灵
1af160542c
Accept Merge Request #1061 : (feature/优化制造订单报废流程 -> develop)
...
Merge Request: 优化部分制造订单报废流程
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1061
2024-06-05 15:53:56 +08:00
jinling.yang
71246af16a
还原注释代码
2024-06-05 15:52:50 +08:00
yuxianghui
d2f4e5495e
1、功能刀具拆解单优化,添加对功能刀具的当前位置校验,只有在刀具房的刀具才能进行拆解;2、中控机床刀库接口优化,清除刀位已经移除的功能刀具信息;
2024-06-05 15:20:00 +08:00
yuxianghui
ba2b833aa8
1
2024-06-05 11:00:21 +08:00
yuxianghui
cf0afd6c64
1、添加刀具预调仪功能
2024-06-05 10:54:58 +08:00
yuxianghui
b6acbb8357
1、功能刀具拆解单新增拆解单号,优化拆解单
2024-06-05 10:23:13 +08:00
杨金灵
e290760895
Accept Merge Request #1060 : (hotfix/修复工件上下产线 -> develop)
...
Merge Request: 修复工件上下产线
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1060
2024-06-05 10:13:02 +08:00
杨金灵
fdfd01605d
Merge branch refs/heads/develop into refs/heads/hotfix/修复工件上下产线
2024-06-05 09:30:30 +08:00
马广威
19799aefe4
Accept Merge Request #1059 : (release/release_1.3 -> master)
...
Merge Request: 优化工件上下产线及配送、优化编程单下发
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1059?initial=true
2024-06-04 22:28:57 +08:00
yuxianghui
d47dcc7611
1、取消创建产品时,自动生成内部参考的值;2、优化功能刀具拆解单,修改由拆解单生成的移动历史单据编码生成规则;3、优化货位看板以及货位看板的货位变更功能;
2024-06-04 17:25:45 +08:00
jinling.yang
f33d7b79fc
优化工件上下产线
2024-06-04 16:13:42 +08:00
jinling.yang
8bd5841d7a
去掉重写state方法
2024-06-04 15:59:35 +08:00
yuxianghui
3882d3a3cb
1、功能刀具拆解单拆解流程优化;2、优化货位看板显示;
2024-06-04 11:26:00 +08:00
jinling.yang
e9ab57854e
修改生成外协出入库单时,查询条件排序修改为根据create_date或id排序
2024-06-04 10:48:50 +08:00
jinling.yang
6fc94042ee
中控调取cnc工单时,工单不完成,加工完成时间为当前时间
2024-06-04 10:42:34 +08:00
jinling.yang
b70ec36365
修改生成外协出入库单时,查询条件排序修改为根据id排序
2024-06-04 10:33:40 +08:00
yuxianghui
67c4f64d08
1、优化刀具组装单、刀具组装单弹窗、刀具拆解单,添加除刀柄外刀具物料按批次号进行管理;优化界面布局,优化组装流程;
2024-06-03 17:34:47 +08:00
jinling.yang
3738b8d72b
中控请求接口超时改为10秒
2024-06-03 17:21:42 +08:00
jinling.yang
5fb9326d8b
中控请求接口超时改为30秒
2024-06-03 17:09:35 +08:00
jinling.yang
2ab9f37062
1.修复工件配送2.优化运送空料架.3.cloud下发编程单至sf时,将程序单pdf同步至制造订单的装夹预调工单的加工图纸上4.修复工件上下产线接口
2024-06-03 16:59:14 +08:00
jinling.yang
711e0d1437
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造订单报废流程
2024-06-03 16:09:08 +08:00
杨金灵
49d55822cc
Accept Merge Request #1058 : (feature/优化工件上下产线及配送 -> develop)
...
Merge Request: 优化工件上下产线及配送
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1058
2024-06-03 15:53:19 +08:00
jinling.yang
ea6de0c248
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造订单报废流程
...
# Conflicts:
# sf_manufacturing/models/mrp_production.py
2024-06-03 15:43:57 +08:00
jinling.yang
2db81ac2cc
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化工件上下产线及配送
2024-06-03 15:36:37 +08:00
jinling.yang
a673630fd3
1.优化工件配送超时提示2.优化工件上下线接口3.优化编程单下发至cnc工单时,将程序单pdf文件也传给装夹预调工单的加工图纸字段上
2024-06-03 15:36:19 +08:00
yuxianghui
a7102c81d4
1、新增货位批次数量模型,用来存储货位产品的批次及其数量;完成该模型根据货位产品的出入库记录自动新增或减少货位产品批次的数量。
2024-06-03 14:14:04 +08:00
yuxianghui
d213a2cf54
接口调整
2024-05-31 11:14:02 +08:00
禹翔辉
6c5b888bba
Accept Merge Request #1057 : (hotfix/新增中控接口-功能刀具查询 -> develop)
...
Merge Request: 优化功能刀具清单查询接口,新增功能刀具查询接口。
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1057
2024-05-31 09:52:45 +08:00
马广威
d527bc6899
Accept Merge Request #1056 : (release/release_1.2 -> master)
...
Merge Request: 1、优化功能刀具清单查询接口,新增功能刀具查询接口。
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1056?initial=true
2024-05-30 21:34:14 +08:00
yuxianghui
7d6fb4f0e3
1、优化货位
2024-05-30 17:26:28 +08:00
jinling.yang
aa6b476e35
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-05-30 16:53:13 +08:00
jinling.yang
263253e79e
Merge branch 'feature/修复报价选择已有产品确认问题' into develop
2024-05-30 16:52:42 +08:00
杨金灵
edda681940
Accept Merge Request #1054 : (feature/修复报价选择已有产品确认问题 -> develop)
...
Merge Request: 修复报价选择已有产品确认问题
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1054?initial=true
2024-05-30 16:52:27 +08:00
jinling.yang
7043d2b8b7
添加日志
2024-05-30 16:52:06 +08:00
马广威
6d66872dee
Accept Merge Request #1055 : (feature/修复会计凭证借贷无法输入的问题 -> develop)
...
Merge Request: 修复会计凭证借贷无法输入的问题
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1055?initial=true
2024-05-30 16:48:56 +08:00
mgw
3ab378f3bd
修复会计凭证借贷无法输入的问题
2024-05-30 16:48:02 +08:00
jinling.yang
26c979ef1d
修复报价选择已有产品确认问题
2024-05-30 16:45:32 +08:00
yuxianghui
6405944cf1
1、优化功能刀具清单查询接口,新增功能刀具查询接口。
2024-05-30 15:22:30 +08:00
yuxianghui
1d4aaa40cd
1、优化刀具采购入库,入库时自动生成批次号;2、优化货位看板
2024-05-30 14:46:15 +08:00
jinling.yang
9aa4858774
Merge branch 'feature/空料架名称去重校验' into develop
2024-05-30 11:05:09 +08:00
jinling.yang
d883a7ff22
新增名称校验
2024-05-30 11:01:29 +08:00
yuxianghui
683e9631fa
刀具物料产品优化需求
2024-05-30 09:36:17 +08:00
jinling.yang
17678c53c9
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/空料架名称去重校验
2024-05-29 17:56:55 +08:00
jinling.yang
fb3cc095b2
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-05-29 17:56:36 +08:00
jinling.yang
c437c185a4
空料架名称去重校验
2024-05-29 17:56:22 +08:00
jinling.yang
b3eb3ee8fa
Merge branch 'feature/优化配送空料架' into develop
2024-05-29 15:53:59 +08:00
杨金灵
b9ec821293
Accept Merge Request #1052 : (feature/优化配送空料架 -> develop)
...
Merge Request: 优化配送空料架
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1052
2024-05-29 15:53:30 +08:00
jinling.yang
f8a9fcc0ce
工件配送去掉重复的起点接驳站
2024-05-29 15:26:47 +08:00
jinling.yang
d12714dd65
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化配送空料架
2024-05-29 15:23:32 +08:00
jinling.yang
a1bea537bb
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-05-29 15:23:12 +08:00
jinling.yang
5350675355
释放occ注释代码
2024-05-29 15:22:57 +08:00
jinling.yang
65d2593db9
配送空料架开放新建
2024-05-29 15:03:08 +08:00
禹翔辉
a529c5513e
Accept Merge Request #1051 : (hotfix/制造订单的工单顺序错误bug -> develop)
...
Merge Request: 修复 【制造订单的工单顺序错误,需排查处理bug】 问题
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1051
2024-05-29 14:37:58 +08:00
禹翔辉
f5f881f256
Merge branch refs/heads/develop into refs/heads/hotfix/制造订单的工单顺序错误bug
2024-05-29 14:22:15 +08:00
jinling.yang
caf7aaa560
Merge branch 'master' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf
2024-05-29 12:50:44 +08:00
jinling.yang
d2babec1aa
Merge tag '修复编程单下发接口' into develop
2024-05-29 12:50:05 +08:00
jinling.yang
ab2978b4ab
Merge branch 'hotfix/修复编程单下发接口'
2024-05-29 12:50:04 +08:00
马广威
0b9c856d56
Accept Merge Request #1050 : (release/release_1_1 -> master)
...
Merge Request: hotfix工厂环境问题,详见描述
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1050?initial=true
2024-05-29 12:47:10 +08:00
jinling.yang
66dc7b540c
Merge branch 'hotfix/修复编程单下发接口' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into release/release_1_1
2024-05-29 12:44:06 +08:00
jinling.yang
decfd27401
1.修复cnc工单没有程序文件路径
...
2.修复编程单已下发,在工件配送时,提示未下发nc程序
2024-05-29 12:41:55 +08:00
yuxianghui
f71d62dad1
优化工单工序
2024-05-29 11:26:17 +08:00
jinling.yang
a1d8b88db2
修复工单排序
2024-05-29 10:25:23 +08:00
yuxianghui
b7a11f0abe
修复 【制造订单的工单顺序错误,需排查处理bug】 问题
2024-05-29 09:34:41 +08:00
jinling.yang
7ab954ebbc
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造订单报废流程
2024-05-29 09:30:41 +08:00
jinling.yang
f7723f1b9c
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-05-29 09:30:20 +08:00
jinling.yang
fe88a416a7
制造订单合并一张编程单下发时,工件配送记录的未下发nc程序为未下发及cnc程序没有对应ftp文件路径问题
2024-05-28 17:57:27 +08:00
禹翔辉
ef80848e9b
Accept Merge Request #1048 : (feature/优化工单工序 -> develop)
...
Merge Request: 1、优化生成工单工序的方法
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1048?initial=true
2024-05-28 16:39:52 +08:00
yuxianghui
138dd40a9e
Merge branch 'feature/组装单弹窗优化' into feature/优化工单工序
2024-05-28 16:37:51 +08:00
yuxianghui
dc210f7263
1
2024-05-28 16:36:49 +08:00
yuxianghui
9055e7ed8b
1、优化生成工单工序的方法
2024-05-28 16:35:06 +08:00
黄焱
6890ddf615
Accept Merge Request #1047 : (feature/前端样式修改 -> develop)
...
Merge Request: 设置表格横向滚动
Created By: @黄焱
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @黄焱
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1047
2024-05-27 17:53:23 +08:00
黄焱
6dc29fb50a
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/前端样式修改
2024-05-27 17:48:06 +08:00
jinling.yang
412bf4b9be
优化返工和报废
2024-05-24 17:00:44 +08:00
黄焱
c7df18ace6
设置表格横向滚动
2024-05-24 14:35:22 +08:00
马广威
053eba5887
Accept Merge Request #1046 : (feature/组装单弹窗优化 -> develop)
...
Merge Request: 1、优化功能刀具定时同步接口,增加刀柄长度数据同步
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1046#mr-1046-review-152801
2024-05-23 16:25:16 +08:00
yuxianghui
e935b2fa11
1、优化功能刀具定时同步接口,增加刀柄长度数据同步
2024-05-23 16:18:48 +08:00
禹翔辉
d5bc610214
Accept Merge Request #1045 : (feature/组装单弹窗优化 -> develop)
...
Merge Request: 1、将刀具名称字段获取由onchange改为depends
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1045
2024-05-23 15:46:34 +08:00
yuxianghui
2ca67eb8ad
1、将刀具名称字段获取由onchange改为depends
2024-05-23 15:43:32 +08:00
禹翔辉
b6a69debd8
Accept Merge Request #1044 : (feature/组装单弹窗优化 -> develop)
...
Merge Request: 1、打开组装弹窗方法添加清除旧数据功能;2、组装弹窗界面,刷新按键名称改为获取测量值,添加是否获取测量值字段等,调整字段只读和界面布局;
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1044?initial=true
2024-05-23 15:24:38 +08:00
yuxianghui
147ac35239
Merge branch 'feature/组装单优化' into feature/组装单弹窗优化
2024-05-23 15:22:35 +08:00
yuxianghui
3c3f375120
1、打开组装弹窗方法添加清除旧数据功能;2、组装弹窗界面,刷新按键名称改为获取测量值,添加是否获取测量值字段等,调整字段只读和界面布局;
2024-05-23 15:19:41 +08:00
jinling.yang
c87f310bb3
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-05-23 14:34:39 +08:00
禹翔辉
f53eecbb57
Accept Merge Request #1043 : (feature/组装单优化 -> develop)
...
Merge Request: 1、组装单弹窗界面调整,优化按刷新后最大寿命值归0的问题;
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1043?initial=true
2024-05-23 14:33:51 +08:00
jinling.yang
1743fa45b5
Merge branch 'feature/优化返工和重新制造订单' into develop
2024-05-23 14:33:09 +08:00
yuxianghui
75f30922e6
1、组装单弹窗界面调整,优化按刷新后最大寿命值归0的问题;
2024-05-23 14:32:13 +08:00
jinling.yang
3a0db05c33
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化返工和重新制造订单
2024-05-23 11:46:26 +08:00
jinling.yang
5f42b5d056
优化制造订单报废流程,返工流程暂停(需求需重新设计)
2024-05-23 11:46:09 +08:00
禹翔辉
c698b50853
Accept Merge Request #1041 : (feature/组装单优化 -> develop)
...
Merge Request: 1、优化刀具预调仪接口的数据处理方式、更改搜索组装单条件;2、优化功能刀具、组装单、组装单弹窗的字段和界面展示的字段内容;3、更改组装单编码生成规则
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1041?initial=true
2024-05-23 11:18:40 +08:00
yuxianghui
251786f6be
Merge branch 'feature/刀具预调仪接口优化' into feature/组装单优化
2024-05-23 11:16:13 +08:00
yuxianghui
66b4df5193
1、优化刀具预调仪接口的数据处理方式、更改搜索组装单条件;2、优化功能刀具、组装单、组装单弹窗的字段和界面展示的字段内容;3、更改组装单编码生成规则
2024-05-23 11:15:13 +08:00
jinling.yang
57b264b84d
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化返工和重新制造订单
2024-05-22 17:36:17 +08:00
jinling.yang
ff12a86406
优化cnc工单返工:在原有的cnc工单后新增返工标志的cnc工单,且工序累加,状态为就绪,解除装夹工单的状态为等待其他工单
2024-05-22 17:35:57 +08:00
禹翔辉
b0b3ce7d99
Accept Merge Request #1040 : (feature/刀具预调仪接口优化 -> develop)
...
Merge Request: 新增刀具预调仪接口,优化组装按键
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1040?initial=true
2024-05-22 15:09:22 +08:00
yuxianghui
8d02a94f78
Merge branch 'feature/物料同步接口优化' into feature/刀具预调仪接口优化
2024-05-22 15:05:55 +08:00
yuxianghui
4f6e4a8ed3
1、优化刀具预调仪接口及其写入到弹窗的流程,更改刀具总长度(高度)、直径和R角字段的精确度为小数点后三位;
2024-05-22 15:04:37 +08:00
黄焱
b524e385a1
Accept Merge Request #1039 : (feature/前端样式修改 -> develop)
...
Merge Request: // 功能刀具组装单 弹窗样式
Created By: @黄焱
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @黄焱
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1039
2024-05-22 09:39:24 +08:00
yuxianghui
d22f08d187
1、添加刀具预调仪接口;2、刀具组装单添加开始预调字段,优化组装按键;3、优化组装单组装时的必填校验,添加刷新按钮用来获取刀具预调仪的参数信息;
2024-05-21 21:41:17 +08:00
黄焱
2ba53bbb02
// 功能刀具组装单 弹窗样式
2024-05-21 17:38:54 +08:00
禹翔辉
38e0a62130
Accept Merge Request #1038 : (feature/物料同步接口优化 -> develop)
...
Merge Request: 动态物料同步接口优化
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1038?initial=true
2024-05-21 09:27:33 +08:00
yuxianghui
bf1b14290e
Merge branch 'feature/解决刀具组装时搜不到功能刀具产品问题' into feature/物料同步接口优化
2024-05-21 09:25:13 +08:00
yuxianghui
1b6ca90bd4
1、优化刀具、夹具同步接口;关闭刀具同步接口的实时调用;
2024-05-21 09:23:47 +08:00
马广威
8ced717b1c
Accept Merge Request #1037 : (release/release1.0 -> master)
...
Merge Request: master_sf_2.0
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1037?initial=true
2024-05-18 22:44:11 +08:00
mgw
187495eb67
Merge branch 'master' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into release/release1.0
...
# Conflicts:
# sf_base/__init__.py
# sf_base/__manifest__.py
# sf_base/commons/__init__.py
# sf_base/commons/common.py
# sf_base/models/__init__.py
# sf_base/models/base.py
# sf_base/models/common.py
# sf_base/security/group_security.xml
# sf_base/security/ir.model.access.csv
# sf_base/views/base_view.xml
# sf_base/views/common_view.xml
# sf_base/views/menu_view.xml
# sf_bf_connect/__init__.py
# sf_bf_connect/__manifest__.py
# sf_bf_connect/controllers/__init__.py
# sf_bf_connect/controllers/controllers.py
# sf_bf_connect/models/__init__.py
# sf_bf_connect/models/http.py
# sf_bf_connect/models/models.py
# sf_bf_connect/models/process_status.py
# sf_bf_connect/views/res_partner_view.xml
# sf_dlm/__manifest__.py
# sf_dlm/data/product_data.xml
# sf_dlm/models/__init__.py
# sf_dlm/models/product_supplierinfo.py
# sf_dlm/views/product_template_view.xml
# sf_machine_connect/__init__.py
# sf_machine_connect/__manifest__.py
# sf_machine_connect/models/__init__.py
# sf_machine_connect/models/ftp_client.py
# sf_machine_connect/models/ftp_operate.py
# sf_machine_connect/models/py2opcua.py
# sf_machine_connect/security/ir.model.access.csv
# sf_machine_connect/views/SfWorkOrderBarcodes.xml
# sf_machine_connect/views/WorkCenterBarcodes.xml
# sf_machine_connect/views/compensation.xml
# sf_machine_connect/views/default_delivery.xml
# sf_machine_connect/views/delivery_record.xml
# sf_machine_connect/views/ftp_button.xml
# sf_machine_connect/views/machine_info_present.xml
# sf_machine_connect/views/machine_monitor.xml
# sf_machine_connect/wizard/__init__.py
# sf_machine_connect/wizard/action_up.py
# sf_manufacturing/__init__.py
# sf_manufacturing/__manifest__.py
# sf_manufacturing/models/__init__.py
# sf_manufacturing/models/model_type.py
# sf_manufacturing/models/mrp_maintenance.py
# sf_manufacturing/models/mrp_production.py
# sf_manufacturing/models/mrp_routing_workcenter.py
# sf_manufacturing/models/mrp_workcenter.py
# sf_manufacturing/models/mrp_workorder.py
# sf_manufacturing/models/res_user.py
# sf_manufacturing/models/stock.py
# sf_manufacturing/security/group_security.xml
# sf_manufacturing/security/ir.model.access.csv
# sf_manufacturing/views/model_type_view.xml
# sf_manufacturing/views/mrp_routing_workcenter_view.xml
# sf_manufacturing/views/mrp_workcenter_views.xml
# sf_manufacturing/views/mrp_workorder_view.xml
# sf_mrs_connect/__init__.py
# sf_mrs_connect/__manifest__.py
# sf_mrs_connect/controllers/controllers.py
# sf_mrs_connect/data/ir_cron_data.xml
# sf_mrs_connect/models/__init__.py
# sf_mrs_connect/models/ftp_operate.py
# sf_mrs_connect/models/res_config_setting.py
# sf_mrs_connect/models/sync_common.py
# sf_mrs_connect/views/res_config_settings_views.xml
# sf_sale/__init__.py
# sf_sale/__manifest__.py
# sf_sale/models/__init__.py
# sf_sale/models/sale_order.py
# sf_sale/views/sale_order_view.xml
# yizuo_login_background_and_styles/__manifest__.py
# yizuo_login_background_and_styles/controllers/main.py
# yizuo_login_background_and_styles/models/login_image.py
# yizuo_login_background_and_styles/models/res_config_settings.py
2024-05-18 22:39:05 +08:00
马广威
5fccd41e07
Accept Merge Request #1035 : (feature/制造代码优化 -> develop)
...
Merge Request: 修复库存岗位验证入库无权限问题
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1035?initial=true
2024-05-18 21:57:50 +08:00
mgw
0ae0ad2ba8
修复库存岗位验证入库无权限问题
2024-05-18 21:56:43 +08:00
马广威
afb5316d8a
Accept Merge Request #1034 : (feature/制造代码优化 -> develop)
...
Merge Request: 优化同步代码
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1034?initial=true
2024-05-18 21:33:47 +08:00
mgw
585e7236a1
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化
2024-05-18 21:33:04 +08:00
mgw
3afa76b79c
优化同步代码
2024-05-18 21:32:24 +08:00
马广威
6d503968a5
Accept Merge Request #1033 : (feature/制造代码优化 -> develop)
...
Merge Request: 修复value bug
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1033?initial=true
2024-05-18 20:03:02 +08:00
mgw
cc7963cb5a
修复value bug
2024-05-18 20:02:32 +08:00
马广威
e2fdfbf1ee
Accept Merge Request #1032 : (feature/修复表面工艺对应库存 -> develop)
...
Merge Request: 修复表面工艺对应库存
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1032#mr-1032-review-151369
2024-05-18 19:54:48 +08:00
马广威
cdf164ec2c
Accept Merge Request #1031 : (feature/制造代码优化 -> develop)
...
Merge Request: cnc工单和解除装夹工单隐藏【工序状态】字段,装夹预调工单已完成后【工序状态】字段显示“装夹预调完成”
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1031?initial=true
2024-05-18 19:53:25 +08:00
jinling.yang
f9cca591bb
修复表面工艺工单完成时对应库存(stock.move)的状态为完成并跳过标记完成方法的检查
2024-05-18 19:52:58 +08:00
mgw
6f3d423da1
cnc工单和解除装夹工单隐藏【工序状态】字段,装夹预调工单已完成后【工序状态】字段显示“装夹预调完成”
2024-05-18 19:52:27 +08:00
jinling.yang
1bcd1f2e33
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-05-18 19:48:47 +08:00
马广威
9284701ed4
Accept Merge Request #1030 : (feature/制造代码优化 -> develop)
...
Merge Request: 优化刀具弹窗
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1030?initial=true
2024-05-18 18:42:57 +08:00
mgw
2c5cc91ef7
优化刀具弹窗
2024-05-18 18:42:20 +08:00
jinling.yang
c6039215a3
Merge branch 'feature/修复销售确认按钮' into develop
2024-05-18 17:32:03 +08:00
杨金灵
21027a8cb6
Accept Merge Request #1029 : (feature/修复销售确认按钮 -> develop)
...
Merge Request: 修复销售确认按钮
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1029
2024-05-18 17:31:39 +08:00
jinling.yang
80cd385df4
修复工单完成时制造订单未完成
2024-05-18 17:30:22 +08:00
jinling.yang
d7bcb0e4f3
修复销售确认按钮
2024-05-18 17:22:02 +08:00
jinling.yang
f62994878c
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-05-18 17:20:55 +08:00
马广威
50b0c37e46
Accept Merge Request #1028 : (feature/解决刀具组装时搜不到功能刀具产品问题 -> develop)
...
Merge Request: 解决刀具组装时,搜不到功能刀具产品问题;
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1028#mr-1028-review-151363
2024-05-18 17:11:30 +08:00
yuxianghui
dc381faae6
Merge branch 'feature/刀具模块优化' into feature/解决刀具组装时搜不到功能刀具产品问题
2024-05-18 17:07:17 +08:00
yuxianghui
f05301320c
1、组装单添加按是否组装排序;2、修改功能刀具组装流程中搜索功能刀具产品的条件
2024-05-18 17:05:39 +08:00
jinling.yang
d87fcb35ba
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-05-18 16:48:24 +08:00
jinling.yang
be69e76d2f
Merge branch 'feature/修复采购总监权限' into develop
2024-05-18 16:47:43 +08:00
jinling.yang
debd788864
修复快速订单
2024-05-18 16:46:59 +08:00
杨金灵
2546dd73b2
Accept Merge Request #1027 : (feature/修复采购总监权限 -> develop)
...
Merge Request: 修复采购总监权限
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1027
2024-05-18 16:45:47 +08:00
jinling.yang
9f2415cfac
修复工件装夹岗无法创建采购订单
2024-05-18 16:45:01 +08:00
jinling.yang
2e151a2292
中控调用日志排序
2024-05-18 16:14:05 +08:00
jinling.yang
9b2ff6268c
修复采购总监权限
2024-05-18 16:08:39 +08:00
杨金灵
d1c08023b9
Accept Merge Request #1026 : (feature/修复表面工艺工单 -> develop)
...
Merge Request: 修复表面工艺工单
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1026?initial=true
2024-05-18 15:28:53 +08:00
jinling.yang
5f02de8b0c
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复表面工艺工单
...
# Conflicts:
# sf_manufacturing/models/mrp_workorder.py
2024-05-18 15:27:17 +08:00
jinling.yang
0f5b94e8ca
1.修复销售订单确认按钮确认后不可见2.修复表面工艺工单完成3.下发编程单工件配送优化
2024-05-18 15:26:32 +08:00
马广威
795b4d43a8
Accept Merge Request #1025 : (feature/制造代码优化 -> develop)
...
Merge Request: 修复仓储岗位权限遗留问题,暂时去掉根据CNC工单是否有编程单来控制装夹预调工单状态的功能,待重议此需求逻辑
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1025?initial=true
2024-05-18 15:15:46 +08:00
mgw
d9d1f86407
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化
2024-05-18 15:14:38 +08:00
mgw
337fecb4cb
暂时去掉根据CNC工单是否有编程单来控制装夹预调工单状态的功能,待重议此需求逻辑
2024-05-18 15:01:09 +08:00
马广威
4be83d8aab
Accept Merge Request #1024 : (feature/刀具模块优化 -> develop)
...
Merge Request: 刀具模块优化
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1024#mr-1024-review-151348
2024-05-18 11:57:27 +08:00
yuxianghui
049521064b
Merge branch 'feature/oca审批修改' into feature/刀具模块优化
2024-05-18 11:55:20 +08:00
yuxianghui
9e2091597b
1、注释action_apply_inventory()方法;2、功能刀具安全库存添加one2many类型的功能刀具废弃many2many类型的关联字段并优化代码,并在功能刀具模型添加功能按钮用来绑定功能刀具和对应的功能刀具安全库存;3、优化根据库存创建功能刀具组装单的方法断定条件;4、优化刀具注册接口的报错处理;5、优化组装流程
2024-05-18 11:54:23 +08:00
杨金灵
01f82fcb5d
Accept Merge Request #1023 : (feature/修复外协位置 -> develop)
...
Merge Request: 修复外协位置
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1023?initial=true
2024-05-18 11:18:46 +08:00
jinling.yang
939aa974e6
修复外协位置
2024-05-18 11:17:11 +08:00
jinling.yang
829c971848
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-05-18 10:29:43 +08:00
mgw
a4b2d5bb42
修复仓储岗位权限遗留问题
2024-05-18 10:29:02 +08:00
jinling.yang
ebdc1ec2ff
Merge branch 'feature/修改表面工艺外协位置' into develop
2024-05-18 10:27:50 +08:00
杨金灵
f0d66b7730
Accept Merge Request #1022 : (feature/修改表面工艺外协位置 -> develop)
...
Merge Request: 修改表面工艺外协位置
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1022
2024-05-18 10:27:18 +08:00
jinling.yang
a935112134
外协代码还原
2024-05-18 10:24:31 +08:00
jinling.yang
70bc2ed718
修改表面工艺外协位置
2024-05-18 10:21:09 +08:00
jinling.yang
c230e550a9
Merge branch 'feature/修复表面工艺工单完成问题' into develop
2024-05-17 17:26:20 +08:00
jinling.yang
297bf76809
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复表面工艺工单完成问题
2024-05-17 16:34:23 +08:00
jinling.yang
2dc9866735
1.修复表面工艺工单完成报错2.外协位置改为供应商位置3.采购总监添加创建制造订单权限
2024-05-17 16:26:15 +08:00
禹翔辉
305e91e7f1
Accept Merge Request #1020 : (feature/oca审批修改 -> develop)
...
Merge Request: 1、优化组装流程;2、添加权限;3、oca审批优化
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1020?initial=true
2024-05-17 15:00:58 +08:00
yuxianghui
a5b9b63b41
Merge branch 'feature/主流程bug处理' into feature/oca审批修改
2024-05-17 14:57:46 +08:00
yuxianghui
1a0e96bbdd
1、采购审批流程中的英文提示信息改为中文提示;当审批完成后隐藏取消审批按键;2、刀具注册接口添加调用接口提示;
2024-05-17 14:56:15 +08:00
马广威
095c15cba4
Accept Merge Request #1019 : (feature/制造代码优化 -> develop)
...
Merge Request: 显示优化,物流下单增补逻辑
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1019?initial=true
2024-05-17 11:48:21 +08:00
mgw
fe6bb46d54
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化
2024-05-17 11:47:44 +08:00
mgw
432a012596
显示优化,物流下单增补逻辑
2024-05-17 11:47:26 +08:00
杨金灵
27b5e92563
Accept Merge Request #1018 : (feature/修复销售确认按钮 -> develop)
...
Merge Request: 修复销售确认按钮
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1018?initial=true
2024-05-17 11:32:45 +08:00
jinling.yang
e5164454f2
修复销售确认按钮
2024-05-17 11:31:07 +08:00
jinling.yang
b79cdea926
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-05-17 11:10:49 +08:00
jinling.yang
836a598cf8
Merge branch 'feature/表面工艺外协修复' into develop
2024-05-17 11:10:02 +08:00
杨金灵
3a0a4b0f15
Accept Merge Request #1017 : (feature/表面工艺外协修复 -> develop)
...
Merge Request: 表面工艺外协修复
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1017?initial=true
2024-05-17 11:07:46 +08:00
jinling.yang
cda0b6d345
还原OCC代码
2024-05-17 11:04:35 +08:00
jinling.yang
7e31869d1f
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/表面工艺外协修复
...
# Conflicts:
# sf_sale/views/sale_order_view.xml
2024-05-17 11:00:58 +08:00
jinling.yang
ea1ed43c92
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/表面工艺外协修复
2024-05-17 11:00:00 +08:00
yuxianghui
eb83114e54
1、优化组装流程;2、添加权限
2024-05-16 17:34:38 +08:00
禹翔辉
af45775040
Accept Merge Request #1016 : (feature/主流程bug处理 -> develop)
...
Merge Request: 主流程bug处理
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1016
2024-05-16 14:16:06 +08:00
yuxianghui
03f5027f49
Merge branch 'feature/优化产品' into feature/主流程bug处理
2024-05-16 14:13:40 +08:00
yuxianghui
20ecd9d949
1、将和刀具相关的模型的刀具直径字段类型从int改为float;2、标准刀库tree视图添加Rfid字段;优化从中控获取标准刀库信息接口;
2024-05-16 14:04:35 +08:00
马广威
ed2c119803
Accept Merge Request #1015 : (feature/制造代码优化 -> develop)
...
Merge Request: 处理物流处修改销售订单状态问题
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1015?initial=true
2024-05-16 09:44:13 +08:00
yuxianghui
37cf4ca435
1、新增sf_oca模块
2024-05-16 09:42:35 +08:00
yuxianghui
1c441d388f
1、序列号模型添加Rfid字段的重复校验;功能刀具模型优化搜索视图的字段;优功能刀具组装流程的值
2024-05-16 09:41:57 +08:00
mgw
d244409d9c
处理物流处修改销售订单状态问题
2024-05-15 14:09:44 +08:00
禹翔辉
1a66d6728e
Accept Merge Request #1014 : (feature/优化产品 -> develop)
...
Merge Request: 1、优化CNC加工流程
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1014
2024-05-14 15:57:26 +08:00
yuxianghui
002c5c06b4
1、优化CNC加工流程
2024-05-14 15:55:34 +08:00
禹翔辉
de62801ef1
Accept Merge Request #1013 : (feature/优化产品 -> develop)
...
Merge Request: 1、关闭产品、采购单中关联字段的创建功能;2、优化采购入库验证条件;
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1013
2024-05-14 14:20:10 +08:00
yuxianghui
62ec721c69
1
2024-05-14 14:19:44 +08:00
yuxianghui
2194374aa2
Merge branch 'feature/解决bug、优化权限' into feature/优化产品
2024-05-14 14:11:39 +08:00
yuxianghui
eff6ce9f1b
1、关闭产品、采购单中关联字段的创建功能;2、优化采购入库验证条件;
2024-05-14 14:09:42 +08:00
杨金灵
9fcfaee8d1
Accept Merge Request #1012 : (feature/销售订单列表倒序排序 -> develop)
...
Merge Request: 销售订单列表倒序排序
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1012?initial=true
2024-05-14 11:02:27 +08:00
jinling.yang
90aae4dad9
销售订单按创建时间倒序
2024-05-14 10:59:35 +08:00
jinling.yang
934b59d213
坯料新增路线
2024-05-14 10:51:38 +08:00
jinling.yang
ed9b575fb5
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-05-13 14:04:30 +08:00
禹翔辉
bcd7ae9dd1
Accept Merge Request #1011 : (feature/解决bug、优化权限 -> develop)
...
Merge Request: 1、添加权限;2、设备的设备检修标准字段关闭创建功能;3、解决 销售经理创建报价单选择产品后没有把模型和价格带过去 的bug;4、关闭仓库创建按钮
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1011
2024-05-13 12:01:16 +08:00
yuxianghui
48782cb62b
Merge branch 'feature/解决主流程bug' into feature/解决bug、优化权限
2024-05-13 11:55:55 +08:00
yuxianghui
0f47f7c3b8
1、添加权限;2、设备的设备检修标准字段关闭创建功能;3、解决 销售经理创建报价单选择产品后没有把模型和价格带过去 的bug;4、关闭仓库创建按钮
2024-05-13 11:54:03 +08:00
jinling.yang
d9f339c4b0
Merge branch 'feature/修复表面工艺外协' into develop
2024-05-13 09:25:44 +08:00
杨金灵
d4b22d228b
Accept Merge Request #1010 : (feature/修复表面工艺外协 -> develop)
...
Merge Request: 优化同一产品多个制造订单合并一张编程单和模型库
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1010
2024-05-13 09:24:12 +08:00
jinling.yang
e916e4e155
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复表面工艺外协
2024-05-12 21:33:57 +08:00
jinling.yang
9dccee84c4
1.优化同一个产品多个制造订单的编程单合并到一张编程单和一个模型库至cloud
2024-05-12 21:33:43 +08:00
马广威
97ce5d81c8
Accept Merge Request #1009 : (feature/制造代码优化 -> develop)
...
Merge Request: 修复工单预计结束时间会取实际结束时间的问题
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1009?initial=true
2024-05-12 13:16:40 +08:00
mgw
c6638ac3f3
修复工单预计结束时间会取实际结束时间的问题
2024-05-12 13:14:53 +08:00
马广威
05e8507000
Accept Merge Request #1008 : (feature/制造代码优化 -> develop)
...
Merge Request: 去掉销售订单加工状态
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1008?initial=true
2024-05-11 23:38:58 +08:00
mgw
1afc48a20e
去掉销售订单加工状态
2024-05-11 23:36:18 +08:00
马广威
053cd5fd89
Accept Merge Request #1007 : (feature/制造代码优化 -> develop)
...
Merge Request: 修复制造订单加工无状态问题
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1007?initial=true
2024-05-11 22:44:30 +08:00
mgw
391a172016
修复制造订单加工无状态问题
2024-05-11 22:42:58 +08:00
禹翔辉
d3677b9c89
Accept Merge Request #1006 : (feature/解决主流程bug -> develop)
...
Merge Request: 1、等待组件状态的装夹预调工单点击【开始】时,没有组件给提示信息;2、隐藏装夹预调工单列表看板,3、库存-内部调拨-产品是刀具物料除刀柄外,其他刀具物料目标货位添加必填校验;
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1006?initial=true
2024-05-11 16:41:01 +08:00
yuxianghui
384b032ef3
Merge branch 'feature/解决坯料外协不生成外协出库单bug' into feature/解决主流程bug
2024-05-11 16:36:17 +08:00
yuxianghui
0ddf2ce1bd
1、等待组件状态的装夹预调工单点击【开始】时,没有组件给提示信息;2、隐藏装夹预调工单列表看板,3、库存-内部调拨-产品是刀具物料除刀柄外,其他刀具物料目标货位添加必填校验;
2024-05-11 16:34:29 +08:00
杨金灵
05307fa25e
Accept Merge Request #1005 : (feature/修复表面工艺可选参数和模版类型 -> develop)
...
Merge Request: 修复表面工艺可选参数和模版类型
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1005?initial=true
2024-05-11 15:42:31 +08:00
jinling.yang
76b7d00643
1.模版类型的成品,坯料,表面工艺模版的工序新增过滤2.表面工艺可选参数的适用材料修改为可编辑
2024-05-11 15:35:15 +08:00
jinling.yang
0f8c4e8765
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-05-11 14:04:15 +08:00
jinling.yang
a1081fe8cc
Merge branch 'feature/优化制造订单和编程' into develop
2024-05-11 14:03:31 +08:00
杨金灵
47ed09152d
Accept Merge Request #1004 : (feature/优化制造订单和编程 -> develop)
...
Merge Request: 优化制造订单和工件配送
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1004
2024-05-11 14:02:09 +08:00
jinling.yang
50dc25a8b7
还原注释代码
2024-05-11 13:51:52 +08:00
jinling.yang
b80df25e0a
注释代码为第二期同一产品多个编程单需求
2024-05-11 13:44:30 +08:00
jinling.yang
999959b6a1
1.修复工件配送向导制造订单号能显示5个
...
2工件配送向导页面优化
3.生成制造订单同时工件配送默认路线
2024-05-11 13:38:57 +08:00
jinling.yang
ec01b89242
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造订单和编程
...
# Conflicts:
# sf_manufacturing/models/mrp_workorder.py
2024-05-11 00:20:08 +08:00
jinling.yang
c932fa035a
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-05-11 00:17:54 +08:00
jinling.yang
2bffc5964a
1.1修复排程工件配送没有目的生产线2.注释获取cnc程序最新代码(第二期)3.优化部分页面
2024-05-11 00:17:43 +08:00
禹翔辉
7d7096a36c
Accept Merge Request #1003 : (feature/解决坯料外协不生成外协出库单bug -> develop)
...
Merge Request: 1、解决 坯料外协不生成外协出库单 的bug;2、添加工件装夹岗对sf.functional.cutting.tool.entity模型的查询权限
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1003?initial=true
2024-05-10 16:45:56 +08:00
yuxianghui
6c70f43b1b
Merge branch 'feature/解决工单Rfid相关bug' into feature/解决坯料外协不生成外协出库单bug
2024-05-10 16:43:55 +08:00
yuxianghui
016a279453
1、解决 坯料外协不生成外协出库单 的bug;2、添加工件装夹岗对sf.functional.cutting.tool.entity模型的查询权限
2024-05-10 16:42:54 +08:00
马广威
52bbc6f6cd
Accept Merge Request #1002 : (feature/制造代码优化 -> develop)
...
Merge Request: 在工单完成处控制状态,来避免非正常操作导致的制造订单状态异常问题
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1002?initial=true
2024-05-10 16:07:55 +08:00
mgw
1dfa890a4d
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化
2024-05-10 16:06:51 +08:00
mgw
d9543d42fd
在工单完成处控制状态,来避免非正常操作导致的制造订单状态异常问题
2024-05-10 16:01:33 +08:00
jinling.yang
b5c9387d8c
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造订单和编程
2024-05-09 21:58:45 +08:00
jinling.yang
c4609e35a5
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-05-09 18:29:45 +08:00
jinling.yang
3d56e54fb2
优化制造订单的获取cnc程序
2024-05-09 18:29:30 +08:00
马广威
494b6c69da
Accept Merge Request #1001 : (feature/制造代码优化 -> develop)
...
Merge Request: 为工单预计时间增加初始值
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1001?initial=true
2024-05-09 14:52:39 +08:00
mgw
e2d3b36683
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化
2024-05-09 14:51:42 +08:00
mgw
138e22255e
为工单预计时间增加初始值
2024-05-09 14:51:21 +08:00
黄焱
7200d03733
Accept Merge Request #1000 : (feature/前端样式修改 -> develop)
...
Merge Request: // 修改 【批量排程】【配送】 按钮UI
Created By: @黄焱
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @黄焱
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1000?initial=true
2024-05-09 11:20:06 +08:00
黄焱
f3c98c9727
// 修改 【批量排程】【配送】 按钮UI
2024-05-09 11:18:01 +08:00
jinling.yang
6a4fd4d922
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造订单和编程
2024-05-09 11:11:16 +08:00
jinling.yang
38298f4a32
Merge branch 'feature/优化agv调用中控接驳站接口' into develop
2024-05-09 11:08:17 +08:00
杨金灵
41603f4caa
Accept Merge Request #999 : (feature/优化agv调用中控接驳站接口 -> develop)
...
Merge Request: 优化agv调用中控接驳站接口
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/999?initial=true
2024-05-09 11:08:02 +08:00
jinling.yang
1a63f82f4b
优化agv调用中控接驳站接口
2024-05-09 11:04:59 +08:00
jinling.yang
0ea3d6f0b3
优化agv接驳站
2024-05-09 11:04:07 +08:00
jinling.yang
54a08802d9
修复装夹工单状态
2024-05-09 10:45:14 +08:00
jinling.yang
388b0b4e4c
优化制造
2024-05-09 10:37:41 +08:00
马广威
db7382826e
Accept Merge Request #998 : (feature/制造代码优化 -> develop)
...
Merge Request: sf_t切换数据库
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/998?initial=true
2024-05-09 10:10:01 +08:00
mgw
07cf13dce7
sf_t切换数据库
2024-05-09 10:09:26 +08:00
马广威
28f4adb293
Accept Merge Request #997 : (feature/制造代码优化 -> develop)
...
Merge Request: 修复排程选择生产线bug
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/997?initial=true
2024-05-09 09:45:07 +08:00
mgw
ac3081d3bf
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化
2024-05-09 09:44:23 +08:00
mgw
4e84562ba7
修复排程选择生产线bug
2024-05-09 09:43:54 +08:00
马广威
72d59c11db
Accept Merge Request #996 : (feature/制造代码优化 -> develop)
...
Merge Request: 处理工单可能为记录集的问题,增加邮件发送公用类
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/996?initial=true
2024-05-09 09:28:18 +08:00
mgw
8c279828be
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化
...
# Conflicts:
# sf_manufacturing/models/mrp_workorder.py
2024-05-09 09:25:19 +08:00
马广威
95a77574ae
Accept Merge Request #995 : (feature/解决工单Rfid相关bug -> develop)
...
Merge Request: 1、解决 装夹预调工单扫描Rfid码时提示语的制造订单号显示重复了 的缺陷, 添加工单扫描的Rfid不是托盘是其他物料的提示;2、解决刀具管理模块的菜单依赖问题;3、管理员添加货位的操作权限
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/995#mr-995-review-148238
2024-05-09 09:21:45 +08:00
mgw
5c68dd45ee
补充提交代码
2024-05-09 09:21:13 +08:00
mgw
af822c9039
增加邮件发送公用类
2024-05-08 21:49:04 +08:00
yuxianghui
92ea9b2a4f
Merge branch 'feature/坯料采购-外协与自加工流程BUG' into feature/解决工单Rfid相关bug
2024-05-08 16:53:00 +08:00
yuxianghui
5eacc01755
1、解决 装夹预调工单扫描Rfid码时提示语的制造订单号显示重复了 的缺陷, 添加工单扫描的Rfid不是托盘是其他物料的提示;2、解决刀具管理模块的菜单依赖问题;3、管理员添加货位的操作权限
2024-05-08 16:50:13 +08:00
杨金灵
72ea4c8a2c
Accept Merge Request #994 : (feature/修复快速订单没有权限问题 -> develop)
...
Merge Request: 修复快速订单没有权限问题
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/994?initial=true
2024-05-08 15:08:57 +08:00
jinling.yang
4bea41b8fd
修复快速订单没有权限问题
2024-05-08 15:07:31 +08:00
jinling.yang
f6373366b6
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-05-08 14:29:35 +08:00
jinling.yang
339c6ec2ee
Merge branch 'feature/优化模型上色路径' into develop
2024-05-08 14:29:19 +08:00
杨金灵
e7ca8ebd9b
Accept Merge Request #993 : (feature/优化模型上色路径 -> develop)
...
Merge Request: 修复快速订单和预调工单
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/993
2024-05-08 14:29:05 +08:00
jinling.yang
d964a9feb1
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化模型上色路径
2024-05-08 11:20:07 +08:00
杨金灵
da139ad30b
Accept Merge Request #992 : (feature/修复工件配送rfidcode没有值 -> develop)
...
Merge Request: 修复工件配送rfidcode没有值
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/992?initial=true
2024-05-08 09:33:15 +08:00
jinling.yang
30053c5493
修复工件配送rfidcode没有值
2024-05-08 09:27:24 +08:00
jinling.yang
fda43deeea
1.优化根据同一个产品,生成的制造订单绑定同一个编程单需求
2024-05-07 17:33:23 +08:00
jinling.yang
cb5cfec82a
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-05-07 15:17:10 +08:00
jinling.yang
8b533475b8
Merge branch 'feature/采购去掉审核' into develop
2024-05-07 15:16:57 +08:00
杨金灵
7cbe1cb35d
Accept Merge Request #991 : (feature/采购去掉审核 -> develop)
...
Merge Request: 优化销售,采购及工件配送
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/991?initial=true
2024-05-07 15:16:31 +08:00
jinling.yang
b8196cc4a9
1.修复销售岗位创建快速订单没有生成销售订单问题2.工件配送Tree视图默认上产线
2024-05-07 14:44:58 +08:00
jinling.yang
ed41667477
1.采购去掉审核2.装夹预调工单验证优化
2024-05-06 16:29:54 +08:00
jinling.yang
ca3cdd9132
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-05-06 14:17:16 +08:00
杨金灵
5551cc51e2
Accept Merge Request #990 : (feature/修复工件配送 -> develop)
...
Merge Request: 优化最新AGV及新增中控日志接口调用
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/990
2024-05-06 11:51:54 +08:00
jinling.yang
178edd645e
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-05-06 11:49:11 +08:00
jinling.yang
848fe9f2f0
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复工件配送
2024-05-06 11:48:53 +08:00
jinling.yang
2cd666c4ae
优化agv及新增中控日志调用
2024-05-06 11:48:34 +08:00
mgw
9d157d6083
处理工单可能为记录集的问题
2024-05-06 11:29:17 +08:00
禹翔辉
ab73deeeaa
Accept Merge Request #989 : (feature/添加人工编程标签 -> develop)
...
Merge Request: 产品添加人工编程的筛选项;制造订单from视图添加人工编程字段;
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/989?initial=true
2024-04-30 17:19:10 +08:00
yuxianghui
68c4c18642
Merge branch 'feature/拆解单优化' into feature/添加人工编程标签
2024-04-30 17:11:56 +08:00
yuxianghui
402a4e1740
1、产品添加人工编程的筛选项;制造订单from视图添加人工编程字段;
2024-04-30 17:09:46 +08:00
jinling.yang
68d8c36755
优化工件配送
2024-04-30 17:05:09 +08:00
jinling.yang
b45ffcc0d2
1.优化工件配送向导2.增加rfid码字段
2024-04-29 17:34:00 +08:00
马广威
58e1754ae2
Accept Merge Request #988 : (feature/拆解单优化 -> develop)
...
Merge Request: 解决 工具装夹岗在工件装夹单详情扫描rfid码报错 bug
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/988#mr-988-review-146501
2024-04-29 17:28:20 +08:00
yuxianghui
a1f0a580a6
解决 工具装夹岗在工件装夹单详情扫描rfid码报错 bug
2024-04-29 17:25:29 +08:00
jinling.yang
952c24eb26
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-04-29 16:42:37 +08:00
禹翔辉
fbfd932561
Accept Merge Request #987 : (feature/拆解单优化 -> develop)
...
Merge Request: 解决 采购入库到具体库位的数量显示不对 问题
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/987
2024-04-29 16:04:38 +08:00
yuxianghui
cc590134f5
1
2024-04-29 16:00:27 +08:00
yuxianghui
338d620d5b
解决 采购入库到具体库位的数量显示不对 问题
2024-04-29 15:53:40 +08:00
jinling.yang
58344b09d2
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复工件配送
...
# Conflicts:
# sf_manufacturing/models/mrp_workorder.py
2024-04-29 15:33:41 +08:00
jinling.yang
3d76d5f0b9
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-04-29 15:32:04 +08:00
jinling.yang
b1d42b9421
优化工件配送和空料架
2024-04-29 15:31:46 +08:00
禹翔辉
cec066c082
Accept Merge Request #986 : (feature/拆解单优化 -> develop)
...
Merge Request: 拆解单优化
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/986?initial=true
2024-04-29 14:24:06 +08:00
yuxianghui
239be9f4ea
Merge branch 'feature/功能刀具组装添加校验' into feature/拆解单优化
2024-04-29 14:20:26 +08:00
yuxianghui
537e890926
1、优化功能刀具拆解后,不同情况下生成的刀具物料的位移记录;添加拆解成功后拆解成功的刀具日志;添加当拆解原因是【更换为其他刀具】时,目标货位必填;2、货位看板添加按产品搜索功能
2024-04-29 14:19:22 +08:00
马广威
9e10382dd7
Accept Merge Request #985 : (feature/制造代码优化 -> develop)
...
Merge Request: 恢复工单按钮展示及实际开始时间
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/985
2024-04-29 12:20:11 +08:00
mgw
3a22c817df
修复工单实际开始时间
2024-04-29 12:15:54 +08:00
mgw
782e266988
恢复工单按钮展示
2024-04-29 11:36:29 +08:00
禹翔辉
f3f138e93c
Accept Merge Request #984 : (feature/功能刀具组装添加校验 -> develop)
...
Merge Request: 1、刀具物料刀柄、夹具物料托盘搜索模型的序列号对象字段的list列表添加Rfid字段;2、制造单搜索看板添加记数功能;3、刀具组装岗添加货位的读写权限;4、功能刀具组装单弹窗添加手动输入五种物料的货位编码时,对该货位进行多项校验;
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/984?initial=true
2024-04-29 10:39:15 +08:00
yuxianghui
8c78a24f7e
Merge branch 'feature/接口优化' into feature/功能刀具组装添加校验
2024-04-29 10:36:35 +08:00
jinling.yang
45220d75af
新增运送空料架
2024-04-28 17:34:41 +08:00
yuxianghui
9d9b454ba5
1、刀具物料刀柄、夹具物料托盘搜索模型的序列号对象字段的list列表添加Rfid字段;2、制造单搜索看板添加记数功能;3、刀具组装岗添加货位的读写权限;4、功能刀具组装单弹窗添加手动输入五种物料的货位编码时,对该货位进行多项校验;
2024-04-28 17:20:11 +08:00
jinling.yang
bc2c0f7fb0
修复站点状态未变,及页面筛选框优化
2024-04-28 15:17:41 +08:00
jinling.yang
809f5a196e
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-04-28 14:57:28 +08:00
jinling.yang
281b041a31
Merge branch 'feature/修复工件配送时间' into develop
2024-04-28 11:45:17 +08:00
杨金灵
1fa45a36f1
Accept Merge Request #983 : (feature/修复工件配送时间 -> develop)
...
Merge Request: 优化agv需求
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/983?initial=true
2024-04-28 11:45:00 +08:00
jinling.yang
24722f474c
修复配送时agv站点验证
2024-04-28 11:43:11 +08:00
jinling.yang
5eb946d936
优化agv需求
2024-04-28 11:34:17 +08:00
jinling.yang
b7f7f0cdff
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复工件配送时间
2024-04-26 18:04:49 +08:00
jinling.yang
42178e3e1e
上下产线接口新增IsComplete判断
2024-04-26 18:04:30 +08:00
马广威
2ebd543d39
Accept Merge Request #982 : (feature/制造代码优化 -> develop)
...
Merge Request: 增加日志打印
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/982?initial=true
2024-04-26 15:55:44 +08:00
mgw
f452f0018f
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化
2024-04-26 15:54:20 +08:00
mgw
cd3feb787f
增加日志打印
2024-04-26 15:53:26 +08:00
杨金灵
d0e7dbefc9
Accept Merge Request #981 : (feature/修复工件配送时间 -> develop)
...
Merge Request: 修复工件配送时间
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/981?initial=true
2024-04-26 15:36:30 +08:00
jinling.yang
8f9781dd13
修复工件配送时间
2024-04-26 14:44:26 +08:00
杨金灵
50aae8a1e8
Accept Merge Request #980 : (feature/优化工件配送 -> develop)
...
Merge Request: 优化工件配送
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/980?initial=true
2024-04-26 14:00:35 +08:00
jinling.yang
41e551fe48
优化工件配送
2024-04-26 13:57:47 +08:00
jinling.yang
1293c327c6
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-04-26 10:01:03 +08:00
jinling.yang
74deef3d41
Merge branch 'feature/优化agv及工件配送' into develop
2024-04-26 10:00:47 +08:00
杨金灵
466dfa4889
Accept Merge Request #979 : (feature/优化agv及工件配送 -> develop)
...
Merge Request: 优化agv及工件配送
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/979?initial=true
2024-04-26 10:00:30 +08:00
jinling.yang
66dcc2f982
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化agv及工件配送
2024-04-26 09:57:21 +08:00
jinling.yang
9362a78f2a
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-04-26 09:56:59 +08:00
jinling.yang
9eb891dd0b
优化agv及工件配送
2024-04-26 09:56:42 +08:00
禹翔辉
84b82cac1d
Accept Merge Request #978 : (feature/接口优化 -> develop)
...
Merge Request: 1、优化机床刀位接口,数据写入到机床的刀位的方法
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/978
2024-04-25 17:17:58 +08:00
yuxianghui
761efbceaa
Merge branch 'feature/中控接口注释及工厂数据处理' into feature/接口优化
2024-04-25 17:16:11 +08:00
yuxianghui
4bcd6b9944
1、优化机床刀位接口,数据写入到机床的刀位的方法;2、制造-刀具管理菜单下的机床换刀申请菜单隐藏,功能菜单改为作业单;3、刀柄和托盘采购入库时,对录入的Rfid做唯一性校验;
2024-04-25 17:14:30 +08:00
jinling.yang
da22015d35
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-04-25 15:46:32 +08:00
jinling.yang
eb2b37eb06
Merge branch 'feature/优化工件配送' into develop
2024-04-25 15:46:18 +08:00
杨金灵
cd6a4b0a38
Accept Merge Request #977 : (feature/优化工件配送 -> develop)
...
Merge Request: 优化工件配送
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/977
2024-04-25 15:45:22 +08:00
jinling.yang
8bbb18b6f4
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化工件配送
2024-04-25 15:43:30 +08:00
jinling.yang
11864feaa4
优化工件配送
2024-04-25 15:43:02 +08:00
禹翔辉
735f602f2d
Accept Merge Request #976 : (feature/中控接口注释及工厂数据处理 -> develop)
...
Merge Request: 中控接口优化及工厂数据处理
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/976
2024-04-25 14:14:12 +08:00
yuxianghui
53ed0d76a6
Merge branch 'feature/中控对接接口优化' into feature/中控接口注释及工厂数据处理
...
# Conflicts:
# sf_manufacturing/views/mrp_production_addional_change.xml
2024-04-25 14:10:22 +08:00
yuxianghui
9d96e0681c
1、注释MES装刀指令接口,删除所以该接口的调用;注释质量检测失败时对零件特采接口的调用;2、序列号模型from界面临时添加按钮,解决工厂录入的有些刀柄序列号存在位数少于10的问题(通过SQL在左侧补零)(已隐藏);
2024-04-25 14:02:51 +08:00
马广威
961f7bfdc5
Accept Merge Request #975 : (feature/制造代码优化 -> develop)
...
Merge Request: 中控接口恢复权限认证
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/975?initial=true
2024-04-25 12:27:45 +08:00
mgw
9374bab0ce
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化
2024-04-25 12:26:52 +08:00
mgw
780944047f
中控接口增加权限认证
2024-04-25 12:26:31 +08:00
马广威
edd1f9a1ee
Accept Merge Request #974 : (feature/制造代码优化 -> develop)
...
Merge Request: 优化制造订单号界面展示效果
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/974?initial=true
2024-04-25 09:36:40 +08:00
mgw
be18124186
优化制造订单号界面展示效果
2024-04-25 09:36:05 +08:00
马广威
a400beb0a4
Accept Merge Request #973 : (feature/制造代码优化 -> develop)
...
Merge Request: 增加工单处的尺寸赋值
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/973?initial=true
2024-04-25 09:03:56 +08:00
mgw
f4433ac3cc
增加工单处的尺寸赋值
2024-04-25 09:03:17 +08:00
马广威
b237e353a9
Accept Merge Request #972 : (feature/制造代码优化 -> develop)
...
Merge Request: 优化制造订单状态问题
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/972?initial=true
2024-04-24 22:55:52 +08:00
mgw
0bcd077914
优化制造订单状态问题
2024-04-24 22:53:48 +08:00
mgw
212f2df830
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化
2024-04-24 22:53:11 +08:00
马广威
192aecb17d
Accept Merge Request #971 : (feature/制造代码优化 -> develop)
...
Merge Request: 优化获取线边刀架、料架信息接口
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/971?initial=true
2024-04-24 22:14:59 +08:00
yuxianghui
6f2043e7e7
1、工单tree视图、from视图添加人工编程字段,及人工编程筛选项;2、序列号模型添加根据Rfid搜索的选项;3、修改零件特采接口,优化MES装刀申请接口、优化机床刀库接口;
2024-04-24 18:33:15 +08:00
mgw
0473e79fcf
优化获取线边刀架、料架信息接口
2024-04-24 17:27:39 +08:00
马广威
6ecc69590b
Accept Merge Request #970 : (feature/制造代码优化 -> develop)
...
Merge Request: 装夹预调工单,要带图纸和模型文件及坯料长宽高参数的优化需求
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/970
2024-04-24 14:35:01 +08:00
mgw
f570eb9b50
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化
2024-04-24 14:24:59 +08:00
马广威
d4aa71975e
Accept Merge Request #969 : (feature/优化工件配送 -> develop)
...
Merge Request: 优化工作配送
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/969#mr-969-review-144848
2024-04-24 14:24:36 +08:00
mgw
3e7bef095c
整理代码
2024-04-24 14:23:37 +08:00
jinling.yang
673a1c6448
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化工件配送
2024-04-24 14:20:42 +08:00
jinling.yang
231536089d
工件装夹岗扫描托盘RFID,识别校验并带出【同运工件】名称,并自动校验【目的生产线】一致
...
【同运工件】校验目的生产线不一致,则弹窗提示:工件生产线不一致,请重新确认;
2024-04-24 14:20:26 +08:00
mgw
347e7f3efe
增加自动备份模块
2024-04-24 13:58:24 +08:00
mgw
31e3f53873
制造订单状态优化
2024-04-24 13:48:56 +08:00
mgw
b6334caf97
优化同步库区功能(线边刀、线边料)
2024-04-24 11:26:52 +08:00
mgw
a83b8bcd14
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化
2024-04-24 08:58:54 +08:00
mgw
59c8631c15
库位变更接口优化
2024-04-24 08:58:15 +08:00
禹翔辉
24d8c2426c
Accept Merge Request #968 : (feature/中控对接接口优化 -> develop)
...
Merge Request: 1、俩个刀具组接口加上token验证;2、新增功能刀具组装完成时,如果单据来源于CAM用刀,则调用MES装刀指令接口;
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/968
2024-04-23 19:56:58 +08:00
yuxianghui
9778245ee7
1
2024-04-23 19:56:10 +08:00
yuxianghui
228770cb76
Merge branch 'feature/新增功能刀具拆解单模型' into feature/中控对接接口优化
2024-04-23 19:52:20 +08:00
yuxianghui
b80ba02c8f
1、俩个刀具组接口加上token验证;2、新增功能刀具组装完成时,如果单据来源于CAM用刀,则调用MES装刀指令接口;
2024-04-23 19:50:33 +08:00
杨金灵
1344bd7219
Accept Merge Request #967 : (feature/优化工件配送添加编码字段 -> develop)
...
Merge Request: 优化工件配送添加编码字段
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/967
2024-04-23 19:21:38 +08:00
jinling.yang
90d1f96857
优化工件配送添加编码字段
2024-04-23 17:20:32 +08:00
mgw
ca01b055b8
修复:计划排程时计划开始时间选择明天-执行排程后时间变成今天了 问题
2024-04-23 16:03:03 +08:00
黄焱
1d54066664
Accept Merge Request #966 : (feature/前端样式修改 -> develop)
...
Merge Request: 设置水印
Created By: @黄焱
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @黄焱
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/966?initial=true
2024-04-23 15:42:49 +08:00
黄焱
5488846c85
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/前端样式修改
2024-04-23 15:39:15 +08:00
黄焱
d2f59f6c6a
设置【已完成】【报废】等状态的水印
2024-04-23 15:38:32 +08:00
禹翔辉
c1addd823e
Accept Merge Request #965 : (feature/新增功能刀具拆解单模型 -> develop)
...
Merge Request: 1、接口优化
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/965
2024-04-23 15:37:07 +08:00
yuxianghui
c56886aebe
1、接口优化
2024-04-23 15:33:59 +08:00
禹翔辉
1979b33c32
Accept Merge Request #964 : (feature/新增功能刀具拆解单模型 -> develop)
...
Merge Request: 新增功能刀具拆解单模型,其他优化
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/964?initial=true
2024-04-23 14:21:50 +08:00
yuxianghui
1fa5ebd80a
1
2024-04-23 14:19:55 +08:00
yuxianghui
f1dad7701f
Merge branch 'feature/库存模块优化' into feature/新增功能刀具拆解单模型
2024-04-23 14:18:34 +08:00
yuxianghui
8bc23f5136
1、优化功能刀具拆解单拆解原因为更换其他刀具时的扫码录入刀具物料货位信息功能;2、优化功能刀具拆解单确认拆解后的刀具物料拆解流程,及其刀具物料功能刀具的数量统计等;3、功能刀具拆解、功能刀具模块添加动作过滤已拆解状态的记录,并添加筛选方法;4、功能刀具组装流程添加刀具物料货位数量校验;
2024-04-23 14:15:45 +08:00
杨金灵
bcff104013
Accept Merge Request #963 : (feature/优化agv -> develop)
...
Merge Request: 优化agv及站点位置和对应接口
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/963?initial=true
2024-04-23 14:09:10 +08:00
jinling.yang
307e052740
优化agv及站点位置和对应接口
2024-04-23 14:05:10 +08:00
mgw
f236b149d8
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化
...
# Conflicts:
# sf_manufacturing/models/mrp_production.py
# sf_manufacturing/views/mrp_workorder_view.xml
2024-04-23 10:56:57 +08:00
mgw
9cfc084c5c
装夹预调工单,要带图纸和模型文件及坯料长宽高参数的优化需求2:状态变化逻辑
2024-04-23 10:54:04 +08:00
杨金灵
da48e0aea2
Accept Merge Request #962 : (feature/工单页面修复 -> develop)
...
Merge Request: 工单页面修复
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/962?initial=true
2024-04-23 09:58:01 +08:00
jinling.yang
4e94b8b4c8
工单页面修复
2024-04-23 09:54:44 +08:00
杨金灵
6af611b7c9
Accept Merge Request #961 : (feature/优化工件配送及AGV -> develop)
...
Merge Request: 优化agv相关页面及对应接口
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/961?initial=true
2024-04-23 09:28:29 +08:00
jinling.yang
9a157125ba
优化agv相关页面及对应接口
2024-04-22 22:30:05 +08:00
mgw
49e4f92a91
装夹预调工单,要带图纸和模型文件及坯料长宽高参数的优化需求
2024-04-22 20:03:16 +08:00
yuxianghui
080a3d7175
1、优化扫码的托盘已绑定工单的提示信息;2、优化采购订单未审核时,金额数据不能改变的bug;3、功能刀具拆解单新增根据不同情况扫库位码录入五种物料的目的库位的信息;4、功能刀具拆解单新增拆解后的Rfid字段,新增拆解单状态字段,新增刀具物料库位信息搜索过滤;5、功能刀具拆解单新增确认拆解按钮,完成点击确认拆解后的刀具物料是否报废、磨削或者更换的不同条件进行拆解后物料的不同去向的功能及生成移动历史,解除功能刀具Rfid的绑定并更改状态等。6、优化功能刀具管理下的菜单目录布局;7、
2024-04-22 17:59:48 +08:00
杨金灵
b526565ac4
Accept Merge Request #960 : (feature/修复快递订单模型路径字段问题 -> develop)
...
Merge Request: 修复快递订单模型路径字段问题
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/960?initial=true
2024-04-22 15:49:46 +08:00
jinling.yang
690a66b6a1
修复快递订单模型路径字段问题
2024-04-22 15:46:43 +08:00
jinling.yang
c0db402f5e
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-04-22 15:45:29 +08:00
jinling.yang
d634cf20ba
Merge branch 'feature/修复快速订单' into develop
2024-04-22 15:10:39 +08:00
杨金灵
220af93ed6
Accept Merge Request #959 : (feature/修复快速订单 -> develop)
...
Merge Request: 修复快速订单
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/959
2024-04-22 15:07:17 +08:00
jinling.yang
eb6607be00
修复获取cnc程序方法关于快速订单部分
2024-04-22 14:27:59 +08:00
jinling.yang
4b2e58a66d
修复快速订单订单号和人工报价及注释掉识别长宽高代码
2024-04-22 14:14:59 +08:00
jinling.yang
9c5b3d7c4e
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-04-22 14:04:50 +08:00
马广威
9cb1b8c5aa
Accept Merge Request #958 : (feature/制造代码优化 -> develop)
...
Merge Request: 增加工单模型展示,工单物料增加长宽高值
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/958?initial=true
2024-04-22 10:58:54 +08:00
mgw
e108e2d5d6
增加工单模型展示,工单物料增加长宽高值
2024-04-22 10:58:04 +08:00
jinling.yang
90c87f7ddb
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-04-22 09:28:51 +08:00
jinling.yang
f0bfd18549
Merge branch 'feature/优化agv和ftp' into develop
2024-04-22 09:26:52 +08:00
杨金灵
c86fd099eb
Accept Merge Request #957 : (feature/优化agv和ftp -> develop)
...
Merge Request: 优化agv和ftp
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/957
2024-04-22 09:26:33 +08:00
yuxianghui
857d5d8916
1、新增功能刀具拆解模型及其前端的tree、form视图,新增扫码录入需要拆解的功能刀具功能;
2024-04-19 20:12:32 +08:00
jinling.yang
5cb1e3c838
修复快速订单
2024-04-19 17:24:51 +08:00
jinling.yang
45b300f8a1
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化agv和ftp
2024-04-19 16:50:59 +08:00
jinling.yang
a30c620823
优化快读订单
2024-04-19 16:50:38 +08:00
黄焱
263b8ddec7
Accept Merge Request #956 : (feature/前端样式修改 -> develop)
...
Merge Request: 修复列表总计合计与单项合计错开了一列
Created By: @黄焱
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @黄焱
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/956?initial=true
2024-04-19 15:45:17 +08:00
mgw
89eccb40ac
处理按钮显示
2024-04-19 15:42:35 +08:00
黄焱
761d0b0417
修复列表总计合计与单项合计错开了一列
2024-04-19 15:41:05 +08:00
禹翔辉
f22ee428b6
Accept Merge Request #955 : (feature/库存模块优化 -> develop)
...
Merge Request: 1、优化货位看板的更换货位功能、添加按编码搜索功能;
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/955
2024-04-19 15:02:40 +08:00
yuxianghui
1a860a5eb9
1、设备机床新增机床基坐标page页及其基本信息字段,新增主动获取和被动获取基坐标数据中控接口(接口待对接);
2024-04-19 14:59:19 +08:00
yuxianghui
96a4ee4e26
1
2024-04-19 13:42:12 +08:00
yuxianghui
80f0284c3c
1、优化货位看板的更换货位功能、添加按编码搜索功能;
2024-04-19 13:39:17 +08:00
jinling.yang
bcba08042b
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化agv和ftp
...
# Conflicts:
# sf_manufacturing/models/mrp_production.py
# sf_manufacturing/models/mrp_workorder.py
# sf_mrs_connect/models/ftp_operate.py
# sf_sale/models/quick_easy_order_old.py
2024-04-19 11:28:50 +08:00
禹翔辉
25ee2136c3
Accept Merge Request #954 : (feature/库存模块优化 -> develop)
...
Merge Request: 库存模块优化
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/954?initial=true
2024-04-19 11:00:36 +08:00
yuxianghui
50f5815070
Merge branch 'feature/内部调拨作业详情添加Rfid字段' into feature/库存模块优化
...
# Conflicts:
# sf_manufacturing/models/mrp_production.py
# sf_manufacturing/models/mrp_workorder.py
2024-04-19 10:54:36 +08:00
yuxianghui
b43c3496a1
1、货位看板模型添加货位变更弹窗模块及其功能按钮,实现产品在同库区的内部货位移动;
2024-04-19 10:49:48 +08:00
杨金灵
f1972ca572
Accept Merge Request #953 : (feature/优化获取CNC程序 -> develop)
...
Merge Request: 优化获取cnc程序和FTP
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/953?initial=true
2024-04-19 09:10:46 +08:00
jinling.yang
5f2600c96f
释放注释代码
2024-04-19 08:34:41 +08:00
jinling.yang
040b3b16f0
修复产品条码
2024-04-19 08:33:04 +08:00
yuxianghui
67f3c312de
1、添加采购入库作业详情选取目标货位重复校验
2024-04-18 20:46:09 +08:00
yuxianghui
f26b4510cf
1、采购入库作业详情的目标位置字段关闭创建功能,关闭货位的创建功能;2、优化入库到货位流程(进行中);
2024-04-18 19:10:41 +08:00
jinling.yang
053fa3feb3
优化ftp路径
2024-04-18 19:09:48 +08:00
jinling.yang
59670fb3d7
优化获取CNC程序:添加编程方式(人工/自动),如是快速订单,编程方式为人工
2024-04-18 18:40:05 +08:00
yuxianghui
8dfef16b51
1、产品模型、制造订单模型、工单模型,添加人工编程字段;2、放开工单扫描绑定Rfid的检验功能;3、bfm下单创建产品添加人工报价字段内容;4、优化CNC程序用刀检验库区是否有刀的流程;
2024-04-18 15:38:16 +08:00
jinling.yang
3d1dd533b5
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-04-17 17:11:39 +08:00
jinling.yang
83d1d397f5
Merge branch 'feature/优化货架货位-新增打印条码' into develop
2024-04-17 17:09:37 +08:00
杨金灵
0a9cfd916a
Accept Merge Request #949 : (feature/优化货架货位-新增打印条码 -> develop)
...
Merge Request: 优化货架货位-新增打印条码
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/949
2024-04-17 17:06:53 +08:00
jinling.yang
2e5dd55a7b
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化货架货位-新增打印条码
2024-04-17 17:05:36 +08:00
马广威
4fb57373d5
Accept Merge Request #951 : (feature/制造代码优化 -> develop)
...
Merge Request: 三次元检测z计算修改
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/951?initial=true
2024-04-17 17:03:38 +08:00
禹翔辉
8a85581347
Accept Merge Request #950 : (feature/内部调拨作业详情添加Rfid字段 -> develop)
...
Merge Request: 1、优化品牌同步接口,2、内部调拨作业详情添加Rfid字段;
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/950
2024-04-17 17:03:04 +08:00
yuxianghui
22c388f52c
1、优化品牌同步接口,2、内部调拨作业详情添加Rfid字段;
2024-04-17 17:01:01 +08:00
mgw
0103024f1c
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化
2024-04-17 16:52:08 +08:00
jinling.yang
988241a1bd
条码添加图片展示控件
2024-04-17 16:10:44 +08:00
jinling.yang
92af278451
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化货架货位-新增打印条码
2024-04-17 16:01:10 +08:00
jinling.yang
19b062f5ac
新增货架一键打印所有货位条码和单个打印货位条码
2024-04-17 16:00:47 +08:00
禹翔辉
7897e6e55b
Accept Merge Request #948 : (feature/功能刀具组装流程优化完成 -> develop)
...
Merge Request: 功能刀具组装流程优化完成
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/948
2024-04-17 15:02:52 +08:00
yuxianghui
259f12a11f
Merge branch 'feature/功能刀具组装流程测试及优化' into feature/功能刀具组装流程优化完成
2024-04-17 14:57:39 +08:00
yuxianghui
c6b1c5e047
1、删除功能刀具列表模型的刀具名称计算方法,改为创建记录时给数据;2、功能刀具组装单弹窗添加根据旧刀具名称自动选择新刀具的名称;优化没有序列号的刀具物料的库存位移方法,并在刀具物料出库同时货位物料数减一;关闭弹窗创建刀具组、功能刀具名称记录功能;
2024-04-17 14:55:45 +08:00
杨金灵
38c89a4167
Accept Merge Request #947 : (feature/优化快速订单 -> develop)
...
Merge Request: 优化快速订单
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/947?initial=true
2024-04-17 14:21:49 +08:00
jinling.yang
59683790b7
优化页面展示
2024-04-17 14:19:38 +08:00
mgw
ceae788ecc
三次元检测z计算修改
2024-04-17 14:18:40 +08:00
jinling.yang
f04cbac8d9
1.去掉上色和特征识别方法,
...
2.转换模型需自动识别模型长宽高
3.优化页面:下拉框关闭创建
4.权限修改为不可编辑
2024-04-17 13:19:07 +08:00
yuxianghui
36db60812e
Merge branch 'feature/功能刀具组装优化' into feature/功能刀具组装流程测试及优化
2024-04-16 17:23:55 +08:00
yuxianghui
3c47553be6
1、添加销售总监和采购总监对夹具的可读权限;2、工单的tree视图添加制造订单字段
2024-04-16 17:22:16 +08:00
jinling.yang
c535808d5f
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-04-16 16:22:50 +08:00
jinling.yang
d8a876796a
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化agv和ftp
2024-04-16 16:22:40 +08:00
jinling.yang
d777970a9b
1.ftp文件路径修改为:/NC/以下
2024-04-16 16:22:26 +08:00
马广威
d1e9254996
Accept Merge Request #946 : (feature/制造代码优化 -> develop)
...
Merge Request: 修改测点位置匹配,优化错误抛出方式
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/946?initial=true
2024-04-15 21:15:28 +08:00
mgw
028eb18dd8
修改测点位置匹配,优化错误抛出方式
2024-04-15 21:14:12 +08:00
黄焱
c4ddd067e7
Accept Merge Request #945 : (feature/前端样式修改 -> develop)
...
Merge Request: 修改因添加表格必填而出现报错问题
Created By: @黄焱
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @黄焱
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/945?initial=true
2024-04-15 17:22:01 +08:00
黄焱
48cba4274b
修改因添加表格必填而出现报错问题
2024-04-15 17:04:43 +08:00
mgw
9df62129b7
控制按钮显隐逻辑
2024-04-15 13:39:58 +08:00
马广威
65330b083b
Accept Merge Request #944 : (feature/制造代码优化 -> develop)
...
Merge Request: 前置三次元检测数据读取功能初步完成
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/944?initial=true
2024-04-15 11:40:57 +08:00
mgw
543f1a8e9b
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化
2024-04-15 11:39:35 +08:00
mgw
19156f5944
优化代码健壮性,解决部分硬编码问题
2024-04-15 11:39:10 +08:00
mgw
9ac3ef7c93
前置三次元检测数据读取
2024-04-15 11:16:33 +08:00
禹翔辉
3f9eb762f9
Accept Merge Request #943 : (feature/刀具定时同步到cloud -> develop)
...
Merge Request: 添加刀具信息定时同步到cloud功能
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/943?initial=true
2024-04-15 10:25:15 +08:00
yuxianghui
ef0e09ba4b
1、优化没有刀具信息记录时同步报错问题
2024-04-15 10:22:19 +08:00
yuxianghui
eb2db1dfdd
1、添加定时同步刀具物料和功能刀具相关的信息到cloud的功能;2、添加同步所以刀具物料和所以功能刀具相关记录同步接口;
2024-04-12 17:30:59 +08:00
yuxianghui
180db6b91e
1、调整功能刀具清单模型的菜单代码位置,解决依赖冲突问题;2、产品采购时,添加一个订单同时采购多个相同产品的校验;3、优化刀柄采购入库时,自动生成的序列号规则;
2024-04-12 16:15:02 +08:00
yuxianghui
482dbb9baa
Merge branch 'feature/优化组装单模型' into feature/功能刀具组装优化
2024-04-12 10:22:26 +08:00
yuxianghui
4391a4e145
1、功能刀具清单模型添加功能刀具名称重名检验,2、功能刀具安全库存模型添加根据所选功能刀具名称自动带出类型、刀具组、直径、R角信息;3、优化刀具物料搜索模型,物料数量字段改为存储字段,根据对应产品的各个位置的库存数量自动计算刀具物料的总数等值;
2024-04-11 17:34:15 +08:00
yuxianghui
010fbb23b0
1、优化工单扫描绑定托盘的验证条件,只有在工单已完成时不能再扫描绑定托盘;2、优化中控的刀具组接口,改为传输功能刀具清单的刀具组数据;3、优化功能刀具组装单模型的刀柄信息,删除刀柄货位字段,添加刀柄Rfid字段,根据货位带出刀柄信息改为根据序列号带出;5、优化功能刀具组装单弹窗,删除刀柄货位字段添加刀柄Rfid字段,删除刀柄的扫货位录入信息的代码;夹头货位改为非必填;添加组装后刀具组字段,添加根据所选的功能刀具名称,自动带出功能刀具的类型、刀具组、直径、刀尖R角、最大寿命值、总长度、伸出长、避空长信息,且可修改;6、优化调整功能刀具组装单弹窗的布局;
2024-04-11 15:11:50 +08:00
yuxianghui
7f6444cc89
1、优化功能刀具组装模型,重构刀具物料的组成结构;2、优化刀具物料查询模型,重构刀具物流库存统计方法;3、优化功能刀具组装流程,重构刀具物料出库方法;4、重构扫码录入刀具物料数据方法;5、优化功能刀具列表模型;
2024-04-10 17:32:35 +08:00
马广威
b5767970a4
Accept Merge Request #942 : (feature/制造代码优化 -> develop)
...
Merge Request: 开完库存处新增需求基本完成
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/942?initial=true
2024-04-09 20:43:57 +08:00
mgw
422e4bda6c
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化
...
# Conflicts:
# sf_warehouse/models/model.py
2024-04-09 20:42:15 +08:00
马广威
29790b7760
Accept Merge Request #941 : (feature/优化组装单模型 -> develop)
...
Merge Request: 优化组装单
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/941#mr-941-review-140567
2024-04-09 20:16:09 +08:00
mgw
310a2de34f
开完库存处新增需求基本完成
2024-04-09 20:14:44 +08:00
yuxianghui
12a54d1f2a
Merge branch 'feature/新增功能刀具清单' into feature/优化组装单模型
2024-04-09 17:29:13 +08:00
yuxianghui
f19a1a282a
1、优化扫描录入刀具物料方法,
2024-04-09 17:27:37 +08:00
jinling.yang
cc7a72d6f4
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-04-09 17:25:16 +08:00
jinling.yang
1681e9e4da
Merge branch 'feature/修复刀具物料同步' into develop
2024-04-09 17:24:55 +08:00
杨金灵
cf3514e407
Accept Merge Request #940 : (feature/修复刀具物料同步 -> develop)
...
Merge Request: 修复刀具物料同步
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/940?initial=true
2024-04-09 17:24:36 +08:00
jinling.yang
abdb636176
1.补充agv优化代码
...
2.修复刀具物料同步
2024-04-09 17:10:53 +08:00
yuxianghui
85649daef6
1、功能刀具清单模型添加功能刀具类型、加工材料、寿命字段;2、删除供应商的地址和email必填;3、优化功能刀具组装单模型,新增五种物料的货位字段,修改继承关系,添加根据货位获取刀具物料信息功能;
2024-04-09 16:53:15 +08:00
jinling.yang
8eee9d9173
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/new
2024-04-09 16:47:56 +08:00
jinling.yang
c104ecf24b
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-04-09 16:47:12 +08:00
mgw
961b4f8e2d
库存需求修改1
2024-04-09 15:21:47 +08:00
yuxianghui
0a4c86f601
功能刀具清单添加刀具组字段
2024-04-09 13:38:13 +08:00
禹翔辉
9e5843c4a8
Accept Merge Request #938 : (feature/新增功能刀具清单 -> develop)
...
Merge Request: 新增功能刀具清单模型
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/938?initial=true
2024-04-09 11:18:47 +08:00
yuxianghui
e9bca64f20
Merge branch 'feature/工单扫描绑定Rfid优化' into feature/新增功能刀具清单
2024-04-09 10:48:57 +08:00
yuxianghui
34ea140941
1、新增功能刀具清单模型,及其tree视图、权限;2、功能刀具安全库存模型和功能刀具组装单模型新增功能刀具名称关联功能刀具清单,优化功能刀具组装流程生成功能刀具安全库存信息的流程
2024-04-09 10:46:08 +08:00
黄焱
0dc94fa69b
Accept Merge Request #937 : (feature/前端样式修改 -> develop)
...
Merge Request: 修改制造模块子页面样式问题
Created By: @黄焱
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @黄焱
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/937?initial=true
2024-04-08 17:19:01 +08:00
黄焱
4c9fbab471
修改制造模块子页面样式问题
2024-04-08 17:17:27 +08:00
jinling.yang
51685ba68b
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-04-08 16:51:54 +08:00
jinling.yang
04de8fe9de
Merge branch 'feature/优化Rfid绑定工单' into develop
2024-04-08 16:51:32 +08:00
杨金灵
bb29db2ff5
Accept Merge Request #936 : (feature/优化Rfid绑定工单 -> develop)
...
Merge Request: 优化工单和agv
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/936?initial=true
2024-04-08 16:51:13 +08:00
jinling.yang
3f86dd48ec
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化Rfid绑定工单
...
# Conflicts:
# sf_manufacturing/models/mrp_workorder.py
# sf_manufacturing/models/product_template.py
# sf_manufacturing/views/mrp_workorder_view.xml
2024-04-08 16:47:16 +08:00
jinling.yang
00802f9fc0
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-04-08 16:39:52 +08:00
jinling.yang
07230703d8
1.优化agv配置及接口:新增站点集合对象,agv车辆编号及任务单类型编号字段
...
2.优化rfid和工单部分需求:点完工按钮,若为工件装夹工单,完工需校验工件坯料、RFID码、前置三元定位是否填写;若未填写,页面弹出对应提示,反之则需要二次确认弹窗
3.新增最初版的快速订单:为了工厂测试下单走流程
4.工单优化:新增检测结果和是否重新生成制造订单字段
2024-04-08 16:39:26 +08:00
禹翔辉
4cd2cbe1a7
Accept Merge Request #935 : (feature/工单扫描绑定Rfid优化 -> develop)
...
Merge Request: 优化工单扫托盘Rfid绑定Rfid码录入信息时,工单的开始等按键消失的问题
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/935
2024-04-08 15:58:09 +08:00
yuxianghui
6bddc4c262
Merge branch 'feature/功能刀具组装功能优化' into feature/工单扫描绑定Rfid优化
2024-04-08 14:45:05 +08:00
yuxianghui
4faeda11b8
1、优化工单扫托盘Rfid绑定Rfid码录入信息时,工单的开始等按键消失的问题
2024-04-08 14:43:46 +08:00
禹翔辉
3a484682fa
Accept Merge Request #934 : (feature/功能刀具组装功能优化 -> develop)
...
Merge Request: 1、处理刀具物料注册时搜索不到的问题;2、功能刀具组装时,当没有选择物料的时候功能刀具编码不显示数据;添加最大寿命值、报警值、有效长、避空长的必填验证;
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/934?initial=true
2024-04-07 16:46:26 +08:00
yuxianghui
556c3cb4bb
Merge branch 'feature/工单扫Rfid绑定托盘' into feature/功能刀具组装功能优化
2024-04-07 15:37:52 +08:00
yuxianghui
000280e53a
no message
2024-04-07 15:36:05 +08:00
yuxianghui
4dd733c466
1、处理刀具物料注册时搜索不到的问题;2、功能刀具组装时,当没有选择物料的时候功能刀具编码不显示数据;添加最大寿命值、报警值、有效长、避空长的必填验证;
2024-04-07 15:35:47 +08:00
禹翔辉
92e522905c
Accept Merge Request #933 : (feature/工单扫Rfid绑定托盘 -> develop)
...
Merge Request: 暂时关闭工单扫Rfid绑定托盘的Rfid重复验证
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/933?initial=true
2024-04-03 17:27:03 +08:00
yuxianghui
2ef832c17e
暂时关闭工单扫Rfid绑定托盘的Rfid重复验证
2024-04-03 17:23:57 +08:00
禹翔辉
7fd92e44b3
Accept Merge Request #932 : (feature/工单扫Rfid绑定托盘 -> develop)
...
Merge Request: 托盘物料添加Rfid码,工单扫Rfid绑定托盘
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/932?initial=true
2024-04-03 16:59:55 +08:00
yuxianghui
392784041c
Merge branch 'feature/刀具物料采购生成序列号优化' into feature/工单扫Rfid绑定托盘
2024-04-03 16:54:10 +08:00
yuxianghui
02e5972272
1、新增装夹预调工单扫拖盘Rfid绑定托盘;2、删除工单的Rfid字段的customRFID样式;3、修改序列号模型的Rfid字段的隐藏条件;4、优化刀柄、托盘物料采购时绑定Rfid的判断条件
2024-04-03 16:52:16 +08:00
禹翔辉
eb3583222c
Accept Merge Request #931 : (feature/刀具物料采购生成序列号优化 -> develop)
...
Merge Request: 当产品的刀具物料不是刀柄时,隐藏对应序列号模型的Rfid字段
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/931
2024-04-02 16:43:21 +08:00
yuxianghui
aac5195b4d
当产品的刀具物料不是刀柄时,隐藏对应序列号模型的Rfid字段
2024-04-02 16:38:19 +08:00
禹翔辉
715119d250
Accept Merge Request #930 : (feature/刀具物料采购生成序列号优化 -> develop)
...
Merge Request: 1、优化产品采购刀具物料生成的序列号出现不连续的问题;2、采购刀柄物料时,在入库验证环节增加Rfid是否全部录入检验。
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/930?initial=true
2024-04-02 16:16:25 +08:00
yuxianghui
9ed3930a1b
Merge branch 'feature/刀柄入库录入Rfid' into feature/刀具物料采购生成序列号优化
2024-04-02 16:03:35 +08:00
yuxianghui
2580e0c795
1、优化产品采购刀具物料生成的序列号出现不连续的问题;2、采购刀柄物料时,在入库验证环节增加Rfid是否全部录入检验。
2024-04-02 15:36:28 +08:00
jinling.yang
f4f1c9f839
1.新增表面工艺外协路线初始化数据
2024-04-01 17:34:56 +08:00
禹翔辉
827e056dc8
Accept Merge Request #928 : (feature/刀柄入库录入Rfid -> develop)
...
Merge Request: 添加刀柄采购入库时录入Rfid功能;添加功能刀具组装时,扫Rfid带出刀柄、夹头信息,并填写功能刀具Rfid码
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/928
2024-04-01 17:14:03 +08:00
yuxianghui
02e4987281
优化选取适用夹头方法
2024-04-01 17:12:47 +08:00
yuxianghui
e89b8ac65c
Merge branch 'feature/功能刀具安全库存注册' into feature/刀柄入库录入Rfid
2024-04-01 16:56:56 +08:00
yuxianghui
f0b972e705
1、优化刀柄物料产品适用夹头型号没有数据的问题,优化刀具标准库基本参数同步接口;2、优化功能刀具组装时,只需扫入刀柄的Rfid,将自动带出刀柄信息,并根据刀柄适用夹头型号和适配夹头尺寸随机带出一个可用夹头物料信息,同时将刀柄的Rfid码填入功能刀具的Rfid码。3、优化刀柄物料采购入库时的验证的判断条件;
2024-04-01 16:56:15 +08:00
马广威
5c220af28c
Accept Merge Request #927 : (feature/制造代码优化 -> develop)
...
Merge Request: 修复自定义角色打印无权限的问题
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/927?initial=true
2024-04-01 14:56:35 +08:00
mgw
82947a909e
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化
2024-04-01 14:55:31 +08:00
mgw
18dcb79116
修复自定义角色打印无权限的问题
2024-04-01 14:55:10 +08:00
jinling.yang
8d1e4a89c2
1、没绑定工单不能完工,绑定后才可以完工
...
2、工单绑定后没完工可以换绑
3、工单点完工按钮要有确认弹窗
2024-03-29 17:38:35 +08:00
yuxianghui
48809cd654
1、序列号模型对象添加rfid字段且rfid仅在产品为刀柄时展示,序列号模型添加规格字段,且添加自动根据对应产品类型不同计算出其值,产品为夹具时看板展示其规格的值;2、在采购入库流程,录入序列号的过程界面添加录入rfid字段,当产品是刀柄时需录入刀柄的rfid,并在验证通过后刀柄的序列号中带有rfid码;
2024-03-29 17:37:02 +08:00
jinling.yang
35fd1e329d
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-03-29 16:56:06 +08:00
jinling.yang
af289b7030
Merge branch 'feature/优化下发编程单的同时拉取CMM程序' into develop
2024-03-29 16:55:52 +08:00
杨金灵
5b3ee99bf3
Accept Merge Request #926 : (feature/优化下发编程单的同时拉取CMM程序 -> develop)
...
Merge Request: 优化下发编程单的同时拉取CMM程序
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/926?initial=true
2024-03-29 16:55:31 +08:00
jinling.yang
be975ea901
文件匹配添加注释
2024-03-29 16:52:05 +08:00
jinling.yang
1451539bb4
释放注释代码
2024-03-29 16:48:44 +08:00
jinling.yang
154e7de8a4
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化下发编程单的同时拉取CMM程序
2024-03-29 16:47:18 +08:00
禹翔辉
d21b25467b
Accept Merge Request #925 : (feature/功能刀具安全库存注册 -> develop)
...
Merge Request: 优化功能刀具安全库存信息更新时没有及时注册的问题
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/925?initial=true
2024-03-28 17:34:29 +08:00
yuxianghui
71b7b07949
Merge branch 'feature/表面工艺添加类别筛选' into feature/功能刀具安全库存注册
2024-03-28 17:31:42 +08:00
yuxianghui
4115bbb05e
1、优化功能刀具安全库存信息更新时没有及时注册的问题
2024-03-28 17:30:16 +08:00
禹翔辉
c380d99a26
Accept Merge Request #924 : (feature/表面工艺添加类别筛选 -> develop)
...
Merge Request: 表面工艺添加按类别筛选
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/924
2024-03-28 10:39:15 +08:00
yuxianghui
a0d50edc84
Merge branch 'feature/夹具管理' into feature/表面工艺添加类别筛选
2024-03-28 10:36:29 +08:00
yuxianghui
2aa29e5cbf
1、表面工艺添加按类型筛选功能;2、夹具产品的类型、规格添加必填
2024-03-28 10:35:08 +08:00
杨金灵
32907109ef
Accept Merge Request #923 : (feature/修复表面工艺外协 -> develop)
...
Merge Request: 修复表面工艺外协
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/923?initial=true
2024-03-27 17:30:24 +08:00
jinling.yang
303fcfaabd
查询源位置的条件=改为ilike
2024-03-27 17:28:48 +08:00
jinling.yang
f767433a96
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-03-27 17:26:37 +08:00
jinling.yang
3eae506e48
注释occ代码
2024-03-27 17:26:27 +08:00
jinling.yang
0ddefacda7
注释OCC代码
2024-03-27 17:26:14 +08:00
禹翔辉
42a748e0f8
Accept Merge Request #922 : (feature/夹具管理 -> develop)
...
Merge Request: 1、制造模块新增夹具管理菜单,将夹具物料查询菜单移到夹具管理菜单下,设置夹具管理菜单为工件装夹岗可见;
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/922?initial=true
2024-03-27 11:52:45 +08:00
yuxianghui
63263e3509
修改刀具管理权限
2024-03-27 11:49:42 +08:00
yuxianghui
aaf782b4a1
Merge branch 'feature/刀具管理' into feature/夹具管理
...
# Conflicts:
# sf_tool_management/security/ir.model.access.csv
2024-03-27 11:47:28 +08:00
yuxianghui
ce069e8b50
1、制造模块新增夹具管理菜单,将夹具物料查询菜单移到夹具管理菜单下,设置夹具管理菜单为工件装夹岗可见;
2024-03-27 11:39:07 +08:00
马广威
609ea62d0d
Accept Merge Request #921 : (feature/制造代码优化 -> develop)
...
Merge Request: 控制cnc只能看到cnc产线;增加必填标识
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/921?initial=true
2024-03-27 10:35:29 +08:00
mgw
f7f9cf1e43
控制cnc只能看到cnc产线;增加必填标识
2024-03-27 10:26:46 +08:00
马广威
75eb359c5a
Accept Merge Request #920 : (feature/制造代码优化 -> develop)
...
Merge Request: 优化翻译、排序、权限问题
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/920
2024-03-26 20:40:07 +08:00
mgw
7906ff2836
优化翻译、排序、权限问题
2024-03-26 18:09:23 +08:00
禹翔辉
5e97747ec1
Accept Merge Request #919 : (feature/功能刀具安全库存优化 -> develop)
...
Merge Request: 禁用功能刀具安全库存的刀具组字段创建新记录的功能
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/919?initial=true
2024-03-26 15:20:18 +08:00
yuxianghui
ead758d34c
Merge branch 'feature/零件特采接口优化' into feature/功能刀具安全库存优化
2024-03-26 15:17:49 +08:00
yuxianghui
decb6c7792
禁用功能刀具安全库存的刀具组字段创建新记录的功能
2024-03-26 15:16:26 +08:00
jinling.yang
b83e5575dc
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-03-26 14:19:40 +08:00
jinling.yang
a003987111
Merge branch 'feature/优化agv配置和客户' into develop
2024-03-26 14:19:13 +08:00
杨金灵
db2052a019
Accept Merge Request #918 : (feature/优化agv配置和客户 -> develop)
...
Merge Request: 优化agv配置和客户
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/918
2024-03-26 14:18:56 +08:00
jinling.yang
ca06d11d79
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-03-26 14:11:25 +08:00
jinling.yang
e63eed3405
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化agv配置和客户
2024-03-26 14:11:11 +08:00
jinling.yang
d05c0951eb
1.agv配置参数新增地码
...
2.bpm分配工厂时的客户(业务平台)的必填信息(税,邮箱,号码)赋值
3.报价页面的客户改为不可新建
2024-03-26 14:10:51 +08:00
禹翔辉
0500a2dd02
Accept Merge Request #917 : (feature/零件特采接口优化 -> develop)
...
Merge Request: 零件特采接口优化
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/917?initial=true
2024-03-25 16:55:37 +08:00
yuxianghui
37ea48dbee
Merge branch 'feature/夹具物料搜索' into feature/零件特采接口优化
2024-03-25 16:51:04 +08:00
yuxianghui
48cd8399f4
1、优化中控零件特采接口,2、将刀具管理的功能刀具所有rfid改为Rfid
2024-03-25 16:49:49 +08:00
马广威
ee3c0d702d
Accept Merge Request #916 : (feature/制造代码优化 -> develop)
...
Merge Request: 修复员工模块js问题、能力特征哭js问题、设备处问题
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/916?initial=true
2024-03-25 16:19:22 +08:00
mgw
1212ea0930
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化
...
# Conflicts:
# jikimo_frontend/static/src/js/custom_form_status_indicator.js
2024-03-25 16:18:42 +08:00
mgw
ed8c39d005
修复员工模块js问题、能力特征哭js问题、设备处问题
2024-03-25 16:17:19 +08:00
黄焱
fe4782eecf
Accept Merge Request #915 : (feature/前端样式修改 -> develop)
...
Merge Request: 修改field错误问题
Created By: @黄焱
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @黄焱
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/915?initial=true
2024-03-25 09:10:37 +08:00
黄焱
57bfec02eb
修改field错误问题
2024-03-25 09:07:45 +08:00
马广威
53c4b01a74
Accept Merge Request #914 : (feature/制造代码优化 -> develop)
...
Merge Request: odoo标签打印及去除odoo相关标识
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/914?initial=true
2024-03-20 17:34:56 +08:00
mgw
5b535fae18
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化
2024-03-20 17:33:58 +08:00
mgw
ba79b358a9
调整打印机模型结构
2024-03-20 17:32:17 +08:00
mgw
c788392b36
打印配置初步优化并测试成功,自测流程成功
2024-03-20 16:58:57 +08:00
禹翔辉
d3819e818b
Accept Merge Request #913 : (feature/夹具物料搜索 -> develop)
...
Merge Request: 新增夹具物料搜索模型及注册接口
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/913
2024-03-20 16:38:43 +08:00
yuxianghui
0725b7a7ba
Merge branch 'feature/功能刀具组装优化' into feature/夹具物料搜索
2024-03-20 16:36:00 +08:00
yuxianghui
a07563e166
1、新增夹具物料搜索模型,完成tree视图和form视图;2、新增夹具物料序列号、夹具物料搜索模型注册到cloud的接口,优化刀具物料序列号注册接口及流程;3、删除刀具物料搜索模型的无关字段;
2024-03-20 16:34:11 +08:00
mgw
2407d2cfc7
移除系统中odoo相关标识、信息
2024-03-20 16:15:00 +08:00
mgw
f38c062804
打印相关抽象为公用类
2024-03-20 11:28:58 +08:00
mgw
0363f8c8a3
odoo16中直连局域网zebra标签打印机打印二维码初版测试成功
2024-03-19 17:48:00 +08:00
禹翔辉
2e83fc2e44
Accept Merge Request #912 : (feature/功能刀具组装优化 -> develop)
...
Merge Request: 1、解决刀具物料采购时,自动生成序列号重复问题;2、优化刀具物料生成序列号时,自动更新刀具物料查询记录的方法
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/912?initial=true
2024-03-19 17:22:24 +08:00
yuxianghui
952e663b31
1、解决刀具物料采购时,自动生成序列号重复问题;2、优化刀具物料生成序列号时,自动更新刀具物料查询记录的方法
2024-03-19 17:20:19 +08:00
禹翔辉
bb78404772
Accept Merge Request #911 : (feature/功能刀具组装优化 -> develop)
...
Merge Request: 优化刀具组装时的物料选取
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/911?initial=true
2024-03-19 10:33:04 +08:00
yuxianghui
e5b6f2dcdc
Merge branch 'feature/夹具型号基本参数同步' into feature/功能刀具组装优化
2024-03-19 10:28:07 +08:00
yuxianghui
3458deef09
1、解决功能刀具组装时,已使用刀具物料还能再选到的问题;2、解决功能刀具组装完成后的功能刀具注册到cloud没有编码的问题;3、刀具物料添加未入库状态;
2024-03-19 10:26:55 +08:00
禹翔辉
f8d1bff5d3
Accept Merge Request #910 : (feature/夹具型号基本参数同步 -> develop)
...
Merge Request: 夹具型号基本参数同步
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/910?initial=true
2024-03-18 17:21:29 +08:00
yuxianghui
d3e050bd21
Merge branch 'feature/夹具型号同步优化' into feature/夹具型号基本参数同步
2024-03-18 17:17:10 +08:00
yuxianghui
c470935cc5
1、删除夹具型号同步接口中的夹具型号基本参数的数据;2、新增夹具型号基本参数模型同步接口,完成夹具型号基本参数的同步;3、修改刀具管理菜单下子菜单名称;4、关闭刀具物料搜索模型form视图的注册接口
2024-03-18 17:15:34 +08:00
jinling.yang
b053edd655
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-03-18 15:02:07 +08:00
jinling.yang
0324acd4fd
Merge branch 'feature/优化产品模版' into develop
2024-03-18 15:01:54 +08:00
杨金灵
3eb274aa01
Accept Merge Request #909 : (feature/优化产品模版 -> develop)
...
Merge Request: 优化产品模版
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/909
2024-03-18 15:01:20 +08:00
jinling.yang
d4c786ff1e
1.选择规则,带出对应型号图片
2024-03-18 14:46:49 +08:00
jinling.yang
ab58f5b40c
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化产品模版
2024-03-18 14:46:35 +08:00
jinling.yang
83327136eb
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-03-18 14:43:50 +08:00
jinling.yang
cfd2910ead
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-03-18 14:43:27 +08:00
jinling.yang
e444e27cad
1.选择规则,带出对应型号图片
...
2.规格弹出的页面隐藏刀具类型
3.型号新建弹出的页面图片字段去掉option设置,编码改为强制保存
2024-03-18 14:42:51 +08:00
禹翔辉
64050ac461
Accept Merge Request #908 : (feature/夹具型号同步优化 -> develop)
...
Merge Request: 夹具型号同步优化
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/908?initial=true
2024-03-18 10:31:25 +08:00
yuxianghui
6062ebdf9c
Merge branch 'feature/刀具注册' into feature/夹具型号同步优化
2024-03-18 10:29:22 +08:00
yuxianghui
698ea31d31
夹具型号同步优化
2024-03-18 10:28:08 +08:00
马广威
d52c208ba9
Accept Merge Request #907 : (feature/制造代码优化 -> develop)
...
Merge Request: 优化用户反馈
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/907?initial=true
2024-03-18 09:16:23 +08:00
mgw
38e3f5f31c
优化用户反馈
2024-03-18 09:15:39 +08:00
马广威
4477b12f8d
Accept Merge Request #906 : (feature/制造代码优化 -> develop)
...
Merge Request: 对“还原库存调整按钮”做权限控制
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/906?initial=true
2024-03-18 08:52:17 +08:00
mgw
76ce105289
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化
2024-03-18 08:51:30 +08:00
mgw
0b9f64fbfc
对“还原库存调整按钮”做权限控制
2024-03-18 08:51:11 +08:00
马广威
7dac3ad21a
Accept Merge Request #905 : (feature/制造代码优化 -> develop)
...
Merge Request: 修复“待排程状态的制造订单有实际时长,不应该有【实际时长】、【安排的日期】【计划结束时间】这几个字段”问题
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/905?initial=true
2024-03-16 11:41:34 +08:00
mgw
aeca8ef2b2
修复“待排程状态的制造订单有实际时长,不应该有【实际时长】、【安排的日期】【计划结束时间】这几个字段”问题
2024-03-16 11:22:01 +08:00
yuxianghui
3b7e120eb2
1、优化夹具型号静态数据同步
2024-03-15 17:38:43 +08:00
jinling.yang
56dacd0815
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-03-15 17:09:15 +08:00
jinling.yang
415717ee10
Merge branch 'feature/优化坯料和修复质量标准' into develop
2024-03-15 17:03:03 +08:00
杨金灵
716e04a0a8
Accept Merge Request #904 : (feature/优化坯料和修复质量标准 -> develop)
...
Merge Request: 优化坯料和修复质量标准
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/904
2024-03-15 17:02:47 +08:00
jinling.yang
8ebf71dc23
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-03-15 17:00:14 +08:00
jinling.yang
1a702512e5
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化坯料和修复质量标准
2024-03-15 17:00:05 +08:00
jinling.yang
d5a1a82c72
1.优化分配工厂时材料型号获取方式为采购和外协时未有供应商返回提示
...
2.修复质量标准去掉审核按钮显示
2024-03-15 16:59:51 +08:00
马广威
5e3aff31e0
Accept Merge Request #903 : (feature/制造代码优化 -> develop)
...
Merge Request: 待排程状态隐藏tab页
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/903?initial=true
2024-03-15 16:03:24 +08:00
mgw
d1eba51f61
待排程状态隐藏tab页
2024-03-15 16:02:54 +08:00
jinling.yang
df42932630
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-03-15 10:54:07 +08:00
jinling.yang
3c700e57d1
Merge branch 'feature/优化表面工艺可选参数' into develop
2024-03-15 10:53:29 +08:00
杨金灵
fa66b45373
Accept Merge Request #902 : (feature/优化表面工艺可选参数 -> develop)
...
Merge Request: 优化表面工艺可选参数
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/902?initial=true
2024-03-15 10:53:16 +08:00
jinling.yang
0facdee321
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化表面工艺可选参数
2024-03-15 10:48:58 +08:00
jinling.yang
4d45b81ebc
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-03-15 10:48:13 +08:00
jinling.yang
4765e34c09
1.优化表面工艺可选参数
...
2.修复质量警报质量总监没有制造订单访问权限
2024-03-15 10:48:01 +08:00
黄焱
7717731a22
Accept Merge Request #901 : (feature/前端样式修改 -> develop)
...
Merge Request: 解决频繁报错弹窗,新增判断
Created By: @黄焱
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @黄焱
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/901?initial=true
2024-03-15 10:12:44 +08:00
黄焱
f639e59b91
解决频繁报错弹窗,新增判断
2024-03-15 10:10:17 +08:00
黄焱
2352f862ee
Accept Merge Request #900 : (feature/前端样式修改 -> develop)
...
Merge Request: 增加owl监听field必填功能
Created By: @黄焱
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @黄焱
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/900
2024-03-15 09:52:05 +08:00
黄焱
c3bd0b1391
Merge branch 'feature/前端样式修改' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/前端样式修改
2024-03-14 16:50:34 +08:00
黄焱
776877f7a4
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/前端样式修改
2024-03-14 16:50:03 +08:00
黄焱
cdf8e7227c
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/前端样式修改
...
# Conflicts:
# sf_maintenance/views/equipment_maintenance_standards_views.xml
增加owl监听必填标识功能
2024-03-14 16:47:20 +08:00
黄焱
827b8337bd
Merge branch refs/heads/develop into refs/heads/feature/前端样式修改
2024-03-14 16:13:01 +08:00
jinling.yang
603f9e3f34
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-03-14 15:49:11 +08:00
jinling.yang
f971216c03
Merge branch 'feature/修复部分bug' into develop
2024-03-14 15:48:42 +08:00
杨金灵
cfc044b7bc
Accept Merge Request #899 : (feature/修复部分bug -> develop)
...
Merge Request: 修复部分bug
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/899
2024-03-14 15:48:14 +08:00
jinling.yang
9120ebe6f7
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复部分bug
2024-03-14 15:46:03 +08:00
jinling.yang
02f1805505
修复部分bug
2024-03-14 15:45:40 +08:00
马广威
b937372f82
Accept Merge Request #898 : (feature/制造代码优化 -> develop)
...
Merge Request: 修改zpl相关
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/898?initial=true
2024-03-14 14:31:53 +08:00
mgw
89f3f4b493
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化
2024-03-14 14:31:07 +08:00
马广威
9a47a4c094
Accept Merge Request #897 : (feature/修改机床参数bug -> develop)
...
Merge Request: 增加必填按钮 修改字段string
Created By: @龚启豪
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/897#mr-897-review-133358
2024-03-14 14:30:40 +08:00
qihao.gong@jikimo.com
20436ff6ac
增加必填按钮 修改字段string
2024-03-14 14:28:38 +08:00
mgw
70218f29ac
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化
...
# Conflicts:
# zpl_print/models/common.py
2024-03-14 14:24:26 +08:00
mgw
59677c0304
修改zpl相关等
2024-03-14 14:22:50 +08:00
杨金灵
35e2e4354a
Accept Merge Request #896 : (feature/优化agv接口 -> develop)
...
Merge Request: 优化agv接口和修复刀具产品模版
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/896
2024-03-14 14:08:38 +08:00
jinling.yang
5743ba5fac
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化agv接口
2024-03-14 11:54:34 +08:00
jinling.yang
86ec97bad1
修复刀具产品模版
2024-03-14 11:54:10 +08:00
jinling.yang
5e0b4aa509
优化产品页面
2024-03-13 17:34:35 +08:00
马广威
8117715a02
Accept Merge Request #895 : (feature/制造代码优化 -> develop)
...
Merge Request: 修复能力特征库报错:no placeholder
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/895?initial=true
2024-03-13 09:44:07 +08:00
mgw
cf5fa70f28
修复能力特征库报错:no placeholder
2024-03-13 09:42:46 +08:00
禹翔辉
1e81ef9174
Accept Merge Request #894 : (feature/刀具注册 -> develop)
...
Merge Request: 刀具注册,功能刀具组装流程优化
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/894
2024-03-13 09:08:05 +08:00
yuxianghui
d6c4eb7479
Merge branch 'feature/功能刀具注册优化' into feature/刀具注册
2024-03-13 09:02:34 +08:00
yuxianghui
0957bded16
1、优化刀具物料接口、优化功能刀具安全库存接口、优化功能刀具预警接口;2、优化功能刀具组装流程;3、优化刀具物料序列号同步步骤;
2024-03-12 17:39:21 +08:00
jinling.yang
0c44bba5f2
优化刀具产品
2024-03-12 17:32:40 +08:00
龚启豪
26942afc27
Accept Merge Request #892 : (feature/修改机床参数bug -> develop)
...
Merge Request: 删除工序,加工工艺对象,新增表面工艺可选参数对象
Created By: @龚启豪
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/892
2024-03-12 09:48:23 +08:00
yuxianghui
fbce395321
1、优化刀具物料序列号、刀具物料注册接口;2、优化功能刀具、功能刀具出入库记录接口;3、优化刀具物料搜索模型
2024-03-11 17:34:03 +08:00
jinling.yang
0289e2f9ff
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化agv接口
2024-03-11 17:30:46 +08:00
jinling.yang
b24355dd67
1.优化产品页面
...
2.优化agv回调接口且新增agv参数配置
3.优化工件配送
2024-03-11 17:30:32 +08:00
qihao.gong@jikimo.com
b315f4b3fe
维保计划项目可删除
2024-03-11 17:23:43 +08:00
黄焱
a705d805c9
设置设备模块页面强制必填字段及标识需求【表格】
2024-03-11 15:39:15 +08:00
马广威
e3b8b0a43d
Accept Merge Request #891 : (feature/制造代码优化 -> develop)
...
Merge Request: 修改工单显隐控制逻辑,优化代码
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/891?initial=true
2024-03-11 11:26:19 +08:00
mgw
2044db4d3e
修复权限问题
2024-03-11 11:25:31 +08:00
mgw
8a800e909f
修改工单显隐控制逻辑
2024-03-11 10:56:03 +08:00
mgw
0f2e6b165c
因接口触发按钮,无法触发按钮切换事件。经沟通,暂时隐藏手动触发开始等按钮的功能。
2024-03-08 21:46:26 +08:00
qihao.gong@jikimo.com
b16d2c2864
删除工序,加工工艺,新增表面工艺可选参数相关视图
2024-03-08 17:32:21 +08:00
yuxianghui
61b0b57b87
优化功能刀具等注册接口
2024-03-08 17:31:11 +08:00
黄焱
cfdc7f93ed
Accept Merge Request #890 : (feature/前端样式修改 -> develop)
...
Merge Request: 更改表格底部按钮样式
Created By: @黄焱
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @黄焱
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/890
2024-03-08 15:15:14 +08:00
黄焱
d9cbc52928
Merge branch refs/heads/develop into refs/heads/feature/前端样式修改
2024-03-08 15:14:07 +08:00
黄焱
62e5105191
更改表格底部按钮样式
2024-03-08 15:11:59 +08:00
禹翔辉
1b6e474b9e
Accept Merge Request #889 : (feature/功能刀具注册优化 -> develop)
...
Merge Request: 刀具管理模块新增功能刀具相关模型注册到mrs接口
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/889?initial=true
2024-03-07 17:28:58 +08:00
yuxianghui
a7e43ad9af
Merge branch 'feature/功能刀具注册-新' into feature/功能刀具注册优化
2024-03-07 17:25:26 +08:00
yuxianghui
47692a9b43
1、测试功能刀具相关模型的注册接口并优化;2、功能刀具管理模块中的需要注册的模型前端页面添加注册按钮;
2024-03-07 17:20:43 +08:00
马广威
21ebbc877a
Accept Merge Request #888 : (feature/制造代码优化 -> develop)
...
Merge Request: 修改按钮样式、优化权限
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/888?initial=true
2024-03-07 11:54:52 +08:00
mgw
457035e464
修改按钮样式、优化权限
2024-03-07 11:53:57 +08:00
yuxianghui
71cb09c08b
1、刀具物料搜索模型添加编码字段,添加自动计算编码方法;2、完善刀具物料搜索和功能刀具列表注册到cloud的接口;
2024-03-06 17:30:54 +08:00
马广威
70d6fb5660
Accept Merge Request #887 : (feature/制造代码优化 -> develop)
...
Merge Request: 修复权限问题
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/887?initial=true
2024-03-06 11:21:38 +08:00
mgw
b4e0436b41
修复权限问题
2024-03-06 11:20:58 +08:00
龚启豪
0262d709eb
Accept Merge Request #886 : (feature/修改机床参数bug -> develop)
...
Merge Request: 处理设备字段类型相关缺陷
Created By: @龚启豪
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/886
2024-03-05 17:03:10 +08:00
qihao.gong@jikimo.com
1a50a8220e
处理设备字段类型相关缺陷
2024-03-05 16:50:08 +08:00
马广威
f2213bd5f4
Accept Merge Request #885 : (feature/制造代码优化 -> develop)
...
Merge Request: 修改工单状态
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/885?initial=true
2024-03-05 11:37:56 +08:00
mgw
fcbe33714e
修改工单状态
2024-03-05 11:37:21 +08:00
禹翔辉
184ca7940b
Accept Merge Request #884 : (feature/功能优化 -> develop)
...
Merge Request: 功能优化
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/884
2024-03-04 17:17:11 +08:00
yuxianghui
dceaf7fe8d
Merge branch 'feature/刀具添加归档功能' into feature/功能优化
2024-03-04 17:13:42 +08:00
yuxianghui
d85b05f999
1
2024-03-04 17:11:18 +08:00
yuxianghui
9d2bad977c
1、产品模型的产品类别字段添加必填标记;2、制造订单的工单添加RFID码(已解除)字段,当工单解除装夹时保存RFID码到RFID码(已解除)字段进行展示;3、功能刀具列表的当前位置字段改为Selection类型,并优化自动计算功能刀具当前位置的方法;4、获取机床刀库信息时,对新装刀的功能刀具进行库存位移刀制造前(机内刀库);5、优化功能刀具组装时扫码自动录入RFID码功能;
2024-03-04 17:10:41 +08:00
马广威
4c8ba67cad
Accept Merge Request #883 : (feature/制造代码优化 -> develop)
...
Merge Request: 调整必填、增加用户组控制;优化代码
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/883
2024-03-04 11:54:20 +08:00
mgw
3ca5c02880
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化
2024-03-04 11:52:29 +08:00
mgw
3c0649392e
优化代码
2024-03-04 11:52:04 +08:00
黄焱
8a2d6df43b
Accept Merge Request #882 : (feature/前端样式修改 -> develop)
...
Merge Request: * 修改必填标识js,修改之前必填标识样式
Created By: @黄焱
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @黄焱
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/882?initial=true
2024-03-04 11:25:29 +08:00
黄焱
98103bac73
修改必填标识js,修改之前必填标识样式
2024-03-04 11:21:50 +08:00
mgw
6cbc21cc4e
调整必填、增加用户组控制
2024-03-04 10:58:39 +08:00
黄焱
7edeb59853
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/前端样式修改
2024-03-04 10:27:56 +08:00
马广威
806f921ad2
Accept Merge Request #881 : (feature/制造代码优化 -> develop)
...
Merge Request: 优化质量相关翻译,增加必填标识;处理采购订单按钮
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/881
2024-03-04 09:47:32 +08:00
mgw
ec54c8e014
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化
2024-03-04 09:45:55 +08:00
mgw
b7be5251b8
处理采购订单按钮展示的问题
2024-03-04 09:45:19 +08:00
mgw
33dc25f400
优化质量相关翻译,增加必填标识
2024-03-04 09:18:12 +08:00
黄焱
e761ff9140
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/前端样式修改
2024-03-01 16:31:12 +08:00
马广威
2f26a42b68
Accept Merge Request #880 : (feature/制造代码优化 -> develop)
...
Merge Request: 优化质量模块翻译
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/880?initial=true
2024-03-01 16:27:12 +08:00
马广威
2ed7aa60ff
Accept Merge Request #879 : (feature/修改机床参数bug -> develop)
...
Merge Request: 增加必填标识,修改csv相关参数
Created By: @龚启豪
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/879#mr-879-review-129484
2024-03-01 15:46:04 +08:00
qihao.gong@jikimo.com
7e4a3251c8
增加必填标识
2024-03-01 15:43:03 +08:00
qihao.gong@jikimo.com
b73e46dbc4
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
...
# Conflicts:
# sf_warehouse/security/ir.model.access.csv
2024-03-01 11:34:59 +08:00
qihao.gong@jikimo.com
4185b79e0d
修改csv权限相关文件
2024-03-01 11:30:03 +08:00
杨金灵
3f037b2051
Accept Merge Request #878 : (feature/修复日计划工单接口 -> develop)
...
Merge Request: 修复日计划工单接口
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/878?initial=true
2024-02-29 17:20:16 +08:00
jinling.yang
51c6b7ef9b
修复日计划工单接口
2024-02-29 17:16:27 +08:00
马广威
ceffbd012e
Accept Merge Request #877 : (feature/修复产品页面合并问题 -> develop)
...
Merge Request: 修复产品页面合并问题
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/877#mr-877-review-129080
2024-02-29 15:44:50 +08:00
jinling.yang
12c3869794
修复产品页面合并问题
2024-02-29 15:43:49 +08:00
杨金灵
5a348ae685
Accept Merge Request #876 : (feature/修复权限 -> develop)
...
Merge Request: 修复权限
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/876?initial=true
2024-02-29 15:34:30 +08:00
jinling.yang
c1da64fc36
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复权限
...
# Conflicts:
# sf_dlm_management/views/product_template_management_view.xml
2024-02-29 15:32:54 +08:00
jinling.yang
c262110b9a
修复权限
2024-02-29 15:30:10 +08:00
禹翔辉
dac0c4e767
Accept Merge Request #875 : (feature/刀具添加归档功能 -> develop)
...
Merge Request: 1、刀具组和刀具管理模块下的所以模型添加active字段,添加已归档搜索方式;2、解决俩个警告;3、产品模型的刀具物料、型号、规格字段添加当产品物料为刀具时必填及红星样式;4、关闭刀具物料查询模型和CAM用刀模型的创建按钮;
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/875
2024-02-29 14:54:41 +08:00
yuxianghui
25e65b39bc
Merge branch 'feature/刀具物料序列号优化' into feature/刀具添加归档功能
...
# Conflicts:
# sf_dlm_management/views/product_template_management_view.xml
2024-02-29 14:52:47 +08:00
yuxianghui
3c569fd485
1、刀具组和刀具管理模块下的所以模型添加active字段,添加已归档搜索方式;2、解决俩个警告;3、产品模型的刀具物料、型号、规格字段添加当产品物料为刀具时必填及红星样式;4、关闭刀具物料查询模型和CAM用刀模型的创建按钮;
2024-02-29 14:48:21 +08:00
马广威
7c3b6de41b
Accept Merge Request #874 : (feature/修复分配工厂创建订单和质检接口 -> develop)
...
Merge Request: 修复分配工厂创建订单和质检接口
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/874#mr-874-review-129033
2024-02-29 14:44:40 +08:00
jinling.yang
abdc522f9f
修复分配工厂创建订单和质检接口
2024-02-29 14:42:10 +08:00
jinling.yang
ec5297937d
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-02-29 11:23:29 +08:00
jinling.yang
ff768a6e5d
Merge branch 'feature/修复质检接口' into develop
2024-02-29 11:22:35 +08:00
杨金灵
e0ffe68446
Accept Merge Request #873 : (feature/修复质检接口 -> develop)
...
Merge Request: 修复质检接口和产品页面相关模型的访问权限
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/873?initial=true
2024-02-29 11:22:21 +08:00
jinling.yang
0bc055b1a7
优化加工订单接口日志
2024-02-29 11:09:20 +08:00
jinling.yang
6b8789a54b
修复产品页面涉及到其他模型的访问权限
2024-02-29 11:03:02 +08:00
jinling.yang
d270eaefd0
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复质检接口
2024-02-29 10:35:38 +08:00
jinling.yang
5dd89d3afc
修复质检接口
2024-02-29 10:34:18 +08:00
马广威
556e6ba261
Accept Merge Request #872 : (feature/修改机床参数bug -> develop)
...
Merge Request: 修改设备oee自动生成,设备刀库编码规则
Created By: @龚启豪
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/872#mr-872-review-128778
2024-02-28 17:15:56 +08:00
qihao.gong@jikimo.com
75354c67db
修改设备oee自动生成,设备刀库编码规则
2024-02-28 17:14:42 +08:00
禹翔辉
cf7da65ff9
Accept Merge Request #871 : (feature/刀具物料序列号优化 -> develop)
...
Merge Request: 优化采购刀具物料时刀具物料的序列号生成规则
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/871?initial=true
2024-02-28 16:55:34 +08:00
yuxianghui
17b167f1de
Merge branch 'feature/必填字段添加红星样式' into feature/刀具物料序列号优化
2024-02-28 16:53:43 +08:00
yuxianghui
6937d59b9f
1、优化采购刀具物料时刀具物料的序列号生成规则
2024-02-28 16:52:27 +08:00
杨金灵
e2e8b0a287
Accept Merge Request #870 : (feature/修复质检接口 -> develop)
...
Merge Request: 修复质检接口
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/870?initial=true
2024-02-28 16:47:00 +08:00
jinling.yang
c89f3623f6
修复质检接口
2024-02-28 16:45:50 +08:00
马广威
a5122e2e18
Accept Merge Request #869 : (feature/优化cnc程序和检测文件 -> develop)
...
Merge Request: 优化cnc程序和检测文件及质量检测
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/869
2024-02-28 16:08:57 +08:00
jinling.yang
7d96963b60
修复cnc程序排序
2024-02-28 16:03:26 +08:00
jinling.yang
b6acb48dbf
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化cnc程序和检测文件
2024-02-28 15:54:10 +08:00
jinling.yang
0538763059
1.修复及优化质检接口2.质量检查新增检测报告和检测结果2个字段
2024-02-28 15:53:46 +08:00
黄焱
6a07c09686
Accept Merge Request #868 : (feature/前端样式修改 -> develop)
...
Merge Request: 修改,增加强制必填字段方法
Created By: @黄焱
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @黄焱
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/868?initial=true
2024-02-28 14:45:54 +08:00
黄焱
19be421875
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/前端样式修改
2024-02-28 14:44:16 +08:00
黄焱
1c6544ffbf
修改,增加强制必填字段方法
2024-02-28 14:42:57 +08:00
mgw
58d2367f02
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化
2024-02-28 09:44:07 +08:00
mgw
569e28b229
优化质量模块翻译
2024-02-28 09:43:44 +08:00
黄焱
ab6a3f8b6b
Accept Merge Request #867 : (feature/前端样式修改 -> develop)
...
Merge Request: 修改*样式,增加扫码枪判断
Created By: @黄焱
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @黄焱
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/867?initial=true
2024-02-27 17:58:21 +08:00
黄焱
f2c8bd7333
修改*样式,增加扫码枪判断
2024-02-27 17:57:00 +08:00
马广威
9d2e8d020b
Accept Merge Request #866 : (feature/制造代码优化 -> develop)
...
Merge Request: 处理排程处按钮的显隐规则
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/866?initial=true
2024-02-27 17:33:50 +08:00
mgw
586216fa01
代码优化
2024-02-27 17:33:08 +08:00
mgw
70038e05c8
处理排程处按钮的显隐规则
2024-02-27 17:23:15 +08:00
禹翔辉
e301a4d211
Accept Merge Request #865 : (feature/必填字段添加红星样式 -> develop)
...
Merge Request: 1、新增必填字段前添加 * 的样式;2、给刀具管理模块的必填字段添加红星样式;
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/865
2024-02-27 17:22:31 +08:00
yuxianghui
659f869d63
取消刀具安全库存的tree视图必填样式
2024-02-27 17:20:42 +08:00
yuxianghui
0952bc9b70
Merge branch 'feature/工单rfid解绑' into feature/必填字段添加红星样式
2024-02-27 17:17:19 +08:00
yuxianghui
0f8bee120b
1、新增必填字段前添加 * 的样式;2、给刀具管理模块的必填字段添加红星样式;
2024-02-27 17:15:22 +08:00
马广威
e4e03e1765
Accept Merge Request #864 : (feature/制造代码优化 -> develop)
...
Merge Request: 增加中控接口返回对工单、计划单属性的改变(状态,时间等)
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/864
2024-02-27 15:52:08 +08:00
mgw
27c83f7d3c
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化
2024-02-27 15:49:34 +08:00
mgw
391dedc7b1
产品加工进度反馈给销售订单
2024-02-27 15:47:16 +08:00
mgw
fdddf19d13
增加中控接口返回对工单、计划单属性的改变(状态,时间等)
2024-02-27 11:42:59 +08:00
杨金灵
46f74405a1
Accept Merge Request #863 : (feature/去掉多余定义的bfm_url -> develop)
...
Merge Request: 去掉多余定义的bfm_url
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/863?initial=true
2024-02-27 11:24:43 +08:00
jinling.yang
de6db3c313
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/去掉多余定义的bfm_url
2024-02-27 11:21:18 +08:00
jinling.yang
2ddff54311
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-02-27 11:21:05 +08:00
jinling.yang
a423d0c3bf
去掉多余定义的bfm_url
2024-02-27 11:20:32 +08:00
龚启豪
d684dfe8d0
Accept Merge Request #862 : (feature/修改机床参数bug -> develop)
...
Merge Request: 修改工单布局
Created By: @龚启豪
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/862?initial=true
2024-02-27 10:52:51 +08:00
qihao.gong@jikimo.com
e22e4801c1
修改工单布局
2024-02-27 10:51:50 +08:00
jinling.yang
8b7de5ec25
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-02-27 10:50:17 +08:00
jinling.yang
a1afcc517a
Merge branch 'feature/优化工单搜索' into develop
2024-02-27 10:49:34 +08:00
杨金灵
25eab5c203
Accept Merge Request #861 : (feature/优化工单搜索 -> develop)
...
Merge Request: 优化工单搜索和修复销售审查按钮
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/861?initial=true
2024-02-27 10:49:20 +08:00
jinling.yang
545c1a0407
修复销售总监审核未通过审核按钮未隐藏
2024-02-27 10:46:41 +08:00
jinling.yang
42acd22978
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-02-27 10:38:43 +08:00
jinling.yang
3ff8e6d0f8
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化工单搜索
2024-02-27 10:38:32 +08:00
jinling.yang
424754db1a
1.工单查询页面新增工序类型和状态搜索面板
...
2.销售模块新增delivery依赖
2024-02-27 10:37:59 +08:00
禹翔辉
dfada55cf7
Accept Merge Request #860 : (feature/工单rfid解绑 -> develop)
...
Merge Request: 解除装夹工单时解除RFID码和工单的绑定关系
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/860
2024-02-26 17:22:08 +08:00
yuxianghui
7f50a3f1d3
Merge branch 'feature/刀具物料搜索计算方法优化' into feature/工单rfid解绑
2024-02-26 17:19:45 +08:00
龚启豪
ed1a528fa7
Accept Merge Request #859 : (feature/修改机床参数bug -> develop)
...
Merge Request: 修改定时同步接口,机床参数
Created By: @龚启豪
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/859?initial=true
2024-02-26 17:12:03 +08:00
yuxianghui
c9825805db
1、解除装夹工单时解除RFID码和工单的绑定关系
2024-02-26 17:10:34 +08:00
qihao.gong@jikimo.com
e70a91d1ec
修改定时同步接口,机床参数
2024-02-26 17:07:16 +08:00
jinling.yang
bf7926acf4
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-02-26 16:39:43 +08:00
jinling.yang
1fcc0d2ae3
Merge branch 'feature/优化cnc程序' into develop
2024-02-26 16:39:30 +08:00
杨金灵
74678a56f7
Accept Merge Request #858 : (feature/优化cnc程序 -> develop)
...
Merge Request: 优化cnc程序
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/858
2024-02-26 16:39:13 +08:00
jinling.yang
2a39320fc3
优化获取cnc程序的判断条件
2024-02-26 16:37:54 +08:00
jinling.yang
c528c62536
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化cnc程序
2024-02-26 16:35:01 +08:00
jinling.yang
28a080d1cd
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-02-26 16:34:43 +08:00
jinling.yang
267667b3f5
优化cnc程序,
2024-02-26 16:34:26 +08:00
禹翔辉
0b6f5db9ff
Accept Merge Request #857 : (feature/刀具物料搜索计算方法优化 -> develop)
...
Merge Request: 计算方法优化
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/857?initial=true
2024-02-26 12:09:33 +08:00
yuxianghui
a103f84635
Merge branch 'feature/刀具物料搜索优化' into feature/刀具物料搜索计算方法优化
2024-02-26 12:07:39 +08:00
yuxianghui
da89b2f00d
删除刀具物料搜索的计算字段的store=True属性,优化计算方法;
2024-02-26 12:06:00 +08:00
禹翔辉
30e7c616a2
Accept Merge Request #856 : (feature/刀具物料搜索优化 -> develop)
...
Merge Request: 解决刀具物料搜索的计算字段数据问题;
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/856?initial=true
2024-02-26 11:42:43 +08:00
yuxianghui
690c388143
解决刀具物料搜索的计算字段数据问题;
2024-02-26 11:39:25 +08:00
jinling.yang
dbdc2e1238
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-02-23 19:49:55 +08:00
马广威
6c98ea7781
Accept Merge Request #855 : (feature/修改机床参数bug -> develop)
...
Merge Request: 修改库位变更接口
Created By: @龚启豪
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/855#mr-855-review-127671
2024-02-23 18:38:45 +08:00
qihao.gong@jikimo.com
85f4d01cee
修改库位变更接口
2024-02-23 18:33:35 +08:00
马广威
33b456d991
Accept Merge Request #854 : (feature/修改机床参数bug -> develop)
...
Merge Request: 修改库位变更接口
Created By: @龚启豪
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/854#mr-854-review-127659
2024-02-23 18:20:34 +08:00
qihao.gong@jikimo.com
8c8aa63b3a
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
2024-02-23 18:15:45 +08:00
qihao.gong@jikimo.com
5e97f0ef2d
修改库位变更接口
2024-02-23 18:15:28 +08:00
禹翔辉
a255155b4d
Accept Merge Request #853 : (feature/中控接口优化1 -> develop)
...
Merge Request: 优化中控接口
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/853
2024-02-23 17:35:45 +08:00
yuxianghui
97165a0a82
Merge branch 'feature/刀具组接口18-19优化' into feature/中控接口优化1
...
# Conflicts:
# sf_warehouse/models/model.py
2024-02-23 17:33:32 +08:00
yuxianghui
db48ef396e
1、优化中控接口14-16
2024-02-23 17:29:04 +08:00
马广威
1cd05f53b1
Accept Merge Request #852 : (feature/ftp添加新的注释 -> develop)
...
Merge Request: ftp添加新的注释
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/852#mr-852-review-127619
2024-02-23 17:26:33 +08:00
jinling.yang
e126b812b6
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-02-23 17:25:08 +08:00
jinling.yang
4fcbf57e97
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-02-23 17:24:58 +08:00
jinling.yang
6b2608e419
ftp添加新的注释
2024-02-23 17:24:46 +08:00
马广威
9c1365f45e
Accept Merge Request #851 : (feature/修改机床参数bug -> develop)
...
Merge Request: 修改库存信息接口
Created By: @龚启豪
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/851#mr-851-review-127615
2024-02-23 17:21:32 +08:00
qihao.gong@jikimo.com
acf99d3e05
修改库存信息接口
2024-02-23 17:20:25 +08:00
jinling.yang
73ee29246f
Merge branch 'feature/ftp添加输出' into develop
2024-02-23 16:51:08 +08:00
jinling.yang
73e4106dc9
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/ftp添加输出
2024-02-23 16:50:25 +08:00
马广威
96cdc2aba8
Accept Merge Request #850 : (feature/ftp添加输出 -> develop)
...
Merge Request: ftp添加输出
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/850
2024-02-23 16:48:02 +08:00
马广威
342ff9e025
Accept Merge Request #849 : (feature/修改机床参数bug -> develop)
...
Merge Request: 修改库位信息接口
Created By: @龚启豪
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/849#mr-849-review-127596
2024-02-23 16:47:40 +08:00
jinling.yang
c2ad923581
ftp添加输出
2024-02-23 16:46:52 +08:00
qihao.gong@jikimo.com
6a7cff656b
修改库位信息接口
2024-02-23 16:46:30 +08:00
龚启豪
7a00108852
Accept Merge Request #848 : (feature/修改机床参数bug -> develop)
...
Merge Request: 修改库区信息方法
Created By: @龚启豪
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/848?initial=true
2024-02-23 16:42:53 +08:00
qihao.gong@jikimo.com
e1d6726d8b
修改库区信息方法
2024-02-23 16:41:09 +08:00
杨金灵
dcd0f5f892
Accept Merge Request #847 : (feature/修复质检接口 -> develop)
...
Merge Request: 修复质检接口
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/847?initial=true
2024-02-23 16:33:21 +08:00
龚启豪
40fdc1f804
Accept Merge Request #846 : (feature/修改机床参数bug -> develop)
...
Merge Request: 修改获取库区接口
Created By: @龚启豪
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/846
2024-02-23 16:33:19 +08:00
jinling.yang
33e88eb9cc
修复质检接口
2024-02-23 16:31:56 +08:00
qihao.gong@jikimo.com
8b8c8ebd26
修改获取库区接口
2024-02-23 16:29:23 +08:00
杨金灵
bfe7005962
Accept Merge Request #845 : (feature/优化ftp -> develop)
...
Merge Request: 优化ftp
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/845?initial=true
2024-02-23 16:18:57 +08:00
jinling.yang
45fa6931d7
新增下拉检测文件
2024-02-23 16:16:49 +08:00
杨金灵
6f82feddeb
Accept Merge Request #844 : (feature/修复质检接口 -> develop)
...
Merge Request: 修复质检接口
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/844?initial=true
2024-02-23 16:03:32 +08:00
jinling.yang
998900955d
修复质检接口
2024-02-23 16:01:19 +08:00
龚启豪
1c2b50a343
Accept Merge Request #843 : (feature/修改机床参数bug -> develop)
...
Merge Request: 新增获取库区信息定时器,完善库区变更接口
Created By: @龚启豪
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/843?initial=true
2024-02-23 15:34:37 +08:00
杨金灵
49d77c736e
Accept Merge Request #842 : (feature/优化检测文件 -> develop)
...
Merge Request: 优化质检接口
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/842
2024-02-23 15:33:59 +08:00
jinling.yang
6711543567
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化检测文件
2024-02-23 15:33:24 +08:00
qihao.gong@jikimo.com
397cae4f87
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
2024-02-23 15:31:44 +08:00
qihao.gong@jikimo.com
c726bb614c
新增获取库区信息定时器
...
修改库存变更接口
2024-02-23 15:31:25 +08:00
黄焱
6fa8bfffe7
Accept Merge Request #841 : (feature/前端样式修改 -> develop)
...
Merge Request: 扫码RFID实时显示功能
Created By: @黄焱
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @黄焱
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/841?initial=true
2024-02-23 15:31:04 +08:00
jinling.yang
2e62915b41
通过质检接口的质检文件路径获取
2024-02-23 15:29:21 +08:00
黄焱
a80f62c87f
扫码RFID实时显示功能
2024-02-23 15:28:30 +08:00
qihao.gong@jikimo.com
99ba2d0a4d
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
2024-02-23 11:58:26 +08:00
qihao.gong@jikimo.com
b045854a63
修改库位变更接口
2024-02-23 11:58:12 +08:00
马广威
f015cbb9fd
Accept Merge Request #839 : (feature/修改机床参数bug -> develop)
...
Merge Request: 修改工单开始接口
Created By: @龚启豪
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/839
2024-02-23 11:12:11 +08:00
杨金灵
2b9c088d1d
Accept Merge Request #840 : (feature/修复agv接口 -> develop)
...
Merge Request: 修复agv接口
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/840?initial=true
2024-02-23 11:12:05 +08:00
jinling.yang
9ecd95faa0
1.修复质量模块的权限2.修复agv接口
2024-02-23 11:09:57 +08:00
qihao.gong@jikimo.com
7062289c89
修改工单开始
2024-02-23 10:41:28 +08:00
qihao.gong@jikimo.com
d2b80ea42c
修改工单开始接口
2024-02-23 10:32:51 +08:00
jinling.yang
39381ac5b0
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-02-23 10:20:11 +08:00
jinling.yang
cc7b3ea25e
Merge branch 'feature/优化后置三元检测' into develop
2024-02-23 10:19:50 +08:00
杨金灵
85a4fa49a4
Accept Merge Request #838 : (feature/优化后置三元检测 -> develop)
...
Merge Request: 优化后置三元检测
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/838?initial=true
2024-02-23 10:19:25 +08:00
jinling.yang
935b317fe6
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化后置三元检测
2024-02-23 10:17:46 +08:00
jinling.yang
ad0b9983bf
1.新增检测报告链接地址字段
...
2.优化rfid码扫描
3.优化工单页面
2024-02-23 10:17:20 +08:00
龚启豪
648954faa3
Accept Merge Request #837 : (feature/修改机床参数bug -> develop)
...
Merge Request: 修改开始结束工单
Created By: @龚启豪
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/837?initial=true
2024-02-23 10:15:16 +08:00
qihao.gong@jikimo.com
e885d7b372
修改开始结束工单
2024-02-23 10:13:41 +08:00
龚启豪
5fcff90c01
Accept Merge Request #836 : (feature/修改机床参数bug -> develop)
...
Merge Request: 修改工单开始结束接口
Created By: @龚启豪
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/836?initial=true
2024-02-23 09:58:12 +08:00
马广威
8c4c8b0323
Accept Merge Request #835 : (feature/制造代码优化 -> develop)
...
Merge Request: 修改货位编码规则
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/835?initial=true
2024-02-23 09:57:34 +08:00
mgw
f8101c2a16
修改货位编码规则
2024-02-23 09:57:02 +08:00
qihao.gong@jikimo.com
b7c64d9eb4
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
2024-02-23 09:56:16 +08:00
qihao.gong@jikimo.com
e456b811f2
修改工单开始结束接口
2024-02-23 09:56:01 +08:00
杨金灵
01c4e13198
Accept Merge Request #834 : (feature/优化接口和工单 -> develop)
...
Merge Request: 优化接口和工单
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/834
2024-02-22 19:41:54 +08:00
jinling.yang
7bf2316c09
优化接口和工单
2024-02-22 19:40:25 +08:00
杨金灵
e55f7c59e6
Accept Merge Request #833 : (feature/修复日计划工单接口和http -> develop)
...
Merge Request: 修复日计划工单接口和http
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/833?initial=true
2024-02-22 18:54:15 +08:00
jinling.yang
5916b4a740
修复日计划工单接口和http
2024-02-22 18:52:36 +08:00
jinling.yang
a3f6946823
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-02-22 18:26:41 +08:00
jinling.yang
87cda7e641
Merge branch 'feature/修复日计划工单和工件预调接口' into develop
2024-02-22 18:24:54 +08:00
杨金灵
247b82e816
Accept Merge Request #832 : (feature/修复日计划工单和工件预调接口 -> develop)
...
Merge Request: 修复日计划工单和工件预调接口
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/832?initial=true
2024-02-22 18:24:31 +08:00
jinling.yang
4d745b48cf
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复日计划工单和工件预调接口
2024-02-22 18:23:14 +08:00
jinling.yang
fc2588140b
修复日计划工单和工件预调接口
2024-02-22 18:22:56 +08:00
禹翔辉
e619e6660e
Accept Merge Request #831 : (feature/刀具组接口18-19优化 -> develop)
...
Merge Request: 刀具组接口优化
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/831?initial=true
2024-02-22 18:16:51 +08:00
yuxianghui
475b45b293
Merge branch 'feature/中控接口14-16优化' into feature/刀具组接口18-19优化
2024-02-22 18:14:56 +08:00
yuxianghui
3c4a2b58b1
1、优化刀具接口
2024-02-22 18:12:51 +08:00
杨金灵
a8fb541568
Accept Merge Request #830 : (feature/修复日计划工单接口 -> develop)
...
Merge Request: 修复日计划工单
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/830
2024-02-22 18:03:09 +08:00
jinling.yang
90c499f9c7
修复日计划工单
2024-02-22 18:00:16 +08:00
马广威
e6bef9d1ab
Accept Merge Request #829 : (feature/新增agv反馈接口 -> develop)
...
Merge Request: 新增agv接口
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/829#mr-829-review-127286
2024-02-22 17:18:31 +08:00
jinling.yang
5d22318f7d
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增agv反馈接口
...
# Conflicts:
# sf_manufacturing/controllers/controllers.py
2024-02-22 17:17:02 +08:00
jinling.yang
da97fce6d5
新增agv相关接口
2024-02-22 17:16:16 +08:00
龚启豪
b34611d1b3
Accept Merge Request #828 : (feature/修改机床参数bug -> develop)
...
Merge Request: 修改接口
Created By: @龚启豪
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/828?initial=true
2024-02-22 16:55:55 +08:00
qihao.gong@jikimo.com
75e2b2fabe
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
...
# Conflicts:
# sf_manufacturing/controllers/controllers.py
2024-02-22 16:54:15 +08:00
qihao.gong@jikimo.com
df57b33e19
修改接口
2024-02-22 16:52:48 +08:00
jinling.yang
0ca4165219
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-02-22 16:00:03 +08:00
jinling.yang
9ce4cf779b
Merge branch 'feature/新增cmm程序' into develop
2024-02-22 15:58:53 +08:00
杨金灵
4ccebfac29
Accept Merge Request #827 : (feature/新增cmm程序 -> develop)
...
Merge Request: 新增cmm程序及接口
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/827?initial=true
2024-02-22 15:58:35 +08:00
jinling.yang
1142400e9c
新增库位接口(启豪的代码)
2024-02-22 15:56:34 +08:00
jinling.yang
abcada8466
新增cmm程序对象及新增cmm接口
2024-02-22 15:55:35 +08:00
qihao.gong@jikimo.com
a8bedd0425
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
2024-02-22 15:35:48 +08:00
jinling.yang
fe89a971a6
Merge branch 'feature/优化工件预调接口' into develop
2024-02-22 15:23:33 +08:00
jinling.yang
6df562a8ab
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化工件预调接口
2024-02-22 15:20:13 +08:00
jinling.yang
c086bd03f0
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-02-22 15:19:58 +08:00
jinling.yang
9e591c3813
修复工件预调接口
2024-02-22 15:18:40 +08:00
jinling.yang
0be75bc54f
Merge branch 'feature/优化中控接口' into develop
2024-02-22 14:44:06 +08:00
杨金灵
d94e4469f6
Accept Merge Request #825 : (feature/优化中控接口 -> develop)
...
Merge Request: 优化中控接口
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/825
2024-02-22 14:43:48 +08:00
jinling.yang
4b4fd649e6
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化中控接口
2024-02-22 14:42:06 +08:00
jinling.yang
fad44a5413
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-02-22 14:41:47 +08:00
禹翔辉
8910b3493e
Accept Merge Request #824 : (feature/中控刀具接口优化 -> develop)
...
Merge Request: 刀具组接口优化
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/824
2024-02-22 14:35:44 +08:00
yuxianghui
20fe65c73c
Merge branch 'feature/刀具组接口优化' into feature/中控刀具接口优化
2024-02-22 14:34:16 +08:00
qihao.gong@jikimo.com
3fe9c9e532
修改接口方法
2024-02-22 14:30:51 +08:00
yuxianghui
259d723ec9
优化刀具组接口
2024-02-22 14:30:38 +08:00
jinling.yang
0d755a50ae
优化工单相关接口
2024-02-22 14:26:56 +08:00
禹翔辉
e27f2f72bf
Accept Merge Request #823 : (feature/刀具组接口优化 -> develop)
...
Merge Request: 刀具组接口优化
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/823
2024-02-22 14:26:26 +08:00
yuxianghui
b6ea81d07f
Merge branch 'feature/中控接口14-19优化' into feature/刀具组接口优化
2024-02-22 14:24:26 +08:00
yuxianghui
ed8cbb1f81
1、优化刀具组接口
2024-02-22 14:23:19 +08:00
jinling.yang
65b5f7f30a
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-02-22 13:44:25 +08:00
杨金灵
bc30c0558d
Accept Merge Request #822 : (feature/修复中控接口 -> develop)
...
Merge Request: 修复中控接口
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/822
2024-02-22 11:56:38 +08:00
jinling.yang
8913d2f65f
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复中控接口
2024-02-22 11:54:18 +08:00
jinling.yang
907f5db4e2
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-02-22 11:54:01 +08:00
jinling.yang
79c6459adf
1.cnc工单新增程序文件字段2.优化获取编程单接口3.修复与中控对接的接口
2024-02-22 11:53:50 +08:00
qihao.gong@jikimo.com
87e9ecb9e2
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
2024-02-22 10:24:03 +08:00
禹翔辉
e5129fe55f
Accept Merge Request #821 : (feature/中控接口14-19优化 -> develop)
...
Merge Request: 接口优化
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/821
2024-02-22 10:20:15 +08:00
yuxianghui
5f760cf94b
Merge branch 'feature/新增中控接口' into feature/中控接口14-19优化
2024-02-22 10:17:24 +08:00
yuxianghui
ce01127664
中控对接接口优化
2024-02-22 10:15:07 +08:00
jinling.yang
ef3219a098
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-02-22 09:35:37 +08:00
qihao.gong@jikimo.com
473a8ea6fe
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
...
# Conflicts:
# sf_warehouse/views/shelf_location.xml
2024-02-21 16:40:24 +08:00
禹翔辉
8695a66e3d
Accept Merge Request #820 : (feature/新增中控接口 -> develop)
...
Merge Request: 1、新增刀具组、机床刀具组接口,修改中控相关接口名称
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/820?initial=true
2024-02-21 16:28:39 +08:00
yuxianghui
410b384fd6
Merge branch 'feature/中控接口优化' into feature/新增中控接口
2024-02-21 16:26:27 +08:00
qihao.gong@jikimo.com
bb321f90a5
处理库存报错bug
2024-02-21 16:26:18 +08:00
yuxianghui
51b7bcac8a
1、新增刀具组、机床刀具组接口,修改中控相关接口名称
2024-02-21 16:24:10 +08:00
马广威
36ce43cf8a
Accept Merge Request #819 : (feature/制造代码优化 -> develop)
...
Merge Request: 修复序列号问题
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/819?initial=true
2024-02-21 15:26:42 +08:00
mgw
b4538a3f9d
修复序列号问题
2024-02-21 15:25:55 +08:00
jinling.yang
af725fa363
Merge branch 'feature/优化快速订单' into develop
2024-02-21 14:54:58 +08:00
杨金灵
7d3a320893
Accept Merge Request #818 : (feature/优化快速订单 -> develop)
...
Merge Request: 优化快速订单和工单
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/818?initial=true
2024-02-21 14:54:40 +08:00
jinling.yang
0354f6b136
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化快速订单
2024-02-21 14:52:36 +08:00
jinling.yang
1e006b0bd7
1.工单新增rfid字段
...
2.修改中控对接的工单接口
3.快速订单材料,型号,客户修改为可选择
2024-02-21 14:52:14 +08:00
马广威
50b0204cc6
Accept Merge Request #817 : (feature/制造代码优化 -> develop)
...
Merge Request: 修复物流方式导致的分配工厂失败问题
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/817?initial=true
2024-02-21 11:33:18 +08:00
mgw
72df0aa640
修复物流方式导致的分配工厂失败问题
2024-02-21 11:32:06 +08:00
马广威
02bf6a6764
Accept Merge Request #816 : (feature/制造代码优化 -> develop)
...
Merge Request: 货架货位拆分测试异常问题修复
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/816?initial=true
2024-02-20 20:17:50 +08:00
mgw
64581abeb1
测试异常问题修复
2024-02-20 20:17:00 +08:00
马广威
82f80f1d15
Accept Merge Request #815 : (feature/制造代码优化 -> develop)
...
Merge Request: 货架货位对象拆分
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/815
2024-02-20 17:40:01 +08:00
mgw
f324a9d471
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化
...
# Conflicts:
# sf_warehouse/views/shelf_location.xml
2024-02-20 17:37:52 +08:00
mgw
6103bca698
货架货位对象拆分
2024-02-20 17:35:31 +08:00
jinling.yang
9a4477de8b
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化快速订单
2024-02-20 17:34:52 +08:00
jinling.yang
5646cc492e
1.快速订单新增特征识别路径字段
...
2.修复销售经理和销售总监看不到快速订单菜单
3.优化系统设置页面,新增特征识别路径展示,去掉重复的业务平台参数配置展示
4.快速订单去掉老版本的特征识别的代码及包,新增最新的特征识别方法
2024-02-20 17:33:06 +08:00
禹翔辉
d5c748db78
Accept Merge Request #814 : (feature/序列号添加二维码 -> develop)
...
Merge Request: 序列号模型添加二维码字段,添加自动根据序列号名称生成二维码的功能,新增打印二维码功能;
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/814?initial=true
2024-02-20 16:05:00 +08:00
yuxianghui
9c08021773
Merge branch 'feature/自动生成二维码' into feature/序列号添加二维码
2024-02-20 16:01:52 +08:00
yuxianghui
cf3ec1b6ae
1、序列号模型添加二维码字段,添加自动根据序列号名称生成二维码的功能,新增打印二维码功能;
2024-02-20 15:59:58 +08:00
禹翔辉
df89f40a24
Accept Merge Request #813 : (feature/功能刀具组装优化 -> develop)
...
Merge Request: 1、删除功能刀具组装模型的打印二维码按钮,隐藏组装单打印按钮;2、添加功能刀具组装时的rfid验重功能;
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/813?initial=true
2024-02-20 14:51:18 +08:00
yuxianghui
5c24cec4f6
Merge branch 'feature/刀具物料查询模型重构' into feature/功能刀具组装优化
2024-02-20 14:40:28 +08:00
杨金灵
4379854b89
Accept Merge Request #812 : (feature/删除库存部分代码 -> develop)
...
Merge Request: 删除库存部分代码
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/812?initial=true
2024-02-20 14:39:18 +08:00
jinling.yang
3a076bbdd1
删除库存部分代码
2024-02-20 14:37:50 +08:00
yuxianghui
bb519b8ab8
1、序列号模型自动跟具序列号名称生成二维码(未完成)
2024-02-20 14:35:28 +08:00
杨金灵
de26109ccc
Accept Merge Request #809 : (feature/产品的加工参数的权限修复 -> develop)
...
Merge Request: 产品的加工参数的权限修复
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/809
2024-02-20 14:35:03 +08:00
yuxianghui
53e5aa2017
优化刀具组接口
2024-02-20 14:32:13 +08:00
yuxianghui
0183a5ab2b
1、删除功能刀具组装模型的打印二维码按钮,隐藏组装单打印按钮;2、添加功能刀具组装时的rfid验重功能;
2024-02-20 14:27:43 +08:00
马广威
54c5259ed9
Accept Merge Request #811 : (feature/制造代码优化 -> develop)
...
Merge Request: 分配序列号时增加二维码生成及编码打印
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/811?initial=true
2024-02-20 13:11:39 +08:00
mgw
efdde5aef0
分配序列号时增加二维码生成及编码打印
2024-02-20 13:09:25 +08:00
马广威
584dd11c61
Accept Merge Request #810 : (feature/制造代码优化 -> develop)
...
Merge Request: 代码优化
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/810?initial=true
2024-02-19 17:25:00 +08:00
mgw
635583826f
物流处bug修复
2024-02-19 17:23:57 +08:00
jinling.yang
cbd7b561de
产品的加工参数的权限修复
2024-02-19 17:07:42 +08:00
mgw
9c080e0cb4
权限控制增补
2024-02-19 15:26:36 +08:00
mgw
1c61a8ef1c
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化
2024-02-19 14:36:13 +08:00
mgw
07ed60e8a7
刀具管理权限优化
2024-02-19 14:35:51 +08:00
禹翔辉
7207d7eb36
Accept Merge Request #808 : (feature/重构刀具物料查询 -> develop)
...
Merge Request: 重构刀具物料查询模型及其相关功能
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/808?initial=true
2024-02-18 17:26:47 +08:00
yuxianghui
9ede024710
Merge branch 'feature/刀具物料查询模型重构' into feature/重构刀具物料查询
2024-02-18 17:23:44 +08:00
yuxianghui
cb8285d0ca
1、重构刀具物料查询模型;2、新增产品创建时产品类别为刀具时,创建刀具物料查询模型记录;3、新增序列号和刀具物料查询模型的关联字段,新增刀具物料是否可用状态字段;并在新增序列号记录时,如果关联的产品的产品类别为刀具时,对对应刀具物料查询记录进行关联;
2024-02-18 17:22:06 +08:00
马广威
3e3f49f8aa
Accept Merge Request #807 : (feature/制造代码优化 -> develop)
...
Merge Request: 优化排程单与制造订单生产线状态联动的问题
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/807
2024-02-18 15:43:32 +08:00
禹翔辉
35cc1ce6dc
Accept Merge Request #806 : (feature/优化驾驶舱 -> develop)
...
Merge Request: 优化生产线驾驶舱,将功能刀具组装中心的按键改成组装单的跳转按键
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/806
2024-02-18 10:32:36 +08:00
yuxianghui
b4b70e3cf0
Merge branch 'feature/生产线驾驶舱优化' into feature/优化驾驶舱
2024-02-18 10:28:40 +08:00
yuxianghui
39a2b1035a
优化生产线驾驶舱,将功能刀具组装中心的按键改成组装单的跳转按键
2024-02-18 10:24:21 +08:00
jinling.yang
b370e34dca
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-02-17 16:38:03 +08:00
jinling.yang
a6b5a823b8
Merge branch 'feature/产品相关岗位权限的修复' into develop
2024-02-17 16:37:33 +08:00
杨金灵
24bcec8646
Accept Merge Request #805 : (feature/产品相关岗位权限的修复 -> develop)
...
Merge Request: 产品相关岗位权限的修复
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/805?initial=true
2024-02-17 16:37:11 +08:00
jinling.yang
5a74c346a7
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/产品相关岗位权限的修复
2024-02-17 16:35:16 +08:00
jinling.yang
1c64ee9b90
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-02-17 16:34:50 +08:00
jinling.yang
c867b3c7bc
产品相关岗位权限的修复
2024-02-17 16:34:32 +08:00
mgw
a4413af2f3
优化排程单与制造订单生产线状态联动的问题
2024-02-17 15:35:40 +08:00
禹翔辉
f726bbaef6
Accept Merge Request #804 : (feature/刀具物料扫码录入验证 -> develop)
...
Merge Request: 添加功能刀具组装时刀具物料扫码录入验证
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/804?initial=true
2024-02-05 14:13:37 +08:00
yuxianghui
53ce27d623
Merge branch 'feature/功能刀具组装扫录入数据功能优化' into feature/刀具物料扫码录入验证
2024-02-05 14:11:14 +08:00
yuxianghui
b88e4af4e2
优化刀具物料扫码录入验证
2024-02-05 14:09:06 +08:00
jinling.yang
a12c81e60d
Merge branch 'feature/修复同步刀具标准库相关接口' into develop
2024-02-05 11:05:56 +08:00
杨金灵
13415dd771
Accept Merge Request #803 : (feature/修复同步刀具标准库相关接口 -> develop)
...
Merge Request: 修复同步刀具标准库相关接口
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/803
2024-02-05 11:05:33 +08:00
jinling.yang
7ea6a78fbd
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复同步刀具标准库相关接口
2024-02-05 10:59:20 +08:00
jinling.yang
d5aaa70013
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-02-05 10:59:03 +08:00
jinling.yang
f05d0461c3
1.修复同步刀具标准库相关接口2.修复产品存档权限问题
2024-02-05 10:57:57 +08:00
yuxianghui
b525a45107
优化功能刀具组装的刀具物料验证
2024-02-04 17:30:26 +08:00
马广威
6ab0bf7b5d
Accept Merge Request #802 : (feature/制造代码优化 -> develop)
...
Merge Request: 控制oee对计划人员只读
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/802?initial=true
2024-02-04 17:25:29 +08:00
jinling.yang
f1335e8252
Merge branch 'feature/修复产品权限问题' into develop
2024-02-04 16:57:44 +08:00
mgw
f0c8a82b43
控制oee对计划人员只读
2024-02-04 16:57:39 +08:00
杨金灵
f435fe3577
Accept Merge Request #801 : (feature/修复产品权限问题 -> develop)
...
Merge Request: 修复产品权限问题
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/801?initial=true
2024-02-04 16:56:05 +08:00
jinling.yang
9bae3a4e5f
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复产品权限问题
2024-02-04 16:53:28 +08:00
jinling.yang
e7808216ca
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-02-04 16:53:12 +08:00
jinling.yang
e48c5e39ac
修复产品页面部分一对多字段的访问权限
2024-02-04 16:52:57 +08:00
龚启豪
0d2e043449
Accept Merge Request #799 : (feature/修改机床参数bug -> develop)
...
Merge Request: 处理权限相关缺陷
Created By: @龚启豪
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/799
2024-02-04 16:07:25 +08:00
马广威
f2a822aeda
Accept Merge Request #800 : (feature/制造代码优化 -> develop)
...
Merge Request: 机企猫 隐藏项目模块修改接入(可隐藏导出、新建等项目)
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/800?initial=true
2024-02-04 16:06:27 +08:00
qihao.gong@jikimo.com
6cdc547da5
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
2024-02-04 15:57:16 +08:00
qihao.gong@jikimo.com
c11dc4f9c4
修改权限相关缺陷
2024-02-04 15:56:53 +08:00
mgw
f6c121771f
机企猫 隐藏项目模块修改接入(可隐藏导出、新建等项目)
2024-02-04 15:32:25 +08:00
jinling.yang
db77b0b3ac
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-02-04 14:26:23 +08:00
jinling.yang
9565927ba6
Merge branch 'feature/修改客户编辑权限' into develop
2024-02-04 14:25:33 +08:00
杨金灵
18d8212c3f
Accept Merge Request #798 : (feature/修改客户编辑权限 -> develop)
...
Merge Request: 修改客户编辑权限
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/798?initial=true
2024-02-04 14:25:17 +08:00
jinling.yang
1ca5817379
客户页面优化编辑
2024-02-04 14:22:53 +08:00
jinling.yang
0185a3bc2b
修复客户页面除销售员和采购员字段可编辑,其余不可编辑
2024-02-02 17:27:08 +08:00
jinling.yang
0c4407ce8e
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-02-02 15:59:13 +08:00
jinling.yang
f11c88cf1b
Merge branch 'feature/修复工件配送及权限' into develop
2024-02-02 15:59:00 +08:00
杨金灵
7e025e7ca1
Accept Merge Request #797 : (feature/修复工件配送及权限 -> develop)
...
Merge Request: 修复工件配送及权限
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/797?initial=true
2024-02-02 15:58:45 +08:00
jinling.yang
4da7114655
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复工件配送及权限
2024-02-02 15:52:35 +08:00
jinling.yang
e3bac55346
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-02-02 15:52:19 +08:00
jinling.yang
8c52c42074
1.修复来自业务平台的自动生产的采购单状态
...
2.修复所有同步cloud的数据
2024-02-02 15:52:06 +08:00
jinling.yang
ab9fcf97e0
1.修复工件配送扫描工件(坯料)时,同运工件显示的是坯料对应的制造订单号,修改配送时长字段类型及对应的时长方法,修复工件装夹岗不能修改配送工件
...
2.修复产品中计划总监岗和调度总监岗不能访问切削速度的权限
2024-02-01 17:37:41 +08:00
禹翔辉
f270f683de
Accept Merge Request #796 : (feature/功能刀具组装扫录入数据功能优化 -> develop)
...
Merge Request: 添加功能刀具组装时扫描录入刀具物料时进行物料是否已入库和是否已经使用的判断
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/796?initial=true
2024-02-01 17:11:10 +08:00
yuxianghui
8e806225d0
添加功能刀具组装时扫描录入刀具物料时进行物料是否已入库和是否已经使用的判断
2024-02-01 17:07:19 +08:00
jinling.yang
56847c7a22
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-02-01 11:44:57 +08:00
jinling.yang
9973370fd6
Merge branch 'feature/优化工件配送列表' into develop
2024-02-01 11:44:39 +08:00
杨金灵
3cb71a8017
Accept Merge Request #795 : (feature/优化工件配送列表 -> develop)
...
Merge Request: 优化工件配送列表
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/795
2024-02-01 11:44:16 +08:00
jinling.yang
cc72ddfad7
释放注释代码
2024-02-01 11:35:08 +08:00
jinling.yang
527ab396ee
1.新增工件配送向导2.修复采购审核按钮不可见3.配置中新增agv路径字段4.优化工单上按钮显示条件
2024-01-30 17:40:05 +08:00
jinling.yang
1c90c97b92
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-01-30 11:55:38 +08:00
jinling.yang
d70d3a9254
Merge branch 'feature/修改admin的访问权限' into develop
2024-01-30 11:55:03 +08:00
杨金灵
2d4ae18e64
Accept Merge Request #794 : (feature/修改admin的访问权限 -> develop)
...
Merge Request: 修改访问权限和采购页面
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/794?initial=true
2024-01-30 11:54:21 +08:00
jinling.yang
92850fe34f
采购页面新增审核状态字段
2024-01-30 11:52:29 +08:00
jinling.yang
17bbe1414b
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改admin的访问权限
2024-01-30 11:43:56 +08:00
jinling.yang
7f56a75722
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-01-30 11:43:39 +08:00
jinling.yang
51a9b55782
修改admin在同步模型的访问权限
2024-01-30 11:43:18 +08:00
马广威
addc68ed5a
Accept Merge Request #793 : (feature/制造代码优化 -> develop)
...
Merge Request: 优化货位颜色及启用货位
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/793
2024-01-30 09:49:25 +08:00
mgw
5e9d541239
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化
2024-01-30 09:48:38 +08:00
mgw
642a93c449
优化货位颜色及启用货位
2024-01-30 09:48:14 +08:00
jinling.yang
ff7151399f
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-01-30 09:45:28 +08:00
jinling.yang
a67f45f9d5
Merge branch 'feature/新增工件装夹预调工单任务' into develop
2024-01-30 09:45:07 +08:00
杨金灵
98ef86866a
Accept Merge Request #791 : (feature/新增工件装夹预调工单任务 -> develop)
...
Merge Request: 新增工件装夹预调工单任务
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/791
2024-01-30 09:44:40 +08:00
马广威
f2c70fa167
Accept Merge Request #792 : (feature/制造代码优化 -> develop)
...
Merge Request: 修复货位问题
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/792?initial=true
2024-01-30 09:13:12 +08:00
mgw
1c0187d55b
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化
2024-01-30 09:12:27 +08:00
mgw
04244dd17a
修复货位问题
2024-01-30 09:12:02 +08:00
jinling.yang
da63b0b7ff
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增工件装夹预调工单任务
2024-01-29 19:45:46 +08:00
jinling.yang
a088ee9ed5
1.制造模块内配置下的所有模型增加管理员(admin)权限
...
2.工单上的工件配送优化验证及对应的页面上新增工件配送按钮
2024-01-29 19:43:57 +08:00
禹翔辉
ee78dda3a9
Accept Merge Request #790 : (feature/功能刀具添加fid -> develop)
...
Merge Request: 功能刀具模块的功能刀具添加fid字段,隐藏序列号字段
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/790
2024-01-29 17:28:06 +08:00
yuxianghui
e13bd0dc61
修改功能刀具预警的rfid关联字段
2024-01-29 17:25:34 +08:00
yuxianghui
9f57ad6aaf
将fid改为rfid
2024-01-29 17:23:17 +08:00
yuxianghui
8c4996b7c2
功能刀具模块的功能刀具添加fid字段,隐藏序列号字段
2024-01-29 17:05:56 +08:00
jinling.yang
cf2aaa38fe
1.修复材料型号同步报验证问题2.优化工单的工件派送3.计划里新增生产线的优化
2024-01-26 17:46:53 +08:00
马广威
ac900dd3f0
Accept Merge Request #789 : (feature/制造代码优化 -> develop)
...
Merge Request: 修复数据同步问题
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/789?initial=true
2024-01-26 15:09:07 +08:00
mgw
0e762f9cbc
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化
2024-01-26 15:08:29 +08:00
mgw
4ee4b28389
修复数据同步问题
2024-01-26 14:18:10 +08:00
龚启豪
d36acedaa3
Accept Merge Request #788 : (feature/修改机床参数bug -> develop)
...
Merge Request: 增加设备运行日志,agv运行日志
Created By: @龚启豪
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/788
2024-01-26 11:31:19 +08:00
龚启豪
1311d5be1e
Merge branch refs/heads/develop into refs/heads/feature/修改机床参数bug
2024-01-26 11:28:51 +08:00
qihao.gong@jikimo.com
207cd83d3c
取消OCC注释
2024-01-26 11:27:12 +08:00
jinling.yang
37161e2e20
1.修改工单的托盘序列号,托盘名称,托盘品牌,托盘类型,托盘型号字段类型,且页面对应字段改为只读
...
2.装夹预调工单新增扫条形码,扫码时对该工单进行自动开始并将条码里对应的托盘产品信息回填到托盘序列号,托盘名称,托盘品牌,托盘类型,托盘型号字段上,点击完成时对前置三元定位检测参数进行验证
3.研究打印序列号(多个)
2024-01-25 17:51:57 +08:00
qihao.gong@jikimo.com
6461e3a423
修改货架货位看板颜色
2024-01-25 17:36:34 +08:00
黄焱
76393d438b
Accept Merge Request #787 : (feature/前端样式修改 -> develop)
...
Merge Request: 修改货架货位空闲颜色
Created By: @黄焱
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @黄焱
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/787?initial=true
2024-01-25 10:09:48 +08:00
黄焱
50ced99785
修改货架货位空闲颜色
2024-01-25 10:03:53 +08:00
jinling.yang
8e3a316200
采购入库时,新增打印序列号方法
2024-01-24 17:30:59 +08:00
qihao.gong@jikimo.com
fc7c66c615
AGV增加运行日志
...
设备oee增加运行日志
2024-01-24 17:29:42 +08:00
jinling.yang
2daeb01c4d
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增工件装夹预调工单任务
2024-01-24 16:04:53 +08:00
杨金灵
1818e97289
Accept Merge Request #786 : (feature/修复平台派过来的销售订单缺少【取消】按钮 -> develop)
...
Merge Request: 修复采购和销售按钮显示问题
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/786?initial=true
2024-01-24 16:04:13 +08:00
jinling.yang
e661297b5d
修复采购总监审核菜单单-审核通过后没有反应-订单状态没有变
2024-01-24 15:59:58 +08:00
jinling.yang
926caeca97
工件配送文字修改
2024-01-24 14:54:07 +08:00
jinling.yang
403ba64e50
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增工件装夹预调工单任务
...
# Conflicts:
# sf_manufacturing/views/mrp_production_addional_change.xml
2024-01-24 14:39:47 +08:00
jinling.yang
cdc3c52784
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-01-24 14:24:42 +08:00
马广威
7000b66683
Accept Merge Request #785 : (feature/制造代码优化 -> develop)
...
Merge Request: 调整视图显隐控制逻辑
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/785?initial=true
2024-01-24 14:24:35 +08:00
jinling.yang
82f54b5d83
制造订单页面新增生产线和计划开始加工时间字段
2024-01-24 14:24:27 +08:00
mgw
1af08763ea
调整视图显隐控制逻辑
2024-01-24 14:24:01 +08:00
jinling.yang
8f379a2635
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增工件装夹预调工单任务
...
# Conflicts:
# sf_manufacturing/models/mrp_workorder.py
2024-01-23 17:42:38 +08:00
马广威
96b0773c00
Accept Merge Request #784 : (feature/制造代码优化 -> develop)
...
Merge Request: 物流相关增量开发,修改一些原生按钮,修改一些翻译。增加功能:当为非“自提”单时,必须进行物流下单才能进行出库操作。增加对字段的显隐控制
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/784
2024-01-23 17:32:53 +08:00
mgw
79f8cd21a9
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化
2024-01-23 17:31:04 +08:00
mgw
5c129331e0
增加功能:当为非“自提”单时,必须进行物流下单才能进行出库操作。增加对字段的显隐控制
2024-01-23 16:13:53 +08:00
jinling.yang
cddb025e98
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-01-23 15:33:37 +08:00
jinling.yang
1e2272c13a
新增工件配送对象
2024-01-23 15:33:17 +08:00
禹翔辉
d955832bd8
Accept Merge Request #783 : (feature/新增工件配送模型 -> develop)
...
Merge Request: 新增工件配送模型
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/783?initial=true
2024-01-23 15:32:18 +08:00
yuxianghui
4a52327acd
Merge remote-tracking branch 'origin/feature/关闭接口的调用' into feature/新增工件配送模型
2024-01-23 15:30:10 +08:00
yuxianghui
136d0f5156
新增工件配送模型及其tree视图,search视图,添加自动计算配送时长功能;
2024-01-23 15:29:07 +08:00
mgw
0254387c03
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化
...
# Conflicts:
# sf_sale/models/sale_order.py
2024-01-23 10:36:21 +08:00
mgw
90f8c4143e
物流相关增量开发,修改一些原生按钮,修改一些翻译
2024-01-23 10:34:49 +08:00
qihao.gong@jikimo.com
0ef13504e7
修改货架货位关联移动历史调拨单关联
2024-01-22 17:33:40 +08:00
禹翔辉
40bf41c93d
Accept Merge Request #782 : (feature/关闭接口的调用 -> develop)
...
Merge Request: 注释接口的调用方法
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/782
2024-01-22 17:16:26 +08:00
yuxianghui
3f8aded61c
Merge branch 'feature/CAM用刀优化及添加接口' into feature/关闭接口的调用
2024-01-22 17:14:19 +08:00
yuxianghui
f5c555ec86
注释新增接口的调用
2024-01-22 17:11:45 +08:00
禹翔辉
3e7f145255
Accept Merge Request #781 : (feature/CAM用刀优化及添加接口 -> develop)
...
Merge Request: 1、添加机床刀位字段
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/781?initial=true
2024-01-22 15:55:40 +08:00
yuxianghui
2a5a9de3e3
1、添加机床刀位字段
2024-01-22 15:54:30 +08:00
jinling.yang
d2bca2ff51
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-01-22 15:45:19 +08:00
jinling.yang
f9d6a13d33
Merge branch 'feature/新增机台日计划,工件预调(前置三元检测),NC程序下载接口' into develop
2024-01-22 15:45:00 +08:00
杨金灵
adcd2c39fc
Accept Merge Request #779 : (feature/新增机台日计划,工件预调(前置三元检测),NC程序下载接口 -> develop)
...
Merge Request: 新增机台日计划,工件预调(前置三元检测),NC程序下载接口
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/779
2024-01-22 15:41:49 +08:00
jinling.yang
b37d547359
http验证代码还原
2024-01-22 15:41:20 +08:00
马广威
72f5496905
Accept Merge Request #780 : (feature/制造代码优化 -> develop)
...
Merge Request: 增加刀具管理权限控制,刀具组权限控制,隐藏工单上原生按钮,修复只读权限后修改记录无权限问题等
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/780?initial=true
2024-01-22 15:40:23 +08:00
jinling.yang
daa7c467f9
注释代码还原
2024-01-22 15:37:06 +08:00
jinling.yang
12c6959ba4
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增机台日计划,工件预调(前置三元检测),NC程序下载接口
...
# Conflicts:
# sf_manufacturing/controllers/controllers.py
2024-01-22 15:35:13 +08:00
龚启豪
81fe1cf486
Accept Merge Request #778 : (feature/修改机床参数bug -> develop)
...
Merge Request: 修改视图bug
Created By: @龚启豪
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/778?initial=true
2024-01-22 14:49:20 +08:00
禹翔辉
b5a8379d52
Accept Merge Request #777 : (feature/CAM用刀优化及添加接口 -> develop)
...
Merge Request: CAM用刀优化,新增接口
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/777
2024-01-22 14:48:57 +08:00
qihao.gong@jikimo.com
92fc988951
修改视图bug
2024-01-22 14:43:58 +08:00
yuxianghui
d03813db40
Merge remote-tracking branch 'origin/feature/接口及CAM用刀' into feature/CAM用刀优化及添加接口
2024-01-22 14:42:45 +08:00
龚启豪
1b3b80f735
Accept Merge Request #776 : (feature/修改机床参数bug -> develop)
...
Merge Request: 合并后置三元和CNC工单
Created By: @龚启豪
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/776
2024-01-22 14:39:06 +08:00
qihao.gong@jikimo.com
4efb6dc6d0
Merge branch 'feature/修改机床参数bug' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
...
# Conflicts:
# sf_warehouse/views/view.xml
2024-01-22 14:37:59 +08:00
yuxianghui
f58420ac46
Merge remote-tracking branch 'origin/feature/新增中控对接接口' into feature/接口及CAM用刀
...
# Conflicts:
# sf_tool_management/models/base.py
2024-01-22 14:37:57 +08:00
qihao.gong@jikimo.com
7b2b15d601
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
...
# Conflicts:
# sf_warehouse/views/view.xml
2024-01-22 14:37:25 +08:00
qihao.gong@jikimo.com
b9ba29d276
取消OCC注释
2024-01-22 14:36:36 +08:00
龚启豪
e0baa2574a
Merge branch refs/heads/develop into refs/heads/feature/修改机床参数bug
2024-01-22 14:33:26 +08:00
yuxianghui
fced85f530
1、删除无语字段
2024-01-22 14:32:33 +08:00
qihao.gong@jikimo.com
e80056938f
修改库存配置的审核按钮
2024-01-22 14:30:53 +08:00
yuxianghui
b5c7be8de0
1、新增机床刀具组接口,在刀具组新建和更新时调用接口;2、新增零件特采接口,在质量检测审核之后调用接口;
2024-01-19 17:26:45 +08:00
jinling.yang
b0104e7b93
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增机台日计划,工件预调(前置三元检测),NC程序下载接口
2024-01-19 17:18:59 +08:00
杨金灵
bd9b52e6ce
Accept Merge Request #775 : (feature/修复平台派单采购单无买家问题 -> develop)
...
Merge Request: 修复平台派单采购单无买家问题
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/775
2024-01-19 17:17:15 +08:00
jinling.yang
af348c4d8f
1.修复平台派单采购单无买家问题2.还原获取CNC程序代码
2024-01-19 17:11:20 +08:00
jinling.yang
9e65f947f9
Merge branch 'feature/修复缺陷' into develop
2024-01-19 16:03:44 +08:00
jinling.yang
3226942ed3
1.修复产品类别和计量单位去掉审核状态字段2.优化bfm派单至sf的销售订单流程3.工序增加编码字段
2024-01-19 15:45:15 +08:00
mgw
2dfd3c9128
增加刀具管理权限控制,刀具组权限控制,隐藏工单上原生按钮,修复只读权限后修改记录无权限问题等
2024-01-19 11:49:57 +08:00
jinling.yang
eb117aef86
1.修复采购总监审核采购单审核不通过后-还显示【审核】按钮2.新增采购总监审核采购单审核不通过后-还显示【审核】按钮3.产品详情界面的删除按钮要隐藏
2024-01-18 17:39:22 +08:00
yuxianghui
3575f0c5c9
1、工单的cnc加工模型添加功能刀具类型字段;2、添加根据刀具类型和刀具名称检索现有功能刀具是否满足需求,如果不满足则创建CAM工单程序用刀计划记录的功能记录;3、添加MES装刀指令接口,根据cnc加工所需的刀具类型和刀具名称检索现有机床内功能刀具是否满足需求,如果不满足则发送MES装刀指令;4、添加刀具组接口,新增功能刀具时传送功能刀具名称、编码、刀具组。
2024-01-18 17:33:54 +08:00
qihao.gong@jikimo.com
aa810bbda2
零件质检接口 修改coding缺陷
2024-01-18 17:26:31 +08:00
jinling.yang
2c12f5b9b6
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-01-18 14:26:51 +08:00
马广威
72b89288f2
Accept Merge Request #773 : (feature/制造代码优化 -> develop)
...
Merge Request: 增加排程动作对销售订单状态的修改,对除能操作的用户外隐藏部分原生按钮
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/773
2024-01-18 09:19:34 +08:00
mgw
cffda26ed0
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化
2024-01-18 09:14:25 +08:00
mgw
eefabbd5b3
添加列表框,但暂时不启用
2024-01-18 09:13:41 +08:00
mgw
6bb46186b1
取消部分审核按钮
2024-01-17 17:56:15 +08:00
mgw
4ab1409b13
修改制造模块,使得原生操作按钮只对制造用户可见
2024-01-17 17:44:10 +08:00
jinling.yang
bba2c1d839
优化自动化传递工单号获取工单信息接口
2024-01-17 17:33:13 +08:00
yuxianghui
d9115333bf
1、优化CAM工单程序用刀计划模型,新增大量字段,优化tree视图及form视图字段及其布局;2、添加CAM换刀申请功能和撤销功能及其按钮;3、添加根据刀具类型和刀具名称检索现有功能刀具是否满足需求,如果不满足则创建CAM工单程序用刀计划记录的功能接口(进行中)。
2024-01-17 17:30:16 +08:00
qihao.gong@jikimo.com
2b7243f69c
合并cnc加工和后置检测工单,新增工单开始结束接口
2024-01-17 17:26:24 +08:00
mgw
a3c8082906
库存处隐藏退回按钮
2024-01-17 14:45:34 +08:00
mgw
9bab450af1
对除库存用户外,隐藏操作按钮
2024-01-17 09:56:40 +08:00
yuxianghui
7520d71adb
1、优化机床模型的标准刀库对象,删除了制造模块中机床刀位模型大部分字段,在刀具管理模块中通过继承机床刀位模型新增字段,同时前端机床from视图中的刀位的tree视图新增大量字段;2、刀具管理模块新增controllers模块文件,新增机床当前刀库实时信息接口。
2024-01-16 17:30:59 +08:00
jinling.yang
4f0c7ad274
1.新增机台日计划接口
...
2.新工件预调(前置三元检测)接口
3.,新NC程序下载接口接口
2024-01-16 17:25:25 +08:00
jinling.yang
d6e36eea99
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-01-16 14:39:01 +08:00
qihao.gong@jikimo.com
0ea69f41e2
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
2024-01-16 14:30:26 +08:00
jinling.yang
de142bd371
Merge branch 'feature/新增与中控系统对接的接口' into develop
2024-01-16 14:23:10 +08:00
杨金灵
cb14bb4ea8
Accept Merge Request #771 : (feature/新增与中控系统对接的接口 -> develop)
...
Merge Request: 新增自动化传递工单号获取工单信息接口
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/771
2024-01-16 14:22:42 +08:00
jinling.yang
22176eda69
接口优化
2024-01-16 11:00:01 +08:00
qihao.gong@jikimo.com
bb75b73247
新增设备OEE菜单 以及对象
2024-01-15 17:45:43 +08:00
jinling.yang
1b490951b1
1.新增自动化传递工单号获取工单信息接口
2024-01-15 17:31:15 +08:00
mgw
f19af2a33f
增加排程动作对销售订单状态的修改
2024-01-12 16:40:29 +08:00
杨金灵
d0e92a649a
Accept Merge Request #770 : (feature/修复产品bug -> develop)
...
Merge Request: 修复产品问题
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/770
2024-01-12 16:23:05 +08:00
jinling.yang
687af76372
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复产品bug
2024-01-12 16:19:16 +08:00
jinling.yang
3acb32a5c2
修复产品模版采购选未过滤供应商及产品Tree视图列表可删除问题
2024-01-12 16:18:57 +08:00
黄焱
8d7dcda582
Accept Merge Request #769 : (feature/前端样式修改 -> develop)
...
Merge Request: 设置modal弹窗样式
Created By: @黄焱
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @黄焱
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/769?initial=true
2024-01-11 15:51:04 +08:00
黄焱
fc2c1e06d9
设置modal弹窗样式
2024-01-11 15:47:39 +08:00
禹翔辉
6c57df8270
Accept Merge Request #768 : (feature/夹具型号同步优化 -> develop)
...
Merge Request: 功能刀具优化,夹具型号同步功能优化
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/768
2024-01-11 14:14:34 +08:00
yuxianghui
d042de9e84
Merge remote-tracking branch 'origin/feature/功能刀具新增字段' into feature/夹具型号同步优化
2024-01-11 14:11:57 +08:00
yuxianghui
bc6303d1af
1、删除夹具xml中的无用代码;2、优化夹具物料同步功能
2024-01-11 14:10:49 +08:00
yuxianghui
077ce6d37f
1、删除夹具型号自动更新code值的方法;2、优化功能刀具安全库存创建功能刀具组装单方法;3、优化功能刀具列表中的能力数据的图文展示数据;
2024-01-10 17:42:59 +08:00
杨金灵
0cf3e6e7d6
Accept Merge Request #767 : (feature/修复供应商重复验证 -> develop)
...
Merge Request: 修复供应商重复验证
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/767
2024-01-10 17:18:40 +08:00
jinling.yang
027537080d
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复供应商重复验证
2024-01-10 16:43:58 +08:00
jinling.yang
95d29bb20d
修复供应商名称,税,邮箱重复验证问题
2024-01-10 16:43:28 +08:00
龚启豪
461bc1f86e
Accept Merge Request #766 : (feature/修改机床参数bug -> develop)
...
Merge Request: 处理CNC文件下发失败的bug
Created By: @龚启豪
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/766
2024-01-10 15:50:57 +08:00
qihao.gong@jikimo.com
1bc09a4424
制造订单
2024-01-10 15:50:09 +08:00
qihao.gong@jikimo.com
e6866552bc
处理CNC文件下发失败的bug
2024-01-10 15:48:03 +08:00
jinling.yang
fd7b0630fe
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-01-10 15:28:08 +08:00
jinling.yang
6e6575eadb
Merge branch 'feature/修复采购库存销售模块问题' into develop
2024-01-10 15:27:19 +08:00
杨金灵
cc6ec38bfa
Accept Merge Request #765 : (feature/修复采购库存销售模块问题 -> develop)
...
Merge Request: 修复采购库存销售模块问题
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/765?initial=true
2024-01-10 15:27:01 +08:00
jinling.yang
8eefbeba54
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复采购库存销售模块问题
2024-01-10 15:25:19 +08:00
jinling.yang
94a24bb469
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-01-10 15:24:55 +08:00
jinling.yang
82c0269761
1.材料型号新增获取方式和供应商的输入验证2.每齿走刀量去掉切削速度字段
2024-01-10 15:24:31 +08:00
马广威
631f72bfe9
Accept Merge Request #764 : (feature/制造代码优化 -> develop)
...
Merge Request: 修复排程时,工单时间未生成的问题
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/764?initial=true
2024-01-10 12:20:49 +08:00
mgw
b5147678b1
修复排程时,工单时间未生成的问题
2024-01-10 12:20:03 +08:00
杨金灵
9047e54afa
Accept Merge Request #763 : (feature/修复采购库存销售模块问题 -> develop)
...
Merge Request: 修复采购库存销售模块问题
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/763?initial=true
2024-01-09 17:34:53 +08:00
jinling.yang
8a15ce12d9
修复销售总监创建报价单时在其他信息中不能选择其他销售人员
2024-01-09 17:05:35 +08:00
jinling.yang
4c3e7e40cb
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复采购库存销售模块问题
...
# Conflicts:
# sf_base/models/tool_base_new.py
2024-01-09 16:55:19 +08:00
jinling.yang
128dd60a89
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-01-09 16:54:33 +08:00
jinling.yang
f82cb462cf
1.去掉警告2.销售订单详情显示进度状态字段3.修复采购权限组没有存库模块包括以内的相关菜单的访问权限
2024-01-09 16:54:16 +08:00
马广威
7f6025afc0
Accept Merge Request #762 : (feature/制造代码优化 -> develop)
...
Merge Request: 修改一些访问权限
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/762?initial=true
2024-01-09 16:10:24 +08:00
mgw
9bbe3f28a5
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化
...
# Conflicts:
# sf_manufacturing/security/ir.model.access.csv
2024-01-09 16:08:18 +08:00
mgw
3f2a13448d
修改一些访问权限
2024-01-09 16:02:41 +08:00
马广威
e11976bb61
Accept Merge Request #761 : (feature/制造代码优化 -> develop)
...
Merge Request: 修复批量排程缺少工具包的问题,修改标签翻译
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/761?initial=true
2024-01-09 14:52:18 +08:00
龚启豪
00541c1c8f
Accept Merge Request #760 : (feature/修改机床参数bug -> develop)
...
Merge Request: 处理装夹和前置检测工单合并,以及储存完工产品就绪状态
Created By: @龚启豪
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/760?initial=true
2024-01-09 14:50:20 +08:00
qihao.gong@jikimo.com
cac7815369
处理引入缺失报错
2024-01-09 14:47:06 +08:00
qihao.gong@jikimo.com
c336230287
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
2024-01-09 14:17:50 +08:00
qihao.gong@jikimo.com
1a896a730e
拉取最新代码
2024-01-09 14:17:38 +08:00
jinling.yang
eaad8337d4
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-01-09 14:16:41 +08:00
jinling.yang
b4ee93bc5a
Merge branch 'feature/修复采购按钮显示及产品字段问题' into develop
2024-01-09 12:22:37 +08:00
杨金灵
3919290985
Accept Merge Request #759 : (feature/修复采购按钮显示及产品字段问题 -> develop)
...
Merge Request: 修复采购按钮显示及产品字段问题
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/759?initial=true
2024-01-09 12:22:13 +08:00
jinling.yang
ec3f00f4a3
去掉待删除字段
2024-01-09 12:05:14 +08:00
jinling.yang
f15ac2c7fd
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-01-09 12:03:15 +08:00
jinling.yang
cc9e6fa3d1
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复采购按钮显示及产品字段问题
2024-01-09 12:01:47 +08:00
jinling.yang
3c3ffa1ebc
1.修复采购订单确认按钮显示问题2.修复涉及适合冷却方式字段的相关模型内该字段的过滤查询条件3.修改产品的适合刀柄型号字段类型4.修改销售订单的输入验证
2024-01-09 12:01:20 +08:00
禹翔辉
776515a861
Accept Merge Request #758 : (feature/功能刀具新增字段 -> develop)
...
Merge Request: 1、删除产品中和夹具相关的无用代码;2、添加夹具型号和联装类型必填判断条件
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/758
2024-01-09 11:18:04 +08:00
yuxianghui
8332c5d141
1、删除产品中和夹具相关的无用代码;2、添加夹具型号和联装类型必填判断条件
2024-01-09 11:15:48 +08:00
qihao.gong@jikimo.com
e6c77e7b35
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
...
# Conflicts:
# sf_manufacturing/models/product_template.py
2024-01-09 10:38:40 +08:00
qihao.gong@jikimo.com
1fab9ad253
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
...
# Conflicts:
# sf_manufacturing/models/product_template.py
2024-01-09 10:36:13 +08:00
禹翔辉
e4de4f2af0
Accept Merge Request #757 : (feature/功能刀具新增字段 -> develop)
...
Merge Request: 功能刀具添加字段,夹具物料优化
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/757
2024-01-09 10:35:52 +08:00
yuxianghui
afdfde245a
Merge remote-tracking branch 'origin/feature/产品添加夹具型号信息' into feature/功能刀具新增字段
...
# Conflicts:
# sf_manufacturing/models/product_template.py
2024-01-09 10:33:16 +08:00
qihao.gong@jikimo.com
86366cc6cb
修改工单完成后,自动完成制造订单,完工产品就绪状态
2024-01-09 10:31:43 +08:00
yuxianghui
4e6a66c681
1、删除功能刀具组装单的加工工厂字段
2024-01-09 10:30:18 +08:00
mgw
f5805ce6ae
修改标签翻译
2024-01-09 10:11:13 +08:00
jinling.yang
8239e53a76
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-01-09 09:45:40 +08:00
jinling.yang
bbaede2166
Merge branch 'feature/修复销售和采购' into develop
2024-01-09 09:45:24 +08:00
杨金灵
6e68611f6e
Accept Merge Request #756 : (feature/修复销售和采购 -> develop)
...
Merge Request: 修复采购和销售
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/756?initial=true
2024-01-09 09:44:53 +08:00
jinling.yang
31dd710f6a
修改确认按钮名称
2024-01-09 09:40:56 +08:00
jinling.yang
8b2b58dfa1
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复销售和采购
2024-01-09 09:32:30 +08:00
jinling.yang
84f62ebe1c
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-01-09 09:32:10 +08:00
jinling.yang
ce2f8714d0
修复bug
2024-01-09 09:31:44 +08:00
mgw
931b78ee03
修复批量排程缺少工具包的问题
2024-01-08 23:24:42 +08:00
马广威
61554bf3e5
Accept Merge Request #755 : (feature/制造代码优化 -> develop)
...
Merge Request: 去掉tree视图的schedule_state字段
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/755?initial=true
2024-01-08 19:52:10 +08:00
mgw
0b070de19c
去掉tree视图的schedule_state字段
2024-01-08 19:34:24 +08:00
马广威
7077b8a297
Accept Merge Request #754 : (feature/制造代码优化 -> develop)
...
Merge Request: tree视图中的"批量排程"按钮优化为向导的实现方式,修改制造订单的状态字段以及与排程单的交互逻辑,优化一些翻译
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/754
2024-01-08 19:06:45 +08:00
mgw
e8995acc87
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化
2024-01-08 19:03:34 +08:00
mgw
fbaa81fe7a
修改制造订单的状态字段以及与排程单的交互逻辑,优化一些翻译
2024-01-08 19:02:59 +08:00
qihao.gong@jikimo.com
3742a3b163
修改自动完成制造订单得方法,完工产品捡取需变成就绪状态
2024-01-08 17:51:16 +08:00
yuxianghui
498e1c12af
1、所有功能刀具相关模型添加刀具组字段对象,并且功能刀具名称根据规则自动生成;2、功能刀具组装时按规则自动生成功能刀具编码;
2024-01-08 17:42:34 +08:00
qihao.gong@jikimo.com
317b5d4ced
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
2024-01-08 16:39:15 +08:00
黄焱
3c65b3e3df
Accept Merge Request #753 : (feature/前端样式修改 -> develop)
...
Merge Request: 修改sf表格样式
Created By: @黄焱
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @黄焱
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/753?initial=true
2024-01-08 16:33:13 +08:00
黄焱
4dde30f9f9
修改sf表格样式
2024-01-08 16:28:49 +08:00
qihao.gong@jikimo.com
631d59f95e
处理本地报错
2024-01-08 16:18:15 +08:00
jinling.yang
8928d497ff
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-01-08 16:12:31 +08:00
qihao.gong@jikimo.com
99b1d5f534
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
2024-01-08 15:56:44 +08:00
jinling.yang
61d13b90dc
Merge branch 'feature/优化刀具基本参数同步' into develop
2024-01-08 15:56:22 +08:00
杨金灵
31bb7f0c97
Accept Merge Request #752 : (feature/优化刀具基本参数同步 -> develop)
...
Merge Request: 优化刀具基本参数同步及刀具产品模版
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/752
2024-01-08 15:56:06 +08:00
jinling.yang
d980a036cd
还原代码
2024-01-08 15:52:33 +08:00
jinling.yang
f8c6c766cb
优化刀具模版和刀具标准库
2024-01-08 15:44:16 +08:00
qihao.gong@jikimo.com
41fe63d948
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
2024-01-08 15:30:05 +08:00
qihao.gong@jikimo.com
ce53afe1b0
修改权限组访问权限
2024-01-08 15:29:48 +08:00
mgw
bc4a4df53e
tree视图中的"批量排程"按钮优化为向导的实现方式
2024-01-08 14:52:29 +08:00
jinling.yang
3f448bc6da
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化刀具基本参数同步
...
# Conflicts:
# sf_dlm_management/views/product_template_management_view.xml
2024-01-08 10:08:50 +08:00
yuxianghui
d1c10f56d1
1、sf_base新增刀具组模型;2、所以功能刀具相关模型添加刀具组对象字段(进行中);
2024-01-05 17:33:06 +08:00
jinling.yang
edf4699e9e
1.新增每日同步切削速度和每齿走刀量及切削宽度和深度的接口
...
2.优化产品模版
2024-01-05 17:30:13 +08:00
禹翔辉
ad025eb6da
Accept Merge Request #751 : (feature/产品添加夹具型号信息 -> develop)
...
Merge Request: 夹具物料同步,产品添加夹具物料信息;
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/751?initial=true
2024-01-05 14:48:11 +08:00
yuxianghui
e5bf0d8205
Merge remote-tracking branch 'origin/feature/夹具型号同步' into feature/产品添加夹具型号信息
2024-01-05 14:43:48 +08:00
yuxianghui
831a91c925
1、产品新添七种夹具物料前端字段完成布局展示;2、产品选取夹具型号规格后自动带入规格数据到产品夹具物料参数;
2024-01-05 14:42:38 +08:00
黄焱
bc3325bd3b
Accept Merge Request #750 : (feature/前端样式修改 -> develop)
...
Merge Request: 修改表格,等样式
Created By: @黄焱
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @黄焱
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/750?initial=true
2024-01-05 14:13:52 +08:00
黄焱
e29883d0de
修改表格,等样式
2024-01-05 14:10:43 +08:00
龚启豪
5b9b700372
Accept Merge Request #749 : (feature/修改机床参数bug -> develop)
...
Merge Request: 修改获取cnc从工单到制造订单
Created By: @龚启豪
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/749
2024-01-05 14:03:31 +08:00
qihao.gong@jikimo.com
c81dc99aef
修改获取CNC程序从工单到制造订单
2024-01-05 11:23:27 +08:00
马广威
c0a3a550d7
Accept Merge Request #748 : (feature/制造代码优化 -> develop)
...
Merge Request: 代码优化,权限问题修复
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/748
2024-01-05 10:29:32 +08:00
mgw
0c67b2b659
修复设备清单无法被计划人员看到的问题
2024-01-05 10:22:48 +08:00
mgw
974b112b3a
优化设备、库存权限相关问题
2024-01-05 08:53:39 +08:00
yuxianghui
57f5d138e8
1、修改夹装单元数修改成装夹单元数;2、重构产品的夹具物料信息(进行中);3、完善夹具物料的同步功能;
2024-01-04 17:44:22 +08:00
mgw
2b117e9192
产品序列号权限优化
2024-01-04 11:39:38 +08:00
马广威
688a39363b
Accept Merge Request #747 : (feature/制造代码优化 -> develop)
...
Merge Request: 一些优化事宜,包括批量排程,修复坯料单展示问题等
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/747
2024-01-04 08:56:12 +08:00
mgw
9443a07eb4
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化
...
# Conflicts:
# sf_sale/security/ir.model.access.csv
2024-01-04 08:54:12 +08:00
mgw
ce58e989dd
基本的批量排程已实现
2024-01-04 08:51:25 +08:00
mgw
b9bb528db0
客户列表公司类型卡片增加税ID,计划处tree视图增加批量排程button
2024-01-03 23:03:08 +08:00
jinling.yang
da8cbe4cce
1.修改刀具标准库同步6个物料的方法
...
2.刀具基础参数的刃数和刀片的刃数两个字段新增选项,新增active字段,xml中修改适配刀片型号字段
2024-01-03 17:41:44 +08:00
yuxianghui
ce69127250
1、夹具型号同步(进行中);2、删除功能刀具组装的功能刀具切削类型字段;
2024-01-03 17:31:16 +08:00
qihao.gong@jikimo.com
583f6503ec
修改cnc获取在制造订单的逻辑,制造订单所有工单完成时 制造订单自动完成,以及组件自动消耗掉
2024-01-03 17:29:37 +08:00
jinling.yang
7f050b62f9
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化刀具基本参数同步
2024-01-03 14:39:20 +08:00
杨金灵
5d09d1585b
Accept Merge Request #746 : (feature/权限修复 -> develop)
...
Merge Request: 权限修复
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/746?initial=true
2024-01-03 11:52:12 +08:00
jinling.yang
f373003d2c
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/权限修复
2024-01-03 11:42:41 +08:00
jinling.yang
45e8e380db
修复销售质量采购bug
2024-01-03 11:42:23 +08:00
禹翔辉
c2263c9318
Accept Merge Request #745 : (feature/功能刀具相关模型及组装流程优化 -> develop)
...
Merge Request: 1、修改所以夹具物料信息转接板夹具为转接板(锁板)夹具;2、优化功能刀具安全库存触发生成功能刀具组装单时重复触发的问题;3、设置功能刀具安全库存模型相关字段只有在创建的时候可以修改,其他时候是只读;4、优化功能刀具组装单组装完成后功能刀具入库位置不是刀具房的问题;
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/745
2024-01-03 09:40:23 +08:00
yuxianghui
f09a6cde3e
Merge remote-tracking branch 'origin/feature/功能刀具优化' into feature/功能刀具相关模型及组装流程优化
2024-01-03 09:37:36 +08:00
mgw
ccdbfda019
优化代码,修复检测人功能
2024-01-02 17:55:02 +08:00
jinling.yang
ec9435bb82
修复销售和采购的部分bug
2024-01-02 17:42:06 +08:00
qihao.gong@jikimo.com
77db3d57c9
设备类别非必填
2024-01-02 17:31:48 +08:00
yuxianghui
73c3e06900
1、修改所以夹具物料信息转接板夹具为转接板(锁板)夹具;2、优化功能刀具安全库存触发生成功能刀具组装单时重复触发的问题;3、设置功能刀具安全库存模型相关字段只有在创建的时候可以修改,其他时候是只读;4、优化功能刀具组装单组装完成后功能刀具入库位置不是刀具房的问题;
2024-01-02 17:25:49 +08:00
mgw
56d8190fc6
修改业务逻辑:当主制造订单排程后,子bom自动改状态为已排
2024-01-02 11:47:40 +08:00
qihao.gong@jikimo.com
7fe7de46c6
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
2024-01-02 10:01:24 +08:00
mgw
2339f75517
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化
2023-12-29 15:28:40 +08:00
mgw
8ec038847a
优化权限
2023-12-29 15:28:15 +08:00
禹翔辉
e1118bd579
Accept Merge Request #744 : (feature/功能刀具优化 -> develop)
...
Merge Request: 优化字段显示
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/744?initial=true
2023-12-29 14:20:35 +08:00
yuxianghui
c9af7a8cc4
Merge remote-tracking branch 'origin/feature/夹具型号优化' into feature/功能刀具优化
2023-12-29 14:18:39 +08:00
yuxianghui
4ab7e4db0f
1、优化字段显示问题
2023-12-29 14:17:32 +08:00
qihao.gong@jikimo.com
939a255c2e
修改设备注册接口
2023-12-29 14:17:27 +08:00
jinling.yang
1cf5cd41b4
1.刀具基本参数新增适配夹头尺寸字段,2.优化采购订单确认订单方法
2023-12-29 09:31:41 +08:00
黄焱
860e16659c
Accept Merge Request #743 : (feature/前端样式修改 -> develop)
...
Merge Request: // 加工能力\冷却方式 竖列展示改为横列展示
Created By: @黄焱
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @黄焱
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/743
2023-12-28 17:48:59 +08:00
黄焱
e9987fdcfa
// 加工能力\冷却方式 竖列展示改为横列展示
2023-12-28 17:44:51 +08:00
qihao.gong@jikimo.com
98847a2c42
处理设备控制bug
2023-12-28 17:38:56 +08:00
禹翔辉
f81bf760d4
Accept Merge Request #742 : (feature/夹具型号优化 -> develop)
...
Merge Request: 1、新增夹具物料基本参数模型,重构工厂的夹具型号模型,重新优化夹具物料form视图;2、优化刀具标准库模型,优化切削速度模型,优化每齿走刀量模型,新增切削宽度和深度模型,新增坡铣角度模型;3、优化功能刀具安全库存最低安全库存可以高于最高库存的bug;
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/742?initial=true
2023-12-28 17:09:00 +08:00
yuxianghui
b2bb2e33de
1、新增夹具物料基本参数模型,重构工厂的夹具型号模型,重新优化夹具物料form视图;2、优化刀具标准库模型,优化切削速度模型,优化每齿走刀量模型,新增切削宽度和深度模型,新增坡铣角度模型;3、优化功能刀具安全库存最低安全库存可以高于最高库存的bug;
2023-12-28 17:06:34 +08:00
jinling.yang
8be6373b77
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化刀具基本参数同步
2023-12-28 16:39:09 +08:00
jinling.yang
a9c2d1aa5c
1.新增刀具物料参数的同步接口及方法
...
2.修改刀具物料参数的适配刀片型号及适配刀柄型号字段类型及新增刀柄长度,刀柄直径,法兰直径,动平衡等级,适配夹头型号,适用锁紧螺母型号,编码字段
2023-12-28 16:27:40 +08:00
mgw
8e61d5f87c
优化权限相关
2023-12-28 10:50:44 +08:00
马广威
032b13b2ad
Accept Merge Request #741 : (feature/制造代码优化 -> develop)
...
Merge Request: 修复image小组件图片路径拼接失败的问题
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/741
2023-12-28 09:00:56 +08:00
mgw
e33ca7cd33
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化
2023-12-27 17:23:25 +08:00
mgw
3a7a6e480a
修复image小组件图片路径拼接失败的问题
2023-12-27 17:23:05 +08:00
杨金灵
51b67c0dcd
Accept Merge Request #740 : (feature/修复销售库存权限 -> develop)
...
Merge Request: 修复销售库存访问权限
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/740?initial=true
2023-12-27 15:50:23 +08:00
jinling.yang
8124818bad
修复销售库存访问权限
2023-12-27 15:48:48 +08:00
杨金灵
3a62d4406f
Accept Merge Request #739 : (feature/修复销售和质量权限 -> develop)
...
Merge Request: 修复销售和质量权限
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/739?initial=true
2023-12-27 15:00:38 +08:00
龚启豪
8b8b30602b
Accept Merge Request #738 : (feature/修改机床参数bug -> develop)
...
Merge Request: 区分tree和form继承视图
Created By: @龚启豪
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/738?initial=true
2023-12-27 14:51:18 +08:00
jinling.yang
7a5fcd79d8
修改功能刀具安全库存的创建权限
2023-12-27 14:42:43 +08:00
qihao.gong@jikimo.com
93fe4d8c62
区分tree和form继承视图
2023-12-27 14:41:53 +08:00
jinling.yang
cdeec93e76
产品增加销售的权限组的访问权限,质量标签和质量理由增加质量的权限组的访问权限
2023-12-27 10:18:09 +08:00
jinling.yang
1a2d9592d1
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2023-12-26 14:22:48 +08:00
jinling.yang
71a64c36ca
Merge branch 'feature/修复刀具管理模块' into develop
2023-12-26 14:22:32 +08:00
杨金灵
5f026e3b1e
Accept Merge Request #737 : (feature/修复刀具管理模块 -> develop)
...
Merge Request: 修复刀具管理
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/737?initial=true
2023-12-26 14:22:04 +08:00
jinling.yang
d50f8716b5
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复刀具管理模块
2023-12-26 14:17:38 +08:00
jinling.yang
6cd2637983
1.修复客户和用户的name_search方法2.销售的采购经理权限组代码还原查询销售订单3.新增销售的权限组访问标签权限4.刀具管理去掉引用样式css文件
2023-12-26 14:17:25 +08:00
马广威
ab91ce01d4
Accept Merge Request #736 : (feature/制造代码优化 -> develop)
...
Merge Request: 修复配置文件问题
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/736
2023-12-26 09:40:32 +08:00
mgw
8f1897c4ff
修复配置文件问题
2023-12-26 09:39:52 +08:00
杨金灵
1e2c80c38f
Accept Merge Request #735 : (feature/修改数据库 -> develop)
...
Merge Request: 修改数据库
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/735?initial=true
2023-12-25 17:32:45 +08:00
jinling.yang
db8ad0f425
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改数据库
...
# Conflicts:
# odoo.conf
2023-12-25 17:31:13 +08:00
jinling.yang
eedce8338b
1.修改数据库2.数据库去掉demo数据指令3.工单的获取cnc车程序按钮代码还原
2023-12-25 17:30:32 +08:00
马广威
b132cb8713
Accept Merge Request #734 : (feature/制造代码优化 -> develop)
...
Merge Request: 修复权限,修改数据库名称
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/734?initial=true
2023-12-25 16:08:04 +08:00
mgw
66d6fe8f0a
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化
...
# Conflicts:
# odoo.conf
2023-12-25 16:07:23 +08:00
mgw
97e57f9b3c
修复权限,修改数据库名称
2023-12-25 16:05:23 +08:00
杨金灵
57cfa56081
Accept Merge Request #733 : (feature/优化采购编辑 -> develop)
...
Merge Request: 优化采购
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/733?initial=true
2023-12-25 16:03:59 +08:00
jinling.yang
1d464dd00e
新建数据库
2023-12-25 16:01:25 +08:00
jinling.yang
fdc38afcbd
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化采购编辑
2023-12-25 16:00:33 +08:00
jinling.yang
2e9dc3d006
采购总监查看审核状态不为空的询价/采购单
2023-12-25 16:00:20 +08:00
禹翔辉
c54a8308c6
Accept Merge Request #732 : (feature/自动根据功能刀具安全库存创建组装单 -> develop)
...
Merge Request: 自动按照功能刀具安全库存创建功能刀具组装单
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/732
2023-12-25 15:40:59 +08:00
yuxianghui
1934708d78
Merge remote-tracking branch 'origin/feature/功能刀具组装流程bug优化' into feature/自动根据功能刀具安全库存创建组装单
2023-12-25 15:38:45 +08:00
yuxianghui
e7bfff491b
1、新增库存位置:功能刀具组装位置,2、完善根据功能刀具安全库存自动生成组装单功能。3、功能刀具组装tree视图新增默认筛选未组装状态记录
2023-12-25 15:37:14 +08:00
jinling.yang
97e36c249b
1.产品新增计划岗权限,页面部分字段新增只读控制2.采购优化确认订单按钮
2023-12-25 15:15:35 +08:00
jinling.yang
6d93d5ef87
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2023-12-25 11:35:17 +08:00
jinling.yang
e8a0b3da93
Merge branch 'feature/优化客户' into develop
2023-12-25 11:34:37 +08:00
杨金灵
e9acd98ccc
Accept Merge Request #730 : (feature/优化客户 -> develop)
...
Merge Request: 优化客户,供应商.销售订单和采购订单权限需求
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/730
2023-12-25 11:34:24 +08:00
马广威
535d69f4d9
Accept Merge Request #731 : (feature/制造代码优化 -> develop)
...
Merge Request: 优化计划处代码
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/731?initial=true
2023-12-25 11:34:14 +08:00
mgw
603a59b6d7
优化计划处代码
2023-12-25 11:33:39 +08:00
jinling.yang
ca2f30fdbd
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2023-12-25 11:06:28 +08:00
jinling.yang
4c92c08f84
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化客户
2023-12-25 11:06:11 +08:00
jinling.yang
2fd8483a52
优化客户,供应商.销售订单和采购订单权限需求
2023-12-25 11:05:56 +08:00
马广威
71bdd6334f
Accept Merge Request #729 : (feature/制造代码优化 -> develop)
...
Merge Request: 代码优化
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/729?initial=true
2023-12-25 09:41:00 +08:00
mgw
194f6f52dc
代码优化
2023-12-25 09:40:04 +08:00
jinling.yang
93ce482d40
优化采购和销售
2023-12-22 17:43:25 +08:00
yuxianghui
96c5c3dcf5
1、新增按照功能刀具安全库存数量自动触发创建功能刀具组装单;
2023-12-22 17:37:10 +08:00
马广威
6bcf7ec53a
Accept Merge Request #728 : (feature/制造代码优化 -> develop)
...
Merge Request: 权限优化、代码优化、工单处增加一些字段
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/728
2023-12-22 15:07:17 +08:00
mgw
a7d760bc5e
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化
2023-12-22 15:00:30 +08:00
mgw
e196b6b1e3
优化权限相关展示
2023-12-22 14:58:39 +08:00
黄焱
9cb9872a5e
Accept Merge Request #727 : (feature/前端样式修改 -> develop)
...
Merge Request: sf样式修改,保存,返回按钮修改
Created By: @黄焱
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @黄焱
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/727?initial=true
2023-12-21 17:57:18 +08:00
jinling.yang
58d4b3813b
销售1.新增进度状态字段,选项为:待排程、待加工、待发货、待收货、已收货,
...
2.销售和报价页面的所有按钮根据审核状态和状态做隐藏显示控制
3.销售订单Form和Tree视图新增进度状态字段,且form表单根据状态字段的值为销售和取消时,表单不可编辑
4.产品页面的所有按钮根据销售和采购的权限组做显示和隐藏控制
2023-12-21 17:45:29 +08:00
龚启豪
34d0e989d6
Accept Merge Request #726 : (feature/修改机床参数bug -> develop)
...
Merge Request: 机床型号同步以及设备机床参数修改以及机床注册接口
Created By: @龚启豪
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/726?initial=true
2023-12-21 17:38:15 +08:00
qihao.gong@jikimo.com
c52af21477
1
2023-12-21 17:36:13 +08:00
qihao.gong@jikimo.com
149d6778f5
放开注释
2023-12-21 17:28:55 +08:00
mgw
98c9f3098b
工单详情处增加实际开始时间、实际结束时间,是否合格、加工人、检测人、实际加工机台等字段信息
2023-12-21 10:53:13 +08:00
mgw
ff904ad68c
权限暂存
2023-12-20 17:54:14 +08:00
黄焱
932f82ac6c
需求-客户、供应商视图展示优化
...
库存-库存概览界面的显示需优化
工厂端所有新建编辑页面的保存和取消按钮样式及文字要优化
【刀具组装】功能刀具组装单详情界面有个字段标题显示不全
制造-刀具管理-机床换刀申请界面标题显示重叠了
2023-12-20 17:51:46 +08:00
jinling.yang
bbb5ddb177
1.修复销售总监看不到销售订单2.优化销售审核向导3.优化销售
2023-12-20 17:45:29 +08:00
禹翔辉
7cbbf58309
Accept Merge Request #724 : (feature/功能刀具组装流程bug优化 -> develop)
...
Merge Request: 功能刀具组装流程bug优化
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/724
2023-12-20 15:26:32 +08:00
yuxianghui
8edee62d3a
Merge remote-tracking branch 'origin/feature/换刀申请优化' into feature/功能刀具组装流程bug优化
2023-12-20 15:22:59 +08:00
yuxianghui
ce67b7985b
1、优化功能刀具组装和功能刀具组装弹窗界面的刀具物料信息,添加刀具物料规格字段;2、优化功能刀具组装确认功能,创建刀具组装入库作业时新增name字段内容,新增作业自动验证;3、优化自动生成功能刀具序列号方法
2023-12-20 15:21:06 +08:00
jinling.yang
ef47597cf9
1.强制必填字段
...
(1)【客户名称】、【税ID】、【Email】、【销售员】、【标签】为强制必填
(2)【电话】、【手机】两个字段控制为二选一强制必填
2.客户校验规则:
(1)【客户名称】+【税ID】两个字段分别与已经创建客户的档案信息进行校验,任意一项100%吻合则不允许创建客户
3.强制必填字段
(1)【名称】、【Email】、【销售员】为强制必填
(2)【电话】、【手机】两个字段控制为二选一强制必填
4.个人校验规则:
(1)【名称】+【Email】两个字段分别与已经创建客户的档案信息进行校验,两项一起100%吻合则不允许创建个人
5.下拉仅显示销售人员的账户用户名(非相关用户及姓名不显示),字段为强制必填
(1)创建人的权限为销售经理,则【销售员】字段自动默认为当前账号的用户姓名,且不可修改
(2)创建人的权限为销售总监,则【销售员】字段自动默认为当前账号的用户姓名,可下拉选择,修改销售人员姓名
2023-12-19 17:48:30 +08:00
qihao.gong@jikimo.com
9e8d5aaf6a
修改机床同步注册接口
2023-12-19 17:33:24 +08:00
yuxianghui
363463e31d
1、新增安装时自动配置刀具房位置,重新配置了刀具组装入库的作业类型,增加名称为刀具组装入库的参考序列配置;2、功能刀具所以的装刀长改为总长度;3、机床换刀申请和刀具组装单弹窗界面做字段必填控制,对新刀隐藏切削相关字段;4、刀具组装单弹窗增加一些字段的数值自动填写和计算;
2023-12-19 17:31:37 +08:00
mgw
8ff635e901
优化计划中的菜单项目
2023-12-19 16:32:09 +08:00
qihao.gong@jikimo.com
c65e13a83e
修改设备类别以及机床参数
2023-12-18 17:38:24 +08:00
jinling.yang
8721bc2de1
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2023-12-18 09:36:32 +08:00
jinling.yang
ec344cc918
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2023-12-18 09:36:18 +08:00
马广威
905df2b79e
Accept Merge Request #723 : (feature/制造代码优化 -> develop)
...
Merge Request: 优化权限相关
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/723
2023-12-17 10:52:59 +08:00
mgw
e73fb5791a
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化
2023-12-17 10:50:18 +08:00
mgw
6738a855bb
优化权限相关
2023-12-17 10:48:51 +08:00
jinling.yang
3c82020e5e
Merge branch 'feature/修复销售权限组' into develop
2023-12-15 17:56:04 +08:00
杨金灵
422074fcec
Accept Merge Request #722 : (feature/修复销售权限组 -> develop)
...
Merge Request: 修复销售采购质量权限
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/722
2023-12-15 17:53:41 +08:00
jinling.yang
897f5b76f0
修复质量的权限
2023-12-15 17:49:33 +08:00
jinling.yang
ee565d3796
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复销售权限组
2023-12-15 17:39:16 +08:00
jinling.yang
912b50246a
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2023-12-15 17:39:01 +08:00
jinling.yang
df2ba048f4
1.修复采购权限和销售权限2.销售新增审核向导
2023-12-15 17:38:40 +08:00
qihao.gong@jikimo.com
ef2f7d3ecb
修改机床设备参数,处理同步bug,以及机床设备视图布局
2023-12-15 17:28:42 +08:00
qihao.gong@jikimo.com
2391c08485
修改i机床接口同步以及参数
2023-12-14 17:33:28 +08:00
jinling.yang
85ac3d7a3e
报价Tree视图筛选框去掉默认的我的报价的条件
2023-12-13 17:30:40 +08:00
jinling.yang
b96723d9a5
修复销售权限组
2023-12-12 17:40:22 +08:00
禹翔辉
19b9db66d3
Accept Merge Request #721 : (feature/换刀申请优化 -> develop)
...
Merge Request: 放开机床换刀申请模块记录没有功能刀具信息时换刀申请按键的权限
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/721
2023-12-11 17:10:28 +08:00
yuxianghui
8371875d62
放开机床换刀申请模块记录没有功能刀具信息时换刀申请按键的权限
2023-12-11 15:41:31 +08:00
jinling.yang
a3f6fdda2a
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
...
# Conflicts:
# sf_tool_management/__init__.py
# sf_tool_management/models/base.py
2023-12-11 14:54:23 +08:00
杨金灵
4a10335379
Accept Merge Request #720 : (feature/权限去掉继承 -> develop)
...
Merge Request: 权限去掉继承
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/720
2023-12-11 14:51:36 +08:00
禹翔辉
1132acfa40
Accept Merge Request #719 : (feature/刀具管理模块安装时更新数据 -> develop)
...
Merge Request: 1、新增刀具管理模块安装时根据已有机床设备存在的刀位创建机台换刀申请记录
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/719
2023-12-11 14:48:37 +08:00
jinling.yang
7138dab1b5
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/权限去掉继承
2023-12-11 14:48:08 +08:00
jinling.yang
6bf3df0ef4
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/权限去掉继承
2023-12-11 14:47:34 +08:00
jinling.yang
55594c119f
产品添加质量权限组访问权限
2023-12-11 14:47:06 +08:00
马广威
0a3bd37224
Accept Merge Request #718 : (feature/制造代码优化 -> develop)
...
Merge Request: 修改京东物流寻单据部分逻辑
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/718?initial=true
2023-12-11 14:46:23 +08:00
yuxianghui
60abdfb372
Merge remote-tracking branch 'origin/feature/CAM工单程序用刀计划重构' into feature/刀具管理模块安装时更新数据
2023-12-11 14:46:16 +08:00
mgw
facdf5712a
修改京东物流寻单据部分逻辑
2023-12-11 14:45:55 +08:00
yuxianghui
94df139110
1、新增刀具管理模块安装时根据已有机床设备存在的刀位创建机台换刀申请记录
2023-12-11 14:41:31 +08:00
jinling.yang
e4f6bc4632
权限去掉继承
2023-12-11 14:36:34 +08:00
马广威
6f0dbe3625
Accept Merge Request #717 : (feature/制造代码优化 -> develop)
...
Merge Request: 修改cs环境数据库为t环境数据库
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/717?initial=true
2023-12-11 14:09:56 +08:00
mgw
c00cd5a00a
修改cs环境数据库为t环境数据库
2023-12-11 14:09:02 +08:00
禹翔辉
b487b6fc40
Accept Merge Request #716 : (feature/CAM工单程序用刀计划重构 -> develop)
...
Merge Request: CAM工单程序用刀计划重构
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/716
2023-12-08 17:34:02 +08:00
yuxianghui
8489a67e64
Merge remote-tracking branch 'origin/feature/机床换刀申请优化' into feature/CAM工单程序用刀计划重构
2023-12-08 17:31:54 +08:00
yuxianghui
f8426ae4c3
1、重构CAM工单程序用刀计划模型;2、机床换刀申请模型的申请换刀、转移按键增加显示条件,关闭换刀申请弹窗和功能刀具组装弹窗的功能刀具类型字段创建记录的功能;
2023-12-08 17:29:32 +08:00
马广威
c4021d02ce
Accept Merge Request #715 : (feature/制造代码优化 -> develop)
...
Merge Request: 修改权限依赖
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/715?initial=true
2023-12-08 17:26:19 +08:00
mgw
bd01ad7bbf
修改权限依赖
2023-12-08 17:25:40 +08:00
龚启豪
9650f45ba2
Accept Merge Request #714 : (feature/修改机床参数bug -> develop)
...
Merge Request: 库存根据权限增加审核按钮 以及审核状态
Created By: @龚启豪
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/714?initial=true
2023-12-08 15:21:32 +08:00
qihao.gong@jikimo.com
cfed77d1a5
库存根据权限增加审核按钮 以及审核状态
2023-12-08 15:18:41 +08:00
禹翔辉
94c795a68f
Accept Merge Request #713 : (feature/机床换刀申请优化 -> develop)
...
Merge Request: 机床换刀申请及功能刀具出入库模型优化
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/713?initial=true
2023-12-08 09:05:39 +08:00
yuxianghui
2fba2ad488
Merge remote-tracking branch 'origin/feature/功能刀具库存优化' into feature/机床换刀申请优化
2023-12-08 09:02:51 +08:00
qihao.gong@jikimo.com
31260e8921
新增权限审核按钮
2023-12-07 17:31:28 +08:00
yuxianghui
4d04b37582
1、机台换刀申请tree视图隐藏机床字段,机台号字段内容自动同步位机床名称;功能刀具出入库记录模型机台号字段内容自动同步位机床名称;2、解决功能刀具有的出入库记录机床字段没有内容的问题;3、新增继承机床刀位模型,将新建机床刀位时创建机台换刀申请记录从原机床刀位模型移动到继承后的机床刀位模型中;
2023-12-07 17:31:18 +08:00
马广威
eec27b26f7
Accept Merge Request #711 : (feature/制造代码优化 -> develop)
...
Merge Request: 优化物流、计划权限及库存的一些问题
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/711
2023-12-07 11:28:22 +08:00
jinling.yang
e300ca1822
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2023-12-07 10:58:25 +08:00
jinling.yang
c8a3bee099
Merge branch 'feature/新增采购权限组' into develop
2023-12-07 10:58:04 +08:00
杨金灵
35c051e730
Accept Merge Request #712 : (feature/新增采购权限组 -> develop)
...
Merge Request: 新增采购和质量的权限
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/712?initial=true
2023-12-07 10:57:45 +08:00
jinling.yang
950ec3a1e1
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2023-12-07 10:52:09 +08:00
jinling.yang
1c1a038156
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增采购权限组
2023-12-07 10:51:32 +08:00
jinling.yang
640bf79dc8
新增质量团队和控制点的审核按钮
2023-12-07 10:50:36 +08:00
mgw
1ccc32cbcb
优化物流、计划权限及库存的一些问题
2023-12-07 10:11:59 +08:00
禹翔辉
f8d8d885bb
Accept Merge Request #710 : (feature/功能刀具库存优化 -> develop)
...
Merge Request: 功能刀具自动计算库存
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/710
2023-12-07 09:13:11 +08:00
yuxianghui
7c8c869172
Merge remote-tracking branch 'origin/feature/功能刀具列表自动计算库存' into feature/功能刀具库存优化
2023-12-07 09:07:53 +08:00
jinling.yang
8d5a4ed4c8
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增采购权限组
2023-12-06 17:27:29 +08:00
yuxianghui
981872b0b1
1、根据机台换刀申请的状态,如果为报警状态就自动创建功能刀具预警记录;2、自动检索功能刀具列表的序列号所在位置,计算功能刀具的当前位置及数量;3、功能刀具安全库存模型,根据当前记录的功能刀具对象自动计算出该规则的功能刀具的当前库存,根据当前库存和最低库存量自动计算是否需要补货,如需补货,补货的数量是多少;4、关闭功能刀具预警模型界面的创建、修改、删除功能,新增搜索面板中按机床、刀位分组搜索;5、功能刀具组装模型和组装单模型新增图片字段;
2023-12-06 17:25:47 +08:00
黄焱
d8a74c17f0
Accept Merge Request #709 : (feature/前端样式修改 -> develop)
...
Merge Request: 前端样式修改,甘特图增加功能
Created By: @黄焱
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @黄焱
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/709?initial=true
2023-12-06 15:46:02 +08:00
黄焱
fe6d207099
甘特图增加滚轮事件,点击事件
2023-12-06 15:39:07 +08:00
黄焱
206043a1a0
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/前端样式修改
2023-12-06 15:37:38 +08:00
jinling.yang
6a2a465569
注释掉自动报价的文件
2023-12-06 15:07:06 +08:00
jinling.yang
1767ada489
释放注释的代码
2023-12-06 15:03:07 +08:00
jinling.yang
d7f85967c9
优化质量的访问权限
2023-12-06 15:01:42 +08:00
jinling.yang
1a95f5e4ac
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2023-12-06 14:57:10 +08:00
jinling.yang
abd7364658
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增采购权限组
...
# Conflicts:
# sf_base/security/group_security.xml
# sf_sale/security/group_security.xml
2023-12-06 14:56:31 +08:00
jinling.yang
26ec1c9f6e
修改质量模块的权限组名称
2023-12-06 14:53:38 +08:00
龚启豪
490aa3fe04
Accept Merge Request #707 : (feature/修改机床参数bug -> develop)
...
Merge Request: 制造设备库存权限
Created By: @龚启豪
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/707
2023-12-06 14:52:35 +08:00
jinling.yang
924a28e957
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2023-12-06 11:39:24 +08:00
jinling.yang
e58ceb3ac8
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增采购权限组
2023-12-06 11:38:49 +08:00
龚启豪
61c3b16a69
Merge branch refs/heads/develop into refs/heads/feature/修改机床参数bug
2023-12-06 11:35:01 +08:00
qihao.gong@jikimo.com
70109c0965
修改制造模块权限
2023-12-06 11:31:59 +08:00
马广威
74b4fd1367
Accept Merge Request #705 : (feature/制造代码优化 -> develop)
...
Merge Request: 完成计划权限,优化警告错误
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/705
2023-12-06 10:30:55 +08:00
禹翔辉
c206dc3097
Accept Merge Request #706 : (feature/功能刀具组装流程优化 -> develop)
...
Merge Request: 功能刀具组装流程优化
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/706?initial=true
2023-12-06 09:14:29 +08:00
yuxianghui
4c1c8e7683
Merge remote-tracking branch 'origin/feature/功能刀具安全库存优化' into feature/功能刀具组装流程优化
2023-12-06 09:03:55 +08:00
yuxianghui
0d8d54c05b
1、机床换刀申请新增确认换刀时,依次检索线边刀库、刀具房是否有满足条件的功能刀具,如果有就返回刀具信息,没有就发起组装申请;2、刀具安全库存模型详情页新增可修改的最低库存量、最高库存量、批次补货量字段;
2023-12-05 17:37:47 +08:00
jinling.yang
71147eb7f9
新增质量权限组
2023-12-05 17:28:32 +08:00
qihao.gong@jikimo.com
c753df768d
库存模块权限开发
2023-12-05 17:24:19 +08:00
jinling.yang
45df8f5bc2
新增采购权限
2023-12-04 17:34:23 +08:00
yuxianghui
29a55f3ff8
1、新增设备创建刀位时自动创建对应刀位的机床换刀申请记录;2、机床换刀申请模型的设备、刀位字段修改为只读,搜索视图新增按设备搜索;
2023-12-04 17:30:19 +08:00
qihao.gong@jikimo.com
94c0b00c2d
机床注册按钮根据权限组区分
2023-12-04 17:28:54 +08:00
黄焱
32473d302f
生产驾驶舱列表点击【工单】按钮有时候进入的是机台详情界面
...
工厂端订单详情title显示不美观-建议优化
工厂端材料型号详情界面弹框顶部和底部显示透明了
2023-11-30 17:03:47 +08:00
mgw
2cf4958f46
完成计划权限,优化警告错误
2023-11-29 20:58:12 +08:00
qihao.gong@jikimo.com
893aa2111c
处理coding报错
2023-11-29 17:34:15 +08:00
jinling.yang
6cf26e8029
新增采购权限组
2023-11-29 17:25:40 +08:00
禹翔辉
e796bbe990
Accept Merge Request #704 : (feature/功能刀具安全库存优化 -> develop)
...
Merge Request: 功能刀具安全库存修改字段类型
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/704
2023-11-29 10:23:11 +08:00
yuxianghui
c2d2d16948
Merge remote-tracking branch 'origin/feature/功能刀具组装功能优化' into feature/功能刀具安全库存优化
2023-11-29 10:21:07 +08:00
yuxianghui
c3ba11bed4
1、修改功能刀具安全库存模型的刀尖特征、柄部类型字段的字段类型为many2one
2023-11-29 10:17:43 +08:00
马广威
37815d603a
Accept Merge Request #703 : (feature/制造代码优化 -> develop)
...
Merge Request: 优化货位代码
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/703
2023-11-29 09:43:09 +08:00
mgw
ca0b59e95b
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化
2023-11-29 09:40:03 +08:00
mgw
7c478ec4fd
优化货位代码
2023-11-29 09:39:11 +08:00
qihao.gong@jikimo.com
5b1d347fd4
增加设备模块权限角色,优化coding代码扫描警告
2023-11-28 17:23:49 +08:00
马广威
e738d40b75
Accept Merge Request #702 : (feature/制造代码优化 -> develop)
...
Merge Request: 库存货架货位修改基本完成,推送测试
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/702
2023-11-28 17:23:20 +08:00
mgw
685eced709
货位代码优化
2023-11-28 17:21:29 +08:00
jinling.yang
ffc40c70d2
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2023-11-28 17:15:07 +08:00
jinling.yang
cc3ee289d3
Merge branch 'feature/修改刀具标准库部分字段类型' into develop
2023-11-28 17:14:51 +08:00
杨金灵
487b452519
Accept Merge Request #701 : (feature/修改刀具标准库部分字段类型 -> develop)
...
Merge Request: 修改刀具标准库部分字段类型
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/701
2023-11-28 17:14:34 +08:00
jinling.yang
4a62af7545
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改刀具标准库部分字段类型
2023-11-28 17:09:10 +08:00
jinling.yang
07be7c3074
1.同步刀具标准库接口修改刀片形状,柄部类型,刀尖特征,压紧方式
2023-11-28 17:08:56 +08:00
mgw
ddad1e9114
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化
2023-11-28 16:42:54 +08:00
mgw
2c1a101c24
库存货架货位修改基本完成,推送测试
2023-11-28 16:42:19 +08:00
禹翔辉
ab1af72727
Accept Merge Request #700 : (feature/功能刀具组装功能优化 -> develop)
...
Merge Request: 功能刀具组装功能优化
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/700
2023-11-28 16:37:29 +08:00
yuxianghui
bc186a9723
Merge remote-tracking branch 'origin/feature/功能刀具组装优化' into feature/功能刀具组装功能优化
2023-11-28 16:34:31 +08:00
yuxianghui
de04d452b3
1优化功能刀具组装单的刀具物料过滤条件,取消功能刀具列表的自动计算库存的方法
2023-11-28 16:28:48 +08:00
禹翔辉
66b808dfc9
Accept Merge Request #699 : (feature/功能刀具组装优化 -> develop)
...
Merge Request: 功能刀具组装功能优化
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/699
2023-11-28 15:02:36 +08:00
yuxianghui
ad36b37f27
Merge remote-tracking branch 'origin/feature/功能刀具安全库存重构' into feature/功能刀具组装优化
2023-11-28 14:57:40 +08:00
yuxianghui
e403f2f8e6
1、按面向对象的思想优化功能刀具组装功能的整个流程;2、新增刀具组装完成时的刀具物料出库到刀具组装位置;
2023-11-28 14:52:43 +08:00
马广威
24b850a508
Accept Merge Request #698 : (feature/制造代码优化 -> develop)
...
Merge Request: 优化警告问题
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/698
2023-11-28 09:00:03 +08:00
mgw
4d8b463cb3
优化警告问题
2023-11-28 08:59:01 +08:00
mgw
9fef877d12
优化警告问题
2023-11-27 22:40:56 +08:00
马广威
c323d9995e
Accept Merge Request #697 : (feature/制造代码优化 -> develop)
...
Merge Request: 物流可见性控制,优化警告问题
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/697?initial=true
2023-11-27 21:33:35 +08:00
mgw
4f83c5f29a
优化警告问题
2023-11-27 21:30:45 +08:00
jinling.yang
ed5f47cc31
1.修改刀具标准库刀片形状,柄部类型,压紧方式,刀尖特征,字段类型及对应控件显示
...
2.修改产品页面:刀片形状,柄部类型,压紧方式,刀尖特征,字段类型及对应控件显示
2023-11-27 17:34:23 +08:00
龚启豪
66bb55a823
Accept Merge Request #696 : (feature/修改机床参数bug -> develop)
...
Merge Request: 修改coding代码扫描警告
Created By: @龚启豪
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/696?initial=true
2023-11-27 17:30:01 +08:00
yuxianghui
5926d71d27
1、新增功能刀具列表模型自动计算功能刀具在刀具房数量功能;2、优化功能刀具安全库存模型相同功能刀具的检索条件;3、修改功能刀具组装单组装的初始位置为Production,修改功能刀具序列号的生成规则
2023-11-27 17:27:55 +08:00
qihao.gong@jikimo.com
c78ea6fbe5
修改coding代码扫描警告
2023-11-27 17:08:11 +08:00
mgw
96df8f971c
物流相关可见性控制
2023-11-27 15:40:16 +08:00
马广威
35511effae
Accept Merge Request #695 : (feature/制造代码优化 -> develop)
...
Merge Request: 优化物流下单等代码
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/695
2023-11-27 12:18:47 +08:00
mgw
54912f15b9
优化物流下单等代码
2023-11-27 12:17:57 +08:00
马广威
e8a13f1721
Accept Merge Request #694 : (feature/制造代码优化 -> develop)
...
Merge Request: 优化代码,修改库存货架货位为标签
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/694?initial=true
2023-11-24 21:46:16 +08:00
禹翔辉
1532293918
Accept Merge Request #693 : (feature/功能刀具安全库存重构 -> develop)
...
Merge Request: 功能刀具安全库存模型重构
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/693?initial=true
2023-11-24 17:18:59 +08:00
yuxianghui
030ef14633
Merge remote-tracking branch 'origin/feature/功能刀具出入库优化' into feature/功能刀具安全库存重构
2023-11-24 17:15:26 +08:00
yuxianghui
bf8b45609c
1、功能刀具列表模型新增查询功能刀具安全库存功能;2、重构功能刀具安全库存模型;3、功能刀具组装单弹窗界面的刀具物料新增位置为刀具房的过滤筛选;
2023-11-24 17:12:44 +08:00
龚启豪
964618d365
Accept Merge Request #692 : (feature/修改机床参数bug -> develop)
...
Merge Request: 代码规范
Created By: @龚启豪
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/692
2023-11-24 10:31:39 +08:00
杨金灵
06eeb1ed1f
Accept Merge Request #691 : (feature/优化代码格式 -> develop)
...
Merge Request: 优化代码格式
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/691?initial=true
2023-11-24 10:30:42 +08:00
qihao.gong@jikimo.com
deb732dc5e
代码规范
2023-11-24 10:30:33 +08:00
jinling.yang
5737d7b0bc
优化代码格式
2023-11-24 10:27:21 +08:00
mgw
5fd0beab95
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化
...
# Conflicts:
# sf_manufacturing/models/stock.py
2023-11-23 22:23:21 +08:00
mgw
858c163cbe
库存调整货架货位为标签
2023-11-23 22:14:56 +08:00
mgw
fee3572f38
错误问题处理
2023-11-23 22:14:12 +08:00
jinling.yang
f2862af565
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2023-11-23 17:44:16 +08:00
jinling.yang
c1c3639611
Merge branch 'feature/销售权限' into develop
2023-11-23 17:43:55 +08:00
杨金灵
41017412cd
Accept Merge Request #690 : (feature/销售权限 -> develop)
...
Merge Request: 优化销售权限
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/690
2023-11-23 17:43:39 +08:00
jinling.yang
e552502fd1
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2023-11-23 17:39:58 +08:00
jinling.yang
61da25a031
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/销售权限
...
# Conflicts:
# sf_manufacturing/models/product_template.py
2023-11-23 17:39:35 +08:00
龚启豪
aafafd682d
Accept Merge Request #689 : (feature/修改机床参数bug -> develop)
...
Merge Request: 修改代码不规范问题
Created By: @龚启豪
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/689?initial=true
2023-11-23 17:38:52 +08:00
jinling.yang
98ed831a85
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2023-11-23 17:38:49 +08:00
jinling.yang
e9be2e9c43
优化代码格式
2023-11-23 17:38:30 +08:00
qihao.gong@jikimo.com
b73a449b01
修改代码不规范问题
2023-11-23 17:37:06 +08:00
jinling.yang
45d04e1a05
1.销售新增审核状态,选项为已审核和待审核,销售模型新增权限规则:销售总监查看所有的订单,销售经理只能查看自己的订单
...
2.报价单Form视图新增审核按钮,该按钮只有销售总监可以看到,且确认按钮只有在销售经理审核完才可显示,报价Tree视图新增审核状态
2023-11-23 17:28:58 +08:00
禹翔辉
fc17063507
Accept Merge Request #688 : (feature/功能刀具出入库优化 -> develop)
...
Merge Request: 功能刀具出入库模型优化
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/688
2023-11-23 17:23:11 +08:00
yuxianghui
b3fbbeb85c
Merge remote-tracking branch 'origin/feature/功能刀具组装流程及界面优化' into feature/功能刀具出入库优化
2023-11-23 17:18:43 +08:00
yuxianghui
97d760cd56
1、基于原生的移动历史重构功能刀具出入库记录模型;2、功能刀具列表模型新增查询当前功能刀具出入库记录按钮;3、删除旧的功能刀具出入库记录模型和出入库记录人模型;4、机台换刀申请模型的功能刀具名称字段改为绑定功能刀具组装单;5、优化功能刀具组装单确认组装功能的创建移动历史记录功能。
2023-11-23 17:15:34 +08:00
龚启豪
9d911a5c2b
Accept Merge Request #687 : (feature/修改机床参数bug -> develop)
...
Merge Request: 设备名称生辰规则,制造模块新定义权限组
Created By: @龚启豪
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/687
2023-11-23 16:53:24 +08:00
龚启豪
9bb3b88fd6
Merge branch refs/heads/develop into refs/heads/feature/修改机床参数bug
2023-11-23 16:37:53 +08:00
qihao.gong@jikimo.com
baaeac10eb
修改设备生成名称规则,修改制造模块权限组定义
2023-11-23 16:33:09 +08:00
mgw
2510f5fbf3
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化
2023-11-23 10:22:58 +08:00
mgw
f77691251e
计划模块增加跟踪消息组件,form视图增加归档取消归档按钮,增加归档未归档的筛选项目
2023-11-23 10:21:42 +08:00
jinling.yang
5292826c72
新增销售权限
2023-11-22 17:58:41 +08:00
mgw
6fed64ba2a
计划模块增加权限控制
2023-11-22 17:55:30 +08:00
禹翔辉
8e5f5cf0d1
Accept Merge Request #686 : (feature/功能刀具组装流程及界面优化 -> develop)
...
Merge Request: 功能刀具组装流程及界面优化
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/686?initial=true
2023-11-22 17:39:17 +08:00
qihao.gong@jikimo.com
b4b5207aea
开发测试制造模块权限,修改设备机床类别的布局以及编码规则
2023-11-22 17:36:50 +08:00
yuxianghui
ca61537e21
Merge remote-tracking branch 'origin/feature/功能刀具组装优化' into feature/功能刀具组装流程及界面优化
...
# Conflicts:
# sf_manufacturing/models/product_template.py
2023-11-22 17:31:35 +08:00
yuxianghui
83da8f58e2
1、功能刀具列表模型新增大量字段,新增计算库存数量方法,新增查看当前功能刀具的预警记录按键;2、重构功能刀具预警模型(已完成);3、功能刀具组装模型name字段展示内容改为功能刀具名称;
2023-11-22 17:19:25 +08:00
马广威
a36c30b5c1
Accept Merge Request #685 : (feature/制造代码优化 -> develop)
...
Merge Request: 修改机床链接模块,优化规范代码
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/685?initial=true
2023-11-22 14:24:35 +08:00
mgw
ae6ec7183e
修改sf_machine_connect模块以适配新的设备构成
2023-11-22 14:22:41 +08:00
mgw
cc58425f50
规范问题优化
2023-11-22 10:29:04 +08:00
马广威
dda3aad95d
Accept Merge Request #684 : (feature/制造代码优化 -> develop)
...
Merge Request: 优化现有代码问题
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/684?initial=true
2023-11-22 09:58:21 +08:00
mgw
d6dcb6bf55
优化现有代码问题
2023-11-22 09:54:31 +08:00
马广威
4b672f3c23
Accept Merge Request #683 : (feature/制造代码优化 -> develop)
...
Merge Request: 优化sf_machine_connect的manifest文件
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/683?initial=true
2023-11-21 17:50:39 +08:00
mgw
423d5cec8e
优化sf_machine_connect的manifest文件
2023-11-21 17:49:58 +08:00
qihao.gong@jikimo.com
e6bb5db0e1
开发sf制造模块权限角色
2023-11-21 17:42:36 +08:00
jinling.yang
f0e66c6d90
新增销售权限
2023-11-21 17:30:07 +08:00
yuxianghui
8a1dfe14e6
1、功能刀具列表模型新增部分字段;2、机台换刀申请新增根据报警值和有效值计算当前状态,重构根据状态自动换刀申请的功能,重构撤销换刀申请功能;3、功能刀具组装单模型新增大量字段,优化tree视图和form视图的布局;4、组装单弹窗模型新增大量字段,优化确认组装按键功能,
2023-11-21 17:26:18 +08:00
jinling.yang
5113de7e97
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2023-11-21 16:31:41 +08:00
jinling.yang
e06002e05a
Merge branch 'feature/新增销售权限' into develop
2023-11-21 16:31:27 +08:00
杨金灵
8b7b52ee2c
Accept Merge Request #682 : (feature/新增销售权限 -> develop)
...
Merge Request: 新增销售和计划权限组和优化代码格式
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/682?initial=true
2023-11-21 16:31:19 +08:00
jinling.yang
6738f38131
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增销售权限
...
# Conflicts:
# sf_bf_connect/models/process_status.py
2023-11-21 16:11:24 +08:00
jinling.yang
ab115ab71c
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2023-11-21 16:10:27 +08:00
jinling.yang
6ec6094c5e
1.新增销售和计划权限组2.优化代码格式
2023-11-21 16:10:05 +08:00
马广威
321c40d31d
Accept Merge Request #681 : (feature/制造代码优化 -> develop)
...
Merge Request: 优化js代码过长的问题,优化未用到的变量
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/681?initial=true
2023-11-21 14:18:44 +08:00
mgw
890b73e108
优化js代码过长的问题,优化未用到的变量
2023-11-21 14:18:01 +08:00
马广威
247b3e4444
Accept Merge Request #676 : (feature/制造代码优化 -> develop)
...
Merge Request: 优化代码结构
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/676?initial=true
2023-11-20 17:42:54 +08:00
mgw
7391b1324d
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化
...
# Conflicts:
# sf_manufacturing/models/stock.py
2023-11-20 17:41:51 +08:00
mgw
d53e664881
修复导入错误,优化不使用的模块
2023-11-20 17:38:03 +08:00
yuxianghui
b49b5890a0
1、机台换刀申请及其弹窗新增生产线字段,2、机台换刀申请tree视图搜索面板改为按生产线和状态搜索,3、优化功能刀具组装单,新增大量字段,优化tree试图布局,优化form视图布局,tree视图搜索面板新增按状态搜索,4、重构了机台换刀申请模型申请换刀功能;5、重构刀具转移模型,
2023-11-20 17:36:13 +08:00
jinling.yang
690543e2d4
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2023-11-20 17:08:13 +08:00
jinling.yang
f296e1ba1a
Merge branch 'feature/产品验证' into develop
2023-11-20 17:05:43 +08:00
杨金灵
31f07c5156
Accept Merge Request #675 : (feature/产品验证 -> develop)
...
Merge Request: 产品验证及代码格式修复
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/675
2023-11-20 17:05:06 +08:00
龚启豪
63d6ce6da8
Accept Merge Request #674 : (feature/修改机床参数bug -> develop)
...
Merge Request: import requests
Created By: @龚启豪
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/674
2023-11-20 16:50:06 +08:00
qihao.gong@jikimo.com
580f95f338
importrequests修改
2023-11-20 15:48:43 +08:00
qihao.gong@jikimo.com
326181fa81
Merge branch 'feature/修改机床参数bug' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
...
# Conflicts:
# sf_manufacturing/models/stock.py
2023-11-20 15:44:43 +08:00
qihao.gong@jikimo.com
6fc735063a
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
...
# Conflicts:
# sf_manufacturing/models/stock.py
2023-11-20 15:41:50 +08:00
qihao.gong@jikimo.com
499261f62e
放开依赖
2023-11-20 15:39:07 +08:00
jinling.yang
6912160232
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/产品验证
...
# Conflicts:
# sf_manufacturing/models/stock.py
# sf_wxwork_approval/models/model.py
2023-11-20 15:11:43 +08:00
jinling.yang
04e63dcc59
修复代码规范
2023-11-20 15:10:01 +08:00
jinling.yang
7ceaadb9c4
修复引入库
2023-11-20 15:04:39 +08:00
龚启豪
fdf1b786fe
Merge branch refs/heads/develop into refs/heads/feature/修改机床参数bug
2023-11-20 15:03:36 +08:00
qihao.gong@jikimo.com
1da7a0195d
根据odoo规则修改py文件中得import顺序
2023-11-20 14:59:06 +08:00
马广威
b093b11ec2
Accept Merge Request #671 : (feature/制造代码优化 -> develop)
...
Merge Request: 优化代码结构
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/671?initial=true
2023-11-20 13:30:58 +08:00
mgw
718b1f9edf
优化代码结构
2023-11-20 13:23:37 +08:00
马广威
5bdd3982ae
Accept Merge Request #669 : (feature/制造代码优化 -> develop)
...
Merge Request: 优化wrong-import-order问题
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/669?initial=true
2023-11-20 12:44:35 +08:00
mgw
a606cbfc6d
优化wrong-import-order问题
2023-11-20 12:42:48 +08:00
马广威
1a5fcf09e1
Accept Merge Request #666 : (feature/制造代码优化 -> develop)
...
Merge Request: 测试优化后的代码扫描效果,优化代码
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/666?initial=true
2023-11-20 10:49:58 +08:00
mgw
d2899fe38e
测试优化代码后的代码扫描效果,优化部分代码审查问题
2023-11-20 10:48:43 +08:00
mgw
24e75f8895
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化
2023-11-17 17:51:57 +08:00
mgw
5bc5766507
优化代码格式至PEP8格式
2023-11-17 17:49:08 +08:00
jinling.yang
49f021ed7a
产品新增适配刀片形状,适合加工方式,刀尖特征,走刀方向,柄部类型,冷却液,压紧方式验证
2023-11-17 17:45:41 +08:00
黄焱
94031e68ad
Accept Merge Request #659 : (feature/前端样式修改 -> develop)
...
Merge Request: 修改规格字段位置
Created By: @黄焱
Reviewed By: @马广威
Accepted By: @黄焱
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/659?initial=true
2023-11-17 17:45:05 +08:00
黄焱
182348f427
修改规格字段位置
2023-11-17 17:42:41 +08:00
yuxianghui
c885f3ce8c
1、设备机床的刀位对象新增name字段,并自动添加值;2、根据需求重构了机床换刀申请模型,重构机床换刀弹窗对象;
2023-11-17 17:30:37 +08:00
jinling.yang
e5b0960e3a
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2023-11-17 10:43:16 +08:00
jinling.yang
dd5d4e7748
Merge branch 'feature/自动报价代码还原' into develop
2023-11-17 10:43:00 +08:00
杨金灵
369980d655
Accept Merge Request #530 : (feature/自动报价代码还原 -> develop)
...
Merge Request: 自动报价代码还原
Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/530?initial=true
2023-11-17 10:37:52 +08:00
jinling.yang
2096d05cdb
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/自动报价代码还原
2023-11-17 10:35:42 +08:00
jinling.yang
fbab054324
代码还原
2023-11-17 10:35:10 +08:00
马广威
e3ff9e9fde
Accept Merge Request #529 : (feature/制造代码优化 -> develop)
...
Merge Request: 测试coding代码审查
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/529?initial=true
2023-11-17 10:03:04 +08:00
mgw
c3ee544ca6
测试coding代码审查
2023-11-17 09:55:41 +08:00
jinling.yang
08581c8bc4
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2023-11-17 09:15:29 +08:00
jinling.yang
49cbf2fde2
Merge branch 'feature/产品优化' into develop
2023-11-17 09:13:54 +08:00
杨金灵
2f2522c99e
Accept Merge Request #527 : (feature/产品优化 -> develop)
...
Merge Request: 产品优化
Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/527?initial=true
2023-11-17 09:13:36 +08:00
jinling.yang
fefa14a47b
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/产品优化
...
# Conflicts:
# sf_dlm/models/product_supplierinfo.py
2023-11-17 09:12:41 +08:00
yuxianghui
329d7b6464
1、机床换刀申请界面新增搜索面板和设备字段根据设备的设备类型等于机床的过滤条件;2、隐藏功能刀具出入库记录菜单;3、功能刀具列表form视图新增预警跳转按键(跳转功能未完成);
2023-11-16 17:36:09 +08:00
jinling.yang
f36c2ac096
产品优化
2023-11-16 17:35:04 +08:00
马广威
9c6367c053
Accept Merge Request #526 : (feature/制造代码优化 -> develop)
...
Merge Request: 产品模板修改>>>增加“规格”字段specification_id
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/526?initial=true
2023-11-16 17:03:24 +08:00
mgw
076866e9b7
产品模板修改>>>增加“规格”字段specification_id
2023-11-16 17:01:14 +08:00
mgw
3a64a2106a
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化
2023-11-16 15:14:04 +08:00
黄焱
ead39c9649
Accept Merge Request #525 : (feature/前端样式修改 -> develop)
...
Merge Request: 修改生产线看板样式
Created By: @黄焱
Accepted By: @黄焱
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/525?initial=true
2023-11-16 15:12:44 +08:00
黄焱
25d1a99239
修改生产线看板样式
2023-11-16 15:02:27 +08:00
龚启豪
9a318d45f3
Accept Merge Request #524 : (feature/修改机床参数bug -> develop)
...
Merge Request: wms路线规则动态选取
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/524?initial=true
2023-11-15 16:22:56 +08:00
qihao.gong@jikimo.com
41a9aa86a7
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
2023-11-15 16:21:52 +08:00
qihao.gong@jikimo.com
2322758e50
wms路线规则动态选取
2023-11-15 16:21:40 +08:00
mgw
d216478679
调整这两个文件的__manifest__.py文件
2023-11-15 15:28:32 +08:00
禹翔辉
b487ee127a
Accept Merge Request #523 : (feature/功能刀具组装优化 -> develop)
...
Merge Request: 功能刀具组装刀具物料型号字段绑定对象更改为刀具标准库,并优化组装确认功能。
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/523?initial=true
2023-11-14 16:49:08 +08:00
yuxianghui
2a964bc30e
功能刀具组装刀具物料型号字段绑定对象更改为刀具标准库,并优化组装确认功能。
2023-11-14 16:48:11 +08:00
马广威
d0132dbc3a
Accept Merge Request #522 : (feature/制造代码优化 -> develop)
...
Merge Request: 去掉sf_plan模块中的 工作中心计划 菜单
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/522?initial=true
2023-11-14 16:15:19 +08:00
mgw
acccb4b6f9
去掉sf_plan模块中的 工作中心计划 菜单
2023-11-14 15:42:54 +08:00
马广威
48f75ad600
Accept Merge Request #521 : (feature/制造代码优化 -> develop)
...
Merge Request: 修改订单排程功能为通用方法,同时增加动态判断计划时间是否与获取cnc程序的时间冲突功能,如果冲突,时间自动延后1h;优化gantt显示
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/521?initial=true
2023-11-14 12:22:12 +08:00
mgw
daeae46820
修改订单排程功能为通用方法,同时增加动态判断计划时间是否与获取cnc程序的时间冲突功能,如果冲突,时间自动延后1h;优化gantt显示
2023-11-14 12:21:08 +08:00
马广威
77535fa70e
Accept Merge Request #520 : (feature/制造代码优化 -> develop)
...
Merge Request: 修复gantt图修改日视图后其他视图的pill左移的bug。优化字段默认宽度的逻辑
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/520?initial=true
2023-11-13 15:08:44 +08:00
mgw
913780bc2b
修复gantt图修改日视图后其他视图的pill左移的bug。优化字段默认宽度的逻辑
2023-11-13 15:07:50 +08:00
马广威
f566fc1c08
Accept Merge Request #519 : (feature/制造代码优化 -> develop)
...
Merge Request: 修复订单状态回传的问题
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/519?initial=true
2023-11-13 09:42:56 +08:00
mgw
a97ce9b0a7
修复订单状态回传的问题
2023-11-10 18:06:21 +08:00
马广威
d0e18fbd44
Accept Merge Request #518 : (feature/制造代码优化 -> develop)
...
Merge Request: 解决遗漏代码错误
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/518?initial=true
2023-11-10 16:29:16 +08:00
mgw
3845041f7f
解决遗漏代码错误
2023-11-10 16:28:06 +08:00
马广威
f313a171cb
Accept Merge Request #517 : (feature/图文项目单选功能 -> develop)
...
Merge Request: 图文项目单选功能本地开发测试完成,推送线上测试
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/517?initial=true
2023-11-10 16:21:21 +08:00
mgw
93731a4777
图文项目单选功能本地开发测试完成,推送线上测试
2023-11-10 16:20:48 +08:00
马广威
dba17d5c7a
Accept Merge Request #516 : (feature/制造优化 -> develop)
...
Merge Request: 梳理计划模块结构,删除不必要的代码
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/516
2023-11-10 16:13:11 +08:00
杨金灵
2a984ba2c0
Accept Merge Request #515 : (feature/修复单一制造 -> develop)
...
Merge Request: 修复单一制造
Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/515
2023-11-09 16:32:48 +08:00
jinling.yang
dbfd75b139
修复单一制造
2023-11-09 16:30:05 +08:00
mgw
db1dc18c28
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造优化
2023-11-09 16:21:53 +08:00
mgw
523f7a0942
梳理计划模块结构
2023-11-09 16:20:26 +08:00
龚启豪
16b3df87c9
Accept Merge Request #514 : (feature/修改机床参数bug -> develop)
...
Merge Request: 修改cs数据库
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/514?initial=true
2023-11-09 11:35:15 +08:00
qihao.gong@jikimo.com
8d952aa046
更换cs数据库
2023-11-09 11:34:20 +08:00
qihao.gong@jikimo.com
e3e253fab8
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
2023-11-09 09:44:41 +08:00
mgw
fe96004111
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造优化
2023-11-08 17:47:57 +08:00
jinling.yang
8483be5d2d
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2023-11-08 17:44:45 +08:00
jinling.yang
b6964e29bc
Merge branch 'feature/去掉注释' into develop
2023-11-08 17:44:33 +08:00
杨金灵
56d1a98c53
Accept Merge Request #513 : (feature/去掉注释 -> develop)
...
Merge Request: 去掉注释及硬度的字段类型改为整数型
Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/513?initial=true
2023-11-08 17:43:47 +08:00
jinling.yang
01f0902937
去掉注释,及修改转换3d模型文件的位置
2023-11-08 17:41:18 +08:00
jinling.yang
6335c03cef
硬度相关字段的类型改为整数型
2023-11-08 17:35:16 +08:00
jinling.yang
4f898dd8ce
去掉注释,硬度的字段类型改为整数型
2023-11-08 17:29:38 +08:00
mgw
d012066428
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造优化
2023-11-08 17:21:07 +08:00
jinling.yang
4c57bbe791
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2023-11-08 17:20:07 +08:00
jinling.yang
b8d590de6d
Merge branch 'feature/整合产品和销售模块' into develop
2023-11-08 17:19:53 +08:00
杨金灵
82a31c6f31
Accept Merge Request #512 : (feature/整合产品和销售模块 -> develop)
...
Merge Request: 整合所有模块依赖
Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/512?initial=true
2023-11-08 17:17:55 +08:00
jinling.yang
30a7f762c2
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/整合产品和销售模块
2023-11-08 17:14:01 +08:00
jinling.yang
3a1acb0f5a
整合所有模块依赖
2023-11-08 17:13:18 +08:00
mgw
c0b759aa9d
优化代码
2023-11-08 11:24:05 +08:00
马广威
7f5ac4ef90
Accept Merge Request #511 : (feature/制造优化 -> develop)
...
Merge Request: 增加排程后各工单时间预估功能
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/511?initial=true
2023-11-07 10:19:39 +08:00
mgw
f1c835800e
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造优化
2023-11-07 10:17:52 +08:00
mgw
77852900a3
增加排程后各工单时间预估功能
2023-11-07 10:17:06 +08:00
qihao.gong@jikimo.com
b2a9088354
修改路线规则
2023-11-03 15:48:42 +08:00
杨金灵
3be0d1ffad
Accept Merge Request #510 : (feature/同步刀具标准库(刀杆) -> develop)
...
Merge Request: 修复刀具标准库(刀杆)
Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/510?initial=true
2023-11-03 10:44:46 +08:00
jinling.yang
686c049e52
修复刀具标准库
2023-11-03 10:42:09 +08:00
qihao.gong@jikimo.com
780dbd5dda
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
2023-11-02 17:19:06 +08:00
杨金灵
53ad002f3b
Accept Merge Request #509 : (feature/修复刀具标准库包含同步新增 -> develop)
...
Merge Request: 修复同步刀具标准库
Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/509?initial=true
2023-11-02 17:18:38 +08:00
jinling.yang
36270477d5
修复同步刀具标准库
2023-11-02 17:17:34 +08:00
qihao.gong@jikimo.com
a45ee59a76
修改
2023-11-02 14:34:17 +08:00
qihao.gong@jikimo.com
d2782446b0
修改
2023-11-02 14:24:27 +08:00
杨金灵
eb835ae5c8
Accept Merge Request #508 : (feature/去掉模型代码转换注释 -> develop)
...
Merge Request: 去掉模型代码转换注释
Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/508?initial=true
2023-11-01 17:52:18 +08:00
jinling.yang
401103f17b
去掉模型代码转换注释
2023-11-01 17:51:46 +08:00
jinling.yang
e592d49983
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2023-11-01 17:49:28 +08:00
jinling.yang
de0cb1ebbc
Merge branch 'feature/刀具产品调取Cloud刀具标准库(10.11)' into develop
2023-11-01 17:49:16 +08:00
杨金灵
8e91aec7f1
Accept Merge Request #507 : (feature/刀具产品调取Cloud刀具标准库(10.11) -> develop)
...
Merge Request: 优化刀具标准库
Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/507?initial=true
2023-11-01 17:49:00 +08:00
jinling.yang
0b7dc6d09a
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具产品调取Cloud刀具标准库(10.11)
2023-11-01 17:46:24 +08:00
jinling.yang
108cb96ca5
修复刀具产品及同步刀具标准库
2023-11-01 17:45:54 +08:00
禹翔辉
03efa01a85
Accept Merge Request #506 : (feature/功能刀具组装优化 -> develop)
...
Merge Request: 1、优化CAM申请的组装单中功能刀具名称没有内容的问题,优化组装单等的form表名称问题;2、去除组装单弹窗输出语句
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/506?initial=true
2023-11-01 17:40:30 +08:00
JIKIMO-YXH\xianghui
ba19175472
Merge remote-tracking branch 'origin/feature/功能刀具' into feature/功能刀具组装优化
2023-11-01 17:39:21 +08:00
龚启豪
aa9464face
Accept Merge Request #505 : (feature/修改机床参数bug -> develop)
...
Merge Request: 修改维保项目多图片展示
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/505?initial=true
2023-11-01 17:35:05 +08:00
qihao.gong@jikimo.com
0c788df2f2
修改维保项目多图片展示
2023-11-01 17:33:50 +08:00
JIKIMO-YXH\xianghui
cbc9264b2c
1、优化CAM申请的组装单中功能刀具名称没有内容的问题,优化组装单等的form表名称问题;2、去除组装单弹窗输出语句
2023-11-01 17:26:23 +08:00
马广威
82ce347ca4
Accept Merge Request #504 : (feature/制造-计划优化 -> develop)
...
Merge Request: 本地已处理完序号导致的label变形问题,线上测试
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/504?initial=true
2023-11-01 17:10:53 +08:00
mgw
d13071272a
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造-计划优化
2023-11-01 16:53:15 +08:00
mgw
74523c710f
本地测试优化完序号展示问题,准备线上测试
2023-11-01 16:52:26 +08:00
mgw
fc35ef687b
优化序号导致字段label变形的问题
2023-11-01 12:15:26 +08:00
禹翔辉
a71d960e2d
Accept Merge Request #503 : (feature/功能刀具 -> develop)
...
Merge Request: 功能刀具组装后流程和功能刀具组装优化
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/503?initial=true
2023-11-01 09:44:01 +08:00
JIKIMO-YXH\xianghui
0cbf01b9ec
Merge remote-tracking branch 'origin/feature/功能刀具组装后' into feature/功能刀具
2023-11-01 09:26:04 +08:00
mgw
869b389420
研究下载模板和列宽问题
2023-11-01 09:01:49 +08:00
JIKIMO-YXH\xianghui
d429a8b4b8
1、删除功能刀具缓存对象,删除出库弹窗对像,删除功能刀具组装、机台换刀申请和CAM换刀的界面跳转按钮,并在form界面添加管理界面字段;2、优化组装单编码的生成;3、将刀具管理下所以功能刀具相关的模型中的功能刀具名称字段改为绑定功能刀具产品对象,编码改为序列号并绑定产品序列号对象,4、优化刀具管理下的功能刀具界面,5、优化从组装申请到组装完成所以流程功能
2023-10-31 17:45:45 +08:00
JIKIMO-YXH\xianghui
deccb6e3cd
1、删除功能刀具组装的取消组装功能和出库功能;2、删除功能刀具组装单的单据来源跳转按钮;3、新增组装单编码字段和自动生成编码的方法;4、新增功能刀具序列号,绑定功能刀具产品序列号;5、完成功能刀具组装后的产品入库到位置【组装后】
2023-10-30 17:43:28 +08:00
jinling.yang
2a9c5276ab
优化刀具产品
2023-10-30 17:32:16 +08:00
马广威
db0c83bd2b
Accept Merge Request #502 : (feature/制造-计划优化 -> develop)
...
Merge Request: 解决row number导致字段label变形的问题
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/502
2023-10-30 15:47:37 +08:00
mgw
f81ee155e7
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造-计划优化
2023-10-30 15:45:21 +08:00
mgw
76368398ba
解决row number导致字段label变形的问题
2023-10-30 15:44:45 +08:00
龚启豪
8e5fc5eb61
Accept Merge Request #500 : (feature/修改机床参数bug -> develop)
...
Merge Request: 解决无法生成采购单的bug
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/500
2023-10-30 11:15:32 +08:00
qihao.gong@jikimo.com
a0804758f5
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
2023-10-30 11:14:42 +08:00
qihao.gong@jikimo.com
4634393f6c
修改form全局宽度
2023-10-30 11:14:29 +08:00
jinling.yang
5ffe2ce0e2
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具产品调取Cloud刀具标准库(10.11)
...
# Conflicts:
# sf_maintenance/views/maintenance_views.xml
2023-10-30 10:48:13 +08:00
杨金灵
911f464aca
Accept Merge Request #501 : (feature/修复获取编程单 -> develop)
...
Merge Request: 获取编程单修复
Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/501
2023-10-30 09:38:47 +08:00
jinling.yang
9f30a029c5
机床id改为设备id
2023-10-30 09:36:52 +08:00
JIKIMO-YXH\xianghui
5b9fcb2e53
1、创建创建功能刀具该批次/序列号位置
2023-10-27 17:46:19 +08:00
jinling.yang
46807003e1
产品新增刀具物料为刀片,刀盘,刀杆,夹头,刀柄,相关联的字段,及对应页面的优化
2023-10-27 17:44:12 +08:00
qihao.gong@jikimo.com
593944cac2
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
2023-10-27 15:07:12 +08:00
qihao.gong@jikimo.com
018b51e1e5
解决无法生成采购单的bug
2023-10-27 15:06:49 +08:00
龚启豪
a29dbca0e4
Accept Merge Request #499 : (feature/修改机床参数bug -> develop)
...
Merge Request: 制造标准改成执行标准
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/499?initial=true
2023-10-27 10:31:53 +08:00
qihao.gong@jikimo.com
47a408d034
制造标准改成执行标准
2023-10-27 10:31:10 +08:00
龚启豪
d14120dfa2
Accept Merge Request #498 : (feature/修改机床参数bug -> develop)
...
Merge Request: 长宽高
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/498?initial=true
2023-10-27 09:38:17 +08:00
qihao.gong@jikimo.com
b88c6a53ab
长宽高
2023-10-27 09:37:23 +08:00
JIKIMO-YXH\xianghui
e3d58c2a9e
1、优化产初始化生成功能刀具,解决作业类型无法选择功能刀具的问题;2、优化取消功能刀具组装功能;3、新增功能刀具组装确定后生成功能刀具序列号,生成刀具组装入库单
2023-10-26 17:39:33 +08:00
龚启豪
04261036a5
Accept Merge Request #497 : (feature/修改机床参数bug -> develop)
...
Merge Request: 修改设备菜单默认展示页面
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/497?initial=true
2023-10-26 17:34:01 +08:00
qihao.gong@jikimo.com
0eaed68b82
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
2023-10-26 17:32:15 +08:00
qihao.gong@jikimo.com
ccb53a61de
修改设备菜单默认展示页面
2023-10-26 17:32:00 +08:00
jinling.yang
4a01132b91
新增产品刀具参数里的走刀量
2023-10-26 10:10:47 +08:00
jinling.yang
9fffcd4f04
新增规格改变事件
2023-10-25 17:37:17 +08:00
JIKIMO-YXH\xianghui
ce86a66e92
1、新增产品初始化时生成功能刀具产品类别和功能刀具模版;2、新增库存初始化时生成组装后位置和刀具组装入库的作业类型。
2023-10-25 17:35:12 +08:00
jinling.yang
65dd8372dd
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具产品调取Cloud刀具标准库(10.11)
2023-10-25 15:07:52 +08:00
jinling.yang
39f97131a2
1.去掉不要的代码2,.产品页面新增规格字段
2023-10-25 15:07:29 +08:00
jinling.yang
7b471be4cf
洗澡基本参数回显
2023-10-24 17:47:05 +08:00
龚启豪
802bd4285c
Accept Merge Request #496 : (feature/修改机床参数bug -> develop)
...
Merge Request: 修改设备日志列表展示
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/496
2023-10-24 17:32:39 +08:00
qihao.gong@jikimo.com
e7de773f28
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
2023-10-24 17:31:52 +08:00
qihao.gong@jikimo.com
4098dda5b8
修改设备日志列表展示
2023-10-24 17:31:42 +08:00
禹翔辉
2c67f7a286
Accept Merge Request #495 : (feature/功能刀具组装和产品优化 -> develop)
...
Merge Request: 1、优化产品模块下夹具类别下的零点托盘参数显示;2、调整功能刀具组装单的刀具物料字段布局。
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/495?initial=true
2023-10-24 17:12:28 +08:00
JIKIMO-YXH\xianghui
a953ca189e
1、优化产品模块下夹具类别下的零点托盘参数显示;2、调整功能刀具组装单的刀具物料字段布局。
2023-10-24 17:11:37 +08:00
杨金灵
0a09c54690
Accept Merge Request #494 : (feature/修复快速订单 -> develop)
...
Merge Request: 修复销售方法的传参
Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/494?initial=true
2023-10-24 14:56:30 +08:00
jinling.yang
076c4a2bcb
修复销售方法的传参
2023-10-24 14:55:45 +08:00
杨金灵
0e2cbf06ca
Accept Merge Request #493 : (feature/修复创建销售订单 -> develop)
...
Merge Request: 修复创建销售
Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/493?initial=true
2023-10-24 14:45:16 +08:00
jinling.yang
575c856f27
修复创建销售
2023-10-24 14:43:11 +08:00
jinling.yang
103b00a635
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具产品调取Cloud刀具标准库(10.11)
...
# Conflicts:
# sf_sale/models/quick_easy_order.py
2023-10-24 14:39:45 +08:00
jinling.yang
38c77e7fbb
新增选择刀具规格基本参数
2023-10-24 14:38:35 +08:00
杨金灵
272ab8daa0
Accept Merge Request #492 : (feature/添加日志 -> develop)
...
Merge Request: 添加日志输出·
Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/492?initial=true
2023-10-24 11:24:26 +08:00
jinling.yang
acff814e9b
添加注释
2023-10-24 11:23:29 +08:00
jinling.yang
1bc3f756fe
新增按钮
2023-10-24 11:18:33 +08:00
杨金灵
99ea796f2e
Accept Merge Request #491 : (feature/快速订单 -> develop)
...
Merge Request: 快速订单代码还原
Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/491?initial=true
2023-10-24 10:30:06 +08:00
jinling.yang
4ef82ee7cf
代码还原
2023-10-24 10:29:10 +08:00
jinling.yang
4bed65d1df
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具产品调取Cloud刀具标准库(10.11)
...
# Conflicts:
# sf_sale/models/quick_easy_order.py
2023-10-24 09:59:11 +08:00
杨金灵
2b9e768793
Accept Merge Request #490 : (feature/注释自动报价 -> develop)
...
Merge Request: 注释自动报价
Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/490
2023-10-24 09:52:50 +08:00
jinling.yang
f4a878ced9
注释自动报价
2023-10-24 09:51:31 +08:00
jinling.yang
093724a277
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具产品调取Cloud刀具标准库(10.11)
...
# Conflicts:
# sf_sale/models/quick_easy_order.py
2023-10-24 09:45:35 +08:00
qihao.gong@jikimo.com
8346f40b79
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
2023-10-24 09:41:43 +08:00
qihao.gong@jikimo.com
a9ba65ec17
去除输入框居中的样式
2023-10-24 09:41:28 +08:00
jinling.yang
8f29696b64
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2023-10-24 09:41:23 +08:00
jinling.yang
2d32419a7d
修改计算方法
2023-10-24 09:41:05 +08:00
禹翔辉
2c636c5e64
Accept Merge Request #489 : (feature/功能刀具组装优化 -> develop)
...
Merge Request: 1、完成刀具组装单扫描绑定刀具物料的功能;2、完成刀具组装单刀具物料绑定库存的刀具物料序列号
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/489?initial=true
2023-10-23 17:38:16 +08:00
yuxianghui
270338868b
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/功能刀具组装优化
2023-10-23 17:36:44 +08:00
yuxianghui
845d606b36
完成刀具组装单扫描绑定刀具物料的功能
2023-10-23 17:36:27 +08:00
jinling.yang
919a200750
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2023-10-23 17:36:15 +08:00
jinling.yang
ad11f2ea63
Merge branch 'feature/注释自动报价方法' into develop
2023-10-23 14:32:54 +08:00
杨金灵
a414f7cd25
Accept Merge Request #487 : (feature/注释自动报价方法 -> develop)
...
Merge Request: 注释代码
Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/487?initial=true
2023-10-23 14:32:34 +08:00
jinling.yang
2a8558f5a2
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/注释自动报价方法
2023-10-23 14:31:23 +08:00
jinling.yang
13555d91e2
注释上色代码
2023-10-23 14:30:46 +08:00
杨金灵
5ccc186bd1
Accept Merge Request #486 : (feature/注释自动报价方法 -> develop)
...
Merge Request: 注释自动报价方法
Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/486?initial=true
2023-10-23 11:38:37 +08:00
jinling.yang
27259fb8f7
注释自动报价方法
2023-10-23 11:34:56 +08:00
杨金灵
b733c4168f
Accept Merge Request #485 : (feature/自动报价代码释放 -> develop)
...
Merge Request: 自动报价代码释放
Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/485?initial=true
2023-10-23 10:01:19 +08:00
jinling.yang
1e243e4500
代码释放
2023-10-23 09:59:25 +08:00
yuxianghui
ef2e84e411
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/功能刀具组装优化
2023-10-23 09:44:06 +08:00
马广威
4f644b1e25
Accept Merge Request #484 : (feature/制造-计划优化 -> develop)
...
Merge Request: 解决sequence bug,增加“丢弃”二次确认模态框
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/484
2023-10-23 00:21:50 +08:00
马广威
a5cb2dc93b
Merge branch refs/heads/develop into refs/heads/feature/制造-计划优化
2023-10-23 00:21:20 +08:00
mgw
749473f9dc
form视图的丢弃按钮增加二次确认功能
2023-10-23 00:17:05 +08:00
jinling.yang
dc8aecba93
产品新增刀具规格向导
2023-10-20 18:41:58 +08:00
mgw
587e2a4e3e
修复sequence导致字段值移动位置的bug
2023-10-20 10:50:35 +08:00
jinling.yang
d83255cc67
优化同步刀具标准库接口(包含全部合并每日)
2023-10-19 17:23:53 +08:00
jinling.yang
14edbd85f4
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具产品调取Cloud刀具标准库(10.11)
...
# Conflicts:
# sf_base/models/tool_base.py
# sf_base/models/tool_base_new.py
# sf_maintenance/views/maintenance_views.xml
# sf_mrs_connect/models/res_config_setting.py
2023-10-19 10:53:03 +08:00
jinling.yang
e7df6c14b1
同步刀具标准库
2023-10-19 10:49:54 +08:00
yuxianghui
e2c13a8194
1、功能刀具组装组装功能对象的六个刀具物料对象的序列号绑定库存的刀具物料序列号,2、优化功能刀具组装和功能刀具组装组装弹窗的刀具物料布局
2023-10-18 17:34:19 +08:00
龚启豪
9b5a0162ff
Accept Merge Request #483 : (feature/修改机床参数bug -> develop)
...
Merge Request: 设备其他table增加参数
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/483?initial=true
2023-10-17 15:11:40 +08:00
qihao.gong@jikimo.com
a57cdbe2f3
设备其他table增加参数
2023-10-17 15:10:25 +08:00
龚启豪
d02e0cf455
Accept Merge Request #482 : (feature/修改机床参数bug -> develop)
...
Merge Request: 修改设备table布局
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/482?initial=true
2023-10-16 17:24:17 +08:00
qihao.gong@jikimo.com
e3bdf9409f
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
2023-10-16 17:23:21 +08:00
qihao.gong@jikimo.com
93a6b4ccb4
修改设备table布局
2023-10-16 17:23:04 +08:00
龚启豪
d532ff8c05
Accept Merge Request #481 : (feature/修改机床参数bug -> develop)
...
Merge Request: 修改设备table布局
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/481?initial=true
2023-10-16 17:12:28 +08:00
qihao.gong@jikimo.com
0f15814916
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
2023-10-16 17:11:37 +08:00
qihao.gong@jikimo.com
f02d1a0ace
修改设备table布局
2023-10-16 17:11:24 +08:00
马广威
cbc298f6ad
Accept Merge Request #480 : (feature/制造-计划优化 -> develop)
...
Merge Request: tree视图记录左侧增加序号展示记录数
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/480?initial=true
2023-10-16 15:19:08 +08:00
mgw
e02ab7fd95
tree视图记录左侧增加序号展示记录数
2023-10-16 15:18:18 +08:00
jinling.yang
9acdcc0429
新增同步cloud的刀具标准库接口
2023-10-13 17:29:34 +08:00
龚启豪
dbbddfadab
Accept Merge Request #479 : (feature/修改机床参数bug -> develop)
...
Merge Request: 修改设备table格式布局
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/479?initial=true
2023-10-13 16:43:45 +08:00
qihao.gong@jikimo.com
1f090fdd20
修改设备table格式布局
2023-10-13 16:42:16 +08:00
龚启豪
0b72c59335
Accept Merge Request #415 : (feature/修改机床参数bug -> develop)
...
Merge Request: 修改机床注册接口
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/415?initial=true
2023-10-13 14:28:06 +08:00
qihao.gong@jikimo.com
7c6dd76464
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
2023-10-13 14:26:49 +08:00
qihao.gong@jikimo.com
01ad3e7d8c
修改机床注册接口
2023-10-13 14:26:38 +08:00
龚启豪
53f7f75795
Accept Merge Request #414 : (feature/修改机床参数bug -> develop)
...
Merge Request: 设备过滤能力特征库只关联加工能力
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/414?initial=true
2023-10-12 14:50:13 +08:00
qihao.gong@jikimo.com
a80ab33c50
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
2023-10-12 14:49:41 +08:00
qihao.gong@jikimo.com
3bd5c7efb3
设备过滤能力特征库只关联加工能力
2023-10-12 14:49:25 +08:00
龚启豪
aa2e9e8c1f
Accept Merge Request #413 : (feature/修改机床参数bug -> develop)
...
Merge Request: 修改设备table的样式 修改关联品牌根据各不同类别展示
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/413?initial=true
2023-10-12 14:11:26 +08:00
qihao.gong@jikimo.com
8db9ed68c1
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
2023-10-12 14:10:47 +08:00
qihao.gong@jikimo.com
53e307cd55
修改设备table的样式 修改关联品牌根据各不同类别展示
2023-10-12 14:10:29 +08:00
jinling.yang
c04e138d6b
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具产品调取Cloud刀具标准库(10.11)
...
# Conflicts:
# sf_mrs_connect/models/sync_common.py
2023-10-11 17:41:19 +08:00
jinling.yang
296efcc395
新增调取cloud的刀具标准库接口
2023-10-11 17:39:46 +08:00
龚启豪
e4fb6edb05
Accept Merge Request #412 : (feature/修改机床参数bug -> develop)
...
Merge Request: 处理同步报错bug
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/412?initial=true
2023-10-11 15:42:52 +08:00
qihao.gong@jikimo.com
6724d0e0c1
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
2023-10-11 15:42:06 +08:00
qihao.gong@jikimo.com
e505285a91
处理同步报错bug
2023-10-11 15:41:55 +08:00
龚启豪
2ecc130fd1
Accept Merge Request #411 : (feature/修改机床参数bug -> develop)
...
Merge Request: 设备参数根据不同类别修改必填项, 新增刀具库位table
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/411?initial=true
2023-10-11 14:57:29 +08:00
qihao.gong@jikimo.com
ecb1f4140e
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
...
# Conflicts:
# sf_mrs_connect/models/res_config_setting.py
# sf_mrs_connect/models/sync_common.py
2023-10-11 14:56:18 +08:00
qihao.gong@jikimo.com
b1d2cd1ceb
设备类别参数根据不同类别必填 设备增加刀具库位table 并自动生成
2023-10-11 14:45:35 +08:00
杨金灵
0752ba9d2d
Accept Merge Request #410 : (feature/刀具产品调取Cloud刀具标准库 -> develop)
...
Merge Request: 优化能力特征库
Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/410?initial=true
2023-10-10 17:27:39 +08:00
jinling.yang
6b7b536236
1.优化同步cloud的静态资源库的定时器的代码
...
2.新增能力特征库的接口
2023-10-10 17:19:11 +08:00
qihao.gong@jikimo.com
b9d6e0ea35
材料型号同步接口修改 新增国际标准和材料应用
2023-10-09 17:35:39 +08:00
杨金灵
8f4eff6d1c
Accept Merge Request #409 : (feature/bug修复 -> develop)
...
Merge Request: 同步cloud资源库静态资源Bug修复及代码优化
Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/409?initial=true
2023-10-09 15:23:57 +08:00
jinling.yang
708889b1ed
去掉不要的代码及刀具型号的定时器
2023-10-09 15:21:41 +08:00
jinling.yang
59514cc433
去掉刀具型号的同步方法
2023-10-09 15:15:52 +08:00
qihao.gong@jikimo.com
ea3dbb290f
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
2023-10-08 17:28:09 +08:00
qihao.gong@jikimo.com
30cebea5a1
修改材料型号参数类型
2023-10-08 17:27:51 +08:00
jinling.yang
e586ed8e3b
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/bug修复
2023-10-08 17:19:22 +08:00
jinling.yang
7551bf38ef
销售模块新增依赖引用
2023-10-08 17:19:02 +08:00
龚启豪
34beb03a6a
Accept Merge Request #408 : (feature/修改机床参数bug -> develop)
...
Merge Request: 新增设备AGV小车,机器人,检测设备参数
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/408?initial=true
2023-10-08 09:11:39 +08:00
qihao.gong@jikimo.com
af05d3ec30
设备增加AGV小车,机械臂,检测设备参数
2023-10-07 17:26:09 +08:00
qihao.gong@jikimo.com
ac6315c76a
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
2023-09-28 16:20:24 +08:00
qihao.gong@jikimo.com
960bea5bb0
设备新增参数 AGV小车table页
2023-09-28 16:20:03 +08:00
龚启豪
69bae5b853
Accept Merge Request #407 : (feature/修改机床参数bug -> develop)
...
Merge Request: 故障日志bug
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/407?initial=true
2023-09-27 14:33:03 +08:00
qihao.gong@jikimo.com
6b375ee64d
修改故障日志bug
2023-09-27 14:30:38 +08:00
qihao.gong@jikimo.com
84b211911f
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
2023-09-26 17:29:37 +08:00
qihao.gong@jikimo.com
22a4ccad6b
修改维保生成编码和名称的规则
2023-09-26 17:29:14 +08:00
马广威
f6fd70bb51
Accept Merge Request #406 : (feature/制造-计划优化 -> develop)
...
Merge Request: 测试背景图片在线上展示
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/406?initial=true
2023-09-26 14:55:05 +08:00
mgw
9c5900e4fe
测试背景图片在线上展示
2023-09-26 14:54:13 +08:00
马广威
51f4c1787f
Accept Merge Request #405 : (feature/制造-计划优化 -> develop)
...
Merge Request: 调整菜单顺序等,优化gantt显示
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/405?initial=true
2023-09-26 14:26:29 +08:00
mgw
81cae99093
屏蔽测试内容
2023-09-26 14:24:43 +08:00
mgw
587daef6ee
Merge branch 'feature/制造-计划优化' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造-计划优化
2023-09-26 14:11:51 +08:00
mgw
9217372097
调整代码结构
2023-09-26 14:09:25 +08:00
mgw
256d86567e
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造-计划优化
...
# Conflicts:
# jikimo_frontend/static/src/scss/custom_style.scss
2023-09-26 11:36:59 +08:00
mgw
37541fdcd6
优化gantt的间隔为变量
2023-09-26 11:34:03 +08:00
mgw
b574175a56
调整菜单顺序,修改”开票“翻译为”应收应付“,增加背景图片
2023-09-26 11:31:14 +08:00
许何哲
8e13d2011c
Accept Merge Request #404 : (feature/sf看板样式统一 -> develop)
...
Merge Request: 表头固定bug修改
Created By: @许何哲
Accepted By: @许何哲
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/404?initial=true
2023-09-25 15:12:03 +08:00
WEB许何哲\xuhez
aba664375f
表头固定bug修改
2023-09-25 15:10:50 +08:00
禹翔辉
a50501e75e
Accept Merge Request #403 : (feature/功能刀具优化 -> develop)
...
Merge Request: 计划管理模块和刀具管理模块优化
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/403?initial=true
2023-09-25 13:44:19 +08:00
yuxianghui
16534bb348
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/功能刀具优化
2023-09-25 13:43:27 +08:00
yuxianghui
a538477272
1、计划管理-产线设备资源设置模块优化,工作日历设置模块优化,添加选择提示;2、刀具管理-功能刀具组装、列表、预警、实时分布、出入库记录和组装界面的刀具物料字段绑定对象更改为库存下的刀具物料;3、功能刀具组装-组装界面添加选择提示,4、功能刀具列表下的能力参数对没有选择的图片不展示
2023-09-25 13:43:08 +08:00
许何哲
9c2d4dbc24
Accept Merge Request #402 : (feature/sf看板样式统一 -> develop)
...
Merge Request: 工作中心增加字段并调整样式
Created By: @许何哲
Accepted By: @许何哲
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/402?initial=true
2023-09-25 09:21:11 +08:00
WEB许何哲\xuhez
1acfefa555
Merge branch 'develop' into feature/sf看板样式统一
2023-09-22 17:34:57 +08:00
mgw
52a7e2d698
新时间尺度下pill已可正确展示(包括左边距和宽度)
2023-09-22 17:34:45 +08:00
WEB许何哲\xuhez
d8363f2637
看板添加字段并调整样式
2023-09-22 17:33:56 +08:00
龚启豪
f42383fd10
Accept Merge Request #401 : (feature/修改机床参数bug -> develop)
...
Merge Request: 设备类别增加参数
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/401
2023-09-22 17:20:32 +08:00
qihao.gong@jikimo.com
c919f0724a
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
2023-09-22 17:01:28 +08:00
qihao.gong@jikimo.com
681b769356
设备类别新增选项
2023-09-22 17:01:03 +08:00
mgw
cee39f3e1f
优化看板样式展示
2023-09-22 11:13:13 +08:00
mgw
9dc653694a
修改前暂存
2023-09-22 09:31:56 +08:00
jinling.yang
a9f51df151
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/bug修复
2023-09-21 16:11:04 +08:00
jinling.yang
3aa34ee0cf
http权限代码优化
2023-09-21 16:10:18 +08:00
马广威
cde801a837
Accept Merge Request #400 : (feature/制造-计划优化 -> develop)
...
Merge Request: 增加排程结果反馈给制造订单的功能
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/400?initial=true
2023-09-21 14:33:32 +08:00
mgw
e9e25c582e
增加排程结果反馈给制造订单的功能
2023-09-21 14:32:05 +08:00
禹翔辉
90fa7c159a
Accept Merge Request #399 : (feature/功能刀具优化 -> develop)
...
Merge Request: 功能刀具优化
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/399?initial=true
2023-09-19 17:32:33 +08:00
yuxianghui
d4180df7e9
1、刀具管理模块下的功能刀具内的刀具物料字段类型从many2many更改为many2one,绑定对象从刀具型号更改为刀具物料;2、对功能刀具组装的组装功能和取消组装功能进行了逻辑优化;3、新增功能刀具组装弹窗对象的刀具物料信息根据所选功能刀具字段计算功能;4、关闭了功能刀具列表、预警、实时分布、出入库记录的创建、修改、删除功能;5、功能刀具列表对象新增刀具能力参数;6、优化了刀具管理模块的权限相关警告;
2023-09-19 16:14:29 +08:00
jinling.yang
ab42bde8f2
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/bug修复
2023-09-18 17:42:13 +08:00
jinling.yang
a96c7a34c1
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/bug修复
2023-09-18 17:40:30 +08:00
龚启豪
0ac82acbad
Accept Merge Request #398 : (feature/修改机床参数bug -> develop)
...
Merge Request: 优化sf容器
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/398
2023-09-18 10:41:33 +08:00
qihao.gong@jikimo.com
f03b77f9bb
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
2023-09-18 10:40:48 +08:00
qihao.gong@jikimo.com
dc796abd4a
优化sf容器
2023-09-18 10:40:29 +08:00
龚启豪
cf7551011e
Accept Merge Request #397 : (feature/修改机床参数bug -> develop)
...
Merge Request: 优化sf容器
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/397?initial=true
2023-09-18 10:08:31 +08:00
qihao.gong@jikimo.com
586dc5dbe2
优化sf容器
2023-09-18 10:07:52 +08:00
许何哲
3dbc6f0d6a
Accept Merge Request #396 : (feature/sf看板样式统一 -> develop)
...
Merge Request: 表头固定优化
Created By: @许何哲
Accepted By: @许何哲
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/396?initial=true
2023-09-15 17:18:30 +08:00
WEB许何哲\xuhez
0ae5d724d6
表头固定优化
2023-09-15 17:15:35 +08:00
许何哲
2dcd9bef53
Accept Merge Request #395 : (feature/sf看板样式统一 -> develop)
...
Merge Request: 优化表头固定
Created By: @许何哲
Accepted By: @许何哲
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/395?initial=true
2023-09-15 14:44:50 +08:00
WEB许何哲\xuhez
38331f1501
优化表头固定
2023-09-15 14:42:12 +08:00
龚启豪
e35b4af123
Accept Merge Request #394 : (feature/修改机床参数bug -> develop)
...
Merge Request: 取消注释occ
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/394?initial=true
2023-09-15 14:37:14 +08:00
qihao.gong@jikimo.com
618d4718c9
取消注释occ
2023-09-15 14:36:29 +08:00
龚启豪
f36e9c3d99
Accept Merge Request #393 : (feature/修改机床参数bug -> develop)
...
Merge Request: BT50
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/393?initial=true
2023-09-15 14:28:25 +08:00
qihao.gong@jikimo.com
0de26c4f2f
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
...
# Conflicts:
# sf_maintenance/views/maintenance_views.xml
2023-09-15 14:27:16 +08:00
qihao.gong@jikimo.com
d78fe872ae
BT50
2023-09-15 14:26:04 +08:00
马广威
3c25b829e2
Accept Merge Request #392 : (feature/制造-计划优化 -> develop)
...
Merge Request: 增加表头固定
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/392?initial=true
2023-09-15 11:19:50 +08:00
mgw
fd60505eec
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造-计划优化
2023-09-15 11:17:32 +08:00
mgw
42cc64db74
表头固定
2023-09-15 11:17:07 +08:00
许何哲
496fb40807
Accept Merge Request #391 : (feature/sf看板样式统一 -> develop)
...
Merge Request: 设备清单看板优化
Created By: @许何哲
Accepted By: @许何哲
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/391?initial=true
2023-09-15 11:16:51 +08:00
WEB许何哲\xuhez
e3e717ea60
设备清单看板优化
2023-09-15 11:15:40 +08:00
马广威
1e29f7010a
Accept Merge Request #390 : (feature/制造-计划优化 -> develop)
...
Merge Request: 工作中心看板、图文展示样式修改
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/390?initial=true
2023-09-15 11:00:33 +08:00
mgw
c514af2511
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造-计划优化
2023-09-15 10:59:28 +08:00
禹翔辉
6d4221a565
Accept Merge Request #389 : (feature/刀具优化 -> develop)
...
Merge Request: 解决功能刀具组装时选取刀具型号报错问题;
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/389?initial=true
2023-09-15 10:59:06 +08:00
mgw
5148ad3952
工作中心看板样式修改
2023-09-15 10:58:53 +08:00
yuxianghui
be3df9817c
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具优化
2023-09-15 10:57:19 +08:00
yuxianghui
95e095c184
解决功能刀具组装时选取刀具型号报错问题;
2023-09-15 10:56:58 +08:00
mgw
db5d9863b1
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造-计划优化
...
# Conflicts:
# jikimo_frontend/static/src/scss/custom_style.scss
# sf_manufacturing/views/mrp_workcenter_views.xml
2023-09-15 10:40:30 +08:00
mgw
2cc03c21ed
优化图文展示样式
2023-09-15 10:37:20 +08:00
禹翔辉
480d628125
Accept Merge Request #388 : (feature/刀具优化 -> develop)
...
Merge Request: 修改机床换刀申请字段状态,新增选择字段提示;
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/388?initial=true
2023-09-15 09:52:01 +08:00
yuxianghui
9e212a2684
修改机床换刀申请字段状态,新增选择字段提示;
2023-09-15 09:51:53 +08:00
jinling.yang
a7da1dbadd
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/bug修复
2023-09-14 18:08:05 +08:00
jinling.yang
99f078fad9
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2023-09-14 18:07:47 +08:00
jinling.yang
0445c3bbc4
Merge branch 'feature/页面优化' into develop
2023-09-14 18:07:35 +08:00
杨金灵
23214ae6e6
Accept Merge Request #387 : (feature/页面优化 -> develop)
...
Merge Request: 优化销售和报价及快速订单
Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/387?initial=true
2023-09-14 18:07:07 +08:00
jinling.yang
b966bdd8da
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/页面优化
2023-09-14 18:04:41 +08:00
jinling.yang
5fa9d1e16e
1.优化生成销售订单和产品的接口:bfm分配工厂时将“结算方式”和“支付方式”传到该接口内的生成报价订单方法里
...
2.优化销售和报价查询及详情页面:新增“结算方式”和“支付方式”两个字段;销售的tree列表的“号码”显示改为“订单号”;报价的tree列表的“号码”显示改为“订单号”,创建时间改为“下单时间”
3.优化快速订单:tree列表去掉“表面工艺参数”字段,新增“创建人”和“创建时间”2个字段;详情页面新增“加工时长”字段
2023-09-14 18:04:04 +08:00
许何哲
c45c45607f
Accept Merge Request #386 : (feature/sf看板样式统一 -> develop)
...
Merge Request: sf看板样式统一
Created By: @许何哲
Accepted By: @许何哲
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/386?initial=true
2023-09-14 17:25:37 +08:00
WEB许何哲\xuhez
69506af2ab
sf看板样式统一
2023-09-14 17:23:50 +08:00
龚启豪
00cb9cb8db
Accept Merge Request #385 : (feature/修改机床参数bug -> develop)
...
Merge Request: 维保计划关联维保项目many2many
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/385?initial=true
2023-09-14 10:57:29 +08:00
qihao.gong@jikimo.com
757a1ef102
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
2023-09-14 10:56:03 +08:00
qihao.gong@jikimo.com
5416ecb709
维保计划关联维保项目
2023-09-14 10:55:43 +08:00
jinling.yang
766771e435
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/页面优化
2023-09-14 09:47:14 +08:00
jinling.yang
eb0d83aa3a
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/页面优化
...
# Conflicts:
# sf_manufacturing/models/stock.py
2023-09-14 09:46:28 +08:00
禹翔辉
826119aea6
Accept Merge Request #384 : (feature/刀具优化 -> develop)
...
Merge Request: 解决图文展示中图片不显示问题;新增刀具物料能力对象的form视图。
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/384?initial=true
2023-09-14 09:45:22 +08:00
jinling.yang
650bf2cf86
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/bug修复
2023-09-14 09:30:48 +08:00
jinling.yang
ad0603f921
报价和销售订单页面优化
2023-09-14 09:29:03 +08:00
马广威
4613dc791b
Accept Merge Request #383 : (feature/制造-计划优化 -> develop)
...
Merge Request: 排产代码优化后合并
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/383?initial=true
2023-09-14 09:19:49 +08:00
mgw
6026244783
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造-计划优化
2023-09-14 09:18:05 +08:00
mgw
43d9c54626
优化代码结构
2023-09-14 09:17:38 +08:00
yuxianghui
400f4b6201
解决图文展示中图片不显示问题;新增刀具物料能力对象的form视图。
2023-09-13 17:13:21 +08:00
龚启豪
ce62f90ede
Accept Merge Request #382 : (feature/修改机床参数bug -> develop)
...
Merge Request: 设备图文展示
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/382?initial=true
2023-09-13 16:54:29 +08:00
qihao.gong@jikimo.com
778ce3e409
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
2023-09-13 16:52:56 +08:00
qihao.gong@jikimo.com
532e4a4c7a
设备图文展示
2023-09-13 16:52:40 +08:00
mgw
4d9c0474e6
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造-计划优化
...
# Conflicts:
# sf_plan/models/custom_plan.py
2023-09-13 15:42:18 +08:00
mgw
c1739feabb
优化现有逻辑
2023-09-13 15:40:36 +08:00
龚启豪
6dbdcd2eb9
Accept Merge Request #381 : (feature/修改机床参数bug -> develop)
...
Merge Request: 设备图文展示
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/381?initial=true
2023-09-13 15:40:22 +08:00
qihao.gong@jikimo.com
2e508c7a85
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
2023-09-13 15:39:45 +08:00
qihao.gong@jikimo.com
e3b7d5ad02
设备图文展示
2023-09-13 15:39:27 +08:00
禹翔辉
a65a3ecfbe
Accept Merge Request #380 : (feature/刀具优化 -> develop)
...
Merge Request: 解决产品-整体式刀具-刃部直径字段数据同步问题。
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/380?initial=true
2023-09-13 15:24:20 +08:00
yuxianghui
1f0f7ae0c7
解决产品-整体式刀具-刃部直径字段数据同步问题。
2023-09-13 15:21:51 +08:00
qihao.gong@jikimo.com
0ffe66b501
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
2023-09-13 14:32:51 +08:00
qihao.gong@jikimo.com
9e424600bc
处理机床能力数据
2023-09-13 14:32:32 +08:00
禹翔辉
f9e41f262c
Accept Merge Request #379 : (feature/刀具优化 -> develop)
...
Merge Request: 刀具优化
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/379?initial=true
2023-09-12 17:38:20 +08:00
yuxianghui
7fcd079535
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具优化
2023-09-12 17:37:08 +08:00
yuxianghui
165f961fb4
注释刀具管理-刀具物料查询-整体式刀具参数限制,调整整体式刀具参数位置,添加能力参数图文展示功能,直径类参数增加φ的前缀单位;注释产品-刀具参数-cutting_tool_screw。
2023-09-12 17:36:45 +08:00
禹翔辉
2793bd2472
Accept Merge Request #378 : (feature/刀具优化 -> develop)
...
Merge Request: 放开配备螺丝参数注释
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/378?initial=true
2023-09-12 15:06:47 +08:00
yuxianghui
f554c2073f
放开配备螺丝参数注释
2023-09-12 15:06:21 +08:00
马广威
3a9f408be2
Accept Merge Request #377 : (feature/制造-计划优化 -> develop)
...
Merge Request: 冗余菜单优化完成
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/377?initial=true
2023-09-12 11:13:14 +08:00
mgw
4bcb12d3f1
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造-计划优化
2023-09-12 11:12:19 +08:00
mgw
7cbaf7373a
冗余菜单处理完成
2023-09-12 11:12:00 +08:00
禹翔辉
d6960c2717
Accept Merge Request #376 : (feature/刀具优化 -> develop)
...
Merge Request: 隐藏功能刀具组装的创建按钮;刀具物料功能每齿走刀量模型新增加工方式字段,解决新增记录报错问题;解决计划管理-工作日历设置不自动生成工作日历的问题。
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/376?initial=true
2023-09-11 17:24:51 +08:00
yuxianghui
cf7e6ea33d
隐藏功能刀具组装的创建按钮;刀具物料功能每齿走刀量模型新增加工方式字段,解决新增记录报错问题;解决计划管理-工作日历设置不自动生成工作日历的问题。
2023-09-11 17:21:32 +08:00
jinling.yang
49d41539b0
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2023-09-08 17:28:58 +08:00
jinling.yang
0d40171f13
Merge branch 'feature/刀柄和夹头反注册到Cloud生成动态刀具物料' into develop
2023-09-08 17:28:41 +08:00
杨金灵
e919858e63
Accept Merge Request #375 : (feature/刀柄和夹头反注册到Cloud生成动态刀具物料 -> develop)
...
Merge Request: 整体式刀具,刀柄和夹头反注册到Cloud生成动态刀具物料
Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/375?initial=true
2023-09-08 17:28:21 +08:00
jinling.yang
c1be9a90fe
采购刀具产品反注册接口新增图片字段,3d模型代码放开
2023-09-08 17:14:57 +08:00
jinling.yang
26db256336
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀柄和夹头反注册到Cloud生成动态刀具物料
2023-09-08 17:06:02 +08:00
jinling.yang
aa17de3384
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀柄和夹头反注册到Cloud生成动态刀具物料
...
# Conflicts:
# sf_dlm/views/product_template_view.xml
2023-09-08 17:05:44 +08:00
许何哲
9cbc1428e9
Accept Merge Request #374 : (feature/sf品牌页面表格样式的修改 -> develop)
...
Merge Request: many2many图文展示及点击交互效果
Created By: @许何哲
Accepted By: @许何哲
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/374?initial=true
2023-09-08 16:34:56 +08:00
WEB许何哲\xuhez
857a26231d
Merge branch 'develop' into feature/sf品牌页面表格样式的修改
2023-09-08 16:32:19 +08:00
WEB许何哲\xuhez
b76c192f33
many2many图文展示及点击交互效果
2023-09-08 16:31:06 +08:00
jinling.yang
e50f0c4465
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀柄和夹头反注册到Cloud生成动态刀具物料
...
# Conflicts:
# sf_manufacturing/models/product_template.py
2023-09-08 14:10:48 +08:00
jinling.yang
41641f69fe
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀柄和夹头反注册到Cloud生成动态刀具物料
...
# Conflicts:
# sf_manufacturing/models/product_template.py
2023-09-08 14:08:08 +08:00
禹翔辉
5802c55ab3
Accept Merge Request #373 : (feature/整体式刀具能力参数补充 -> develop)
...
Merge Request: 放开OCC相关的代码
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/373?initial=true
2023-09-08 10:41:09 +08:00
yuxianghui
b12880da50
放开OCC相关的代码
2023-09-08 10:39:47 +08:00
禹翔辉
a23fe9942d
Accept Merge Request #372 : (feature/整体式刀具能力参数补充 -> develop)
...
Merge Request: 刀具物料功能模型从sf_base模块迁移到sf_manufacturing模块;新增每齿走刀量模型;整体式刀具物料新增关联每齿走刀量对象字段;
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/372?initial=true
2023-09-08 10:25:41 +08:00
yuxianghui
5e9b376721
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/整体式刀具能力参数补充
2023-09-08 10:23:01 +08:00
yuxianghui
35afdd3b2a
刀具物料功能模型从sf_base模块迁移到sf_manufacturing模块;新增每齿走刀量模型;整体式刀具物料新增关联每齿走刀量对象字段;
2023-09-08 10:20:52 +08:00
马广威
00dd03bb2c
Accept Merge Request #371 : (feature/参考web模块将widget统一管理 -> develop)
...
Merge Request: custom_many2many widget整合到前端包中
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/371?initial=true
2023-09-07 17:57:49 +08:00
mgw
121217d70f
custom_many2many widget整合到前端包中
2023-09-07 17:54:07 +08:00
jinling.yang
3225916629
1.优化产品页面:
...
①“产品类别”字段放在开票策略后面;“内部编码”和“条码”字段放在产品标签后面;当“产品类别”为“成品”时“上传模型文件“和“模型“字段放在"销售价格"前面;
②当“产品类别”为“刀具”时,且“刀具物料”字段为“整体式刀具”,"刀柄"或"夹头"时,页面根据选择的刀具物料而新增所对应需要的字段及页面布局展示
2.采购产品时,产品的“产品类别”为”刀具“且“刀具物料”为“整体式刀具”,"刀柄"或"夹头"时,在收货单进行验证操作时,优化实时注册到Cloud的动态资源里的工厂刀具物料的接口
3.优化“产品模板"模型的部分字段
2023-09-07 17:46:22 +08:00
马广威
75fabfb63d
Accept Merge Request #370 : (feature/生产排程 -> develop)
...
Merge Request: 调整“程序下载”按钮位置,更新本地代码
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/370
2023-09-07 17:02:51 +08:00
mgw
255786325b
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/生产排程
2023-09-07 15:38:28 +08:00
mgw
797a7207e9
调整“程序下载”按钮位置
2023-09-07 15:32:15 +08:00
马广威
f49f63a32a
Accept Merge Request #369 : (feature/生产排程 -> develop)
...
Merge Request: 实现Many2many的图文展示,并增加图片方法功能
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/369?initial=true
2023-09-07 15:17:22 +08:00
mgw
e0bfea40e1
增加点击图片放大图片的功能
2023-09-07 15:16:03 +08:00
mgw
78e3a0f24f
自定义widget显示many2many图文基本实现
2023-09-07 12:33:35 +08:00
禹翔辉
408a5c72c8
Accept Merge Request #368 : (feature/整体式刀具能力参数补充 -> develop)
...
Merge Request: 新增切削速度Vc对象,产品-整体式刀具物料新增切削速度Vc关联字段;删除部分产品-整体式刀具同步配置-刀具型号-整体式刀具参数。
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/368?initial=true
2023-09-07 09:35:35 +08:00
yuxianghui
ae3f7c9c0c
新增切削速度Vc对象,产品-整体式刀具物料新增切削速度Vc关联字段;删除部分产品-整体式刀具同步配置-刀具型号-整体式刀具参数。
2023-09-06 17:24:08 +08:00
禹翔辉
093badd3a7
Accept Merge Request #367 : (feature/整体式刀具能力参数补充 -> develop)
...
Merge Request: 撤销制造-配置-刀具型号新增的参数;对产品刀具物料字段的限制优化
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/367?initial=true
2023-09-06 16:49:08 +08:00
yuxianghui
9331a22a10
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/整体式刀具能力参数补充
2023-09-06 16:48:43 +08:00
yuxianghui
5353630975
撤销制造-配置-刀具型号新增的参数;对产品刀具物料字段的限制优化
2023-09-06 16:48:07 +08:00
jinling.yang
ecc9bd446f
材料等同步Bug修复
2023-09-06 16:32:25 +08:00
禹翔辉
1983271a9b
Accept Merge Request #366 : (feature/整体式刀具能力参数补充 -> develop)
...
Merge Request: 配置-刀具型号新增整体式刀具能力参数补充;补充产品-整体式刀具同步配置-刀具型号-整体式刀具参数。
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/366?initial=true
2023-09-06 11:11:55 +08:00
yuxianghui
0b8042f07a
配置-刀具型号新增整体式刀具能力参数补充;补充产品-整体式刀具同步配置-刀具型号-整体式刀具参数。
2023-09-06 11:02:55 +08:00
马广威
1f5cabad1a
Accept Merge Request #365 : (feature/生产排程 -> develop)
...
Merge Request: 生产计划优化
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/365?initial=true
2023-09-06 09:23:50 +08:00
mgw
48e30865af
生产计划优化
2023-09-06 09:22:58 +08:00
yuxianghui
fe78d91fa9
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/整体式刀具能力参数补充
2023-09-06 09:12:11 +08:00
许何哲
4ac95c20ad
Accept Merge Request #364 : (feature/sf品牌页面表格样式的修改 -> develop)
...
Merge Request: 对sf样式进行集中管理
Created By: @许何哲
Accepted By: @许何哲
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/364?initial=true
2023-09-05 17:24:19 +08:00
WEB许何哲\xuhez
4a712ff9f1
Merge branch 'develop' into feature/sf品牌页面表格样式的修改
2023-09-05 17:22:58 +08:00
yuxianghui
f8c5553837
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/整体式刀具能力参数补充
2023-09-05 17:22:45 +08:00
WEB许何哲\xuhez
7ea997219b
对sf的css样式进行集中管理
2023-09-05 17:22:37 +08:00
yuxianghui
a6ddfa22a1
对产品的整体式刀具能力参数进行补充,对参数字段进行优化;对刀具物料查询的字段类型进行调整。
2023-09-05 17:21:39 +08:00
许何哲
b6a071d33a
Accept Merge Request #363 : (feature/sf品牌页面表格样式的修改 -> develop)
...
Merge Request: 修改tree视图样式bug
Created By: @许何哲
Accepted By: @许何哲
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/363?initial=true
2023-09-05 16:46:42 +08:00
WEB许何哲\xuhez
26f07a00c3
Merge branch 'develop' into feature/sf品牌页面表格样式的修改
2023-09-05 16:45:32 +08:00
WEB许何哲\xuhez
b47dbe29c0
修改tree视图样式bug
2023-09-05 16:44:42 +08:00
马广威
dbeb975cf6
Accept Merge Request #362 : (feature/生产排程 -> develop)
...
Merge Request: 创建制造订单时同步创建排程单
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/362?initial=true
2023-09-05 10:41:22 +08:00
mgw
e5213d06ae
创建制造订单时同步创建排程单
2023-09-05 10:40:25 +08:00
马广威
a0affba407
Accept Merge Request #361 : (feature/生产排程 -> develop)
...
Merge Request: 基本排程功能合并
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/361?initial=true
2023-09-05 09:33:01 +08:00
禹翔辉
940d2cead8
Accept Merge Request #360 : (feature/整体式刀具能力参数补充 -> develop)
...
Merge Request: 新增加工方式、刀尖特征、柄部类型、走刀方向、适合冷却液五个模型对象;刀具物料查询新增上述五个关联对象;对产品的整体式刀具物料能力参数进行补充。
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/360?initial=true
2023-09-04 17:38:39 +08:00
yuxianghui
c8129478d5
新增加工方式、刀尖特征、柄部类型、走刀方向、适合冷却液五个模型对象;刀具物料查询新增上述五个关联对象;对产品的整体式刀具物料能力参数进行补充。
2023-09-04 17:29:20 +08:00
禹翔辉
4342a2a175
Accept Merge Request #359 : (feature/整体式刀具能力参数补充 -> develop)
...
Merge Request: 整体式刀具基本参数补充,float类型字段增加非零验证,增加相关字段必填属性。
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/359?initial=true
2023-09-01 17:18:50 +08:00
yuxianghui
19f19d5fd0
整体式刀具基本参数补充,float类型字段增加非零验证,增加相关字段必填属性。
2023-09-01 17:17:56 +08:00
qihao.gong@jikimo.com
18259c73a2
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
2023-09-01 16:57:24 +08:00
qihao.gong@jikimo.com
32b773c486
设备新增图文展示table
2023-09-01 16:57:04 +08:00
jinling.yang
699728963c
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2023-08-31 17:39:15 +08:00
jinling.yang
d66d320e7d
Merge branch 'feature/快速订单Bug修复' into develop
2023-08-31 17:38:55 +08:00
杨金灵
c56be1641e
Accept Merge Request #358 : (feature/快速订单Bug修复 -> develop)
...
Merge Request: 快速订单Bug修复
Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/358?initial=true
2023-08-31 17:38:39 +08:00
jinling.yang
7351ea675b
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/快速订单Bug修复
2023-08-31 17:37:27 +08:00
jinling.yang
e51fc8a68e
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2023-08-31 17:36:59 +08:00
jinling.yang
4ec6e7c7a4
Merge branch 'feature/产品点击库存应用没有在cloud生成动态的夹具和刀具物料Bug修复' into develop
2023-08-31 17:36:44 +08:00
杨金灵
44872d4c9f
Accept Merge Request #357 : (feature/产品点击库存应用没有在cloud生成动态的夹具和刀具物料Bug修复 -> develop)
...
Merge Request: 产品库存应用没有在cloud生成动态的夹具和刀具物料Bug修复
Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/357?initial=true
2023-08-31 17:36:32 +08:00
jinling.yang
8bf726382d
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/产品点击库存应用没有在cloud生成动态的夹具和刀具物料Bug修复
2023-08-31 17:35:05 +08:00
jinling.yang
d07098bae1
产品库存应用没有在cloud生成动态的夹具和刀具物料Bug修复
2023-08-31 17:32:42 +08:00
许何哲
c575ea51cd
Accept Merge Request #356 : (feature/sf品牌页面表格样式的修改 -> develop)
...
Merge Request: sf品牌页面表格的样式修改
Created By: @许何哲
Accepted By: @许何哲
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/356?initial=true
2023-08-31 10:18:26 +08:00
WEB许何哲\xuhez
2b22215853
sf品牌页面表格的样式修改
2023-08-31 10:16:16 +08:00
mgw
b4eb57f3df
修改原生gantt图样式(日期格式等去符合国内习惯)
2023-08-30 17:52:13 +08:00
mgw
41566a4d74
基础排程基本完成
2023-08-30 17:50:43 +08:00
jinling.yang
e64cf88809
1.加工工艺去掉form表单展示
...
2.机床型号页面优化
2023-08-30 16:26:19 +08:00
jinling.yang
2fdcd3a009
快速订单页面优化
2023-08-30 16:19:38 +08:00
jinling.yang
76af8c6f2d
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2023-08-29 17:44:03 +08:00
jinling.yang
eae06ccdd7
Merge branch 'feature/获取cnc工单Bug修复' into develop
2023-08-29 17:43:51 +08:00
杨金灵
d322754798
Accept Merge Request #355 : (feature/获取cnc工单Bug修复 -> develop)
...
Merge Request: 获取cnc工单Bug修复
Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/355?initial=true
2023-08-29 17:43:23 +08:00
jinling.yang
908e8b3ff2
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/获取cnc工单Bug修复
2023-08-29 17:41:23 +08:00
jinling.yang
e9afce298d
SF点击后获取cnc程序按钮,cloud生成的编程单的编号未显示Bug修复
2023-08-29 17:40:16 +08:00
禹翔辉
f373c69430
Accept Merge Request #354 : (feature/自建模块日志警告信息处理 -> develop)
...
Merge Request: 库存模块日志警告信息处理
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/354?initial=true
2023-08-29 17:29:26 +08:00
yuxianghui
8ece696775
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/自建模块日志警告信息处理
2023-08-29 17:28:49 +08:00
yuxianghui
5ea6158e8d
库存模块日志警告信息处理
2023-08-29 17:28:20 +08:00
龚启豪
a799793ca8
Accept Merge Request #353 : (feature/修改机床参数bug -> develop)
...
Merge Request: 修改设备table,品牌图片改成图片
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/353?initial=true
2023-08-29 15:50:08 +08:00
qihao.gong@jikimo.com
27571942c9
增肌OCC
2023-08-29 15:49:14 +08:00
qihao.gong@jikimo.com
e6a68eb1eb
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
2023-08-29 15:48:48 +08:00
qihao.gong@jikimo.com
b7f2c4a000
sf修改设备table,品牌图片改成图片
2023-08-29 15:47:58 +08:00
许何哲
3e922df2f8
Accept Merge Request #352 : (feature/必填字段label添加星号 -> develop)
...
Merge Request: sf品牌页面表格样式的修改
Created By: @许何哲
Accepted By: @许何哲
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/352?initial=true
2023-08-29 15:15:20 +08:00
WEB许何哲\xuhez
7713ade077
sf品牌页面表格样式的修改
2023-08-29 15:13:59 +08:00
禹翔辉
12ead3579e
Accept Merge Request #351 : (feature/自建模块日志警告信息处理 -> develop)
...
Merge Request: 智能工厂所有自建模块日志警告信息处理
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/351?initial=true
2023-08-29 11:22:16 +08:00
yuxianghui
be0f62ffe0
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/自建模块日志警告信息处理
...
# Conflicts:
# sf_base/models/fixture.py
# sf_manufacturing/models/model_type.py
# sf_manufacturing/models/product_template.py
# sf_sale/models/quick_easy_order.py
2023-08-29 11:21:13 +08:00
yuxianghui
5ccd754261
所有自建模块日志警告信息处理
2023-08-29 11:06:59 +08:00
杨金灵
dea565f8c6
Accept Merge Request #350 : (feature/去掉警告 -> develop)
...
Merge Request: 去掉警告
Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/350?initial=true
2023-08-29 10:31:28 +08:00
jinling.yang
6e6b0b66d3
去掉警告
2023-08-29 10:22:12 +08:00
jinling.yang
ed96f8dc0e
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2023-08-28 17:44:46 +08:00
jinling.yang
8f6bfa2a9b
Merge branch 'feature/快速订单Bug修复' into develop
2023-08-28 17:43:45 +08:00
杨金灵
d92dcbd4e6
Accept Merge Request #349 : (feature/快速订单Bug修复 -> develop)
...
Merge Request: 快速订单Bug修复
Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/349?initial=true
2023-08-28 17:43:22 +08:00
jinling.yang
c765682311
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/快速订单Bug修复
...
# Conflicts:
# web_widget_model_viewer/__manifest__.py
2023-08-28 17:41:31 +08:00
jinling.yang
fb717c22ad
1.模型为上色Bug修复(cloud代码注释引起)
...
2.创建产品和订单未成功Bug修复
2023-08-28 17:40:19 +08:00
yuxianghui
39feda07e5
自建模块日志警告信息处理
2023-08-28 17:31:41 +08:00
禹翔辉
5d30dae189
Accept Merge Request #348 : (feature/刀具管理加粗字段调整及界面布局优化 -> develop)
...
Merge Request: 刀具管理加粗字段调整, zpl_print,web_widget模块添加 'license': 'LGPL-3'
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/348?initial=true
2023-08-28 10:02:47 +08:00
yuxianghui
19b4cfd078
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具管理加粗字段调整及界面布局优化
2023-08-28 10:00:57 +08:00
yuxianghui
1e1ed20231
刀具管理加粗字段调整, zpl_print,web_widget模块添加 'license': 'LGPL-3'
2023-08-28 10:00:14 +08:00
jinling.yang
df650edefd
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2023-08-25 15:54:20 +08:00
jinling.yang
7cb94f79a0
Merge branch 'feature/产品模板优化' into develop
2023-08-25 15:51:43 +08:00
杨金灵
cd3ad6f975
Accept Merge Request #347 : (feature/产品模板优化 -> develop)
...
Merge Request: 产品模板优化
Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/347?initial=true
2023-08-25 15:51:13 +08:00
jinling.yang
425b926948
品牌Tree列表图片放在备注前面
2023-08-25 15:49:32 +08:00
jinling.yang
71ca6d27ce
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/产品模板优化
2023-08-25 15:47:16 +08:00
jinling.yang
7174de3de6
产品模板的型号手动输入时型号对象的编码,联装类型,夹具物料字段的值显示
2023-08-25 15:46:41 +08:00
龚启豪
194faf5a55
Accept Merge Request #346 : (feature/修改机床参数bug -> develop)
...
Merge Request: 维保项目可以上传多张图片的功能
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/346?initial=true
2023-08-25 11:12:46 +08:00
qihao.gong@jikimo.com
caeff1e17a
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
2023-08-25 11:10:46 +08:00
qihao.gong@jikimo.com
a9954c1231
维保计划中维保项目可以上传多张图片
2023-08-25 11:10:28 +08:00
mgw
e3f58ccee8
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/生产排程
2023-08-25 10:43:39 +08:00
mgw
7e071151a8
删除制造订单处排程相关的部分,排程模块架构改造完成
2023-08-25 10:43:22 +08:00
jinling.yang
e4af4ca0b6
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2023-08-25 10:42:09 +08:00
jinling.yang
3ef20d64ac
Merge branch 'feature/新增上传模型功能' into develop
2023-08-25 10:41:49 +08:00
杨金灵
c6a6eec5b7
Accept Merge Request #345 : (feature/新增上传模型功能 -> develop)
...
Merge Request: 新增上传模型(快速订单)功能
Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/345?initial=true
2023-08-25 10:41:20 +08:00
jinling.yang
5de04449e4
对模型进行上色和特征识别及自动报价
2023-08-25 10:39:31 +08:00
mgw
eda57036bd
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/生产排程
2023-08-25 09:14:34 +08:00
mgw
e33a25e47a
更改排程结构前备份
2023-08-25 09:14:15 +08:00
jinling.yang
e7d32e5041
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增上传模型功能
2023-08-24 17:32:59 +08:00
jinling.yang
55504c2725
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增上传模型功能
2023-08-24 17:32:25 +08:00
龚启豪
9318be0f09
Accept Merge Request #344 : (feature/修改机床参数bug -> develop)
...
Merge Request: 修改工作中心看板,设备清单看板
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/344?initial=true
2023-08-24 15:01:56 +08:00
qihao.gong@jikimo.com
f31a6d0d43
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
...
# Conflicts:
# sf_maintenance/views/maintenance_views.xml
2023-08-24 15:00:41 +08:00
qihao.gong@jikimo.com
3b3847990d
工作重心看板展示设备状态以及图片,设备看板增加负责人
2023-08-24 14:51:03 +08:00
mgw
c699cdff0a
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/生产排程
2023-08-24 11:36:30 +08:00
许何哲
bbfb29f60b
Accept Merge Request #343 : (feature/必填字段label添加星号 -> develop)
...
Merge Request: 修改文字颜色
Created By: @许何哲
Accepted By: @许何哲
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/343?initial=true
2023-08-24 11:35:01 +08:00
WEB许何哲\xuhez
28a50a1d94
Merge branch 'develop' into feature/必填字段label添加星号
2023-08-24 11:33:48 +08:00
WEB许何哲\xuhez
623d89bf31
修改文字颜色
2023-08-24 11:33:24 +08:00
mgw
7a4dd55fa4
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/生产排程
2023-08-24 11:24:48 +08:00
mgw
bf7ef78b20
搭建排程基础架构
2023-08-24 11:24:27 +08:00
许何哲
bcb05cb2e2
Accept Merge Request #342 : (feature/必填字段label添加星号 -> develop)
...
Merge Request: 3d模型无法展示的时候用文字替换
Created By: @许何哲
Accepted By: @许何哲
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/342?initial=true
2023-08-24 11:10:06 +08:00
WEB许何哲\xuhez
9c52e23e44
Merge branch 'develop' into feature/必填字段label添加星号
2023-08-24 11:09:07 +08:00
WEB许何哲\xuhez
1c50e11a43
3d模型无法展示的时候用文字替换
2023-08-24 11:07:54 +08:00
许何哲
a2f5dbd70d
Accept Merge Request #341 : (feature/必填字段label添加星号 -> develop)
...
Merge Request: 修改看板样式
Created By: @许何哲
Accepted By: @许何哲
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/341?initial=true
2023-08-24 09:04:02 +08:00
WEB许何哲\xuhez
0f283c1eda
Merge branch 'develop' into feature/必填字段label添加星号
2023-08-24 09:03:20 +08:00
WEB许何哲\xuhez
f67c8169bf
修改看板样式
2023-08-24 09:02:15 +08:00
jinling.yang
f9e4b73fb0
新增上传模型功能
2023-08-23 17:34:06 +08:00
禹翔辉
e31858c9d7
Accept Merge Request #340 : (feature/刀具管理加粗字段调整及界面布局优化 -> develop)
...
Merge Request: 刀具管理模块中的所有模型界面的加粗字段都改为name字段;优化了刀具物料查询界面布局。
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/340?initial=true
2023-08-23 17:33:34 +08:00
yuxianghui
4f70f7ef70
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具管理加粗字段调整及界面布局优化
2023-08-23 17:32:58 +08:00
yuxianghui
11a06df0a4
刀具管理模块中的所有模型界面的加粗字段都改为name字段;优化了刀具物料查询界面布局。
2023-08-23 17:32:22 +08:00
马广威
da8caf42f5
Accept Merge Request #339 : (feature/生产排程 -> develop)
...
Merge Request: 更新3D模型展示代码
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/339?initial=true
2023-08-23 15:48:04 +08:00
mgw
0b30408aae
更新3D模型展示代码
2023-08-23 15:47:17 +08:00
龚启豪
e2f5ce42e6
Accept Merge Request #338 : (feature/修改机床参数bug -> develop)
...
Merge Request: 刀把类型新增bt50 处理品牌图片同步报错问题
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/338?initial=true
2023-08-23 14:40:10 +08:00
qihao.gong@jikimo.com
90868d4a09
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
2023-08-23 14:37:20 +08:00
qihao.gong@jikimo.com
b01a5a4216
刀把类型新增bt50 修改同步品牌图片报错问题
2023-08-23 14:37:02 +08:00
jinling.yang
c27bfb5990
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2023-08-23 10:31:21 +08:00
jinling.yang
589f99db1a
Merge branch 'feature/同步夹具型号Bug修复' into develop
2023-08-23 10:31:01 +08:00
杨金灵
7d0e35a9f4
Accept Merge Request #337 : (feature/同步夹具型号Bug修复 -> develop)
...
Merge Request: 夹具型号同步修复和页面名称加大醒目
Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/337?initial=true
2023-08-23 10:30:43 +08:00
jinling.yang
a64d24d8ff
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/同步夹具型号Bug修复
2023-08-23 10:29:09 +08:00
jinling.yang
2ae7b2c8ec
页面名称加大醒目
2023-08-23 10:28:54 +08:00
jinling.yang
cd33fb9fb9
夹具型号同步修复
2023-08-23 10:09:47 +08:00
禹翔辉
1176aee38b
Accept Merge Request #336 : (feature/产线设备资源设置模块优化 -> develop)
...
Merge Request: 计划管理-基础设置内模型的界面布局和字段优化
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/336?initial=true
2023-08-22 11:43:15 +08:00
yuxianghui
e781bce27e
1、优化了产线设备资源设置和工作日历设置界面布局;删除工作日历、班次、休息日模型的form视图,新增tree视图修改功能;2、修复产线设备资源设置的设备信息显示问题,修改了机台号字段名称;3、新增工作日历设置班次字段必填;4、调整产线设备资源设置和工作日历设置菜单位置
2023-08-22 11:40:35 +08:00
qihao.gong@jikimo.com
10292df48d
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
2023-08-21 17:23:26 +08:00
qihao.gong@jikimo.com
76293f5cca
修改维保table
2023-08-21 17:22:53 +08:00
马广威
16de3e40df
Accept Merge Request #335 : (feature/cnc工单处增加下载按钮 -> develop)
...
Merge Request: cnc工单处增加NC文件下载的功能已完成
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/335?initial=true
2023-08-21 17:22:10 +08:00
mgw
642007d29b
cnc工单处增加NC文件下载的功能已完成
2023-08-21 17:20:52 +08:00
龚启豪
3c281230cc
Accept Merge Request #334 : (feature/修改机床参数bug -> develop)
...
Merge Request: 修改设备看板
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/334
2023-08-21 15:42:12 +08:00
qihao.gong@jikimo.com
a5a9ae150f
修改设备看板
2023-08-21 15:41:40 +08:00
jinling.yang
c2e2de4ab5
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2023-08-21 15:37:34 +08:00
jinling.yang
e49e3b6981
Merge branch 'feature/页面布局' into develop
2023-08-21 15:37:20 +08:00
杨金灵
1b3c929fa7
Accept Merge Request #333 : (feature/页面布局 -> develop)
...
Merge Request: 去掉厂家型号字段
Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/333?initial=true
2023-08-21 15:37:03 +08:00
jinling.yang
fb8ca5f145
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/页面布局
2023-08-21 15:35:50 +08:00
jinling.yang
dfc5c206fd
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2023-08-21 11:51:32 +08:00
jinling.yang
3ab0fcb337
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/页面布局
2023-08-21 11:50:36 +08:00
jinling.yang
f6841e5e9f
同步材料型号及优化材料型号页面及新增拉伸强度,硬度,粗加工,精加工
2023-08-21 11:49:24 +08:00
龚启豪
2cb84c5f55
Accept Merge Request #332 : (feature/修改机床参数bug -> develop)
...
Merge Request: 设备改成维保
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/332?initial=true
2023-08-21 10:28:46 +08:00
qihao.gong@jikimo.com
ff60824291
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
2023-08-21 10:28:12 +08:00
qihao.gong@jikimo.com
82322b5024
修改设备table和跳转到维保 设备改为维保
2023-08-21 10:27:50 +08:00
jinling.yang
bfa51d378c
Merge branch 'feature/制造基础数据删除按钮放开' into develop
2023-08-21 10:25:13 +08:00
禹翔辉
78ddf4e52f
Accept Merge Request #331 : (feature/功能刀具优化 -> develop)
...
Merge Request: 功能刀具优化
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/331?initial=true
2023-08-21 10:21:25 +08:00
yuxianghui
8a50a10b23
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/功能刀具优化
2023-08-21 10:19:09 +08:00
杨金灵
80f7da7979
Accept Merge Request #330 : (feature/制造基础数据删除按钮放开 -> develop)
...
Merge Request: 制造基础数据删除按钮放开
Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/330?initial=true
2023-08-21 10:18:17 +08:00
jinling.yang
eec6dce4fc
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造基础数据删除按钮放开
2023-08-21 10:16:47 +08:00
jinling.yang
cd671bdc88
1.删除按钮放开
...
2.刀具类型同步代码还原
2023-08-21 10:16:30 +08:00
yuxianghui
0fa2656aad
优化功能刀具的刀具物料字段
2023-08-21 10:11:54 +08:00
许何哲
109da940ba
Accept Merge Request #329 : (feature/必填字段label添加星号 -> develop)
...
Merge Request: 修改制造订单页面样式bug
Created By: @许何哲
Accepted By: @许何哲
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/329?initial=true
2023-08-21 10:10:45 +08:00
WEB许何哲\xuhez
64143798e0
Merge branch 'develop' into feature/必填字段label添加星号
2023-08-21 10:09:42 +08:00
WEB许何哲\xuhez
d8489a5f07
制造订单页面样式bug修改
2023-08-21 10:08:55 +08:00
禹翔辉
8ae4d0dce8
Accept Merge Request #328 : (feature/生产线优化 -> develop)
...
Merge Request: 生产线新增关联工作中心字段,优化看板和form视图布局
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/328?initial=true
2023-08-18 15:14:41 +08:00
yuxianghui
f88dd790a0
生产线新增关联工作中心字段,优化看板和form视图布局
2023-08-18 15:11:36 +08:00
龚启豪
baea2d2a3e
Accept Merge Request #327 : (feature/修改机床参数bug -> develop)
...
Merge Request: 品牌备注增加
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/327?initial=true
2023-08-18 14:39:39 +08:00
qihao.gong@jikimo.com
43d6794151
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
...
# Conflicts:
# sf_base/views/base_view.xml
# sf_mrs_connect/models/sync_common.py
2023-08-18 14:34:37 +08:00
qihao.gong@jikimo.com
c924426725
品牌备注
2023-08-18 14:31:28 +08:00
杨金灵
607eac90c6
Accept Merge Request #326 : (feature/刀具物料与夹具物料的反注册 -> develop)
...
Merge Request: 刀具及夹具物料反注册
Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/326?initial=true
2023-08-18 11:41:23 +08:00
jinling.yang
06b1e30670
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具物料与夹具物料的反注册
2023-08-18 11:38:02 +08:00
jinling.yang
5644ee2670
刀具页面优化
2023-08-18 11:37:30 +08:00
许何哲
6fccd63916
Accept Merge Request #325 : (feature/必填字段label添加星号 -> develop)
...
Merge Request: 修改样式bug
Created By: @许何哲
Accepted By: @许何哲
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/325?initial=true
2023-08-18 11:04:40 +08:00
WEB许何哲\xuhez
bed385d025
Merge branch 'develop' into feature/必填字段label添加星号
2023-08-18 11:02:46 +08:00
WEB许何哲\xuhez
77b1ef2d91
消息发送界面的样式bug修改
2023-08-18 11:01:30 +08:00
jinling.yang
3cef87ea46
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具物料与夹具物料的反注册
...
# Conflicts:
# sf_base/views/base_view.xml
# sf_base/views/common_view.xml
# sf_tool_management/models/base.py
2023-08-17 18:09:19 +08:00
jinling.yang
97fcf6d91f
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具物料与夹具物料的反注册
...
# Conflicts:
# sf_base/views/base_view.xml
2023-08-17 18:03:12 +08:00
龚启豪
ae07a515b7
Accept Merge Request #324 : (feature/修改机床参数bug -> develop)
...
Merge Request: 移除托盘对象,并清除关联方法,关联关系等
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/324?initial=true
2023-08-17 16:35:07 +08:00
qihao.gong@jikimo.com
422698ce34
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
2023-08-17 16:34:09 +08:00
qihao.gong@jikimo.com
08ac2978a1
移除托盘对象 并清除所有关联关系
2023-08-17 16:33:40 +08:00
禹翔辉
92a9894757
Accept Merge Request #323 : (feature/品牌增加按类别显示的搜索面板 -> develop)
...
Merge Request: 品牌增加按类别显示的搜索面板
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/323?initial=true
2023-08-17 15:28:25 +08:00
yuxianghui
093b0e63ce
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/品牌增加按类别显示的搜索面板
2023-08-17 15:26:28 +08:00
yuxianghui
07564248d2
品牌增加按类别显示的搜索面板
2023-08-17 15:25:53 +08:00
龚启豪
908d247f98
Accept Merge Request #322 : (feature/修改机床参数bug -> develop)
...
Merge Request: 设备看板优化以及表单视图修改
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/322?initial=true
2023-08-17 11:58:38 +08:00
qihao.gong@jikimo.com
6193fa3c09
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
2023-08-17 11:48:54 +08:00
禹翔辉
5c1ba207b6
Accept Merge Request #321 : (feature/刀具管理界面布局优化 -> develop)
...
Merge Request: 刀具管理下除刀具物料外的界面布局及字段的优化
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/321?initial=true
2023-08-17 11:22:24 +08:00
yuxianghui
21bfad2f95
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具管理界面布局优化
2023-08-17 11:20:31 +08:00
yuxianghui
8b88f31672
刀具管理下除刀具物料外的界面布局及字段的优化
2023-08-17 11:19:59 +08:00
qihao.gong@jikimo.com
28fcf5c4fa
优化机场看板以及机床表单
2023-08-17 11:11:47 +08:00
qihao.gong@jikimo.com
f5653ce1dd
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
...
# Conflicts:
# sf_base/static/src/scss/test.scss
2023-08-17 10:13:19 +08:00
许何哲
23b11fce15
Accept Merge Request #320 : (feature/必填字段label添加星号 -> develop)
...
Merge Request: 修復bug
Created By: @许何哲
Accepted By: @许何哲
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/320?initial=true
2023-08-17 10:09:42 +08:00
WEB许何哲\xuhez
facd5d23d7
修复了样式调整后a标签文字变蓝的bug
2023-08-17 10:06:59 +08:00
qihao.gong@jikimo.com
a8c817d704
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
2023-08-16 17:30:40 +08:00
qihao.gong@jikimo.com
cd0f455db3
修改设备模块看板
2023-08-16 17:30:30 +08:00
qihao.gong@jikimo.com
fac3450257
设备基础参数
2023-08-16 15:00:03 +08:00
qihao.gong@jikimo.com
fcf5963079
修改设备清单看板
2023-08-16 11:56:41 +08:00
WEB许何哲\xuhez
2f732e41ed
Merge remote-tracking branch 'origin/develop' into feature/必填字段label添加星号
2023-08-16 11:23:46 +08:00
WEB许何哲\xuhez
1747f38bca
必填字段label添加星号
2023-08-16 11:22:50 +08:00
禹翔辉
d17cfc7793
Accept Merge Request #319 : (feature/制造工单界面布局优化 -> develop)
...
Merge Request: 将记录的讨论和评论窗口从form视图右侧移动到视图最下方。
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/319?initial=true
2023-08-16 11:03:05 +08:00
yuxianghui
ddce0ab436
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造工单界面布局优化
2023-08-16 11:01:11 +08:00
yuxianghui
9d025c10b4
将记录的讨论和评论窗口从form视图右侧移动到视图最下方。
2023-08-16 11:00:34 +08:00
马广威
928257f125
Accept Merge Request #318 : (feature/坯料排程 -> develop)
...
Merge Request: 修改生产线驾驶舱形式为searchpanel,贴近整体布局
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/318?initial=true
2023-08-16 10:14:48 +08:00
mgw
2169c10417
修改生产线驾驶舱形式为searchpanel,贴近整体布局
2023-08-16 10:11:40 +08:00
mgw
ab61902deb
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/坯料排程
2023-08-16 09:43:29 +08:00
mgw
06ed10bd5e
优化界面展示
2023-08-16 09:42:51 +08:00
许何哲
4e2bf6534a
Accept Merge Request #317 : (feature/tree视图表格样式修改 -> develop)
...
Merge Request: 完成tree视图样式修改
Created By: @许何哲
Accepted By: @许何哲
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/317?initial=true
2023-08-16 09:28:58 +08:00
WEB许何哲\xuhez
b780b50a42
Merge branch 'develop' into feature/tree视图表格样式修改
2023-08-16 09:26:19 +08:00
WEB许何哲\xuhez
f4428fde9f
gantt图样式修改
2023-08-16 09:25:13 +08:00
龚启豪
42066865be
Accept Merge Request #316 : (feature/修改机床参数bug -> develop)
...
Merge Request: 修改机床型号参数缺陷
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/316?initial=true
2023-08-15 17:32:13 +08:00
jinling.yang
8a99bd8589
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具物料与夹具物料的反注册
2023-08-15 17:31:49 +08:00
qihao.gong@jikimo.com
e0f43fa9fe
修改机床型号参数缺陷
2023-08-15 17:31:27 +08:00
qihao.gong@jikimo.com
0ecd4e4c3b
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2023-08-15 14:27:03 +08:00
qihao.gong@jikimo.com
a79a3ef64f
Merge branch 'feature/修改设备模块' into develop
2023-08-15 14:26:47 +08:00
龚启豪
5b64664bbb
Accept Merge Request #315 : (feature/修改设备模块 -> develop)
...
Merge Request: 修改控制系统同步接口
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/315?initial=true
2023-08-15 14:26:34 +08:00
qihao.gong@jikimo.com
0f5e5d6ebe
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改设备模块
2023-08-15 14:23:23 +08:00
qihao.gong@jikimo.com
abddb82f94
修改数控系统同步参数
2023-08-15 14:21:41 +08:00
龚启豪
9856bb65fb
Accept Merge Request #314 : (feature/修改设备模块 -> develop)
...
Merge Request: 新增主生产计划模块
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/314?initial=true
2023-08-15 10:36:38 +08:00
qihao.gong@jikimo.com
1533ef7be9
新增主生产计划模块
2023-08-15 10:36:04 +08:00
马广威
4a5fb0c6e4
Accept Merge Request #313 : (feature/坯料排程 -> develop)
...
Merge Request: 解决翻译问题
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/313?initial=true
2023-08-14 10:25:05 +08:00
mgw
ea958ed489
解决翻译问题
2023-08-14 10:24:39 +08:00
马广威
5556274d8b
Accept Merge Request #312 : (feature/坯料排程优化 -> develop)
...
Merge Request: 临时解决看板报错的问题
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/312?initial=true
2023-08-14 08:53:53 +08:00
mgw
d3e6315269
临时解决看板报错的问题
2023-08-14 08:52:51 +08:00
龚启豪
9c7d27f860
Accept Merge Request #311 : (feature/修改设备模块 -> develop)
...
Merge Request: 处理控制系统参数缺失 以及name同步不全问题
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/311?initial=true
2023-08-11 17:08:33 +08:00
qihao.gong@jikimo.com
9e90c98454
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改设备模块
2023-08-11 17:07:13 +08:00
qihao.gong@jikimo.com
ce3ffb75ae
处理控制系统参数丢失问题
2023-08-11 17:06:57 +08:00
禹翔辉
b83a3cc185
Accept Merge Request #310 : (feature/刀具管理缺陷优化 -> develop)
...
Merge Request: 新增出入库记录对象,功能刀具出入库记录对象多对一关联出入库记录对象,优化功能刀具出入库布局;新增功能刀具列表、刀具物料查询的分组展示全部信息;对刀具物料查询对象的字段根据所选的刀具物料不同展示不同的刀具物料信息字段
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/310?initial=true
2023-08-11 17:05:32 +08:00
yuxianghui
d103a1cd29
新增出入库记录对象,功能刀具出入库记录对象多对一关联出入库记录对象,优化功能刀具出入库布局;新增功能刀具列表、刀具物料查询的分组展示全部信息;对刀具物料查询对象的字段根据所选的刀具物料不同展示不同的刀具物料信息字段
2023-08-11 17:04:08 +08:00
qihao.gong@jikimo.com
150c40f9b1
处理数控系统同步数据 name缺失问题
2023-08-11 16:55:50 +08:00
马广威
4d650a9aca
Accept Merge Request #309 : (feature/坯料排程 -> develop)
...
Merge Request: char字段聚焦全选功能已完成,坯料排程基本功能已完成
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/309?initial=true
2023-08-11 12:28:28 +08:00
mgw
9b239dbcb2
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/坯料排程
2023-08-11 12:24:35 +08:00
mgw
68805fee4a
char字段聚焦全选功能已完成
2023-08-11 12:22:59 +08:00
mgw
fc490f1612
坯料排程基本功能完成
2023-08-11 12:18:47 +08:00
龚启豪
e6a496d062
Accept Merge Request #308 : (feature/修改设备模块 -> develop)
...
Merge Request: 处理同步报错bug
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/308?initial=true
2023-08-11 10:28:14 +08:00
qihao.gong@jikimo.com
fb2cc0e504
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改设备模块
2023-08-11 10:26:35 +08:00
qihao.gong@jikimo.com
94efe4e7ca
处理同步报错
2023-08-11 10:26:15 +08:00
WEB许何哲\xuhez
8a736775d8
Merge branch 'develop' into feature/tree视图表格样式修改
2023-08-11 10:19:47 +08:00
WEB许何哲\xuhez
4b34335963
看板视图样式还原
2023-08-11 10:19:00 +08:00
禹翔辉
6116434399
Accept Merge Request #307 : (feature/刀具管理缺陷优化 -> develop)
...
Merge Request: 刀具管理测试的缺陷优化
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/307?initial=true
2023-08-10 17:15:42 +08:00
yuxianghui
eccc4c3ade
新增功能刀具组装对象组装新刀具时创建功能刀具预警、功能刀具实时分布、功能刀具出入库记录的记录;新增新刀具取消组装时删除功能刀具预警、功能刀具实时分布、功能刀具出入库记录的记录;新增同步功能刀具列表数据到功能刀具预警、功能刀具实时分布、功能刀具出入库记录对象;新增同步功能刀具组装数据到功能刀具预警对象;新增功能刀具出入库记录和功能刀具实时分布对象分组展示全部功能刀具类型。
2023-08-10 16:41:41 +08:00
禹翔辉
a764f42d23
Accept Merge Request #306 : (feature/刀具管理问题优化 -> develop)
...
Merge Request: 优化了刀具管理模块的功能刀具组装、CAM工单程序用刀计划、机床换刀申请模型的问题。
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/306?initial=true
2023-08-09 15:04:02 +08:00
yuxianghui
650a29b74f
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具管理问题优化
2023-08-09 15:01:39 +08:00
yuxianghui
1e1b0dd359
新增功能刀具组装界面和CAM工单程序用刀计划界面、机床换刀申请界面相互跳转功能按钮;功能刀具预警新增展示分组展示全部CNC机床,功能刀具实时分布修改数量相关字段类型为Integer,并新增自动计算合计数和总数功能
2023-08-09 15:00:59 +08:00
龚启豪
8d126a0024
Accept Merge Request #305 : (feature/修改设备模块 -> develop)
...
Merge Request: 修改路线多规则条件选取
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/305?initial=true
2023-08-09 10:00:17 +08:00
qihao.gong@jikimo.com
06d73a815f
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改设备模块
2023-08-09 09:59:11 +08:00
qihao.gong@jikimo.com
386b5eb11c
修改采购入库路线多规则条件选取
2023-08-09 09:58:51 +08:00
jinling.yang
9fe58a1fba
刀具型号页面布局
2023-08-08 18:17:49 +08:00
yuxianghui
924b838a83
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具管理问题优化
2023-08-08 18:09:49 +08:00
yuxianghui
b2012c004a
新增刀具管理按键使用提示,调整相关按键布局;新增机床换刀申请、CAM装刀申请界面、功能刀具组装界面的tree视图左侧分组显示全部信息;优化三个界面相关字段;新增功能刀具组装界面刀具物料信息无数据隐藏,功能刀具组装申请组装界面刀具物料信息根据不同情况隐藏;新增功能刀具组装的刀具物料字段根据所选型号自动带出。
2023-08-08 18:08:53 +08:00
jinling.yang
e638245b8a
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具物料与夹具物料的反注册
...
# Conflicts:
# sf_mrs_connect/models/res_config_setting.py
2023-08-08 17:18:06 +08:00
许何哲
be53b012f1
Accept Merge Request #304 : (feature/tree视图表格样式修改 -> develop)
...
Merge Request: 调试线上sf的bug
Created By: @许何哲
Accepted By: @许何哲
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/304?initial=true
2023-08-08 14:45:47 +08:00
WEB许何哲\xuhez
35ef00a8cd
Merge branch 'develop' into feature/tree视图表格样式修改
2023-08-08 14:43:48 +08:00
WEB许何哲\xuhez
0e292ea597
调试线上sf的bug
2023-08-08 14:42:10 +08:00
jinling.yang
b3f2065edd
夹具物料注册
2023-08-07 17:29:17 +08:00
许何哲
7fb585dfdd
Accept Merge Request #303 : (feature/tree视图表格样式修改 -> develop)
...
Merge Request: 标签页筛选完后看板视图的样式修改
Created By: @许何哲
Accepted By: @许何哲
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/303?initial=true
2023-08-07 16:58:41 +08:00
WEB许何哲\xuhez
194bb28085
Merge branch 'develop' into feature/tree视图表格样式修改
2023-08-07 16:51:09 +08:00
WEB许何哲\xuhez
46f40ec480
修改标签页筛选完后看板视图的样式
2023-08-07 16:49:36 +08:00
龚启豪
a99fe44408
Accept Merge Request #302 : (feature/修改设备模块 -> develop)
...
Merge Request: 修改设备基础参数以及同步方法
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/302?initial=true
2023-08-07 16:06:08 +08:00
qihao.gong@jikimo.com
432920b100
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改设备模块
2023-08-07 16:03:13 +08:00
qihao.gong@jikimo.com
f0e1939b95
修改设备参数以及机床型号基础参数以及同步cloud方法
2023-08-07 16:00:26 +08:00
WEB许何哲\xuhez
f85a0e4c85
删除searchPannel
2023-08-07 15:06:35 +08:00
WEB许何哲\xuhez
578d9c46d9
Merge branch 'develop' into feature/tree视图表格样式修改
...
# Conflicts:
# sf_manufacturing/static/src/js/kanban_change.js
# sf_manufacturing/static/src/scss/kanban_change.scss
# sf_manufacturing/views/mrp_workcenter_views.xml
2023-08-07 14:51:55 +08:00
WEB许何哲\xuhez
5a28ec7579
工作中心看板视图标签页的动态添加并实现点击筛选
2023-08-07 14:48:55 +08:00
马广威
d971cbd5f1
Accept Merge Request #301 : (feature/坯料排程 -> develop)
...
Merge Request: 看板视图一句标签进行筛选基础功能已完成
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/301?initial=true
2023-08-07 14:39:48 +08:00
mgw
72a0be3a54
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/坯料排程
2023-08-07 14:38:18 +08:00
mgw
5f04cbb896
看板视图css调整(老许做的)
2023-08-07 14:37:58 +08:00
mgw
4f893929ca
工作中心看板视图动态添加标签页并可初步进行点击晒选
2023-08-07 10:50:44 +08:00
mgw
de32f5db78
看板视图筛选实现功能的条件已具备(看板已抠,字段存在),待优化
2023-08-07 08:58:50 +08:00
jinling.yang
aa7e39c28a
新增采购入库时实时注册夹具产品到cloud
2023-08-04 17:33:21 +08:00
qihao.gong@jikimo.com
0838ff417f
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改设备模块
2023-08-04 17:32:09 +08:00
qihao.gong@jikimo.com
2321304e2a
修改设备
2023-08-04 17:31:47 +08:00
禹翔辉
1910b461f3
Accept Merge Request #300 : (feature/刀具管理 -> develop)
...
Merge Request: 优化了功能刀具组装对象组装和取消组装时功能刀具列表的many2many类型字段赋值为[]时值不修改的问题
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/300?initial=true
2023-08-04 16:54:36 +08:00
yuxianghui
2a1b39b0fb
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具管理
2023-08-04 16:24:43 +08:00
yuxianghui
cd042a8073
优化了功能刀具组装对象组装和取消组装时功能刀具列表的many2many类型字段赋值为[]时值不修改的问题
2023-08-04 16:24:12 +08:00
禹翔辉
c75e1b3c19
Accept Merge Request #299 : (feature/刀具管理 -> develop)
...
Merge Request: 优化了功能刀具组装出库bug,优化了功能刀具组装对象组装旧刀具时的bug
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/299?initial=true
2023-08-04 10:43:02 +08:00
yuxianghui
7f6ea605d2
优化了功能刀具组装出库bug,优化了功能刀具组装对象组装旧刀具时的bug
2023-08-04 10:40:35 +08:00
yuxianghui
9203f13161
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具管理
2023-08-04 09:20:31 +08:00
许何哲
cb011a9bd7
Accept Merge Request #298 : (feature/tree视图表格样式修改 -> develop)
...
Merge Request: sf工作中心看板视图标签页的动态添加
Created By: @许何哲
Accepted By: @许何哲
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/298?initial=true
2023-08-03 17:36:29 +08:00
WEB许何哲\xuhez
da7184d841
Merge branch 'develop' into feature/tree视图表格样式修改
...
# Conflicts:
# sf_manufacturing/static/src/xml/kanban_change.xml
2023-08-03 17:34:54 +08:00
WEB许何哲\xuhez
921336ad13
no message
2023-08-03 17:32:43 +08:00
WEB许何哲\xuhez
17476fdcf4
工作中心看板视图动态添加标签页
2023-08-03 17:31:11 +08:00
yuxianghui
fe310de31d
新增功能刀具列表缓存对象,新增组装旧刀是创建缓存数据,新增取消组装时清除缓存数据
2023-08-03 17:29:26 +08:00
马广威
d0fab40b03
Accept Merge Request #297 : (feature/odoo16前端rpc拿取后端生产线数据 -> develop)
...
Merge Request: 实现基础的rpc拿取后端生产线数据功能
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/297?initial=true
2023-08-03 17:25:06 +08:00
mgw
810ef41c05
实现基础的rpc拿取后端生产线数据功能
2023-08-03 17:24:37 +08:00
杨金灵
30ad60c2c1
Accept Merge Request #296 : (feature/夹具型号和功能夹具反向注册到cloud -> develop)
...
Merge Request: 制造模块里的配置内的页面优化
Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/296?initial=true
2023-08-03 16:57:56 +08:00
jinling.yang
5df00e14da
制造模块里的配置内的页面优化
2023-08-03 16:57:18 +08:00
jinling.yang
1929fb1b57
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/夹具型号和功能夹具反向注册到cloud
2023-08-03 15:58:18 +08:00
jinling.yang
06bb0f77c9
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/夹具型号和功能夹具反向注册到cloud
2023-08-03 15:57:38 +08:00
yuxianghui
aed5ac4c3d
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具管理
2023-08-03 14:31:46 +08:00
yuxianghui
03cc5b2281
新增功能刀具组装对象取消组装时删除组装时所创建的功能刀具列表信息,删除了功能刀具组装对象组装时创建功能刀具预警、实时分布、出入库记录信息的功能。
2023-08-03 14:31:16 +08:00
马广威
8c963be133
Accept Merge Request #295 : (feature/odoo16翻译研究 -> develop)
...
Merge Request: 优化未生效翻译
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/295?initial=true
2023-08-03 13:06:19 +08:00
mgw
1afd164712
优化未生效翻译
2023-08-03 13:05:49 +08:00
马广威
0eedca58e9
Accept Merge Request #294 : (feature/odoo16翻译研究 -> develop)
...
Merge Request: 新增翻译问题解决
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/294?initial=true
2023-08-03 11:58:53 +08:00
mgw
95c57a3ffb
新增翻译问题解决
2023-08-03 11:55:46 +08:00
马广威
48d673a48e
Accept Merge Request #293 : (feature/odoo16翻译研究 -> develop)
...
Merge Request: 制造订单处字段调整完成,翻译优化完成
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/293?initial=true
2023-08-02 18:04:16 +08:00
mgw
3f3a72a905
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/odoo16翻译研究
2023-08-02 18:03:41 +08:00
mgw
3c934e3a4b
制造订单处字段调整完成,翻译优化完成
2023-08-02 18:01:28 +08:00
jinling.yang
24afa53028
新增功能夹具接口
2023-08-02 17:35:09 +08:00
禹翔辉
5c2a9f62dc
Accept Merge Request #292 : (feature/刀具管理 -> develop)
...
Merge Request: 优化了刀具管理-功能刀具组装的刀具物料字段,新增功能刀具组装完成时新建功能刀具列表、预警、实时分布、出入库记录数据功能
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/292?initial=true
2023-08-02 17:30:45 +08:00
yuxianghui
57de3f9456
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具管理
2023-08-02 17:29:31 +08:00
yuxianghui
6c001b6950
优化了刀具管理-功能刀具组装的刀具物料字段,新增功能刀具组装完成时新建功能刀具列表、预警、实时分布、出入库记录数据功能
2023-08-02 17:29:02 +08:00
马广威
f940d1bf24
Accept Merge Request #291 : (feature/odoo16翻译研究 -> develop)
...
Merge Request: 补充部分未生效翻译
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/291?initial=true
2023-08-02 10:18:11 +08:00
mgw
aaeab9a241
补充部分未生效翻译
2023-08-02 10:17:00 +08:00
mgw
109674bdb5
修改 概述 为 生产线驾驶舱
2023-08-02 10:10:38 +08:00
马广威
49e0c64dfd
Accept Merge Request #290 : (feature/odoo16翻译研究 -> develop)
...
Merge Request: 修改设备处翻译
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/290?initial=true
2023-08-02 10:00:08 +08:00
mgw
f71c437b46
修改设备处翻译
2023-08-02 09:59:13 +08:00
马广威
26a6d01654
Accept Merge Request #289 : (feature/odoo16翻译研究 -> develop)
...
Merge Request: odoo16质量模块翻译本地测试完成
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/289?initial=true
2023-08-02 09:33:41 +08:00
mgw
1670b3fd78
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/odoo16翻译研究
2023-08-02 09:31:56 +08:00
mgw
d7729028cf
质量模块的改造已完成,本地已测试
2023-08-02 09:31:06 +08:00
yuxianghui
858acf053e
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具管理
2023-08-01 17:41:54 +08:00
yuxianghui
d574925122
1、刀具管理-机床换刀申请、CAM工单程序用刀计划、功能刀具组装增加了机床、功能刀具和功能刀具类型字段的关联关系,增加了tree视图功能按键 2、优化了CAM工单程序用刀计划的按键功能 3、对三个对象的字段的可读性进行了调整
2023-08-01 17:41:21 +08:00
jinling.yang
5c2e7c80da
1.产品模板优化:增加产品类别的搜索面板
...
2.夹具型号注册到cloud:夹具型号的Tree和form视图去掉不可增删改操作,页面新增时编码根据夹具物料回显不同的编码;新增注册按钮及对应的注册接口
3.功能夹具注册到cloud:.功能夹具的Tree和form视图去掉不可增删改操作,页面新增时编码和名称根据功能夹具类型和对应的托盘型号所进行回显
2023-08-01 17:39:40 +08:00
mgw
6abafcaf68
设备处翻译优化完成
2023-08-01 17:15:30 +08:00
杨金灵
f6e50161c6
Accept Merge Request #288 : (feature/产品增加搜索面板 -> develop)
...
Merge Request: 产品新增搜索面板
Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/288?initial=true
2023-08-01 15:09:23 +08:00
jinling.yang
7c8e470199
产品新增搜索面板
2023-08-01 15:08:32 +08:00
马广威
a4f511b47b
Accept Merge Request #287 : (feature/odoo16翻译研究 -> develop)
...
Merge Request: 测试制造模块的翻译效果
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/287?initial=true
2023-08-01 10:17:44 +08:00
mgw
84aeb0d8eb
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/odoo16翻译研究
2023-08-01 10:17:08 +08:00
mgw
501756d4e7
测试制造模块更改后的翻译,本地已生效
2023-08-01 10:16:47 +08:00
龚启豪
06630fb85e
Accept Merge Request #286 : (feature/修改设备模块 -> develop)
...
Merge Request: 修改设备模块bug
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/286?initial=true
2023-07-28 15:46:37 +08:00
qihao.gong@jikimo.com
10fde2b175
Merge branch 'feature/修改设备基础参数' into develop
2023-07-28 15:33:55 +08:00
qihao.gong@jikimo.com
06de46c084
修改设备模块
2023-07-28 15:33:31 +08:00
qihao.gong@jikimo.com
2b69524c57
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改设备基础参数
2023-07-28 15:32:37 +08:00
杨金灵
7eca8110cf
Accept Merge Request #285 : (feature/同步的相关模型页面优化 -> develop)
...
Merge Request: 同步的模型的页面不可增删改
Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/285?initial=true
2023-07-27 15:47:01 +08:00
jinling.yang
47b2e8c709
1.同步的模型的页面不可增删改
...
2.工单的物料里新增长宽高字段
2023-07-27 15:45:45 +08:00
马广威
6380e1ad0a
Accept Merge Request #284 : (feature/库存扫码研究 -> develop)
...
Merge Request: 修改位置占用bug
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/284?initial=true
2023-07-27 09:23:49 +08:00
mgw
0e2973f01e
修改位置占用bug
2023-07-27 09:21:24 +08:00
jinling.yang
d7a7256929
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2023-07-26 18:57:56 +08:00
jinling.yang
eebc4f7a63
Merge branch 'feature/Bug修复' into develop
2023-07-26 18:55:24 +08:00
杨金灵
0f3f27ff26
Accept Merge Request #283 : (feature/Bug修复 -> develop)
...
Merge Request: 夹具优化
Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/283?initial=true
2023-07-26 18:54:18 +08:00
jinling.yang
21a69a1048
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/Bug修复
2023-07-26 18:52:56 +08:00
jinling.yang
7ee652d021
1.夹具物料,联装类型,功能夹具类型的Tree视图去掉删除方法和删除操作;同步的方法里新增active字段
...
2.品牌模型新增厂家型号字段
3.修复3D模型全屏展示及不显示模型Bug
2023-07-26 18:52:27 +08:00
jinling.yang
72b3e736c0
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/Bug修复
2023-07-26 18:39:59 +08:00
马广威
459a9c3fbb
Accept Merge Request #282 : (feature/修复粗心导致的同步bug -> develop)
...
Merge Request: 修复同步bug
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/282?initial=true
2023-07-26 16:53:36 +08:00
mgw
7671830648
修复同步bug
2023-07-26 16:52:56 +08:00
马广威
b1ea52cbe3
Accept Merge Request #281 : (feature/修改缺陷 -> develop)
...
Merge Request: 去掉自定义barcode,暂时取消功能刀具的同步
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/281?initial=true
2023-07-26 15:27:09 +08:00
mgw
503361a847
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改缺陷
2023-07-26 15:25:42 +08:00
mgw
bace7aa175
去掉自定义barcode,暂时取消同步功能刀具
2023-07-26 15:25:12 +08:00
禹翔辉
fd7875b24e
Accept Merge Request #280 : (feature/刀具管理 -> develop)
...
Merge Request: 刀具管理-功能刀具列表、预警、实时分布、出入库记录优化
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/280?initial=true
2023-07-26 15:19:50 +08:00
yuxianghui
e5c5aa6cdd
刀具管理-新增功能刀具预警、功能刀具实时分布、功能刀具出入库记录对象(tree视图、form视图已完成);功能刀具管理对象修改为功能刀具列表对象,并优化了字段信息,优化了tree视图展示字段,新增form视图;解除了功能刀具列表对象与功能刀具对象的继承关系。
2023-07-26 15:17:12 +08:00
yuxianghui
98f9269766
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具管理
2023-07-25 17:43:02 +08:00
yuxianghui
d3c7f8cd56
新增了功能刀具列表的form视图,简化了tree视图字段
2023-07-25 17:42:47 +08:00
qihao.gong@jikimo.com
f246827d3d
修改设备模块布局
2023-07-25 17:27:11 +08:00
禹翔辉
bcec481268
Accept Merge Request #279 : (feature/刀具管理 -> develop)
...
Merge Request: 新增了刀具管理的机床换刀申请、CAM工单程序用刀计划、功能刀具组装的form视图,简化了tree视图的字段
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/279?initial=true
2023-07-25 14:40:12 +08:00
yuxianghui
810ec1fd6c
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具管理
2023-07-25 14:38:24 +08:00
yuxianghui
fc2d77a0dc
新增了刀具管理的机床换刀申请、CAM工单程序用刀计划、功能刀具组装的form视图,简化了tree视图的字段,
2023-07-25 14:38:06 +08:00
qihao.gong@jikimo.com
65157e93a9
设备新需求(根据维保项目生成维保计划)
2023-07-24 17:44:07 +08:00
龚启豪
a43e423c06
Accept Merge Request #278 : (feature/修改设备基础参数 -> develop)
...
Merge Request: 质量模块和库存扫码
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/278?initial=true
2023-07-24 11:44:31 +08:00
qihao.gong@jikimo.com
abc7e1c8c6
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改设备基础参数
2023-07-24 11:42:44 +08:00
qihao.gong@jikimo.com
3c89404543
质量模块和库存扫码
2023-07-24 11:42:15 +08:00
jinling.yang
ae2fdad4f1
1.物料page里的库存模型新增物料长宽高三个字段
...
2.修复功能夹具同步Bug
3.夹具物料新增不可删除控制
2023-07-21 17:35:44 +08:00
qihao.gong@jikimo.com
8d024ad625
修改sf设备修改过的需求
2023-07-21 17:15:43 +08:00
禹翔辉
24e9cc0658
Accept Merge Request #277 : (feature/刀具管理 -> develop)
...
Merge Request: 优化了刀具管理的功能刀具预警,功能刀具列表,功能刀具出入库记录,功能刀具实时分布的字段,优化了功能刀具预警界面显示错误问题
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/277?initial=true
2023-07-20 17:31:38 +08:00
yuxianghui
b15d574d8b
优化了刀具管理的功能刀具预警,功能刀具列表,功能刀具出入库记录,功能刀具实时分布的字段,优化了功能刀具预警界面显示错误问题
2023-07-20 17:29:03 +08:00
yuxianghui
507392b23e
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具管理
2023-07-20 15:40:34 +08:00
杨金灵
8765a00ead
Accept Merge Request #276 : (feature/夹具查询页面去掉创建按钮 -> develop)
...
Merge Request: 夹具相关查询页面去掉创建按钮
Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/276?initial=true
2023-07-20 15:20:41 +08:00
jinling.yang
9334d5cdc8
夹具相关查询页面去掉创建按钮
2023-07-20 15:19:09 +08:00
mgw
a94bc7073d
测试翻译项目是否生效
2023-07-20 12:12:17 +08:00
马广威
fe8402b856
Accept Merge Request #275 : (feature/修改缺陷 -> develop)
...
Merge Request: 修改功能刀具模块继承方式
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/275?initial=true
2023-07-20 09:18:34 +08:00
mgw
b37656d4fe
修改功能刀具模块继承方式
2023-07-20 09:17:21 +08:00
yuxianghui
399aaa9e2d
修改功能刀具出入库记录的字段展示
2023-07-19 17:30:40 +08:00
龚启豪
80616bf9bd
Accept Merge Request #274 : (feature/修改设备基础参数 -> develop)
...
Merge Request: 修改设备模块布局以及报错处理
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/274?initial=true
2023-07-19 17:12:49 +08:00
qihao.gong@jikimo.com
3832b9216f
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改设备基础参数
2023-07-19 17:11:07 +08:00
qihao.gong@jikimo.com
9c556c5f40
修改设备布局
2023-07-19 17:10:49 +08:00
许何哲
532d5cbc6d
Accept Merge Request #273 : (feature/tree视图表格样式修改 -> develop)
...
Merge Request: 修改表格样式css的选择器
Created By: @许何哲
Accepted By: @许何哲
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/273?initial=true
2023-07-19 14:50:04 +08:00
WEB许何哲\xuhez
292af4d1ef
修改表格样式css的选择器
2023-07-19 14:49:42 +08:00
禹翔辉
4b16fc2ec5
Accept Merge Request #272 : (feature/刀具管理 -> develop)
...
Merge Request: 优化刀具管理的弹窗界面布局
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/272?initial=true
2023-07-19 11:26:15 +08:00
yuxianghui
de0b37bf43
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具管理
2023-07-19 11:24:25 +08:00
yuxianghui
89eec3250a
优化刀具管理弹窗界面的展示布局
2023-07-19 11:24:05 +08:00
许何哲
07a06ae598
Accept Merge Request #271 : (feature/tree视图表格样式修改 -> develop)
...
Merge Request: tree视图表格样式修改
Created By: @许何哲
Accepted By: @许何哲
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/271?initial=true
2023-07-19 10:40:47 +08:00
WEB许何哲\xuhez
3b09297600
tree视图表格样式修改
2023-07-19 10:40:15 +08:00
马广威
1bae5ecb55
Accept Merge Request #270 : (feature/修改缺陷 -> develop)
...
Merge Request: sf处功能刀具修改及其同步,目录位置调整
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/270?initial=true
2023-07-19 10:05:04 +08:00
mgw
e44e44df41
sf处功能刀具修改及其同步,目录位置调整
2023-07-19 10:03:53 +08:00
许何哲
e6ecc6068d
Accept Merge Request #269 : (feature/tree视图表格中字段的样式修改 -> develop)
...
Merge Request: tree视图表格中字段样式的修改
Created By: @许何哲
Accepted By: @许何哲
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/269?initial=true
2023-07-18 17:10:00 +08:00
WEB许何哲\xuhez
a7028e00f9
tree视图表格中字段样式的修改
2023-07-18 17:09:17 +08:00
禹翔辉
66f0097b80
Accept Merge Request #268 : (feature/创建工作日历代码测试 -> develop)
...
Merge Request: 工作日历设置---新增将中文的星期转换成英文的星期的方法,删除了大部分日志。
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/268?initial=true
2023-07-18 16:27:26 +08:00
yuxianghui
b5484ecda6
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/创建工作日历代码测试
2023-07-18 16:27:42 +08:00
yuxianghui
2462c3774d
工作日历设置---新增将中文的星期转换成英文的星期的方法,删除了大部分日志。
2023-07-18 16:27:24 +08:00
杨金灵
baf13117dc
Accept Merge Request #267 : (feature/夹具型号新增搜索面板 -> develop)
...
Merge Request: 优化夹具型号功能
Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/267?initial=true
2023-07-18 16:21:16 +08:00
jinling.yang
988f70bf69
1.夹具型号新增搜索面板
...
2.夹具查询列表新增创建人和创建时间字段展示
2023-07-18 16:20:09 +08:00
禹翔辉
4f60118f37
Accept Merge Request #266 : (feature/创建工作日历代码测试 -> develop)
...
Merge Request: 新增工作日历设置的日志
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/266?initial=true
2023-07-18 14:37:03 +08:00
yuxianghui
b7e1bff0f4
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/创建工作日历代码测试
2023-07-18 14:37:00 +08:00
yuxianghui
a0758b4b61
新增工作日历设置的日志
2023-07-18 14:36:44 +08:00
许何哲
b614eed79d
Accept Merge Request #265 : (feature/修改logo图片 -> develop)
...
Merge Request: 修改登录页面logo
Created By: @许何哲
Accepted By: @许何哲
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/265?initial=true
2023-07-18 11:36:41 +08:00
WEB许何哲\xuhez
b22cc7f19f
修改登录页面logo
2023-07-18 11:36:12 +08:00
龚启豪
a11dcc16f0
Accept Merge Request #264 : (feature/修改设备基础参数 -> develop)
...
Merge Request: 修改设备菜单以及二级菜单结构
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/264?initial=true
2023-07-18 10:48:29 +08:00
qihao.gong@jikimo.com
8333a834fc
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改设备基础参数
2023-07-18 10:47:43 +08:00
qihao.gong@jikimo.com
fc93d5c646
修改设备菜单名称以及二级目录结构
2023-07-18 10:47:23 +08:00
禹翔辉
92a04d5f2a
Accept Merge Request #263 : (feature/创建工作日历代码测试 -> develop)
...
Merge Request: 优化产线设备资源设置的form视图界面名字显示
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/263?initial=true
2023-07-18 10:30:08 +08:00
yuxianghui
ff0786def7
优化产线设备资源设置的form视图界面名字显示
2023-07-18 10:30:01 +08:00
yuxianghui
4907f06183
添加工作日历设置创建工作日历时的输出日志
2023-07-18 09:45:53 +08:00
禹翔辉
ad5a8c06a5
Accept Merge Request #262 : (feature/创建工作日历代码测试 -> develop)
...
Merge Request: 添加工作日历设置创建工作日历时的输出日志
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/262?initial=true
2023-07-18 09:45:15 +08:00
许何哲
749765c85d
Accept Merge Request #261 : (feature/一级菜单收起 -> develop)
...
Merge Request: 一级菜单点击收起
Created By: @许何哲
Accepted By: @许何哲
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/261?initial=true
2023-07-18 09:27:43 +08:00
WEB许何哲\xuhez
aafa9317e0
一级菜单点击收起
2023-07-18 09:26:02 +08:00
杨金灵
628a74c3f7
Accept Merge Request #260 : (feature/去掉不用的代码 -> develop)
...
Merge Request: 去掉不要的引用
Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/260?initial=true
2023-07-17 17:36:50 +08:00
jinling.yang
9a392eebad
去掉不要的引用
2023-07-17 17:35:55 +08:00
许何哲
f67850461f
Accept Merge Request #259 : (feature/一级菜单点击收起 -> develop)
...
Merge Request: 一级菜单点击收起
Created By: @许何哲
Accepted By: @许何哲
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/259?initial=true
2023-07-17 17:32:35 +08:00
WEB许何哲\xuhez
ad60e1a624
一级菜单点击收起
2023-07-17 17:32:11 +08:00
jinling.yang
21a594a81e
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2023-07-17 16:51:10 +08:00
jinling.yang
253736221e
Merge branch 'feature/页面展示优化' into develop
2023-07-17 16:50:41 +08:00
杨金灵
1252d11bba
Accept Merge Request #258 : (feature/页面展示优化 -> develop)
...
Merge Request: 修复产品模板Bug
Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/258?initial=true
2023-07-17 16:50:17 +08:00
jinling.yang
b1da9ff18b
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/页面展示优化
2023-07-17 16:48:44 +08:00
禹翔辉
c6d6937f21
Accept Merge Request #257 : (feature/优化生成工作日历记录功能 -> develop)
...
Merge Request: 优化产线设备资源设置新建bug
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/257?initial=true
2023-07-17 16:48:00 +08:00
yuxianghui
f40655b1af
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化生成工作日历记录功能
2023-07-17 16:47:57 +08:00
jinling.yang
f68dce9ee2
修复产品模板中产品类别为刀具和夹具时,根据产品类别为刀具和夹具时,新增的page页面里的字段显示及回显Bug
2023-07-17 16:46:01 +08:00
yuxianghui
ebda457684
优化产线设备资源设置新建bug
2023-07-17 16:45:52 +08:00
禹翔辉
d9a6d1a803
Accept Merge Request #256 : (feature/优化生成工作日历记录功能 -> develop)
...
Merge Request: 优化工作日历设置开始时间和结束时间为根据所选班次自动生成
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/256?initial=true
2023-07-17 16:40:30 +08:00
yuxianghui
fc5a3dcab4
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化生成工作日历记录功能
2023-07-17 16:40:03 +08:00
yuxianghui
5b0df0befd
优化工作日历设置开始时间和结束时间为根据所选班次自动生成
2023-07-17 16:39:30 +08:00
龚启豪
0dd5e5086d
Accept Merge Request #255 : (feature/修改设备基础参数 -> develop)
...
Merge Request: 修改设备参数布局
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/255?initial=true
2023-07-17 15:45:38 +08:00
qihao.gong@jikimo.com
bb464a2351
修改设备参数布局
2023-07-17 15:44:04 +08:00
马广威
c03d683dcb
Accept Merge Request #254 : (feature/修改缺陷 -> develop)
...
Merge Request: 修复工作中心计划报错的问题,修改制造模块目录结构
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/254?initial=true
2023-07-17 15:38:49 +08:00
mgw
344fe1b58b
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改缺陷
2023-07-17 15:37:47 +08:00
mgw
c0d14daf44
修复工作中心计划报错的问题,修改制造模块目录结构
2023-07-17 15:37:23 +08:00
许何哲
cf22c6f6fc
Accept Merge Request #253 : (feature/表头固定 -> develop)
...
Merge Request: 修改表头固定
Created By: @许何哲
Accepted By: @许何哲
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/253?initial=true
2023-07-17 11:10:43 +08:00
WEB许何哲\xuhez
f579875b35
修改表头固定
2023-07-17 11:09:26 +08:00
禹翔辉
b49677d5ba
Accept Merge Request #252 : (feature/优化生成工作日历记录功能 -> develop)
...
Merge Request: 对工作日历设置的name字段进行限制,优化工作日历form视图的显示
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/252?initial=true
2023-07-17 11:04:21 +08:00
马广威
6389186851
Accept Merge Request #251 : (feature/修改制造目录结构 -> develop)
...
Merge Request: 修改制造菜单结构
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/251?initial=true
2023-07-17 10:58:02 +08:00
mgw
d27fedcd0b
修改原生“作业”为“计划管理”
2023-07-17 10:56:43 +08:00
mgw
c1350f04b7
修改制造目录结构,更改原生“作业”为“计划管理”
2023-07-17 10:56:19 +08:00
yuxianghui
b48c231dcc
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化生成工作日历记录功能
2023-07-17 10:43:47 +08:00
yuxianghui
9752b2e49f
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化生成工作日历记录功能
2023-07-17 10:40:49 +08:00
龚启豪
00795ca3e9
Accept Merge Request #249 : (feature/订单计划 -> develop)
...
Merge Request: 修改设备模块菜单名称
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/249?initial=true
2023-07-17 10:40:14 +08:00
yuxianghui
a557a42cf5
对工作日历设置的name字段进行限制,优化工作日历form视图的显示
2023-07-17 10:40:07 +08:00
qihao.gong@jikimo.com
1743801c78
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/订单计划
2023-07-17 10:39:15 +08:00
qihao.gong@jikimo.com
ad84eedda3
修改设备菜单名称
2023-07-17 10:38:54 +08:00
许何哲
6055921556
Accept Merge Request #248 : (feature/tree视图表头固定 -> develop)
...
Merge Request: tree视图表头固定
Created By: @许何哲
Accepted By: @许何哲
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/248?initial=true
2023-07-17 10:17:56 +08:00
WEB许何哲\xuhez
b74a029166
tree视图表头固定
2023-07-17 10:15:50 +08:00
qihao.gong@jikimo.com
4bb3ab3e16
维保计划视图优化
2023-07-14 17:27:11 +08:00
禹翔辉
095b707f0c
Accept Merge Request #247 : (feature/工作日历设置-工作日历表 -> develop)
...
Merge Request: 优化刀具管理form视图的name显示
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/247?initial=true
2023-07-14 17:27:01 +08:00
yuxianghui
992435b1f8
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/工作日历设置-工作日历表
2023-07-14 17:26:01 +08:00
yuxianghui
a4339d1d67
优化刀具管理的form视图表名显示问题
2023-07-14 17:25:35 +08:00
yuxianghui
9c4f51d5f6
优化刀具管理form视图表名显示问题
2023-07-14 17:24:59 +08:00
禹翔辉
90a71326a9
Accept Merge Request #246 : (feature/工作日历设置-工作日历表 -> develop)
...
Merge Request: 工作日历设置模型新增查看日历按键,隐藏工作日历菜单
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/246?initial=true
2023-07-14 16:07:02 +08:00
yuxianghui
a8e30a5228
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/工作日历设置-工作日历表
2023-07-14 15:02:15 +08:00
yuxianghui
808f57adfb
工作日历设置模型新增查看日历按键,隐藏工作日历菜单
2023-07-14 15:01:56 +08:00
马广威
a71497d3a8
Accept Merge Request #245 : (feature/解决工作日历无法创建的bug -> develop)
...
Merge Request: 解决冲突与优化结构
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/245?initial=true
2023-07-14 14:45:03 +08:00
mgw
5b6a563a87
更改库存模块库区相关字段
2023-07-14 14:43:06 +08:00
mgw
3de5a95a98
解决工作日历无法创建的bug
2023-07-14 14:35:22 +08:00
马广威
14283ab5e4
Accept Merge Request #244 : (feature/测试皮肤模块 -> develop)
...
Merge Request: 修改.gitignore文件,注释忽略lib文件夹部分;修改制造模块依赖
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/244?initial=true
2023-07-14 12:29:44 +08:00
mgw
3b789d040a
修改制造模块依赖
2023-07-14 12:28:23 +08:00
mgw
f0e7d41ad6
修改.gitignore文件,注释忽略lib文件夹部分
2023-07-14 12:26:21 +08:00
qihao.gong@jikimo.com
0077d97cfa
master-sf1.0
2023-05-06 16:03:00 +08:00