胡尧
cc030957fb
给仓储岗增加修改工单的权限
2025-04-11 16:02:24 +08:00
胡尧
10bea40159
增加不同工作中心配置相同接驳站的功能
2025-04-08 10:29:29 +08:00
黄焱
80f259651c
Accept Merge Request #1986 : (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/1986?initial=true
2025-04-02 09:05:31 +08:00
hyyy
1c57ee0be1
修复没加引号字段
2025-04-02 09:04:38 +08:00
黄焱
c732bbad62
Accept Merge Request #1984 : (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/1984?initial=true
2025-04-02 08:54:03 +08:00
马广威
5285fcd066
Accept Merge Request #1985 : (feature/制造功能优化 -> develop)
...
Merge Request: 零件名称调为可写
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1985?initial=true
2025-04-02 08:50:06 +08:00
mgw
d318d8cb32
零件名称调为可写
2025-04-02 08:49:24 +08:00
hyyy
5b9dc05653
还原代码
2025-04-02 08:48:27 +08:00
hyyy
a513592b21
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/前端样式修改
2025-04-02 08:36:23 +08:00
胡尧
e686ea9469
Accept Merge Request #1983 : (feature/commercially_launched -> develop)
...
Merge Request: Merge branch 'develop' into feature/commercially_launched
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1983
2025-04-01 20:45:15 +08:00
胡尧
651918c51c
Merge branch 'develop' into feature/commercially_launched
2025-04-01 20:42:36 +08:00
胡尧
7b13dfcc0e
Accept Merge Request #1982 : (feature/tool_standard_library_process -> develop)
...
Merge Request: 采购申请添加字段的翻译
Created By: @廖丹龙
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1982
2025-04-01 20:32:39 +08:00
liaodanlong
60e139d5e0
采购申请添加字段的翻译
2025-04-01 16:59:40 +08:00
胡尧
8d5ea0ae19
去掉采购申请不同补货组不能合并的检查
2025-04-01 11:07:08 +08:00
胡尧
d7597359ba
处理多个表面工艺,确认供货路线报错的问题
2025-03-31 16:50:50 +08:00
胡尧
f8309bfaba
Merge branch 'develop' into feature/commercially_launched
2025-03-31 16:07:11 +08:00
胡尧
7ed756f922
修改报错翻译
2025-03-31 16:06:50 +08:00
禹翔辉
e837b84a50
Accept Merge Request #1981 : (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/1981
2025-03-31 15:57:51 +08:00
yuxianghui
e7cb100ab1
1、优化调拨单验证方法;2、隐藏请购明细列表视图字段
2025-03-31 15:55:37 +08:00
mgw
d00c9dd38c
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched
2025-03-31 13:02:30 +08:00
胡尧
1d857be16a
修改获取编程文件根目录
2025-03-31 09:28:30 +08:00
马广威
5914e4ca6e
Accept Merge Request #1980 : (feature/制造功能优化 -> develop)
...
Merge Request: 调整字段显隐
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1980?initial=true
2025-03-31 09:12:35 +08:00
mgw
d96970fb96
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2025-03-31 09:11:44 +08:00
mgw
0af9064fce
调整字段显隐
2025-03-31 09:11:21 +08:00
胡尧
21148ae74b
屏蔽sf获取编程文件的逻辑
2025-03-31 09:06:36 +08:00
胡尧
1a3590b6b6
屏蔽物流下单的按钮
2025-03-30 15:03:18 +08:00
胡尧
b55c6c1fe7
修改前置三元检测文件根目录
2025-03-30 11:16:40 +08:00
mgw
8c61dcac29
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched
2025-03-28 14:25:58 +08:00
马广威
41d4e9785f
Accept Merge Request #1979 : (feature/制造功能优化 -> develop)
...
Merge Request: 调整页脚布局
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1979?initial=true
2025-03-28 14:24:14 +08:00
mgw
5bf86930e9
调整页脚布局
2025-03-28 14:23:41 +08:00
mgw
7ad9885377
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched
2025-03-28 14:05:29 +08:00
mgw
71433c18b7
Merge branch 'feature/commercially_launched' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched
2025-03-28 14:03:21 +08:00
马广威
4b60ad307b
Accept Merge Request #1978 : (feature/制造功能优化 -> develop)
...
Merge Request: Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1978?initial=true
2025-03-28 14:02:11 +08:00
mgw
1a5c8e5f56
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2025-03-28 14:01:17 +08:00
mgw
8b1e12eb9f
质检报告优化
2025-03-28 14:00:55 +08:00
胡尧
dbf2257a88
Merge branch 'feature/commercially_launched' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched
2025-03-28 13:37:37 +08:00
胡尧
f34c01d1b0
解决表面工艺外协调拨单验证报错的问题
2025-03-28 13:37:29 +08:00
廖丹龙
9c73062593
Accept Merge Request #1977 : (feature/tool_standard_library_process -> develop)
...
Merge Request: 产品加工面部代码还原
Created By: @廖丹龙
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1977?initial=true
2025-03-28 10:10:56 +08:00
liaodanlong
878fef18df
产品加工面部代码还原
2025-03-28 10:03:41 +08:00
liaodanlong
8348c4fc48
Merge branch 'refs/heads/develop' into feature/commercially_launched
2025-03-27 16:42:22 +08:00
廖丹龙
8643fb2385
Accept Merge Request #1976 : (feature/tool_standard_library_process -> develop)
...
Merge Request: 子制造订单零件图号零件名称问题
Created By: @廖丹龙
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1976
2025-03-27 16:41:19 +08:00
liaodanlong
77744e75d7
子制造订单零件图号零件名称问题
2025-03-27 16:38:57 +08:00
胡尧
4cbcf08da8
销售单默认筛选供货方式待确认
2025-03-27 16:10:07 +08:00
mgw
af2a589679
添加翻译文件
2025-03-27 15:59:39 +08:00
胡尧
4b6f04aa9d
修改字段显示位置
2025-03-27 15:51:16 +08:00
廖丹龙
4634d43012
Accept Merge Request #1975 : (feature/tool_standard_library_process -> develop)
...
Merge Request: 调试信息
Created By: @廖丹龙
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1975
2025-03-27 15:23:00 +08:00
liaodanlong
dd6e8b6707
调试信息
2025-03-27 15:21:15 +08:00
mgw
55337815c7
修改dashboard当日完成数据计算逻辑
2025-03-27 10:42:20 +08:00
廖丹龙
0ccb7cb3d1
Accept Merge Request #1974 : (feature/tool_standard_library_process -> develop)
...
Merge Request: 子制造订单零件图号与零件名称获取方式修改
Created By: @廖丹龙
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1974
2025-03-26 17:24:40 +08:00
liaodanlong
d2155b17b4
Merge branch 'refs/heads/develop' into feature/tool_standard_library_process
...
# Conflicts:
# sf_manufacturing/models/product_template.py
2025-03-26 17:01:13 +08:00
liaodanlong
11a5217430
子制造订单零件图号与零件名称获取方式修改
2025-03-26 16:57:47 +08:00
管欢
855e0eb1c2
Accept Merge Request #1973 : (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/1973
2025-03-26 14:50:07 +08:00
guanhuan
6a70f3b88a
坯料冗余新增描述字段
2025-03-26 14:32:53 +08:00
guanhuan
236158d556
调拨单零件图号信息搜索
2025-03-26 13:35:28 +08:00
胡尧
1a67c5d1e3
Accept Merge Request #1971 : (feature/mrp_bug_fixed -> develop)
...
Merge Request: 采购申请审批完成后状态变更
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1971?initial=true
2025-03-26 09:10:19 +08:00
胡尧
bdb8763fea
采购申请审批完成后状态变更
2025-03-26 09:07:01 +08:00
胡尧
78ed512699
Accept Merge Request #1970 : (feature/mrp_bug_fixed -> develop)
...
Merge Request: 解决供货路线选择报错,采购申请审批状态编程已审批
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1970?initial=true
2025-03-26 08:44:19 +08:00
胡尧
2e74c76e07
解决供货路线选择报错,采购申请审批状态编程已审批
2025-03-26 08:43:18 +08:00
胡尧
40dcd11da8
解决供货路线选择报错
2025-03-26 08:42:08 +08:00
胡尧
f9b40be428
Accept Merge Request #1969 : (feature/mrp_bug_fixed -> develop)
...
Merge Request: 采购申请跳转到采购单,不默认筛选询价单
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1969?initial=true
2025-03-25 17:10:17 +08:00
胡尧
4ca655ad51
采购申请跳转到采购单,不默认筛选询价单
2025-03-25 17:09:22 +08:00
胡尧
a2ed102895
Accept Merge Request #1968 : (feature/mrp_bug_fixed -> develop)
...
Merge Request: 询价单行项目价格判断
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1968?initial=true
2025-03-25 16:27:55 +08:00
胡尧
8ec746858c
询价单行项目价格判断
2025-03-25 16:25:05 +08:00
胡尧
03539c7ed3
询价单行项目价格判断
2025-03-25 16:20:54 +08:00
胡尧
4d38a11c3c
修改询价单判断行项目价格不能为0
2025-03-25 15:58:24 +08:00
mgw
6312bb988a
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched
2025-03-25 15:04:15 +08:00
马广威
2b082a0dd7
Accept Merge Request #1967 : (feature/制造功能优化 -> develop)
...
Merge Request: 调整报告样式;调整样式
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1967?initial=true
2025-03-25 15:03:12 +08:00
mgw
3e9a11dd7b
调整样式
2025-03-25 15:02:26 +08:00
mgw
f011c1efda
调整报告样式
2025-03-25 15:00:18 +08:00
mgw
fe9548a0d1
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched
2025-03-25 14:08:06 +08:00
马广威
ac2d81285e
Accept Merge Request #1966 : (feature/制造功能优化 -> develop)
...
Merge Request: 补充下载链接
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1966?initial=true
2025-03-25 14:06:49 +08:00
mgw
73ae2cd5c3
补充下载链接
2025-03-25 14:06:23 +08:00
胡尧
0347eb48e4
销售订单行增加交期字段,销售订单列表默认值修改为供货方式待确认
2025-03-25 13:48:17 +08:00
mgw
0aae15cbce
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched
2025-03-25 13:32:55 +08:00
禹翔辉
d888be06c4
Accept Merge Request #1965 : (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/1965
2025-03-25 13:29:48 +08:00
yuxianghui
2275f7a384
制造订单详情页添加对应采购申请跳转链接
2025-03-25 13:28:31 +08:00
mgw
5a7d70fb6b
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched
2025-03-25 13:27:51 +08:00
马广威
1256f5ecb5
Accept Merge Request #1964 : (feature/制造功能优化 -> develop)
...
Merge Request: 修改报告二维码指向
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1964?initial=true
2025-03-25 13:26:49 +08:00
mgw
4dfac9e96f
修改报告二维码指向
2025-03-25 13:26:12 +08:00
mgw
8ea8bf1f48
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched
2025-03-25 10:40:48 +08:00
马广威
29f143a547
Accept Merge Request #1963 : (feature/制造功能优化 -> develop)
...
Merge Request: 恢复旧报告名称字段
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1963?initial=true
2025-03-25 10:39:48 +08:00
mgw
2eaf8aef8f
恢复旧报告名称字段
2025-03-25 10:39:24 +08:00
liaodanlong
df78019226
Merge remote-tracking branch 'origin/feature/commercially_launched' into feature/commercially_launched
2025-03-25 10:39:22 +08:00
liaodanlong
6ad945b720
产品加工面板空值处理
2025-03-25 10:39:02 +08:00
mgw
3285d4da57
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched
2025-03-25 10:35:00 +08:00
马广威
8d1466485a
Accept Merge Request #1962 : (feature/制造功能优化 -> develop)
...
Merge Request: 调整报告编号
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1962?initial=true
2025-03-25 10:33:14 +08:00
mgw
b39281d057
调整报告编号
2025-03-25 10:32:12 +08:00
liaodanlong
60539462a0
报错处理
2025-03-25 10:02:39 +08:00
mgw
fd9018a4c8
调整完成逻辑取值
2025-03-25 09:56:40 +08:00
liaodanlong
81b425ae0c
调拨单零件图号零件名称处理
2025-03-24 17:28:16 +08:00
mgw
f8e8615dc8
适配索引
2025-03-24 17:25:23 +08:00
mgw
2b2da79e33
调整筛选逻辑
2025-03-24 17:18:19 +08:00
马广威
01ac8a19b6
Accept Merge Request #1961 : (feature/制造功能优化 -> develop)
...
Merge Request: 优化数采查询代码
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1961?initial=true
2025-03-24 16:51:02 +08:00
mgw
20a8ca6146
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2025-03-24 16:50:20 +08:00
mgw
62cd60ec06
优化数采查询代码
2025-03-24 16:49:49 +08:00
liaodanlong
33fabc068a
报错处理
2025-03-24 16:06:11 +08:00
liaodanlong
db4dd33709
报错处理
2025-03-24 15:54:59 +08:00
liaodanlong
4acb0fa0ba
Merge branch 'refs/heads/develop' into feature/commercially_launched
2025-03-24 15:39:26 +08:00
廖丹龙
c9ba3a07bf
Accept Merge Request #1960 : (feature/tool_standard_library_process -> develop)
...
Merge Request: 日志修改
Created By: @廖丹龙
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1960
2025-03-24 15:38:07 +08:00
liaodanlong
89a2260adc
日志修改
2025-03-24 15:16:55 +08:00
胡尧
c5ad94c5f3
Merge branch 'develop' into feature/commercially_launched
2025-03-24 14:56:16 +08:00
廖丹龙
02e0a792d4
Accept Merge Request #1959 : (feature/tool_standard_library_process -> develop)
...
Merge Request: 调拨单零件图号零件名称计算逻辑 错误处理
Created By: @廖丹龙
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1959
2025-03-24 14:55:24 +08:00
liaodanlong
e6d54a3eba
调拨单零件图号零件名称计算逻辑 错误处理
2025-03-24 14:53:33 +08:00
胡尧
43c6686240
Merge branch 'develop' into feature/commercially_launched
2025-03-24 14:29:47 +08:00
廖丹龙
9b73ae26e8
Accept Merge Request #1958 : (feature/tool_standard_library_process -> develop)
...
Merge Request: 过滤错误
Created By: @廖丹龙
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1958
2025-03-24 14:28:44 +08:00
liaodanlong
a0606842e5
过滤错误
2025-03-24 14:26:53 +08:00
liaodanlong
d014ba980b
过滤错误
2025-03-24 14:25:19 +08:00
mgw
5c35eae859
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched
2025-03-24 14:03:21 +08:00
马广威
9df76253de
Accept Merge Request #1957 : (feature/制造功能优化 -> develop)
...
Merge Request: 恢复按钮控制
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1957?initial=true
2025-03-24 14:02:16 +08:00
mgw
8ba71ea8af
恢复按钮控制
2025-03-24 14:01:35 +08:00
mgw
fde28bed8a
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched
2025-03-24 13:54:14 +08:00
马广威
8fed12f7bb
Accept Merge Request #1956 : (feature/制造功能优化 -> develop)
...
Merge Request: 调整按钮显隐逻辑
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1956?initial=true
2025-03-24 13:52:46 +08:00
mgw
489d7030f4
调整按钮显隐逻辑
2025-03-24 13:52:08 +08:00
mgw
16ae845ad9
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched
2025-03-24 13:41:39 +08:00
马广威
2c1d90ae63
Accept Merge Request #1955 : (feature/制造功能优化 -> develop)
...
Merge Request: Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1955?initial=true
2025-03-24 13:40:20 +08:00
mgw
8e21434fba
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2025-03-24 13:39:46 +08:00
mgw
956cefbd9f
调整按钮显隐
2025-03-24 13:39:19 +08:00
mgw
85789d137b
修复线上pdf版本报告变形
2025-03-24 13:35:43 +08:00
禹翔辉
6e731cfadc
Accept Merge Request #1954 : (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/1954
2025-03-24 13:17:57 +08:00
yuxianghui
f51f8bebb2
新增按规格生成的采购申请订单跳过审核环节自动更新为已批准状态
2025-03-24 13:16:02 +08:00
胡尧
e10648ad07
Merge branch 'develop' into feature/commercially_launched
2025-03-24 11:13:48 +08:00
胡尧
2bd18def8f
Accept Merge Request #1953 : (feature/mrp_bug_fixed -> develop)
...
Merge Request: 修改采购单需要审批提醒的方式
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1953?initial=true
2025-03-24 11:13:10 +08:00
胡尧
61b2b05367
修改采购单需要审批提醒的方式
2025-03-24 11:11:50 +08:00
mgw
d2b02bb6f7
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched
2025-03-24 11:03:07 +08:00
马广威
e7b4f51736
Accept Merge Request #1952 : (feature/制造功能优化 -> develop)
...
Merge Request: 调整报告样式
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1952
2025-03-24 11:02:08 +08:00
mgw
8832b01408
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2025-03-24 11:01:11 +08:00
mgw
a5c5b499f1
调整报告样式
2025-03-24 11:00:49 +08:00
胡尧
0e1c44c3ac
Merge branch 'develop' into feature/commercially_launched
2025-03-24 09:56:19 +08:00
胡尧
4212ed763b
Accept Merge Request #1951 : (feature/mrp_bug_fixed -> develop)
...
Merge Request: 取消物流单屏蔽
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1951?initial=true
2025-03-24 09:54:48 +08:00
胡尧
a6ac46617d
取消物流单屏蔽
2025-03-24 09:54:04 +08:00
胡尧
43ba241b42
增加采购申请翻译
2025-03-24 09:51:05 +08:00
胡尧
5ffbe4c6fc
Merge branch 'feature/commercially_launched' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched
2025-03-24 09:00:22 +08:00
胡尧
5ae167c133
去掉取消自动加工原因
2025-03-24 09:00:16 +08:00
mgw
0702e1dd51
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched
2025-03-21 18:26:58 +08:00
马广威
d9d434d994
Accept Merge Request #1950 : (feature/制造功能优化 -> develop)
...
Merge Request: 调整报告样式
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1950?initial=true
2025-03-21 18:26:18 +08:00
mgw
08fa26d9c8
调整报告样式
2025-03-21 18:25:20 +08:00
mgw
e861897527
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched
2025-03-21 18:18:29 +08:00
马广威
4ba3a56794
Accept Merge Request #1949 : (feature/制造功能优化 -> develop)
...
Merge Request: 增加已批准为无异动
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1949?initial=true
2025-03-21 18:17:32 +08:00
mgw
4c995d00d0
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2025-03-21 18:16:18 +08:00
mgw
30b01b6e2c
增加已批准为无异动
2025-03-21 18:15:37 +08:00
胡尧
19a66d2c81
屏蔽物流下单按钮
2025-03-21 16:44:49 +08:00
禹翔辉
b2b9120577
Accept Merge Request #1948 : (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/1948
2025-03-21 16:14:32 +08:00
yuxianghui
ad8f63570d
请购明细添加供货方式搜索
2025-03-21 16:10:30 +08:00
胡尧
3bb909c2ee
Merge branch 'develop' into feature/commercially_launched
2025-03-21 15:39:56 +08:00
禹翔辉
e8b22cedea
Accept Merge Request #1947 : (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/1947
2025-03-21 15:39:00 +08:00
yuxianghui
d202e7ee93
零件名称字段计算方法修改
2025-03-21 15:37:10 +08:00
胡尧
da19b86bf5
Merge branch 'develop' into feature/commercially_launched
2025-03-21 15:29:49 +08:00
胡尧
2876d56803
Accept Merge Request #1946 : (feature/mrp_bug_fixed -> develop)
...
Merge Request: 销售订单自动确认
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1946?initial=true
2025-03-21 15:29:22 +08:00
胡尧
e1fd4c465e
销售订单自动确认
2025-03-21 15:27:11 +08:00
胡尧
dc318769af
Merge branch 'develop' into feature/commercially_launched
2025-03-21 15:13:28 +08:00
禹翔辉
31820dfef1
Accept Merge Request #1945 : (feature/采购申请字段调整 -> develop)
...
Merge Request: Merge branch 'feature/采购申请代码搬迁' into feature/采购申请字段调整
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1945
2025-03-21 15:07:48 +08:00
yuxianghui
1cb46bb1e1
Merge branch 'feature/采购申请代码搬迁' into feature/采购申请字段调整
2025-03-21 15:06:29 +08:00
yuxianghui
80e9085e29
采购申请字段调整
2025-03-21 15:05:42 +08:00
mgw
311b95bca5
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched
2025-03-21 13:18:22 +08:00
马广威
d1f8bdb1f4
Accept Merge Request #1944 : (feature/制造功能优化 -> develop)
...
Merge Request: 调整原有质检单图纸获取逻辑
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1944
2025-03-21 13:17:11 +08:00
mgw
08267ba1e6
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2025-03-21 13:16:18 +08:00
mgw
c6f1bc80a7
调整原有质检单图纸获取逻辑
2025-03-21 13:15:59 +08:00
廖丹龙
384761514b
Accept Merge Request #1943 : (feature/tool_standard_library_process -> develop)
...
Merge Request: 自加工坯料制造订单的调拨单零件图号零件名称赋值
Created By: @廖丹龙
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1943
2025-03-21 11:34:57 +08:00
胡尧
80118b61c2
Merge branch 'develop' into feature/commercially_launched
2025-03-21 11:24:02 +08:00
禹翔辉
eab3ba9478
Accept Merge Request #1942 : (feature/采购申请代码搬迁 -> develop)
...
Merge Request: Merge branch 'feature/采购单优化' into feature/采购申请代码搬迁
Created By: @禹翔辉
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1942
2025-03-21 11:23:27 +08:00
yuxianghui
c2be45f204
Merge branch 'feature/采购单优化' into feature/采购申请代码搬迁
2025-03-21 11:21:08 +08:00
yuxianghui
86d2fb1ac2
efms-purchase_request模块新增修改代码搬迁到sf-jikimo_purchase_request模块
2025-03-21 11:20:24 +08:00
禹翔辉
f28d07e58f
Accept Merge Request #1941 : (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/1941
2025-03-20 17:03:28 +08:00
yuxianghui
7124eebabe
采购单采购类型计算方法添加新判断条件
2025-03-20 17:01:36 +08:00
mgw
94d0c14e1f
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched
2025-03-20 16:23:01 +08:00
马广威
9f3791bd6b
Accept Merge Request #1940 : (feature/制造功能优化 -> develop)
...
Merge Request: sf-坯料的获取方式是自加工,生成的坯料制造订单的排程单不在取消列表中
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1940?initial=true
2025-03-20 16:21:05 +08:00
mgw
ae1028972c
sf-坯料的获取方式是自加工,生成的坯料制造订单的排程单不在取消列表中
2025-03-20 16:19:55 +08:00
mgw
3f6f9bb709
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched
2025-03-20 15:44:11 +08:00
马广威
b86d15c5cb
Accept Merge Request #1939 : (feature/制造功能优化 -> develop)
...
Merge Request: Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1939?initial=true
2025-03-20 15:43:17 +08:00
mgw
52e68ffa4c
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2025-03-20 15:41:49 +08:00
mgw
f85f614190
质检标准类型是出厂检验报告时可以更换控制方式-需要增加校验
2025-03-20 15:41:10 +08:00
禹翔辉
2da22d5f19
Accept Merge Request #1938 : (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/1938
2025-03-20 15:37:55 +08:00
mgw
98644a4b57
调整加工订单匹配条件
2025-03-20 15:34:17 +08:00
yuxianghui
6c879e4af3
1、新增由销售单生成的采购申请自动确认;2、销售单新增【采购申请】跳转按钮
2025-03-20 15:20:05 +08:00
liaodanlong
cf060d0d6c
自加工坯料制造订单的调拨单零件图号零件名称赋值
2025-03-20 10:24:34 +08:00
mgw
49a1ec353a
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched
2025-03-20 08:49:47 +08:00
马广威
134c68abc8
Accept Merge Request #1937 : (feature/制造功能优化 -> develop)
...
Merge Request: 取消发布增加二次确认;发布状态隐藏
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1937?initial=true
2025-03-20 08:48:23 +08:00
mgw
d6a7a3c919
取消发布增加二次确认;发布状态隐藏
2025-03-20 08:45:40 +08:00
mgw
b89cfb899b
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched
2025-03-19 15:44:21 +08:00
马广威
db661e76f5
Accept Merge Request #1935 : (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/1935
2025-03-19 15:43:09 +08:00
mgw
bf8ff7199e
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2025-03-19 15:42:20 +08:00
胡尧
0ff0cc5fbd
Merge branch 'develop' into feature/commercially_launched
2025-03-19 15:41:51 +08:00
廖丹龙
813939a6c2
Accept Merge Request #1936 : (feature/tool_standard_library_process -> develop)
...
Merge Request: 【合金牌号】,【材料应用】字段同步
Created By: @廖丹龙
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1936
2025-03-19 15:41:02 +08:00
liaodanlong
221e25f581
【合金牌号】,【材料应用】字段同步
2025-03-19 15:33:06 +08:00
mgw
e4ed431167
Merge branch 'feature/制造功能优化' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2025-03-19 15:32:07 +08:00
mgw
1a511b93cf
调整名称及总数量逻辑
2025-03-19 15:31:34 +08:00
hyyy
9093770ce1
修改取消列表,修改出厂检验报告
2025-03-19 14:45:04 +08:00
mgw
37173968fd
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched
2025-03-19 13:18:42 +08:00
马广威
a75e236f1f
Accept Merge Request #1934 : (feature/制造功能优化 -> develop)
...
Merge Request: 当调拨单完成后,重新发布才重新写入到加工订单明细
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1934?initial=true
2025-03-19 13:17:50 +08:00
mgw
e1177a44e8
当调拨单完成后,重新发布才重新写入到加工订单明细
2025-03-19 13:17:15 +08:00
mgw
470482b7e2
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched
2025-03-19 13:06:52 +08:00
马广威
27702fe46e
Accept Merge Request #1933 : (feature/制造功能优化 -> develop)
...
Merge Request: 调整检验数边界值
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1933?initial=true
2025-03-19 13:06:02 +08:00
mgw
8c793c6ad9
调整检验数边界值
2025-03-19 13:04:19 +08:00
liaodanlong
0b067f9999
原材料的调拨单缺少零件图号零件名称
2025-03-19 12:59:16 +08:00
mgw
5b51cc3de4
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched
2025-03-19 12:55:23 +08:00
马广威
625188d46d
Accept Merge Request #1932 : (feature/制造功能优化 -> develop)
...
Merge Request: 修改取消明细状态
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1932?initial=true
2025-03-19 12:54:18 +08:00
mgw
6178ad0f8e
修改取消明细状态
2025-03-19 12:53:40 +08:00
mgw
9e939467e5
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched
2025-03-19 11:35:27 +08:00
马广威
6c89a2c4fb
Accept Merge Request #1931 : (feature/制造功能优化 -> develop)
...
Merge Request: 调整名称
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1931?initial=true
2025-03-19 11:34:38 +08:00
mgw
dc5e70c118
调整名称
2025-03-19 11:33:59 +08:00
mgw
b05492615f
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched
2025-03-19 11:23:49 +08:00
马广威
03d6f9a32e
Accept Merge Request #1930 : (feature/制造功能优化 -> develop)
...
Merge Request: 调整字段名
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1930?initial=true
2025-03-19 11:22:21 +08:00
mgw
8634c1fc40
调整字段名
2025-03-19 11:21:28 +08:00
mgw
32ed0e9693
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched
2025-03-19 11:18:28 +08:00
马广威
e1c535f907
Accept Merge Request #1929 : (feature/制造功能优化 -> develop)
...
Merge Request: 增加包名映射
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1929
2025-03-19 11:17:38 +08:00
mgw
a556c21196
增加包名映射
2025-03-19 11:16:36 +08:00
mgw
623ebe3ec3
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched
2025-03-19 11:09:16 +08:00
马广威
b1821d3ed6
Accept Merge Request #1928 : (feature/制造功能优化 -> develop)
...
Merge Request: state字段添加ondelete策略
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1928?initial=true
2025-03-19 11:08:34 +08:00
mgw
a8d8bcbcee
state字段添加ondelete策略
2025-03-19 11:07:49 +08:00
mgw
da06688571
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched
2025-03-19 11:02:40 +08:00
马广威
e7d8587a32
Accept Merge Request #1927 : (feature/制造功能优化 -> develop)
...
Merge Request: 取消列表增加采购申请明细
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1927?initial=true
2025-03-19 11:01:51 +08:00
mgw
b53ea2e0e9
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2025-03-19 11:01:21 +08:00
mgw
5b979ffc34
取消列表增加采购申请明细
2025-03-19 11:00:48 +08:00
mgw
c01451336d
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched
2025-03-19 10:24:26 +08:00
马广威
e5fc3dfe62
Accept Merge Request #1926 : (feature/制造功能优化 -> develop)
...
Merge Request: 判断文件是否上传
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1926?initial=true
2025-03-19 10:23:38 +08:00
mgw
08cd1a176b
判断文件是否上传
2025-03-19 10:22:44 +08:00
mgw
2db5068e85
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched
2025-03-19 10:06:52 +08:00
马广威
bab21d7b76
Accept Merge Request #1925 : (feature/制造功能优化 -> develop)
...
Merge Request: 出厂检验报告bug修改
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1925?initial=true
2025-03-19 10:05:59 +08:00
mgw
6bdaad8718
出厂检验报告上传模板后-没有自动新增有数值的列
2025-03-19 10:03:59 +08:00
mgw
94441422cd
出厂检验报告已经发布-还可以编辑页面内容-发布后要禁掉编辑功能
2025-03-19 09:43:23 +08:00
mgw
5f48dad86c
发料出库单质检弹窗发布前校验
2025-03-19 08:44:23 +08:00
mgw
c955953335
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched
2025-03-18 16:51:19 +08:00
马广威
f5bf727b34
Accept Merge Request #1924 : (feature/制造功能优化 -> develop)
...
Merge Request: 修正问题
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1924?initial=true
2025-03-18 16:50:35 +08:00
mgw
c55231555c
修正问题
2025-03-18 16:49:50 +08:00
mgw
9220c4b7c4
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched
2025-03-18 16:42:51 +08:00
马广威
e4606ece75
Accept Merge Request #1923 : (feature/制造功能优化 -> develop)
...
Merge Request: 修正数据类型转换
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1923
2025-03-18 16:42:14 +08:00
mgw
972c06cdc1
修正数据类型转换
2025-03-18 16:41:35 +08:00
mgw
70b21c607e
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched
2025-03-18 16:31:48 +08:00
马广威
f8bfb7ba40
Accept Merge Request #1922 : (feature/制造功能优化 -> develop)
...
Merge Request: 调整报告逻辑
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1922
2025-03-18 16:29:24 +08:00
mgw
b2c3694a23
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2025-03-18 16:28:33 +08:00
mgw
be0df6e66b
调整报告逻辑
2025-03-18 16:26:39 +08:00
mgw
242f9c9050
总数量问题
2025-03-18 15:58:05 +08:00
胡尧
4fe7300ec0
Merge branch 'develop' into feature/commercially_launched
2025-03-18 15:56:19 +08:00
廖丹龙
307bfa19f2
Accept Merge Request #1921 : (feature/tool_standard_library_process -> develop)
...
Merge Request: 材料型号同步添加材料代号
Created By: @廖丹龙
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1921
2025-03-18 15:55:27 +08:00
liaodanlong
83b051e0b9
材料型号同步添加材料代号
2025-03-18 15:51:56 +08:00
liaodanlong
5bbcd8ec23
材料型号同步添加材料代号
2025-03-18 15:46:22 +08:00
mgw
282458c945
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched
2025-03-18 13:45:19 +08:00
马广威
b211ffdff9
Accept Merge Request #1920 : (feature/制造功能优化 -> develop)
...
Merge Request: 修改模板样式
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1920?initial=true
2025-03-18 13:44:28 +08:00
mgw
cb445393ce
Merge branch 'feature/制造功能优化' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2025-03-18 13:43:36 +08:00
hyyy
25ba61607f
修改模板样式
2025-03-18 13:42:42 +08:00
胡尧
f6e87493d3
Merge branch 'develop' into feature/commercially_launched
2025-03-18 11:28:23 +08:00
廖丹龙
8c4c65a00f
Accept Merge Request #1919 : (feature/tool_standard_library_process -> develop)
...
Merge Request: 表面工艺零件图号没有问题
Created By: @廖丹龙
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1919
2025-03-18 11:27:43 +08:00
liaodanlong
3642398724
表面工艺零件图号没有问题
2025-03-18 11:25:46 +08:00
禹翔辉
23bcf13d95
Accept Merge Request #1918 : (feature/质检弹窗优化_2 -> 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/1918
2025-03-18 11:22:47 +08:00
yuxianghui
6b78cb72b3
1、质检弹窗和数量应用弹窗顺序调整
2025-03-18 11:21:56 +08:00
马广威
fde508c563
Accept Merge Request #1917 : (feature/制造功能优化 -> develop)
...
Merge Request: Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1917?initial=true
2025-03-18 11:05:13 +08:00
mgw
b65682f5c9
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2025-03-18 11:04:36 +08:00
mgw
bfe9c51d57
处理质检可能存在多个出厂检验报告问题
2025-03-18 11:04:19 +08:00
禹翔辉
e0015f9d6b
Accept Merge Request #1916 : (feature/质检弹窗优化_1 -> develop)
...
Merge Request: Merge branch 'feature/质检弹窗优化' into feature/质检弹窗优化_1
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1916
2025-03-18 10:54:35 +08:00
yuxianghui
24166c2e71
Merge branch 'feature/质检弹窗优化' into feature/质检弹窗优化_1
2025-03-18 10:53:29 +08:00
yuxianghui
8fb90c1c35
调拨验证提示数据信息优化
2025-03-18 10:52:34 +08:00
mgw
e141f0af2c
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched
2025-03-18 10:41:01 +08:00
马广威
f8b5871912
Accept Merge Request #1915 : (feature/制造功能优化 -> develop)
...
Merge Request: 修复模板不能下载问题
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1915?initial=true
2025-03-18 10:40:19 +08:00
mgw
40a7c14b81
修复模板不能下载问题
2025-03-18 10:39:52 +08:00
mgw
4618c83b2f
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched
2025-03-18 09:45:00 +08:00
马广威
dee616fbef
Accept Merge Request #1914 : (feature/制造功能优化 -> develop)
...
Merge Request: 修复按钮规则;修复排程单取消
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1914?initial=true
2025-03-18 09:44:20 +08:00
mgw
a2868a2581
修复按钮规则;修复排程单取消
2025-03-18 09:43:48 +08:00
mgw
e89400f04e
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched
2025-03-18 09:18:47 +08:00
禹翔辉
5e5c7e5512
Accept Merge Request #1913 : (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/1913
2025-03-17 17:31:43 +08:00
yuxianghui
117d90bd5c
质量检查弹出框顺序修改
2025-03-17 17:30:42 +08:00
廖丹龙
fb19a19b25
Accept Merge Request #1912 : (feature/tool_standard_library_process -> develop)
...
Merge Request: 零件图号零件名称无数据 问题修复
Created By: @廖丹龙
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1912
2025-03-17 16:50:52 +08:00
liaodanlong
1311669814
材料型号同步修改时赋予默认值
2025-03-17 16:39:49 +08:00
liaodanlong
8347a8b029
零件图号零件名称无数据 问题修复
2025-03-17 16:05:42 +08:00
胡尧
051f8128e9
Merge branch 'develop' into feature/commercially_launched
2025-03-17 15:05:47 +08:00
马广威
2cdad0cec4
Accept Merge Request #1911 : (feature/制造功能优化 -> develop)
...
Merge Request: 恢复报告
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1911
2025-03-17 15:03:48 +08:00
mgw
7df5bea5b1
恢复报告
2025-03-17 15:03:17 +08:00
马广威
40965af4c0
Accept Merge Request #1910 : (feature/制造功能优化 -> develop)
...
Merge Request: 暂时不加载报告
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1910?initial=true
2025-03-17 14:26:09 +08:00
mgw
21876f4b9d
暂时不加载报告
2025-03-17 14:25:40 +08:00
马广威
5a8df0a1ae
Accept Merge Request #1909 : (feature/制造功能优化 -> develop)
...
Merge Request: 暂时屏蔽工厂名称
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1909?initial=true
2025-03-17 14:18:43 +08:00
mgw
d280d2b776
暂时屏蔽工厂名称
2025-03-17 14:18:07 +08:00
禹翔辉
323a204a48
Accept Merge Request #1907 : (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/1907
2025-03-17 13:52:58 +08:00
禹翔辉
3ce7f1771a
Merge branch refs/heads/develop into refs/heads/feature/质量检查弹出框优化
2025-03-17 13:52:03 +08:00
马广威
e1dc2bde7e
Accept Merge Request #1908 : (feature/制造功能优化 -> develop)
...
Merge Request: 出厂检验报告
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1908?initial=true
2025-03-17 13:49:25 +08:00
mgw
495f1962df
恢复流程控制
2025-03-17 13:47:56 +08:00
mgw
221eb7c3a1
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
...
# Conflicts:
# quality_control/security/ir.model.access.csv
# quality_control/wizard/quality_check_wizard.py
# sf_quality/__manifest__.py
# sf_quality/models/__init__.py
# sf_quality/models/stock.py
2025-03-17 13:46:40 +08:00
mgw
af529d21ec
调整报告公开可访问
2025-03-17 13:39:59 +08:00
liaodanlong
0a1b48ed93
零件图号零件名称数据填充
2025-03-17 11:26:42 +08:00
mgw
db881ac594
调整报告格式
2025-03-17 11:26:29 +08:00
mgw
61776ca6a3
完善出厂报告需求功能
2025-03-17 11:14:20 +08:00
yuxianghui
6da31b4f48
质量检查弹出框顺序修改
2025-03-17 10:54:18 +08:00
mgw
84f74ae09f
出库单写入报告到bfm
2025-03-17 09:34:47 +08:00
mgw
561b515242
调整数据类型
2025-03-17 09:12:44 +08:00
mgw
71e79502f9
增加报告写入bfm方法
2025-03-14 19:59:13 +08:00
mgw
67f3c29af3
调整二维码内容
2025-03-14 17:58:22 +08:00
mgw
5d703b8b73
缓存报告附件,并清理旧附件
2025-03-14 17:44:57 +08:00
胡尧
8f61f258b1
解决冲突
2025-03-14 16:08:37 +08:00
胡尧
a864845d2b
解决销售订单form中,tree内显示模型的问题
2025-03-14 16:06:33 +08:00
mgw
7755cc3982
优化接口;质量检查wizard添加发布按钮
2025-03-14 15:45:45 +08:00
管欢
34565c5d79
Accept Merge Request #1906 : (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/1906
2025-03-14 15:43:18 +08:00
mgw
0f537a3158
增加文件下载功能
2025-03-14 14:54:13 +08:00
mgw
7f99b4ba8b
记录历史报告名字、增加状态修改
2025-03-14 14:22:25 +08:00
mgw
4138903bff
调整向导提示语逻辑
2025-03-14 14:02:14 +08:00
mgw
4200fdbf3b
限制可上传文件类型
2025-03-14 13:52:54 +08:00
胡尧
a6a2e53111
Merge branch 'develop' into feature/commercially_launched
2025-03-14 13:52:18 +08:00
mgw
214f45850e
增加对新增删除行的控制
2025-03-14 12:58:26 +08:00
mgw
c23aa4de75
调整报告样式
2025-03-14 11:13:50 +08:00
hyyy
f66ff6339d
修改
2025-03-14 10:52:50 +08:00
mgw
f9525beb65
调整发布业务逻辑
2025-03-14 10:44:54 +08:00
mgw
35bcfa6fa1
调整按钮
2025-03-14 09:50:13 +08:00
mgw
7b6dda3d75
重新发布按钮也增加二次确认
2025-03-13 19:17:49 +08:00
mgw
954ff6b848
对发布按钮进行二次确认控制
2025-03-13 19:13:57 +08:00
mgw
af3a2880e8
添加发布前校验数据
2025-03-13 18:55:59 +08:00
mgw
424a496046
调整预览报表model名字
2025-03-13 18:33:26 +08:00
mgw
bd2ba3bb49
添加合格图章
2025-03-13 17:55:13 +08:00
mgw
2d4926f8b7
优化上传逻辑
2025-03-13 17:23:26 +08:00
hyyy
9d84b68525
修改报错问题
2025-03-13 17:21:22 +08:00
guanhuan
3baf3e60e8
修复外协入库单根据图号查询不到
2025-03-13 17:21:05 +08:00
mgw
16dbfc3867
限制测量列数
2025-03-13 17:13:51 +08:00
hyyy
6de31608d1
Merge branch 'feature/制造功能优化' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2025-03-13 17:07:26 +08:00
hyyy
73ce21ef99
优化,修复bug
2025-03-13 17:07:19 +08:00
mgw
c632926348
调整报表展示
2025-03-13 17:07:07 +08:00
禹翔辉
a421055348
Accept Merge Request #1903 : (feature/工单Rfid优化 -> 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/1903
2025-03-13 16:47:39 +08:00
yuxianghui
cd114d183b
处理质检单控制方式为非数量时,调拨单验证时存在不合格质检单的提示信息数量问题
2025-03-13 16:45:09 +08:00
mgw
20efa0bdab
去除重复声明
2025-03-13 16:44:03 +08:00
mgw
839b3c981d
配合前端列数修改
2025-03-13 16:39:10 +08:00
廖丹龙
395db2cf5f
Accept Merge Request #1904 : (feature/tool_standard_library_process -> develop)
...
Merge Request: 删除无用代码
Created By: @廖丹龙
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1904
2025-03-13 16:21:00 +08:00
黄焱
1ca069b149
Accept Merge Request #1905 : (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/1905
2025-03-13 16:14:31 +08:00
mgw
061714413c
Merge branch 'feature/制造功能优化' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2025-03-13 16:13:09 +08:00
mgw
f780d47562
发布相关
2025-03-13 16:12:48 +08:00
hyyy
082e25feae
增加添加删除列
2025-03-13 16:10:43 +08:00
liaodanlong
ef5eea1845
删除无用代码
2025-03-13 15:32:54 +08:00
yuxianghui
359eae14cc
1、完成 制造订单内外协调拨单质量检查不通过,点击跳转质量检查页面报错
2025-03-13 15:32:12 +08:00
廖丹龙
528d63123f
Accept Merge Request #1901 : (feature/tool_standard_library_process -> develop)
...
Merge Request: 表面工艺添加零件图号零件名称
Created By: @廖丹龙
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1901
2025-03-13 15:27:59 +08:00
胡尧
a11329eaf8
Merge branch 'develop' into feature/commercially_launched
2025-03-13 14:51:21 +08:00
胡尧
d571b77915
修改工单新模型显示
2025-03-13 14:50:26 +08:00
禹翔辉
b94adc9704
Accept Merge Request #1902 : (feature/工单Rfid优化 -> develop)
...
Merge Request: Merge branch 'feature/制造工单优化' into feature/工单Rfid优化
Created By: @禹翔辉
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1902
2025-03-13 14:42:06 +08:00
yuxianghui
2568e63712
Merge branch 'feature/制造工单优化' into feature/工单Rfid优化
2025-03-13 14:40:12 +08:00
yuxianghui
7ddcfc6226
1、处理 制造订单内外协调拨单质量检查不通过,点击跳转质量检查页面报错 ;2、处理 工单Rfid绑定解绑是数据不正确问题
2025-03-13 14:39:04 +08:00
liaodanlong
3543531f61
表面工艺添加零件图号零件名称
2025-03-13 14:13:28 +08:00
mgw
04b255d5c6
检测报告发布流程
2025-03-13 14:10:06 +08:00
胡尧
24897f07f8
获取编程单,不传递模型参数
2025-03-13 13:58:13 +08:00
胡尧
53779b89a7
Merge branch 'develop' into feature/commercially_launched
2025-03-13 13:06:26 +08:00
禹翔辉
326dcc8b87
Accept Merge Request #1900 : (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/1900
2025-03-13 13:05:44 +08:00
yuxianghui
9d042dc61e
1、处理调拨单二次验证时其他提示信息窗口直接关闭问题;2、处理特殊途径-制造订单内外协调拨单质量检查不通过,点击跳转质量检查页面报错 问题
2025-03-13 13:02:22 +08:00
胡尧
a1a94867f0
Merge branch 'develop' into feature/commercially_launched
2025-03-13 11:34:17 +08:00
禹翔辉
7ba415968b
Accept Merge Request #1899 : (feature/制造工单优化 -> develop)
...
Merge Request: Merge branch 'feature/功能刀具组装提示优化' into feature/制造工单优化
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1899
2025-03-13 11:13:35 +08:00
yuxianghui
e10483b87b
Merge branch 'feature/功能刀具组装提示优化' into feature/制造工单优化
2025-03-13 11:12:06 +08:00
yuxianghui
83699fcae6
1、修改质检提示翻译;2、处理单据合并原单据数据不全问题;3、处理制造订单返工报错
2025-03-13 11:11:22 +08:00
胡尧
0a666f568d
解决待发货获取不到模型名字的问题
2025-03-13 10:52:14 +08:00
廖丹龙
b2b8762138
Accept Merge Request #1898 : (feature/tool_standard_library_process -> develop)
...
Merge Request: 同一个销售订单的不同产品的坯料获取方式不一样,生成的采购订单问题
Created By: @廖丹龙
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1898
2025-03-13 10:12:56 +08:00
liaodanlong
7c48e6b186
同一个销售订单的不同产品的坯料获取方式不一样,生成的采购订单问题
2025-03-13 09:49:17 +08:00
胡尧
ad8ec770b6
Merge branch 'develop' into feature/commercially_launched
2025-03-13 09:17:33 +08:00
管欢
e87689da33
Accept Merge Request #1896 : (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/1896
2025-03-13 08:48:04 +08:00
胡尧
3cc3c48ab3
Merge branch 'develop' into feature/commercially_launched
2025-03-13 08:47:59 +08:00
禹翔辉
dff0841317
Accept Merge Request #1897 : (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/1897
2025-03-13 08:43:43 +08:00
yuxianghui
0d8445e444
处理工单的Rfid扫码绑定解绑问题
2025-03-13 08:36:10 +08:00
胡尧
f5da36a82c
修改销售订单模型显示
2025-03-12 17:26:19 +08:00
胡尧
da489555b0
去掉多余的字段
2025-03-12 17:17:21 +08:00
胡尧
29337bfceb
调整模型显示
2025-03-12 17:05:29 +08:00
mgw
c6ae4d933c
计算总数量
2025-03-12 14:14:21 +08:00
mgw
d577630657
增加报告相关结构
2025-03-12 14:06:03 +08:00
liaodanlong
5b084624df
不送检的质量检查单状态更新:等待、待处理
2025-03-12 13:46:07 +08:00
mgw
5e51ee8db3
控制字段、page显隐逻辑
2025-03-12 12:43:13 +08:00
mgw
de1bdbe18b
准备前端开发用结构
2025-03-12 09:08:41 +08:00
mgw
78738ed8aa
检查文件上传
2025-03-11 16:19:00 +08:00
yuxianghui
8237d04f32
功能刀具组装扫码验证物料提示信息优化
2025-03-11 16:12:04 +08:00
hyyy
ef0d05a29d
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/前端样式修改
2025-03-11 13:29:19 +08:00
mgw
e6e740a6c7
质量检查优化-界面部分
2025-03-11 12:54:59 +08:00
胡尧
b8bec37e15
Merge branch 'develop' into feature/commercially_launched
2025-03-11 09:06:43 +08:00
禹翔辉
003a115084
Accept Merge Request #1895 : (feature/调拨单优化 -> develop)
...
Merge Request: Merge branch 'feature/工单页签优化_1' into feature/调拨单优化
Created By: @禹翔辉
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1895
2025-03-11 08:59:33 +08:00
yuxianghui
9ca7f75ef7
Merge branch 'feature/工单页签优化_1' into feature/调拨单优化
2025-03-11 08:55:59 +08:00
胡尧
7654a60f2f
Accept Merge Request #1892 : (feature/tool_standard_library_process -> 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/1892#mr-1892-review-228565
2025-03-11 08:55:02 +08:00
mgw
bd43de74dd
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2025-03-10 17:10:46 +08:00
mgw
2cc7386027
质量检查优化
2025-03-10 17:10:27 +08:00
liaodanlong
4a92e39b0d
Merge branch 'refs/heads/develop' into feature/tool_standard_library_process
2025-03-10 16:55:39 +08:00
yuxianghui
34456c3506
完成 验证调拨单时,校验不合格产品,如果存在不合格质检单则给与提示
2025-03-10 16:54:15 +08:00
胡尧
dedc820b50
Merge branch 'develop' into feature/commercially_launched
2025-03-10 16:31:35 +08:00
yuxianghui
dc550d1be5
完成 调拨单取消后,关联取消质量检查单
2025-03-10 15:24:24 +08:00
mgw
1541326dfc
增加排程单取消
2025-03-10 14:56:42 +08:00
guanhuan
0d7f348194
调拨列表采购订单询价单页面优化
2025-03-07 11:29:32 +08:00
胡尧
2ccedc95f2
Merge branch 'feature/mrp_bug_fixed' into feature/commercially_launched
2025-03-06 16:24:36 +08:00
胡尧
307f1b221f
Accept Merge Request #1894 : (feature/mrp_bug_fixed -> develop)
...
Merge Request: 成品,坯料复制模板中的采购申请字段模板
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1894?initial=true
2025-03-06 16:03:14 +08:00
胡尧
674af1d11d
成品,坯料复制模板中的采购申请字段模板
2025-03-06 16:02:19 +08:00
胡尧
b276f616e5
成品供应商默认取模板中最后一个
2025-03-06 14:03:31 +08:00
胡尧
cb645aa1b9
增加自动化产线的零件供货路线初始化为自动化产线加工
2025-03-06 13:59:14 +08:00
guanhuan
e12755783c
审批优化
2025-03-06 13:46:18 +08:00
禹翔辉
1215d62e76
Accept Merge Request #1893 : (feature/工单页签优化_1 -> develop)
...
Merge Request: Merge branch 'feature/工单页签优化' into feature/工单页签优化_1
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1893?initial=true
2025-03-06 13:40:34 +08:00
yuxianghui
00c9ad423c
Merge branch 'feature/工单页签优化' into feature/工单页签优化_1
2025-03-06 13:39:27 +08:00
yuxianghui
826d5b1d58
1、优化工单子页签可全量配置处理方法;
2025-03-06 13:37:52 +08:00
liaodanlong
9a67caca74
Merge branch 'refs/heads/develop' into feature/tool_standard_library_process
2025-03-06 10:44:31 +08:00
liaodanlong
9c5ecdfe76
sf 材料型号页面修改字段信息
2025-03-06 10:25:56 +08:00
hyyy
0a65c29286
取消销售订单的下游清单界面优化
2025-03-05 17:24:42 +08:00
胡尧
2409dab8b0
增加非自动化原因
2025-03-05 14:27:41 +08:00
禹翔辉
f2415ae80d
Accept Merge Request #1891 : (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/1891?initial=true
2025-03-05 11:26:11 +08:00
yuxianghui
7d4314abc7
完成 工单子页签可全量配置
2025-03-05 11:24:48 +08:00
马广威
28a3d52aea
Accept Merge Request #1890 : (feature/制造功能优化 -> develop)
...
Merge Request: 人工建立销售单取第一份bom
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1890?initial=true
2025-03-04 11:42:02 +08:00
mgw
7e93586f69
人工建立销售单取第一份bom
2025-03-04 11:40:39 +08:00
胡尧
e8fc38e6ed
Merge branch 'develop' into feature/commercially_launched
2025-03-04 09:32:07 +08:00
马广威
4bff6e4355
Accept Merge Request #1889 : (release/release_2.9 -> develop)
...
Merge Request: 调整名称与提示语
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1889?initial=true
2025-02-28 17:45:56 +08:00
mgw
98b4c53213
调整名称与提示语
2025-02-28 17:35:32 +08:00
廖丹龙
ec1da84da0
Accept Merge Request #1888 : (feature/tool_standard_library_process -> develop)
...
Merge Request: 制造订单状态为返工时限制表面工艺工单状态
Created By: @廖丹龙
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1888
2025-02-28 16:38:23 +08:00
liaodanlong
4c8cf5caf8
制造订单状态为返工时限制表面工艺工单状态
2025-02-28 16:36:16 +08:00
马广威
aa1517ebce
Accept Merge Request #1887 : (release/release_2.9 -> develop)
...
Merge Request: 取消销售订单时的下游单据清单【大类、单据名称、作业类型】显示错误
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1887?initial=true
2025-02-28 16:06:04 +08:00
mgw
c24f539197
取消销售订单时的下游单据清单【大类、单据名称、作业类型】显示错误
2025-02-28 16:04:49 +08:00
禹翔辉
72620236ab
Accept Merge Request #1886 : (feature/外协优化_1 -> develop)
...
Merge Request: Merge branch 'feature/外协优化' into feature/外协优化_1
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1886
2025-02-28 08:39:01 +08:00
yuxianghui
eb69e20f01
Merge branch 'feature/外协优化' into feature/外协优化_1
2025-02-28 08:37:41 +08:00
yuxianghui
76f9b5ef3e
处理特殊表面工艺外协入库单点击【验证】报错
2025-02-28 08:36:12 +08:00
胡尧
04f697ae7b
Merge branch 'develop' into release/release_2.9
2025-02-27 17:08:59 +08:00
廖丹龙
d5e93b14be
Accept Merge Request #1885 : (feature/tool_standard_library_process -> develop)
...
Merge Request: 隐藏发料出库的批量调拨按钮
Created By: @廖丹龙
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1885
2025-02-27 16:14:24 +08:00
liaodanlong
d4f42abfd8
隐藏发料出库的批量调拨按钮
2025-02-27 16:12:12 +08:00
mgw
07c07ef37c
完善下游单据问题
2025-02-27 16:00:29 +08:00
廖丹龙
8fd536324e
Accept Merge Request #1884 : (feature/tool_standard_library_process -> develop)
...
Merge Request: 隐藏收料入库的批量调拨按钮
Created By: @廖丹龙
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1884
2025-02-27 15:11:21 +08:00
liaodanlong
22c5ee6806
隐藏收料入库的批量调拨按钮
2025-02-27 15:09:57 +08:00
liaodanlong
3bcc673d88
人工线下加工表面工艺逻辑还原
2025-02-27 15:09:14 +08:00
马广威
90a7a025b1
Accept Merge Request #1883 : (feature/制造功能优化 -> develop)
...
Merge Request: 组件制造调拨外置
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1883?initial=true
2025-02-27 14:54:13 +08:00
mgw
95929fa01c
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2025-02-27 14:53:41 +08:00
mgw
19eb6519c0
组件制造调拨外置
2025-02-27 14:53:23 +08:00
马广威
188e1fc553
Accept Merge Request #1882 : (feature/制造功能优化 -> develop)
...
Merge Request: 调整名称等
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1882?initial=true
2025-02-27 14:37:47 +08:00
mgw
197f1f65ea
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2025-02-27 14:37:21 +08:00
mgw
bae6d4d59b
调整名称等
2025-02-27 14:37:03 +08:00
马广威
211e9c58f1
Accept Merge Request #1881 : (feature/制造功能优化 -> develop)
...
Merge Request: 处理空值情况
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1881?initial=true
2025-02-27 14:01:33 +08:00
mgw
46d1c9a83d
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2025-02-27 14:00:58 +08:00
mgw
92adde7909
处理空值情况
2025-02-27 14:00:41 +08:00
廖丹龙
a8f70c82d1
Accept Merge Request #1879 : (feature/tool_standard_library_process -> develop)
...
Merge Request: 人工线下加工表面工艺逻辑修改
Created By: @廖丹龙
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1879
2025-02-27 13:55:33 +08:00
马广威
1efb6be453
Accept Merge Request #1880 : (feature/制造功能优化 -> develop)
...
Merge Request: 统一处理质检单
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1880?initial=true
2025-02-27 13:55:19 +08:00
mgw
b6165e333b
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2025-02-27 13:54:46 +08:00
mgw
ed17444f21
统一处理质检单
2025-02-27 13:54:28 +08:00
liaodanlong
20932f9d51
人工线下加工表面工艺逻辑修改
2025-02-27 13:46:30 +08:00
禹翔辉
43904c0249
Accept Merge Request #1878 : (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/1878?initial=true
2025-02-27 13:14:24 +08:00
yuxianghui
919717ccc5
处理工单外协创建的外协出入库单没有质检单的问题
2025-02-27 13:13:22 +08:00
马广威
a4898297b7
Accept Merge Request #1877 : (feature/制造功能优化 -> develop)
...
Merge Request: Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1877?initial=true
2025-02-27 11:33:19 +08:00
mgw
75bbbaa027
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2025-02-27 11:32:46 +08:00
mgw
b693252a7b
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2025-02-27 11:32:29 +08:00
马广威
4db8a29bc1
Accept Merge Request #1876 : (feature/制造功能优化 -> develop)
...
Merge Request: 调整单据状态
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1876
2025-02-27 11:27:05 +08:00
mgw
88fceb016f
调整单据状态
2025-02-27 11:26:26 +08:00
马广威
712e1f3947
Accept Merge Request #1875 : (feature/制造功能优化 -> develop)
...
Merge Request: 完善单据
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1875?initial=true
2025-02-27 11:00:19 +08:00
mgw
d1a71e1a05
完善单据
2025-02-27 10:58:06 +08:00
马广威
0c3e730619
Accept Merge Request #1874 : (feature/制造功能优化 -> develop)
...
Merge Request: 取消列表单据只读
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1874?initial=true
2025-02-27 09:58:58 +08:00
mgw
0063a199f8
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2025-02-27 09:58:29 +08:00
mgw
7af9b25eee
取消列表单据只读
2025-02-27 09:58:12 +08:00
管欢
7f195f9e5f
Accept Merge Request #1873 : (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/1873
2025-02-27 09:54:51 +08:00
guanhuan
000cd9a13c
修复坯料发料提醒重复发送
2025-02-27 09:53:42 +08:00
廖丹龙
3771a62dae
Accept Merge Request #1871 : (feature/tool_standard_library_process -> develop)
...
Merge Request: 批量调拨按钮隐藏
Created By: @廖丹龙
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1871
2025-02-27 09:18:55 +08:00
马广威
172219a3e2
Accept Merge Request #1872 : (feature/制造功能优化 -> develop)
...
Merge Request: 调整行号
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1872?initial=true
2025-02-27 09:18:15 +08:00
mgw
7bd17ea8da
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2025-02-27 09:17:06 +08:00
mgw
f234943104
调整行号
2025-02-27 09:16:50 +08:00
liaodanlong
9b9b0a30a3
批量调拨按钮隐藏
2025-02-27 09:10:07 +08:00
马广威
3552c11122
Accept Merge Request #1870 : (feature/制造功能优化 -> develop)
...
Merge Request: 补全单据
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1870?initial=true
2025-02-27 09:05:59 +08:00
mgw
e0e5dc8f7e
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2025-02-27 09:04:58 +08:00
mgw
d608b78f8c
坯料外协单据
2025-02-27 09:04:38 +08:00
mgw
513daa7c2b
补全单据
2025-02-26 17:39:34 +08:00
黄焱
57342ec843
Accept Merge Request #1869 : (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/1869?initial=true
2025-02-26 16:40:33 +08:00
hyyy
352dc89e91
还原序号处理
2025-02-26 16:29:19 +08:00
马广威
8dc6c1a617
Accept Merge Request #1868 : (feature/制造功能优化 -> develop)
...
Merge Request: Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1868?initial=true
2025-02-26 14:48:43 +08:00
mgw
82cbd95b7d
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2025-02-26 14:47:45 +08:00
mgw
a4bfda0a41
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2025-02-26 14:47:28 +08:00
廖丹龙
6e0e00a5a1
Accept Merge Request #1867 : (feature/tool_standard_library_process -> develop)
...
Merge Request: 切割工单过滤掉回退按钮
Created By: @廖丹龙
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1867
2025-02-26 14:38:34 +08:00
liaodanlong
0cb73b6d29
切割工单过滤掉回退按钮
2025-02-26 14:36:50 +08:00
廖丹龙
358ad68dc9
Accept Merge Request #1866 : (feature/tool_standard_library_process -> develop)
...
Merge Request: 过滤掉检测结果为合格的数据
Created By: @廖丹龙
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1866
2025-02-26 14:17:33 +08:00
liaodanlong
cd115ea411
过滤掉检测结果为合格的数据
2025-02-26 14:15:46 +08:00
廖丹龙
64fa908519
Accept Merge Request #1865 : (feature/tool_standard_library_process -> develop)
...
Merge Request: 字段名称修改
Created By: @廖丹龙
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1865
2025-02-26 13:33:40 +08:00
liaodanlong
266c448c00
字段名称修改
2025-02-26 13:21:27 +08:00
马广威
1fb39e55c7
Accept Merge Request #1864 : (feature/制造功能优化 -> develop)
...
Merge Request: 去除对切割工单的编程控制
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1864?initial=true
2025-02-26 13:09:45 +08:00
mgw
dbaf5342fc
去除对切割工单的编程控制
2025-02-26 13:09:15 +08:00
马广威
8bfb5b3b79
Accept Merge Request #1863 : (feature/制造功能优化 -> develop)
...
Merge Request: Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1863?initial=true
2025-02-26 12:43:21 +08:00
mgw
897a10a500
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2025-02-26 12:42:58 +08:00
mgw
2035dd6857
切割工单隐藏编程相关
2025-02-26 12:42:42 +08:00
廖丹龙
4beaeffd46
Accept Merge Request #1862 : (feature/tool_standard_library_process -> develop)
...
Merge Request: 匹配规则修改
Created By: @廖丹龙
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1862
2025-02-26 11:32:02 +08:00
liaodanlong
cd78a39410
匹配规则修改
2025-02-26 11:30:14 +08:00
liaodanlong
2e47922086
匹配规则修改
2025-02-26 11:25:09 +08:00
廖丹龙
fd76863daa
Accept Merge Request #1861 : (feature/tool_standard_library_process -> develop)
...
Merge Request: 匹配规则修改
Created By: @廖丹龙
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1861
2025-02-26 10:48:29 +08:00
liaodanlong
85c8e834cb
匹配规则修改
2025-02-26 10:46:02 +08:00
马广威
e4c729e8e0
Accept Merge Request #1860 : (feature/制造功能优化 -> develop)
...
Merge Request: 调整判断逻辑
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1860?initial=true
2025-02-26 10:41:42 +08:00
mgw
e9226a87f5
调整判断逻辑
2025-02-26 10:41:05 +08:00
廖丹龙
22b0b02168
Accept Merge Request #1859 : (feature/tool_standard_library_process -> develop)
...
Merge Request: 修改计算方法名称
Created By: @廖丹龙
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1859
2025-02-26 10:31:10 +08:00
liaodanlong
bff10de6b2
修改计算方法名称
2025-02-26 10:29:01 +08:00
廖丹龙
ebe8d56ffd
Accept Merge Request #1854 : (feature/tool_standard_library_process -> develop)
...
Merge Request: 坯料的采购订单零件图号,零件名称显示
Created By: @廖丹龙
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1854
2025-02-26 10:22:03 +08:00
liaodanlong
d7e3ce2b1a
刀具标准库数据同步
2025-02-26 10:21:40 +08:00
马广威
ae7e902b4d
Accept Merge Request #1858 : (feature/制造功能优化 -> develop)
...
Merge Request: 修改变量名
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1858?initial=true
2025-02-26 10:13:57 +08:00
mgw
0be9afcdfe
修改变量名
2025-02-26 10:13:26 +08:00
马广威
02582470e5
Accept Merge Request #1857 : (feature/制造功能优化 -> develop)
...
Merge Request: 调整判断逻辑
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1857?initial=true
2025-02-26 10:06:55 +08:00
mgw
e3b2dade15
调整判断逻辑
2025-02-26 10:06:27 +08:00
马广威
f6e36014c8
Accept Merge Request #1856 : (feature/制造功能优化 -> develop)
...
Merge Request: 修改状态名称
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1856?initial=true
2025-02-26 09:58:39 +08:00
mgw
f89b52bad1
修改状态名称
2025-02-26 09:58:16 +08:00
马广威
157ce5e2dc
Accept Merge Request #1855 : (feature/制造功能优化 -> develop)
...
Merge Request: sf-工厂取消接单-取消列表展示数据问题
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1855?initial=true
2025-02-26 09:54:53 +08:00
mgw
478c54a44d
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2025-02-26 09:54:24 +08:00
mgw
f06951958d
sf-工厂取消接单-取消列表展示数据问题
2025-02-26 09:54:08 +08:00
liaodanlong
8799fcddb2
还原代码
2025-02-26 09:41:17 +08:00
马广威
0d25eb5009
Accept Merge Request #1853 : (feature/制造功能优化 -> develop)
...
Merge Request: sf-工厂取消接单-坯料的制造订单未取消
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1853?initial=true
2025-02-26 09:41:07 +08:00
mgw
92c3de98ba
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2025-02-26 09:40:39 +08:00
mgw
dca6f9fb53
sf-工厂取消接单-坯料的制造订单未取消
2025-02-26 09:40:18 +08:00
liaodanlong
c4c6386871
坯料的采购订单零件图号,零件名称显示
2025-02-26 09:37:56 +08:00
禹翔辉
4bdeec6e24
Accept Merge Request #1852 : (feature/调拨质检消息优化_1 -> develop)
...
Merge Request: Merge branch 'feature/调拨质检消息优化' into feature/调拨质检消息优化_1
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1852
2025-02-26 09:25:26 +08:00
yuxianghui
b7331a811b
Merge branch 'feature/调拨质检消息优化' into feature/调拨质检消息优化_1
2025-02-26 09:23:44 +08:00
yuxianghui
e5d1a18640
处理质检完成时消息通知重复问题
2025-02-26 09:22:50 +08:00
马广威
62e8634abf
Accept Merge Request #1851 : (feature/制造功能优化 -> develop)
...
Merge Request: 坯料自加工的切割工序状态也判断了编程状态
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1851
2025-02-26 09:11:10 +08:00
mgw
2a8791b9a9
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2025-02-26 09:10:04 +08:00
mgw
def9bd2c6e
坯料自加工的切割工序状态也判断了编程状态
2025-02-26 09:09:26 +08:00
胡尧
bf785328ac
Accept Merge Request #1850 : (feature/mrp_bug_fixed -> develop)
...
Merge Request: 工单返工完成不触发制造订单的完成事件
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1850?initial=true
2025-02-25 17:25:26 +08:00
胡尧
332dbce769
工单返工完成不触发制造订单的完成事件
2025-02-25 17:25:04 +08:00
廖丹龙
fa2f5552e2
Accept Merge Request #1849 : (feature/tool_standard_library_process -> develop)
...
Merge Request: 工艺确认时的工单空值处理
Created By: @廖丹龙
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1849
2025-02-25 16:40:12 +08:00
liaodanlong
c400553294
工艺确认时的工单空值处理
2025-02-25 16:35:40 +08:00
liaodanlong
7975fd2bd2
CNC回退后需开放送检按钮
2025-02-25 16:32:04 +08:00
liaodanlong
a0c5f9d15f
制造订单是返工状态时-上报返工的工单有【回退】入口-要隐藏问题处理
2025-02-25 16:31:18 +08:00
liaodanlong
2e648dea4e
成品入库单已经完成-工单还有【回退】按钮-还能回退成功 问题处理
2025-02-25 16:29:58 +08:00
黄焱
7056298420
Accept Merge Request #1848 : (feature/前端样式修改 -> develop)
...
Merge Request: 去掉listRenderer含有hasSelectors时的row_no,因为td中没有序号
Created By: @黄焱
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @黄焱
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1848?initial=true
2025-02-25 16:28:26 +08:00
hyyy
3cd7a52900
去掉listRenderer含有hasSelectors时的row_no,因为td中没有序号
2025-02-25 16:15:11 +08:00
禹翔辉
5323f1076e
Accept Merge Request #1847 : (feature/调拨质检消息优化 -> develop)
...
Merge Request: Merge branch 'feature/库存优化_6' into feature/调拨质检消息优化
Created By: @禹翔辉
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1847
2025-02-25 15:09:55 +08:00
yuxianghui
5c5b8fb8fd
Merge branch 'feature/库存优化_6' into feature/调拨质检消息优化
2025-02-25 15:06:38 +08:00
yuxianghui
fb4f08a24a
1、处理销售订单确认供货路线报错-坯料获取方式是自加工 问题;2、质检完成的消息通知添加超链接;3、添加 库存作业单据没有质检单时-会发送待处理消息通知-不用发送判断条件
2025-02-25 15:05:30 +08:00
禹翔辉
f3e5901474
Accept Merge Request #1846 : (feature/库存优化_6 -> develop)
...
Merge Request: Merge branch 'feature/库存优化_5' into feature/库存优化_6
Created By: @禹翔辉
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1846
2025-02-25 11:30:39 +08:00
yuxianghui
247036209e
Merge branch 'feature/库存优化_5' into feature/库存优化_6
2025-02-25 11:23:23 +08:00
yuxianghui
0fd33831f1
处理由客供料入库单生成的质检单没有批次序列号问题
2025-02-25 11:22:41 +08:00
禹翔辉
78b58d4fb8
Accept Merge Request #1845 : (feature/库存优化_5 -> develop)
...
Merge Request: Merge branch 'feature/质检消息优化' into feature/库存优化_5
Created By: @禹翔辉
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1845
2025-02-25 10:33:39 +08:00
yuxianghui
6e94dc45a9
Merge branch 'feature/质检消息优化' into feature/库存优化_5
2025-02-25 10:31:00 +08:00
yuxianghui
7ecb28382a
1、库存序列号的更新序列号功能按钮优化;2、销售单默认显示字段优化;
2025-02-25 10:28:51 +08:00
禹翔辉
7a0b8f0c78
Accept Merge Request #1844 : (feature/质检消息优化 -> develop)
...
Merge Request: Merge branch 'feature/库存优化_3' into feature/质检消息优化
Created By: @禹翔辉
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1844
2025-02-25 09:32:43 +08:00
yuxianghui
ee42b6ae70
Merge branch 'feature/库存优化_3' into feature/质检消息优化
2025-02-25 08:45:54 +08:00
马广威
e8c0011fbc
Accept Merge Request #1843 : (feature/制造功能优化 -> develop)
...
Merge Request: 编程单去重
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1843?initial=true
2025-02-24 17:01:31 +08:00
mgw
e2e9637dbf
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2025-02-24 16:59:33 +08:00
mgw
3745125990
编程单去重
2025-02-24 16:59:12 +08:00
yuxianghui
83fb8a6625
质检完成消息通知发送失败 优化
2025-02-24 16:53:43 +08:00
廖丹龙
014456f09f
Accept Merge Request #1842 : (feature/tool_standard_library_process -> develop)
...
Merge Request: 当前工单下一张工单为表面工艺时不显示回退按钮问题处理
Created By: @廖丹龙
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1842
2025-02-24 16:50:08 +08:00
liaodanlong
7a3534f8e4
当前工单下一张工单为表面工艺时不显示回退按钮问题处理
2025-02-24 16:39:10 +08:00
廖丹龙
08c7226add
Accept Merge Request #1840 : (feature/tool_standard_library_process -> develop)
...
Merge Request: 最后一个解除装夹未隐藏回退按钮
Created By: @廖丹龙
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1840
2025-02-24 16:31:56 +08:00
禹翔辉
de43411e53
Accept Merge Request #1841 : (feature/库存优化_3 -> develop)
...
Merge Request: Merge branch 'feature/库存功能优化' into feature/库存优化_3
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1841?initial=true
2025-02-24 16:29:40 +08:00
yuxianghui
8c14ea4a85
Merge branch 'feature/库存功能优化' into feature/库存优化_3
2025-02-24 16:27:49 +08:00
yuxianghui
eb11e71d0d
1、入库单据优化:单据就绪自动分配序列号;分配序列号时,流水号取值=MAX(产品序列号模型最大序号,预分配最大序号),界面优化。2、客供料入库单批量调拨有待质检的单子时-提示语显示重复了优化
2025-02-24 16:27:09 +08:00
liaodanlong
71e7ac9993
最后一个解除装夹未隐藏回退按钮
2025-02-24 16:16:00 +08:00
liaodanlong
749df39809
cnc工单没有回退按钮问题
2025-02-24 16:08:22 +08:00
马广威
332ac49229
Accept Merge Request #1839 : (feature/制造功能优化 -> develop)
...
Merge Request: 调整工单名称、编程单去重
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1839?initial=true
2025-02-24 15:29:53 +08:00
mgw
fea58e6288
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2025-02-24 15:29:20 +08:00
mgw
28a16ca08e
调整工单名称、编程单去重
2025-02-24 15:29:02 +08:00
马广威
363169d9e4
Accept Merge Request #1838 : (feature/制造功能优化 -> develop)
...
Merge Request: 改正语法问题
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1838?initial=true
2025-02-24 15:15:47 +08:00
mgw
74442c6539
改正语法问题
2025-02-24 15:15:27 +08:00
马广威
d247b25d55
Accept Merge Request #1837 : (feature/制造功能优化 -> develop)
...
Merge Request: 调整领料单生成次数
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1837?initial=true
2025-02-24 15:13:09 +08:00
mgw
b2b6a57f40
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2025-02-24 15:12:40 +08:00
mgw
4e7bf40d91
调整领料单生成次数
2025-02-24 15:12:23 +08:00
马广威
2baf739eb2
Accept Merge Request #1836 : (feature/制造功能优化 -> develop)
...
Merge Request: 调整行号取值
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1836?initial=true
2025-02-24 15:00:23 +08:00
mgw
7ab90143b6
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2025-02-24 14:59:53 +08:00
mgw
8bf788e39c
调整行号取值
2025-02-24 14:57:19 +08:00
马广威
2e83a22540
Accept Merge Request #1835 : (feature/制造功能优化 -> develop)
...
Merge Request: 调整下游单据内容
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1835?initial=true
2025-02-24 14:47:28 +08:00
mgw
9e25657fea
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2025-02-24 14:46:35 +08:00
mgw
555802b271
调整下游单据内容
2025-02-24 14:46:18 +08:00
廖丹龙
4002588eec
Accept Merge Request #1834 : (feature/tool_standard_library_process -> 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/1834
2025-02-24 14:05:38 +08:00
liaodanlong
09ba001b06
sf-生产环境-客供料入库单-合并后的客供料入库单的零件图号显示名称不正确
2025-02-24 13:38:02 +08:00
廖丹龙
c208bac3a1
Accept Merge Request #1833 : (feature/tool_standard_library_process -> develop)
...
Merge Request: 刀具标准库 基本参数修改字段默认隐藏,并可勾选展示
Created By: @廖丹龙
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1833
2025-02-24 09:45:27 +08:00
liaodanlong
7efea85420
刀具标准库 基本参数修改字段默认隐藏,并可勾选展示
2025-02-24 09:30:27 +08:00
mgw
91061b1eec
调整调拨产品名称等
2025-02-21 17:34:57 +08:00
廖丹龙
3c349c3346
Accept Merge Request #1832 : (feature/tool_standard_library_process -> develop)
...
Merge Request: 子制造订单回退功能处理 处理解除装夹没有回退按钮
Created By: @廖丹龙
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1832?initial=true
2025-02-21 16:47:25 +08:00
liaodanlong
e1185aa28b
子制造订单回退功能处理 处理解除装夹没有回退按钮
2025-02-21 15:22:00 +08:00
胡尧
e2edd38a8e
Accept Merge Request #1831 : (feature/mrp_bug_fixed -> develop)
...
Merge Request: 修复库存有两个驾驶舱菜单的bug
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1831?initial=true
2025-02-21 14:48:34 +08:00
胡尧
16b5ce300a
修复库存有两个驾驶舱菜单的bug
2025-02-21 14:48:01 +08:00
胡尧
70855a4936
Accept Merge Request #1830 : (feature/mrp_bug_fixed -> develop)
...
Merge Request: 取消配送路线关联字段修改
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1830?initial=true
2025-02-21 14:29:46 +08:00
胡尧
1bbdf2bd44
取消配送路线关联字段修改
2025-02-21 14:29:15 +08:00
廖丹龙
3da67f27ec
Accept Merge Request #1829 : (feature/tool_standard_library_process -> develop)
...
Merge Request: 工单详情添加回退按钮
Created By: @廖丹龙
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1829?initial=true
2025-02-21 10:30:16 +08:00
liaodanlong
d8e8babbd3
工单详情添加回退按钮
2025-02-21 10:28:12 +08:00
廖丹龙
41deefa4f3
Accept Merge Request #1828 : (feature/tool_standard_library_process -> develop)
...
Merge Request: 刀具编码修改
Created By: @廖丹龙
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1828
2025-02-21 09:00:21 +08:00
liaodanlong
acfc09596b
刀具编码修改
2025-02-20 17:21:44 +08:00
管欢
5d00c1018b
Accept Merge Request #1827 : (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/1827
2025-02-20 16:28:20 +08:00
廖丹龙
a438ba9c40
Accept Merge Request #1826 : (feature/tool_standard_library_process -> develop)
...
Merge Request: 制造订单 工单回退
Created By: @廖丹龙
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1826
2025-02-20 16:13:43 +08:00
liaodanlong
c3f5a890f1
工厂编码修改
2025-02-20 16:12:59 +08:00
liaodanlong
416a63138a
Merge branch 'refs/heads/develop' into feature/tool_standard_library_process
...
# Conflicts:
# sf_manufacturing/models/mrp_workorder.py
2025-02-20 15:48:22 +08:00
liaodanlong
75460c5df6
制造订单 工单回退
2025-02-20 15:38:37 +08:00
liaodanlong
162a1061de
制造订单 工单回退
2025-02-20 14:08:06 +08:00
胡尧
52e585e637
解决冲突
2025-02-20 13:51:24 +08:00
胡尧
05dac9fb0c
调整模型上传的流程
2025-02-20 13:36:05 +08:00
黄焱
cb2777ba3e
Accept Merge Request #1825 : (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/1825?initial=true
2025-02-20 11:37:34 +08:00
hyyy
e6ab17ca0d
sf-制造-功能刀具标准库字段样式调整
2025-02-20 11:34:19 +08:00
guanhuan
8e27ee2434
修复取消订单状态已更新时的提示
2025-02-20 10:25:56 +08:00
禹翔辉
1ca61b2346
Accept Merge Request #1824 : (feature/库存功能优化 -> develop)
...
Merge Request: Merge branch 'feature/调拨质检完成消息通知' into feature/库存功能优化
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1824?initial=true
2025-02-20 10:06:34 +08:00
yuxianghui
087896aa1c
Merge branch 'feature/调拨质检完成消息通知' into feature/库存功能优化
2025-02-20 10:05:05 +08:00
yuxianghui
7ff1fed4b6
调拨单批量调拨功能,新增调拨单的质检单是否完成校验
2025-02-20 10:04:22 +08:00
禹翔辉
74c747b3ef
Accept Merge Request #1823 : (feature/调拨质检完成消息通知 -> develop)
...
Merge Request: Merge branch 'feature/质检返工优化' into feature/调拨质检完成消息通知
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1823
2025-02-19 16:24:26 +08:00
yuxianghui
996f25232b
Merge branch 'feature/质检返工优化' into feature/调拨质检完成消息通知
2025-02-19 16:22:51 +08:00
yuxianghui
cddcec4225
添加调拨单的质检完成的消息通知
2025-02-19 16:22:00 +08:00
mgw
a30ee546bd
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2025-02-19 15:35:40 +08:00
马广威
045faeae89
Accept Merge Request #1822 : (feature/制造功能优化 -> develop)
...
Merge Request: 调整名称
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1822?initial=true
2025-02-19 15:35:29 +08:00
mgw
064af3b884
调整名称
2025-02-19 15:34:42 +08:00
马广威
a783d54836
Accept Merge Request #1821 : (feature/制造功能优化 -> develop)
...
Merge Request: 修复完善取消订单问题
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1821
2025-02-19 15:15:39 +08:00
mgw
55a118f19a
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2025-02-19 15:14:24 +08:00
mgw
0969967570
修复完善取消订单问题
2025-02-19 15:14:05 +08:00
管欢
85f19defa8
Accept Merge Request #1820 : (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/1820
2025-02-19 14:50:15 +08:00
guanhuan
a628826b52
采购协议
2025-02-19 11:34:58 +08:00
guanhuan
bdccce07d4
采购协议
2025-02-19 11:31:46 +08:00
guanhuan
4dc19cab81
采购协议
2025-02-19 10:42:48 +08:00
黄焱
986b727d9b
Accept Merge Request #1818 : (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/1818?initial=true
2025-02-19 10:36:52 +08:00
hyyy
9e6fc3bacb
增加样式权重
2025-02-19 10:29:25 +08:00
黄焱
201bab304d
Accept Merge Request #1817 : (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/1817
2025-02-18 16:24:30 +08:00
hyyy
6984f31547
删除多余代码
2025-02-18 16:23:25 +08:00
hyyy
6f4f0ab0fb
增加刀具管理的展开列
2025-02-18 15:44:40 +08:00
马广威
a4b40bee16
Accept Merge Request #1816 : (feature/制造功能优化 -> develop)
...
Merge Request: 增加状态映射
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1816?initial=true
2025-02-17 18:00:29 +08:00
mgw
dc29671f1a
增加状态映射
2025-02-17 17:59:38 +08:00
马广威
1ca68d9ff2
Accept Merge Request #1815 : (feature/制造功能优化 -> develop)
...
Merge Request: 调整工单状态改变逻辑
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1815?initial=true
2025-02-17 17:35:57 +08:00
mgw
9fce93e1ef
调整工单状态改变逻辑
2025-02-17 17:34:54 +08:00
mgw
732c2089b9
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2025-02-17 17:30:21 +08:00
mgw
09f8f5c0fd
调整状态
2025-02-17 17:30:02 +08:00
禹翔辉
74290a060e
Accept Merge Request #1814 : (feature/质检返工优化 -> develop)
...
Merge Request: Merge branch 'feature/库存优化_2' into feature/质检返工优化
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1814
2025-02-17 17:17:18 +08:00
yuxianghui
6388072bed
Merge branch 'feature/库存优化_2' into feature/质检返工优化
2025-02-17 17:16:11 +08:00
yuxianghui
71cbd7ac36
1、优化由质检返工生成的制造订单检测结果数据不全的问题;2、 发票账单:增加字段及优化
2025-02-17 17:15:30 +08:00
马广威
c77c6310a2
Accept Merge Request #1813 : (feature/制造功能优化 -> develop)
...
Merge Request: 调整字段名称
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1813?initial=true
2025-02-17 16:21:54 +08:00
mgw
5d13c09468
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2025-02-17 16:21:20 +08:00
mgw
f24c5ff75a
调整字段名称
2025-02-17 16:21:01 +08:00
马广威
902857444b
Accept Merge Request #1812 : (feature/制造功能优化 -> develop)
...
Merge Request: 完善取消订单功能
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1812?initial=true
2025-02-17 16:16:14 +08:00
mgw
fafa12dd23
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2025-02-17 16:12:20 +08:00
mgw
8d9aee497a
完善取消订单功能
2025-02-17 16:11:48 +08:00
黄焱
27820837c4
Accept Merge Request #1811 : (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/1811?initial=true
2025-02-17 16:06:47 +08:00
hyyy
69c5996db7
合并销售订单列,修改必填*展示方法,
2025-02-17 16:03:14 +08:00
马广威
1e3f8f005e
Accept Merge Request #1810 : (feature/制造功能优化 -> develop)
...
Merge Request: 完善人工编程功能
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1810?initial=true
2025-02-17 15:41:32 +08:00
mgw
5d2cadc3d0
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2025-02-17 15:37:58 +08:00
mgw
567ea84b00
完善人工编程功能
2025-02-17 15:37:30 +08:00
禹翔辉
006152edd9
Accept Merge Request #1809 : (feature/库存优化_2 -> develop)
...
Merge Request: Merge branch 'feature/库存优化_1' into feature/库存优化_2
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1809
2025-02-17 15:19:55 +08:00
yuxianghui
60f525e228
Merge branch 'feature/库存优化_1' into feature/库存优化_2
2025-02-17 15:18:49 +08:00
yuxianghui
3d2e383330
1、处理 sf-制造订单-通过质量检查对装夹预调进行返工-制造订单未记录检测结果 问题;2、处理 手动创建调拨单右上角会关联坯料采购单和坯料委外单 问题
2025-02-17 15:17:54 +08:00
胡尧
d25022204b
Accept Merge Request #1808 : (feature/mrp_bug_fixed -> develop)
...
Merge Request: 修改配送类型的字段关联形式,修改工件配送列表页的默认筛选条件
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1808?initial=true
2025-02-17 13:24:31 +08:00
胡尧
8095a8a972
修改配送类型的字段关联形式,修改工件配送列表页的默认筛选条件
2025-02-17 13:23:32 +08:00
禹翔辉
781e1d616f
Accept Merge Request #1807 : (feature/库存优化_1 -> develop)
...
Merge Request: Merge branch 'feature/同步接口优化' into feature/库存优化_1
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1807?initial=true
2025-02-17 12:44:29 +08:00
yuxianghui
f556e45102
Merge branch 'feature/同步接口优化' into feature/库存优化_1
2025-02-17 12:42:55 +08:00
yuxianghui
fc4eae0488
完成 入库优化:自动确认序列号 需求
2025-02-17 12:42:07 +08:00
mgw
3e9b6f808d
优化取消接单功能
2025-02-17 10:00:40 +08:00
黄焱
3f1c745ece
Accept Merge Request #1806 : (feature/前端样式修改 -> develop)
...
Merge Request: 删除模块,移到efms里面;销售订单明细表的视图优化_1
Created By: @黄焱
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @黄焱
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1806?initial=true
2025-02-17 08:39:25 +08:00
hyyy
b117fde8c3
删除模块,移到efms里面,修改样式
2025-02-14 17:31:19 +08:00
mgw
e98a9a3788
增加取消订单其他功能
2025-02-14 17:29:33 +08:00
mgw
3ac096e9a7
取消接单需求进行中
2025-02-13 17:41:18 +08:00
胡尧
3130ef4983
增加工单的开始时间已经leave_id字段的监控,异常则发送企业微信消息
2025-02-13 15:48:41 +08:00
禹翔辉
5463bff63b
Accept Merge Request #1805 : (feature/同步接口优化 -> develop)
...
Merge Request: Merge branch 'feature/库存优化' into feature/同步接口优化
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1805
2025-02-13 15:15:28 +08:00
yuxianghui
ea96ae2c55
Merge branch 'feature/库存优化' into feature/同步接口优化
2025-02-13 15:00:25 +08:00
yuxianghui
a05885936d
刀具标准库及关联模型同步接口优化
2025-02-13 14:26:01 +08:00
胡尧
32ead7fa07
去掉设置tree字段为隐藏的代码
2025-02-13 13:29:54 +08:00
胡尧
cf9095b51b
Accept Merge Request #1804 : (feature/mrp_bug_fixed -> develop)
...
Merge Request: 增加测试数据清理模块
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1804
2025-02-13 13:04:40 +08:00
胡尧
827311a146
质量检查列表修改3个字段的隐藏默认值
2025-02-13 13:04:16 +08:00
胡尧
941b8c0be7
增加测试数据清理模块
2025-02-13 11:31:35 +08:00
胡尧
f0525355c4
Accept Merge Request #1803 : (feature/mrp_bug_fixed -> develop)
...
Merge Request: 质量检查列表增加默认筛选项
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1803?initial=true
2025-02-13 10:27:43 +08:00
胡尧
bb1012a15d
质量检查列表增加默认筛选项
2025-02-13 10:26:58 +08:00
胡尧
68e9537cdb
Accept Merge Request #1802 : (feature/mrp_bug_fixed -> develop)
...
Merge Request: 修改客供料的供货路线不能选择外购
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1802?initial=true
2025-02-12 15:34:34 +08:00
胡尧
2411d8334c
修改客供料的供货路线不能选择外购
2025-02-12 15:33:57 +08:00
胡尧
97d4e03ef8
Accept Merge Request #1801 : (feature/mrp_bug_fixed -> develop)
...
Merge Request: 修改质量检查列表页
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1801?initial=true
2025-02-12 15:23:19 +08:00
胡尧
b7a2a763ac
修改质量检查列表页
2025-02-12 15:14:27 +08:00
禹翔辉
7e0f392550
Accept Merge Request #1800 : (feature/库存优化 -> develop)
...
Merge Request: Merge branch 'feature/销售视图优化' into feature/库存优化
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1800?initial=true
2025-02-12 11:32:03 +08:00
yuxianghui
c223869bbd
Merge branch 'feature/销售视图优化' into feature/库存优化
2025-02-12 11:30:27 +08:00
yuxianghui
7a6538bcc1
完成 库存单据列表增加字段【需求数量】 需求
2025-02-12 11:29:46 +08:00
mgw
d3cfec2f35
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2025-02-12 09:49:54 +08:00
mgw
6b9428c8bf
多种状态下显示拒绝接单/取消按钮
2025-02-10 16:38:34 +08:00
马广威
f25d06e08f
Accept Merge Request #1799 : (feature/制造功能优化 -> develop)
...
Merge Request: 调整工单处人工编程可见
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1799?initial=true
2025-02-10 13:35:06 +08:00
mgw
62314d38b3
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2025-02-10 13:34:06 +08:00
mgw
027be2b021
调整工单处人工编程可见
2025-02-10 13:33:46 +08:00
马广威
372dfd99c4
Accept Merge Request #1798 : (feature/制造功能优化 -> develop)
...
Merge Request: 人工线下加工工单标识
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1798?initial=true
2025-02-10 13:15:01 +08:00
mgw
c702d1f3be
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2025-02-10 13:14:25 +08:00
mgw
7e33ca44d0
人工线下加工工单标识
2025-02-10 13:13:57 +08:00
马广威
c7d9b15624
Accept Merge Request #1797 : (feature/制造功能优化 -> develop)
...
Merge Request: 增加人工线下加工工单的查找
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1797
2025-02-10 11:30:52 +08:00
mgw
a4d640acb5
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2025-02-10 11:29:56 +08:00
mgw
523cc4ac5e
增加人工线下加工工单的查找
2025-02-10 11:29:37 +08:00
马广威
9aa2bd5d54
Accept Merge Request #1796 : (feature/制造功能优化 -> develop)
...
Merge Request: 人工线下加工编程方式设置
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1796
2025-02-10 11:00:17 +08:00
mgw
ae23edb9d5
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2025-02-10 10:58:19 +08:00
mgw
9695997542
人工线下加工编程方式设置
2025-02-10 10:58:01 +08:00
管欢
90243a7d2f
Accept Merge Request #1795 : (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/1795
2025-02-10 09:53:46 +08:00
guanhuan
5dc5602e3d
月结取消订单
2025-02-10 09:47:42 +08:00
胡尧
cbf58fd3fb
Accept Merge Request #1794 : (feature/mrp_bug_fixed -> develop)
...
Merge Request: 解决采购总监选择销售员报错的问题
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1794?initial=true
2025-02-10 09:30:49 +08:00
马广威
0ada4933ba
Accept Merge Request #1793 : (feature/制造功能优化 -> develop)
...
Merge Request: 人工线下加工默认加工面ZM
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1793?initial=true
2025-02-10 09:14:33 +08:00
mgw
b1261bb91b
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2025-02-10 09:13:16 +08:00
mgw
ffde591b3c
人工线下加工默认加工面ZM
2025-02-10 09:12:58 +08:00
胡尧
356e1e55e4
解决采购总监选择销售员报错的问题
2025-02-10 09:03:13 +08:00
马广威
b6ce462171
Accept Merge Request #1792 : (feature/制造功能优化 -> develop)
...
Merge Request: 增加人工线下加工程序写入
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1792?initial=true
2025-02-08 16:49:34 +08:00
mgw
e8b5ff0b75
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2025-02-08 16:48:59 +08:00
mgw
ac3b50c534
增加人工线下加工程序写入
2025-02-08 16:48:36 +08:00
yuxianghui
bc4806b303
1、销售订单详情界面列表优化;2、完成 人工线下加工制造订单提交返工时-建议隐藏【保留装夹预调测量数据】 需求
2025-02-08 16:47:06 +08:00
马广威
e7bc434d60
Accept Merge Request #1791 : (feature/制造功能优化 -> develop)
...
Merge Request: 调整程序写入逻辑
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1791?initial=true
2025-02-08 16:01:11 +08:00
mgw
2de501b61d
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2025-02-08 16:00:25 +08:00
mgw
976d75973d
调整程序写入逻辑
2025-02-08 16:00:07 +08:00
马广威
e20bf3816a
Accept Merge Request #1790 : (feature/制造功能优化 -> develop)
...
Merge Request: 人工线下加工工单也需要走cloud编程流程的优化需求
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1790?initial=true
2025-02-08 14:10:19 +08:00
mgw
44f29d001e
调整人工线下加工页面内容
2025-02-08 14:08:53 +08:00
mgw
aff81f0b3a
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2025-02-08 13:32:59 +08:00
mgw
88840abf9f
制造订单编程状态搜索的优化需求
2025-02-08 13:32:40 +08:00
胡尧
332276752a
Accept Merge Request #1789 : (feature/mrp_bug_fixed -> develop)
...
Merge Request: 修复bug
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1789?initial=true
2025-02-07 10:54:56 +08:00
胡尧
d852cf54df
修复bug
2025-02-07 10:49:17 +08:00
管欢
6756cc201c
Accept Merge Request #1788 : (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/1788
2025-02-06 11:14:52 +08:00
guanhuan
06dd9c12e0
人工线下加工工单下发通知修改
2025-02-06 10:43:11 +08:00
mgw
978e427734
调整制造订单集合
2025-02-05 17:44:32 +08:00
mgw
dd35a6ae5f
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2025-02-05 17:42:10 +08:00
mgw
0a8cc050b8
人工线下加工工单也需要走cloud编程流程的优化需求
2025-02-05 17:41:52 +08:00
管欢
eb47e4c963
Accept Merge Request #1787 : (feature/工单返工优化 -> 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/1787
2025-01-23 16:48:24 +08:00
guanhuan
5636681ee6
CNC工单返工
2025-01-23 16:42:16 +08:00
guanhuan
9b49edb290
装夹工单返工
2025-01-23 13:55:35 +08:00
liaodanlong
b604209df4
刀具标准库列表视图添加创建时间与修改时间
2025-01-21 16:23:34 +08:00
liaodanlong
a9b4c5d91b
保持智能工厂刀具标准库与cloud一致
2025-01-21 16:04:16 +08:00
胡尧
39b29960e3
Accept Merge Request #1786 : (feature/验证合并的逻辑 -> develop)
...
Merge Request: Merge branch 'develop' into feature/验证合并的逻辑
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1786?initial=true
2025-01-21 10:40:27 +08:00
胡尧
6abb237491
Merge branch 'develop' into feature/验证合并的逻辑
2025-01-21 10:39:41 +08:00
胡尧
b0c043676c
Accept Merge Request #1785 : (release/release_2.8 -> develop)
...
Merge Request: 优化工件下产线,修改CNC加工工单状态为待检测时,同步修改对应质检单状态为待处理
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1785?initial=true
2025-01-21 10:39:19 +08:00
yuxianghui
8f9b7b2fb0
优化工件下产线,修改CNC加工工单状态为待检测时,同步修改对应质检单状态为待处理
2025-01-20 15:39:08 +08:00
mgw
32255af3a3
申请编程状态
2025-01-20 14:53:26 +08:00
yuxianghui
955b6a6213
工单优化
2025-01-20 14:47:09 +08:00
yuxianghui
8e788d3745
处理CNC加工工单通过接口上产线下产线变更为待检测时,对应质检单还是等待状态问题
2025-01-20 14:18:02 +08:00
guanhuan
dc843588e9
制造列表新增编程状态显示
2025-01-20 14:09:23 +08:00
马广威
8bfe5eca03
Accept Merge Request #1783 : (feature/制造功能优化 -> develop)
...
Merge Request: 申请编程状态控制
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1783?initial=true
2025-01-20 14:04:27 +08:00
mgw
dbcf8b1089
申请编程状态控制
2025-01-20 14:02:54 +08:00
yuxianghui
0bf701e743
质检单状态优化
2025-01-20 12:55:12 +08:00
yuxianghui
a96a9f5b75
1、修改工单检测结果只读条件;2、修改质检单完成时同步完成工单判断条件;3、去除只有配置后置三元检测的工单才能看到质检单对应字段、页签的判断条件
2025-01-20 12:47:11 +08:00
yuxianghui
9e2704f726
新增工单送检按钮显示的时候隐藏完成按钮
2025-01-20 10:34:32 +08:00
胡尧
c436bbea46
Merge branch 'release/release_2.8' into feature/验证合并的逻辑
2025-01-17 16:12:27 +08:00
胡尧
47c73ae66e
处理订单行参数说明的精度问题
2025-01-17 15:20:50 +08:00
黄焱
53ceed4649
Accept Merge Request #1782 : (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/1782?initial=true
2025-01-17 14:22:56 +08:00
hyyy
e39e9d8812
放弃保存 -> 不保存
2025-01-17 14:17:46 +08:00
胡尧
0a01afc863
Accept Merge Request #1781 : (feature/增加质检模块 -> develop)
...
Merge Request: 修复采购单没有接收产品的问题
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1781?initial=true
2025-01-17 12:55:39 +08:00
胡尧
98b338f33a
修复采购单没有接收产品的问题
2025-01-17 12:55:09 +08:00
胡尧
3c12b05b94
Accept Merge Request #1780 : (feature/增加质检模块 -> develop)
...
Merge Request: 修复采购单没有接收产品的问题
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1780?initial=true
2025-01-17 11:27:40 +08:00
胡尧
b619c15231
修复采购单没有接收产品的问题
2025-01-17 11:27:04 +08:00
禹翔辉
bccdd93884
Accept Merge Request #1779 : (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/1779?initial=true
2025-01-17 11:07:54 +08:00
yuxianghui
41cdeb7fd9
制造订单状态优化
2025-01-17 11:06:17 +08:00
马广威
57ab276c37
Accept Merge Request #1778 : (feature/制造功能优化 -> develop)
...
Merge Request: 调整扫码字段位置
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1778?initial=true
2025-01-17 10:01:16 +08:00
mgw
f3e64b007e
调整扫码字段位置
2025-01-17 09:59:46 +08:00
mgw
eed89836e1
调整扫码字段位置
2025-01-17 09:36:37 +08:00
胡尧
19e1b16122
屏蔽将制造订单的补货组修改为不同的代码
2025-01-17 09:27:38 +08:00
马广威
9efa4636d9
Accept Merge Request #1777 : (feature/制造功能优化 -> develop)
...
Merge Request: 恢复屏蔽
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1777?initial=true
2025-01-16 17:40:09 +08:00
mgw
0b2b9c2bf5
恢复屏蔽
2025-01-16 17:39:34 +08:00
马广威
cc5036ce64
Accept Merge Request #1776 : (feature/制造功能优化 -> develop)
...
Merge Request: 调整扫码字段的位置
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1776?initial=true
2025-01-16 17:11:59 +08:00
mgw
2dc54792f4
调整扫码字段的位置
2025-01-16 17:10:55 +08:00
禹翔辉
5db877a54c
Accept Merge Request #1775 : (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/1775
2025-01-16 15:58:53 +08:00
yuxianghui
6bff1f2f64
优化工单的质量检查跳转按钮
2025-01-16 15:56:11 +08:00
禹翔辉
0aaa3bd5ba
Accept Merge Request #1774 : (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/1774
2025-01-16 15:42:18 +08:00
yuxianghui
39d6c8ae24
处理制造订单再次返工时,点击返工按钮报错
2025-01-16 15:41:07 +08:00
禹翔辉
2c56011502
Accept Merge Request #1773 : (feature/质检单优化_1 -> develop)
...
Merge Request: Merge branch 'feature/制造订单状态优化' into feature/质检单优化_1
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1773
2025-01-16 14:53:50 +08:00
yuxianghui
1e71fc1b08
Merge branch 'feature/制造订单状态优化' into feature/质检单优化_1
2025-01-16 14:51:51 +08:00
yuxianghui
add528f0f3
1、质检单有关后置三元检测的字段和页签添加工单没有后置三元检测时隐藏的条件;2、工单添加质检单跳转按钮
2025-01-16 14:51:04 +08:00
马广威
b8cff4445d
Accept Merge Request #1772 : (feature/制造功能优化 -> develop)
...
Merge Request: Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1772?initial=true
2025-01-16 14:33:39 +08:00
mgw
a2d51ce04e
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2025-01-16 14:32:47 +08:00
mgw
109a093f86
调整审批状态
2025-01-16 14:32:21 +08:00
管欢
c7265bdb46
Accept Merge Request #1771 : (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/1771
2025-01-16 12:50:47 +08:00
廖丹龙
f93edef2d3
Accept Merge Request #1770 : (feature/customer_supply -> develop)
...
Merge Request: 修改采购单非询价状态只读
Created By: @廖丹龙
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1770
2025-01-16 12:42:28 +08:00
liaodanlong
5c780c7b82
客供料合并
2025-01-16 11:35:37 +08:00
liaodanlong
303fcd0430
修改采购单非询价状态只读
2025-01-16 11:24:21 +08:00
guanhuan
e57574783f
修复设备档案页面数据显示
2025-01-16 10:28:30 +08:00
禹翔辉
ff35374eee
Accept Merge Request #1769 : (feature/制造订单状态优化 -> develop)
...
Merge Request: Merge branch 'feature/返工功能优化' into feature/制造订单状态优化
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1769
2025-01-16 09:03:17 +08:00
yuxianghui
5b550952a2
Merge branch 'feature/返工功能优化' into feature/制造订单状态优化
2025-01-16 09:02:04 +08:00
yuxianghui
e3562e7ae3
1、制造订单状态优化
2025-01-16 09:01:11 +08:00
禹翔辉
229df40db4
Accept Merge Request #1768 : (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/1768?initial=true
2025-01-15 15:52:44 +08:00
yuxianghui
5ff6fe73d4
点击制造订单触发返工的过滤条件优化
2025-01-15 15:40:19 +08:00
禹翔辉
1dd8eac32c
Accept Merge Request #1767 : (feature/返工功能优化 -> develop)
...
Merge Request: Merge branch 'feature/工单-制造订单优化' into feature/返工功能优化
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1767?initial=true
2025-01-15 14:47:16 +08:00
yuxianghui
93eb588f91
Merge branch 'feature/工单-制造订单优化' into feature/返工功能优化
2025-01-15 14:37:46 +08:00
yuxianghui
5297bf05d1
1、制造订单返工按钮添加新的显示条件;2、优化返工流程
2025-01-15 14:36:49 +08:00
马广威
9adfca6010
Accept Merge Request #1766 : (feature/制造功能优化 -> develop)
...
Merge Request: Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1766?initial=true
2025-01-15 13:37:14 +08:00
mgw
03c317542a
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2025-01-15 13:36:34 +08:00
mgw
ece136e71e
解除屏蔽
2025-01-15 13:36:05 +08:00
马广威
e0452283f6
Accept Merge Request #1765 : (feature/制造功能优化 -> develop)
...
Merge Request: 调整扫码widget
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1765?initial=true
2025-01-15 11:35:00 +08:00
禹翔辉
8ee98c52e4
Accept Merge Request #1764 : (feature/工单-制造订单优化 -> develop)
...
Merge Request: Merge branch 'feature/质检单优化' into feature/工单-制造订单优化
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1764?initial=true
2025-01-15 11:27:55 +08:00
yuxianghui
1b9dbffcce
Merge branch 'feature/质检单优化' into feature/工单-制造订单优化
2025-01-15 11:26:01 +08:00
yuxianghui
8d5d19ec69
1、质检单通过、失败按钮添加工单为返工时隐藏条件;2、处理夹具入库到夹具房时,夹具查询中夹具可用状态没有变更为可用问题;3、处理后置三元检测选择返工后制造订单状态没有变更为返工的问题
2025-01-15 11:25:00 +08:00
mgw
8bda70be71
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2025-01-15 10:19:42 +08:00
mgw
ca3015600a
调整扫码widget
2025-01-15 10:18:25 +08:00
马广威
09bd06774d
Accept Merge Request #1763 : (feature/制造功能优化 -> develop)
...
Merge Request: 调整下发更新进行中状态的制造订单
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1763?initial=true
2025-01-15 09:38:05 +08:00
mgw
eabe2aa9e9
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2025-01-15 09:37:20 +08:00
mgw
4b6fd72237
调整下发更新进行中状态的制造订单
2025-01-15 09:34:09 +08:00
胡尧
f79fa75a68
Accept Merge Request #1762 : (feature/customer_supply -> develop)
...
Merge Request: 隐藏欠单
Created By: @廖丹龙
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1762#mr-1762-review-218183
2025-01-15 08:43:31 +08:00
liaodanlong
f4f87555a8
排除坯料制造订单
2025-01-15 01:44:48 +08:00
liaodanlong
adbf5a6a0d
隐藏欠单
2025-01-14 21:03:27 +08:00
禹翔辉
19ff7b5eb4
Accept Merge Request #1761 : (feature/质检单优化 -> develop)
...
Merge Request: Merge branch 'feature/工单-质检优化_3' into feature/质检单优化
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1761
2025-01-14 16:24:35 +08:00
yuxianghui
bf3256c4bc
Merge branch 'feature/工单-质检优化_3' into feature/质检单优化
2025-01-14 16:22:59 +08:00
yuxianghui
847b7da8f7
处理 质检单确认合格或者不合格时报错 bug
2025-01-14 16:22:17 +08:00
马广威
61e08f20c7
Accept Merge Request #1760 : (feature/制造功能优化 -> develop)
...
Merge Request: Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1760?initial=true
2025-01-14 16:22:08 +08:00
mgw
fc29791f1b
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2025-01-14 16:21:35 +08:00
mgw
2a9d19436a
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2025-01-14 16:21:07 +08:00
黄焱
e5762f7058
Accept Merge Request #1759 : (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/1759?initial=true
2025-01-14 16:20:52 +08:00
hyyy
357bb15e72
修复-会计-供应商-发票账单新增明细行标题显示错位了
2025-01-14 16:18:34 +08:00
马广威
7de2e98464
Accept Merge Request #1758 : (feature/制造功能优化 -> develop)
...
Merge Request: 直接使用recordset
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1758?initial=true
2025-01-14 16:04:22 +08:00
mgw
78a9c59cde
直接使用recordset
2025-01-14 16:03:28 +08:00
马广威
18365de57e
Accept Merge Request #1757 : (feature/制造功能优化 -> develop)
...
Merge Request: 调整取值对象
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1757?initial=true
2025-01-14 15:54:26 +08:00
mgw
90644a705b
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2025-01-14 15:53:35 +08:00
mgw
5106067882
调整取值对象
2025-01-14 15:52:09 +08:00
胡尧
79bd5344ad
Accept Merge Request #1756 : (feature/增加质检模块 -> develop)
...
Merge Request: 解决收藏报错的问题
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1756?initial=true
2025-01-14 15:50:21 +08:00
胡尧
833b7ff78b
Accept Merge Request #1755 : (feature/customer_supply -> develop)
...
Merge Request: 采购单重复产品限制去除
Created By: @廖丹龙
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1755
2025-01-14 15:49:59 +08:00
胡尧
b9d95c0751
解决收藏报错的问题
2025-01-14 15:48:49 +08:00
liaodanlong
e5f15661ce
采购单重复产品限制去除
2025-01-14 15:10:22 +08:00
禹翔辉
33ee5cb172
Accept Merge Request #1754 : (feature/工单-质检优化_3 -> develop)
...
Merge Request: Merge branch 'feature/工单-质检优化_2' into feature/工单-质检优化_3
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1754
2025-01-14 15:09:58 +08:00
yuxianghui
b433c6423b
Merge branch 'feature/工单-质检优化_2' into feature/工单-质检优化_3
2025-01-14 15:08:42 +08:00
yuxianghui
eae310ddad
1、工单、质检单优化
2025-01-14 15:07:53 +08:00
廖丹龙
deff14b4d3
Accept Merge Request #1753 : (feature/customer_supply -> develop)
...
Merge Request: 客供料与非客供料分开合并
Created By: @廖丹龙
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1753
2025-01-14 14:17:26 +08:00
liaodanlong
9d6baee082
客供料与非客供料分开合并
2025-01-14 14:12:08 +08:00
管欢
47c54107f1
Accept Merge Request #1752 : (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/1752
2025-01-14 13:53:17 +08:00
马广威
551e6e0a02
Accept Merge Request #1751 : (feature/制造功能优化 -> develop)
...
Merge Request: 调整提示词
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1751?initial=true
2025-01-14 13:29:08 +08:00
mgw
f992d625bb
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2025-01-14 13:28:33 +08:00
mgw
883d6938e5
调整提示词
2025-01-14 13:28:08 +08:00
胡尧
37a5e37ed4
Accept Merge Request #1750 : (feature/增加质检模块 -> develop)
...
Merge Request: 修改模块翻译
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1750?initial=true
2025-01-14 13:26:48 +08:00
胡尧
4aa6b59204
修改模块翻译
2025-01-14 13:25:52 +08:00
guanhuan
437b081f15
加工面筛选修改
2025-01-14 13:13:50 +08:00
马广威
489ecc8028
Accept Merge Request #1749 : (feature/制造功能优化 -> develop)
...
Merge Request: 调整编程记录生成
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1749?initial=true
2025-01-14 11:13:10 +08:00
mgw
bb5126d4f5
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2025-01-14 11:12:41 +08:00
mgw
40603fea6a
调整编程记录生成
2025-01-14 11:12:07 +08:00
禹翔辉
0a718b9836
Accept Merge Request #1748 : (feature/工单-质检优化_2 -> develop)
...
Merge Request: Merge branch 'feature/工单-质检优化_1' into feature/工单-质检优化_2
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1748?initial=true
2025-01-14 10:42:36 +08:00
yuxianghui
f44dff2106
Merge branch 'feature/工单-质检优化_1' into feature/工单-质检优化_2
2025-01-14 10:40:56 +08:00
yuxianghui
07d854a740
处理质检结果为返工时,制造订单状态没有更改为返工的问题
2025-01-14 09:25:06 +08:00
马广威
fa80d42fc0
Accept Merge Request #1747 : (feature/制造功能优化 -> develop)
...
Merge Request: 调整判断条件
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1747?initial=true
2025-01-14 08:48:14 +08:00
mgw
86747b77a6
调整判断条件
2025-01-14 08:47:30 +08:00
马广威
cc6fc450d9
Accept Merge Request #1746 : (feature/制造功能优化 -> develop)
...
Merge Request: 解除屏蔽
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1746?initial=true
2025-01-14 08:42:06 +08:00
mgw
5865aab25c
解除屏蔽
2025-01-14 08:41:41 +08:00
马广威
9292fa29e6
Accept Merge Request #1745 : (feature/制造功能优化 -> develop)
...
Merge Request: 解除状态限制屏蔽
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1745?initial=true
2025-01-14 08:34:34 +08:00
mgw
8b5740ece2
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2025-01-14 08:33:57 +08:00
mgw
63ca6f5856
解除状态限制屏蔽
2025-01-14 08:33:34 +08:00
马广威
dfd2082871
Accept Merge Request #1744 : (feature/制造功能优化 -> develop)
...
Merge Request: 调整首次下发理由
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1744?initial=true
2025-01-13 17:32:25 +08:00
mgw
587370fe54
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2025-01-13 17:31:23 +08:00
mgw
f29582ef07
调整首次下发理由
2025-01-13 17:30:23 +08:00
秦圣
0d3a1f063c
Accept Merge Request #1743 : (feature/customer_supply -> develop)
...
Merge Request: 代码合并
Created By: @廖丹龙
Accepted By: @秦圣
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1743
2025-01-13 17:16:56 +08:00
liaodanlong
6cf4bf1005
代码合并
2025-01-13 17:16:22 +08:00
黄焱
119e4b9590
Accept Merge Request #1742 : (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/1742?initial=true
2025-01-13 17:09:07 +08:00
hyyy
4467865b86
取消 -> 放弃保存
2025-01-13 17:04:00 +08:00
秦圣
2756edd6bc
Accept Merge Request #1741 : (feature/customer_supply -> develop)
...
Merge Request: 采购单取消错误提示修改
Created By: @廖丹龙
Accepted By: @秦圣
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1741
2025-01-13 17:03:17 +08:00
liaodanlong
b87343f017
采购单取消错误提示修改
2025-01-13 17:02:41 +08:00
马广威
ece4a0adba
Accept Merge Request #1740 : (feature/制造功能优化 -> develop)
...
Merge Request: 调整写入编程记录的位置
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1740?initial=true
2025-01-13 16:58:14 +08:00
mgw
80384e3244
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
...
# Conflicts:
# sf_manufacturing/models/mrp_production.py
2025-01-13 16:56:49 +08:00
mgw
d8a816c90e
调整写入编程记录的位置
2025-01-13 16:51:25 +08:00
秦圣
266927f53b
Accept Merge Request #1739 : (feature/customer_supply -> develop)
...
Merge Request: 工艺确认后的错误提示
Created By: @廖丹龙
Accepted By: @秦圣
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1739
2025-01-13 16:47:45 +08:00
liaodanlong
b398d1236e
工艺确认后的错误提示
2025-01-13 16:46:13 +08:00
秦圣
d626303a2d
Accept Merge Request #1738 : (feature/customer_supply -> develop)
...
Merge Request: 采购单参考销售订单可见性设置
Created By: @廖丹龙
Accepted By: @秦圣
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1738
2025-01-13 16:11:13 +08:00
liaodanlong
a8271d851d
采购单参考销售订单可见性设置
2025-01-13 16:09:51 +08:00
liaodanlong
bf4d06e22b
制造订单调拨单合并排除自加工产品
2025-01-13 16:08:51 +08:00
禹翔辉
45baac492a
Accept Merge Request #1737 : (feature/工单-质检优化_1 -> develop)
...
Merge Request: Merge branch 'feature/工单-质检优化' into feature/工单-质检优化_1
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1737
2025-01-13 15:46:31 +08:00
yuxianghui
3de86cf538
Merge branch 'feature/工单-质检优化' into feature/工单-质检优化_1
2025-01-13 15:08:04 +08:00
yuxianghui
186dca4618
1、取消质量检查页面根据指令检查自动筛选;2、修改送检按钮隐藏条件;3、优化工单后置三元检测page页显示时,检测结果选择返工时制造订单没有生成检测结果记录问题
2025-01-13 15:07:08 +08:00
马广威
29a6102620
Accept Merge Request #1736 : (feature/制造功能优化 -> develop)
...
Merge Request: 调整码值
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1736?initial=true
2025-01-13 14:00:52 +08:00
mgw
b2c6c9c27d
调整码值
2025-01-13 14:00:20 +08:00
马广威
8d130609f1
Accept Merge Request #1735 : (feature/制造功能优化 -> develop)
...
Merge Request: 调整爆出位置
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1735?initial=true
2025-01-13 13:52:10 +08:00
mgw
ed6e326539
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2025-01-13 13:51:35 +08:00
mgw
be9846986f
调整爆出位置
2025-01-13 13:51:07 +08:00
秦圣
005fa10539
Accept Merge Request #1734 : (feature/customer_supply -> develop)
...
Merge Request: cloud 静态资源库同步问题
Created By: @廖丹龙
Accepted By: @秦圣
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1734
2025-01-13 13:42:08 +08:00
liaodanlong
e8e05bbf6d
cloud 镜头资源库同步问题
2025-01-13 13:40:28 +08:00
马广威
bfc4752e2c
Accept Merge Request #1733 : (feature/制造功能优化 -> develop)
...
Merge Request: 对程序用刀增加补充逻辑
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1733?initial=true
2025-01-13 13:16:50 +08:00
mgw
332a44e861
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2025-01-13 13:16:15 +08:00
mgw
d6325bd483
对程序用刀增加补充逻辑
2025-01-13 13:15:44 +08:00
廖丹龙
1820be6691
Accept Merge Request #1732 : (feature/customer_supply -> develop)
...
Merge Request: 外协工单采购单关联产品展示
Created By: @廖丹龙
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1732
2025-01-13 13:03:40 +08:00
liaodanlong
6ac3bbe2af
外协工单采购单关联产品展示
2025-01-13 12:57:21 +08:00
秦圣
a2a8ea5ab1
Accept Merge Request #1731 : (feature/customer_supply -> develop)
...
Merge Request: 客供料合并,坯料制造订单问题处理
Created By: @廖丹龙
Accepted By: @秦圣
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1731
2025-01-13 11:35:03 +08:00
liaodanlong
d5c65fdc6c
客供料合并,坯料制造订单问题处理
2025-01-13 11:31:24 +08:00
马广威
922a8fca82
Accept Merge Request #1730 : (feature/制造功能优化 -> develop)
...
Merge Request: 申请编程需求
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1730?initial=true
2025-01-13 11:12:33 +08:00
mgw
6a3a739e2c
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2025-01-13 11:11:33 +08:00
mgw
6b6f091da8
更新编程记录相关
2025-01-13 11:11:09 +08:00
管欢
a78b1c7eaf
Accept Merge Request #1729 : (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/1729
2025-01-13 10:56:28 +08:00
guanhuan
5aca6d0685
屏蔽报废
2025-01-13 10:48:01 +08:00
guanhuan
0870bafdb9
制造订单、工单页面导航优化
2025-01-13 10:41:49 +08:00
mgw
9dfe9ba572
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2025-01-13 09:08:38 +08:00
禹翔辉
0eaafbf11b
Accept Merge Request #1727 : (feature/工单-质检优化 -> develop)
...
Merge Request: Merge branch 'feature/质检优化_1' into feature/工单-质检优化
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1727
2025-01-10 17:27:37 +08:00
yuxianghui
66922f726a
Merge branch 'feature/质检优化_1' into feature/工单-质检优化
2025-01-10 17:26:08 +08:00
yuxianghui
629995ad9c
1、完成<工单>通用调整配置优化;2、完成<工单>后置三元检测和质检单逻辑判断及结果同步优化;3、工单新增【送检】功能按钮;
2025-01-10 17:25:19 +08:00
管欢
2323c888b4
Accept Merge Request #1726 : (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/1726
2025-01-10 13:22:38 +08:00
廖丹龙
52bba95c93
Accept Merge Request #1725 : (feature/customer_supply -> develop)
...
Merge Request: 采购单合并后确认工单外协工序为就绪问题
Created By: @廖丹龙
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1725
2025-01-10 11:10:07 +08:00
liaodanlong
a6c8cd8784
采购单合并后确认工单外协工序为就绪问题
2025-01-10 11:08:45 +08:00
mgw
28d3d6fe60
更新编程记录
2025-01-10 10:20:23 +08:00
廖丹龙
5a4ca414a5
Accept Merge Request #1723 : (feature/customer_supply -> develop)
...
Merge Request: 工艺确认修改采购单状态变动逻辑
Created By: @廖丹龙
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1723?initial=true
2025-01-10 10:03:02 +08:00
胡尧
64a0009692
Accept Merge Request #1724 : (feature/增加质检模块 -> develop)
...
Merge Request: 检测结果增加创建人,时间,处理人,时间
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1724?initial=true
2025-01-10 09:58:53 +08:00
胡尧
22bac48a98
检测结果增加创建人,时间,处理人,时间
2025-01-10 09:57:06 +08:00
mgw
47f8e5dc1c
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2025-01-10 09:35:16 +08:00
mgw
8589da1b4d
增加多种状态对编程记录的更改
2025-01-10 09:34:38 +08:00
liaodanlong
5e8a69e252
Merge branch 'refs/heads/develop' into feature/customer_supply
2025-01-10 09:23:02 +08:00
禹翔辉
937145a542
Accept Merge Request #1722 : (feature/质检优化_1 -> 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/1722
2025-01-09 17:24:29 +08:00
yuxianghui
4c97719e68
Merge branch 'feature/质检优化' into feature/质检优化_1
2025-01-09 17:22:54 +08:00
liaodanlong
7e9e6d0738
工艺确认修改采购单状态变动逻辑
2025-01-09 17:22:40 +08:00
liaodanlong
e27506fb07
错误信息修改与委外加工单报错处理
2025-01-09 17:22:03 +08:00
yuxianghui
8d0e993d1a
1、取消工单点击开始按钮二次确认;2、优化质量控制标准模型;3、完成<质量_质量检查>通用调整优化,
2025-01-09 17:20:18 +08:00
mgw
4b5661108a
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
...
# Conflicts:
# sf_manufacturing/security/ir.model.access.csv
2025-01-09 16:14:23 +08:00
liaodanlong
1084f4db12
错误信息修改
2025-01-09 16:12:56 +08:00
mgw
aaf72d5e35
调整数据源
2025-01-09 16:12:54 +08:00
廖丹龙
bb241095e2
Accept Merge Request #1721 : (feature/customer_supply -> develop)
...
Merge Request: 客供料调拨单合并
Created By: @廖丹龙
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1721
2025-01-09 14:35:09 +08:00
liaodanlong
ebf290fbb3
客供料调拨单合并
2025-01-09 14:32:17 +08:00
mgw
fc16c867aa
申请编程需求
2025-01-09 14:07:35 +08:00
guanhuan
c658027dcc
新增零件图号
2025-01-09 10:45:06 +08:00
禹翔辉
0d3d3284ff
Accept Merge Request #1720 : (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/1720?initial=true
2025-01-08 17:26:19 +08:00
yuxianghui
1a384b9902
1、优化制造-工序模块;2、新增工序个性化记录模型,并添加生成初始化值;
2025-01-08 17:24:58 +08:00
廖丹龙
c4b2a42ac5
Accept Merge Request #1719 : (feature/part_number -> develop)
...
Merge Request: 合并代码部分还原
Created By: @廖丹龙
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1719
2025-01-08 13:38:54 +08:00
liaodanlong
284234adf2
合并代码部分还原
2025-01-08 13:37:48 +08:00
廖丹龙
d312782245
Accept Merge Request #1718 : (feature/part_number -> develop)
...
Merge Request: 修改错误提示
Created By: @廖丹龙
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1718
2025-01-08 13:11:30 +08:00
管欢
0ce88f322c
Accept Merge Request #1717 : (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/1717
2025-01-08 13:09:07 +08:00
guanhuan
d582604f13
报废解绑rfid
2025-01-08 13:06:01 +08:00
liaodanlong
3ba79d88b5
修改错误提示
2025-01-08 11:36:28 +08:00
廖丹龙
35fb6f7119
Accept Merge Request #1716 : (feature/part_number -> develop)
...
Merge Request: Merge branch 'refs/heads/release/release_2.7' into feature/part_number
Created By: @廖丹龙
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1716
2025-01-08 11:28:33 +08:00
liaodanlong
c5755c318c
Merge branch 'refs/heads/release/release_2.7' into feature/part_number
...
# Conflicts:
# sf_manufacturing/models/mrp_workorder.py
2025-01-08 11:26:16 +08:00
胡尧
4a330f6c84
Accept Merge Request #1714 : (feature/增加质检模块 -> develop)
...
Merge Request: 增加质检模块
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1714?initial=true
2025-01-08 11:16:41 +08:00
胡尧
db83846588
增加质检模块
2025-01-08 11:16:05 +08:00
guanhuan
4fc0eab513
修复报废没有生成调拨单
2025-01-08 10:58:56 +08:00
廖丹龙
b996c0c787
Accept Merge Request #1713 : (feature/part_number -> develop)
...
Merge Request: 外协工单关联采购单数量计算
Created By: @廖丹龙
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1713
2025-01-08 10:50:02 +08:00
liaodanlong
dcaca89c6f
外协工单关联采购单数量计算
2025-01-08 10:47:31 +08:00
廖丹龙
ea0ddf0a46
Accept Merge Request #1712 : (feature/part_number -> develop)
...
Merge Request: 外协工艺合并采购单处理
Created By: @廖丹龙
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1712
2025-01-08 09:37:48 +08:00
liaodanlong
5774f241a0
外协工艺合并采购单处理
2025-01-08 09:36:38 +08:00
秦圣
55933d6843
Accept Merge Request #1711 : (feature/part_number -> 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/1711
2025-01-07 13:55:10 +08:00
liaodanlong
ad02cbf8cb
sf-制造订单-工单添加外协工序,制造订单状态变成已完成,销售订单的收货中没有该产品的调拨
2025-01-07 13:40:17 +08:00
guanhuan
9660392495
修复报废没有生成调拨单
2025-01-06 14:52:24 +08:00
liaodanlong
196b427867
状态计算
2025-01-06 13:39:21 +08:00
liaodanlong
b6f3382e5d
状态计算
2025-01-06 13:34:57 +08:00
liaodanlong
f2ee382205
状态计算
2025-01-06 13:33:02 +08:00
liaodanlong
081880b4bb
状态计算
2025-01-06 13:20:10 +08:00
yuxianghui
bc475441a2
1、去除工单开始按钮的二次确认;2、优化托盘入库后夹具物料查询中的状态还是未入库的问题
2025-01-06 13:11:22 +08:00
liaodanlong
a7c3a604a6
Merge remote-tracking branch 'origin/release/release_2.7' into release/release_2.7
2025-01-06 13:03:30 +08:00
liaodanlong
0bd65b5da8
状态计算
2025-01-06 13:03:15 +08:00
liaodanlong
79d561ba68
状态计算
2025-01-06 13:01:58 +08:00
guanhuan
63d9b4bf39
Merge branch 'refs/heads/develop' into release/release_2.7
2025-01-06 12:51:14 +08:00
管欢
2619953be1
Accept Merge Request #1710 : (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/1710
2025-01-06 12:49:14 +08:00
guanhuan
9f1514bd14
修复销售单号和追溯参考为空问题
2025-01-06 11:44:33 +08:00
liaodanlong
6e46d1d8dc
Merge branch 'refs/heads/release/release_2.7' into feature/part_number
2025-01-06 11:20:44 +08:00
liaodanlong
403e64a957
表面工艺外协关联采购单查询条件修改
2025-01-06 11:09:22 +08:00
mgw
aaded331cd
解除装夹方法增加前置判断
2025-01-06 10:11:44 +08:00
liaodanlong
5d2ddfb510
Merge branch 'refs/heads/develop' into feature/part_number
2025-01-06 08:46:19 +08:00
mgw
f68453a0c6
Merge branch 'release/release_2.7' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into release/release_2.7
2025-01-03 15:26:20 +08:00
mgw
5cff411aaf
r环境审批问题
2025-01-03 15:25:47 +08:00
guanhuan
ef5a3decd4
Merge remote-tracking branch 'origin/release/release_2.7' into release/release_2.7
2025-01-03 15:17:26 +08:00
guanhuan
ce1860b283
Merge branch 'refs/heads/develop' into release/release_2.7
2025-01-03 15:16:57 +08:00
mgw
b3f56754cd
修改翻译
2025-01-03 15:09:03 +08:00
管欢
202db10cea
Accept Merge Request #1709 : (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/1709
2025-01-03 15:06:29 +08:00
guanhuan
6b61df9d50
工序外协发料通知跳转
2025-01-03 15:04:22 +08:00
guanhuan
1cac579a1f
Merge remote-tracking branch 'origin/develop' into release/release_2.7
2025-01-03 12:59:19 +08:00
管欢
53ca78a6a3
Accept Merge Request #1708 : (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/1708
2025-01-03 12:54:37 +08:00
mgw
0d28df0415
适配多层审批
2025-01-03 12:52:27 +08:00
guanhuan
d182641d81
外购订单采购单提醒
2025-01-03 12:52:24 +08:00
马广威
7789c901b2
Accept Merge Request #1707 : (feature/制造功能优化 -> develop)
...
Merge Request: 调整状态字段名称
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1707?initial=true
2025-01-03 11:43:55 +08:00
mgw
aa4b73e406
调整状态字段名称
2025-01-03 11:43:27 +08:00
马广威
1ca8ebe3cc
Accept Merge Request #1706 : (feature/制造功能优化 -> develop)
...
Merge Request: Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1706?initial=true
2025-01-03 11:33:28 +08:00
mgw
c34cdd595d
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2025-01-03 11:32:48 +08:00
mgw
1936b512c2
调整多层审批需求
2025-01-03 11:32:24 +08:00
胡尧
3c470093d3
Merge branch 'develop' into release/release_2.7
2025-01-03 10:24:24 +08:00
管欢
b483097907
Accept Merge Request #1705 : (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/1705?initial=true
2025-01-03 10:21:33 +08:00
guanhuan
c6aeff2006
待质检提醒
2025-01-03 10:17:33 +08:00
胡尧
170309b3c0
修改依赖
2025-01-03 10:01:52 +08:00
liaodanlong
58acdc4913
工艺确认重置表面工艺工单的关联采购单代码还原
2025-01-02 16:38:26 +08:00
管欢
d4537fe73d
Accept Merge Request #1704 : (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/1704
2025-01-02 14:24:53 +08:00
guanhuan
eaaa13fb9a
待质检提醒
2025-01-02 14:21:18 +08:00
guanhuan
f92bd8263c
待质检提醒
2025-01-02 14:20:31 +08:00
廖丹龙
5f3957864a
Accept Merge Request #1703 : (feature/part_number -> develop)
...
Merge Request: 工艺确认重置表面工艺工单的关联采购单为草稿
Created By: @廖丹龙
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1703
2025-01-02 13:43:03 +08:00
liaodanlong
f884963abc
工艺确认重置表面工艺工单的关联采购单为草稿
2025-01-02 13:34:09 +08:00
廖丹龙
1e17ac07a9
Accept Merge Request #1702 : (feature/part_number -> develop)
...
Merge Request: 表面工艺采购单确认订单限制,自动化产线加工路线逻辑矫正
Created By: @廖丹龙
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1702
2025-01-02 12:52:02 +08:00
liaodanlong
2f3e12e3af
表面工艺采购单确认订单限制,自动化产线加工路线逻辑矫正
2025-01-02 12:50:39 +08:00
liaodanlong
0ce51a4a66
添加人工线下加工工单排序
2025-01-02 12:49:46 +08:00
liaodanlong
a1bf997d51
采购岗与采购总监岗位添加工单操作权限
2025-01-02 12:49:05 +08:00
马广威
e6c125cae6
Accept Merge Request #1701 : (feature/制造功能优化 -> develop)
...
Merge Request: Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1701?initial=true
2025-01-02 11:34:28 +08:00
mgw
ac968b0d6e
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2025-01-02 10:59:27 +08:00
mgw
81bebf836d
sf-采购-询价单状态流转多余按钮影响现有按钮功能
2025-01-02 10:59:03 +08:00
黄焱
d47d3f1638
Accept Merge Request #1700 : (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/1700?initial=true
2025-01-02 10:31:33 +08:00
hy
614447d56e
解开屏蔽的方法
2025-01-02 10:28:40 +08:00
廖丹龙
bf13edc1be
Accept Merge Request #1699 : (feature/part_number -> develop)
...
Merge Request: 表面工艺采购单确认订单进行限制
Created By: @廖丹龙
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1699
2025-01-02 09:08:27 +08:00
liaodanlong
e99b8692ea
Merge branch 'refs/heads/develop' into feature/part_number
2025-01-02 09:06:41 +08:00
liaodanlong
701decb38f
表面工艺采购单确认订单进行限制
2024-12-31 17:08:38 +08:00
管欢
3c61726fd3
Accept Merge Request #1698 : (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/1698?initial=true
2024-12-31 16:42:34 +08:00
guanhuan
247bebbd75
询价单审批
2024-12-31 16:39:09 +08:00
胡尧
c3ceda2ba9
Accept Merge Request #1697 : (feature/sale_order_route_pick -> develop)
...
Merge Request: 特殊表面工艺外协采购单发起人修改为供应商的采购员
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1697?initial=true
2024-12-31 16:01:03 +08:00
胡尧
281f3c67c3
特殊表面工艺外协采购单发起人修改为供应商的采购员
2024-12-31 16:00:24 +08:00
禹翔辉
641a669f46
Accept Merge Request #1696 : (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/1696
2024-12-31 15:53:53 +08:00
yuxianghui
94b1c7d258
关闭报废入口
2024-12-31 15:50:51 +08:00
廖丹龙
b06b690ae9
Accept Merge Request #1695 : (feature/part_number -> develop)
...
Merge Request: 回退代码
Created By: @廖丹龙
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1695
2024-12-31 14:05:55 +08:00
liaodanlong
37476bcc88
回退代码
2024-12-31 14:03:15 +08:00
管欢
af7eeb55f1
Accept Merge Request #1694 : (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/1694
2024-12-31 13:32:34 +08:00
guanhuan
39ed32f3e9
修复成品调拨出库订单的状态没变
2024-12-31 13:08:00 +08:00
廖丹龙
79ec60bd6b
Accept Merge Request #1693 : (feature/part_number -> 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/1693
2024-12-31 12:55:17 +08:00
liaodanlong
4b7308fdcd
sf-制造-外协工单-调拨单已取消问题
2024-12-31 12:54:16 +08:00
胡尧
198f1145d7
Accept Merge Request #1692 : (feature/sale_order_route_pick -> develop)
...
Merge Request: 修改退回工艺设计后再确认,采购单编程草稿状态
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1692?initial=true
2024-12-31 11:40:03 +08:00
胡尧
64eb66c334
修改退回工艺设计后再确认,采购单编程草稿状态
2024-12-31 11:39:36 +08:00
禹翔辉
cff21a4bcc
Accept Merge Request #1691 : (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/1691?initial=true
2024-12-31 11:35:30 +08:00
yuxianghui
2373f33315
采购单源单据为入库单时,自动计算对应参考销售订单的值
2024-12-31 11:34:21 +08:00
禹翔辉
d6e2e554a8
Accept Merge Request #1690 : (feature/采购单链接销售单 -> develop)
...
Merge Request: 采购订单的关联销售订单字段从销售模块搬迁到制造模块,并新增一个many2many类型字段,且对字段的自动计算方法进行优化。
Created By: @禹翔辉
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1690
2024-12-31 10:58:54 +08:00
yuxianghui
6c45a0bf4a
Merge branch 'feature/入库单优化' into feature/采购单链接销售单
2024-12-31 10:57:09 +08:00
yuxianghui
4902fc5d9a
1、采购订单的关联销售订单字段从销售模块搬迁到制造模块,并新增一个many2many类型字段,且对字段的自动计算方法进行优化。
2024-12-31 10:56:07 +08:00
黄焱
9e5dbc0104
Accept Merge Request #1688 : (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/1688?initial=true
2024-12-31 10:00:18 +08:00
管欢
c57918736d
Accept Merge Request #1689 : (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/1689
2024-12-31 10:00:01 +08:00
guanhuan
78a456849c
修复成品调拨出库订单的状态没变
2024-12-31 09:55:16 +08:00
hy
1816f1a497
修复表格对不齐问题
2024-12-31 09:45:56 +08:00
禹翔辉
da815c8ea1
Accept Merge Request #1686 : (feature/入库单优化 -> develop)
...
Merge Request: 1、采购订单form页买家改名为采购员;2、优化成品入库单的的坯料委外加工链接;
Created By: @禹翔辉
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1686
2024-12-31 08:57:15 +08:00
yuxianghui
32e3c2f79f
采购订单源文档字段名称改为源单据
2024-12-31 08:56:41 +08:00
胡尧
c478b72e04
Accept Merge Request #1687 : (feature/sale_order_route_pick -> develop)
...
Merge Request: 创建成品时从模板上获取供应商价格
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1687?initial=true
2024-12-31 08:54:23 +08:00
胡尧
78b0529809
创建成品时从模板上获取供应商价格
2024-12-31 08:54:02 +08:00
yuxianghui
17ffac63cb
Merge branch 'feature/夹具查询优化_2' into feature/入库单优化
2024-12-31 08:48:50 +08:00
yuxianghui
acee32cc39
1、采购订单form页买家改名为采购员;2、优化成品入库单的的坯料委外加工链接;
2024-12-31 08:47:44 +08:00
马广威
b36cf745c2
Accept Merge Request #1685 : (feature/制造功能优化 -> develop)
...
Merge Request: 添加提交审批的通知消息
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1685?initial=true
2024-12-30 21:38:17 +08:00
mgw
a24279f6e6
添加提交审批的通知消息
2024-12-30 21:37:10 +08:00
马广威
68b89999a9
Accept Merge Request #1684 : (feature/制造功能优化 -> develop)
...
Merge Request: 修改展示名称
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1684?initial=true
2024-12-30 20:29:57 +08:00
mgw
7c38c7f643
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2024-12-30 20:28:49 +08:00
mgw
4937c3a812
修改展示名称
2024-12-30 20:27:57 +08:00
马广威
05469c71b8
Accept Merge Request #1683 : (feature/制造功能优化 -> develop)
...
Merge Request: 修改展示名称
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1683?initial=true
2024-12-30 19:25:14 +08:00
mgw
210eea3b0b
修改展示名称
2024-12-30 19:24:45 +08:00
马广威
f58d1058f7
Accept Merge Request #1682 : (feature/制造功能优化 -> develop)
...
Merge Request: Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1682?initial=true
2024-12-30 18:00:08 +08:00
mgw
0622d7525f
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2024-12-30 17:59:36 +08:00
mgw
7556c09ac2
增加活动项
2024-12-30 17:59:11 +08:00
禹翔辉
5344e97b7e
Accept Merge Request #1681 : (feature/夹具查询优化_2 -> develop)
...
Merge Request: Merge branch 'feature/成品调拨单优化_1' into feature/夹具查询优化_2
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1681?initial=true
2024-12-30 17:33:58 +08:00
yuxianghui
1b10b7bb53
Merge branch 'feature/成品调拨单优化_1' into feature/夹具查询优化_2
2024-12-30 17:32:28 +08:00
yuxianghui
9ab164f0fe
1
2024-12-30 17:31:22 +08:00
马广威
3b07b26303
Accept Merge Request #1680 : (feature/制造功能优化 -> develop)
...
Merge Request: Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1680?initial=true
2024-12-30 17:28:41 +08:00
管欢
29a32be8d2
Accept Merge Request #1679 : (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/1679
2024-12-30 17:28:15 +08:00
mgw
3620412a13
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2024-12-30 17:27:46 +08:00
mgw
5e72e3d1dd
审批明细问题
2024-12-30 17:27:00 +08:00
guanhuan
4137b304f3
消息提醒
2024-12-30 17:25:32 +08:00
马广威
caac651ab4
Accept Merge Request #1678 : (feature/制造功能优化 -> develop)
...
Merge Request: Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1678?initial=true
2024-12-30 17:12:01 +08:00
mgw
30e496442f
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2024-12-30 17:11:31 +08:00
mgw
c28c00a47b
调整description
2024-12-30 17:11:08 +08:00
禹翔辉
4f4fdeecb5
Accept Merge Request #1677 : (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/1677?initial=true
2024-12-30 17:07:07 +08:00
yuxianghui
8742f9b98b
Merge branch 'feature/成品调拨单优化' into feature/成品调拨单优化_1
2024-12-30 17:05:45 +08:00
yuxianghui
d7ce69f474
1、询价单的确认按钮权限添加;2、成品调拨单添加对应的坯料采购单和坯料外协单跳转链接
2024-12-30 17:04:59 +08:00
胡尧
cf46cff7e5
Accept Merge Request #1676 : (feature/sale_order_route_pick -> develop)
...
Merge Request: 屏蔽前端代码
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1676?initial=true
2024-12-30 16:33:41 +08:00
胡尧
c124e2962c
屏蔽前端代码
2024-12-30 16:32:36 +08:00
管欢
f4312c4d4e
Accept Merge Request #1675 : (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/1675
2024-12-30 16:20:37 +08:00
guanhuan
5928456ffe
提示优化
2024-12-30 16:19:17 +08:00
马广威
305ea9dff7
Accept Merge Request #1674 : (feature/制造功能优化 -> develop)
...
Merge Request: Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1674?initial=true
2024-12-30 16:04:59 +08:00
mgw
bdfc393099
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2024-12-30 16:04:10 +08:00
mgw
1e1bd63acf
调整提示语句格式
2024-12-30 16:03:46 +08:00
马广威
fa20bb6eb5
Accept Merge Request #1673 : (feature/制造功能优化 -> develop)
...
Merge Request: sf-询价单-新增状态及修改未审批的提示语句
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1673?initial=true
2024-12-30 15:51:19 +08:00
mgw
c82db7159d
sf-询价单-新增状态及修改未审批的提示语句
2024-12-30 15:50:25 +08:00
廖丹龙
89d6752012
Accept Merge Request #1672 : (feature/part_number -> develop)
...
Merge Request: 销售订单交付状态修改
Created By: @廖丹龙
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1672
2024-12-30 15:40:36 +08:00
liaodanlong
3060b35ab2
销售订单交付状态修改
2024-12-30 15:38:43 +08:00
廖丹龙
17ad976a32
Accept Merge Request #1671 : (feature/part_number -> 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/1671
2024-12-30 15:28:57 +08:00
liaodanlong
9f3b351544
sf-工序外协调拨单-外协出库单多生成了一张外协出库调拨单
2024-12-30 15:25:20 +08:00
黄焱
5dc7dc8e0a
Accept Merge Request #1670 : (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/1670?initial=true
2024-12-30 14:40:22 +08:00
hy
f1868168af
修复会计列表表头少了列bug
2024-12-30 14:38:45 +08:00
guanhuan
f084b5d765
提示优化
2024-12-30 14:12:54 +08:00
guanhuan
854c3ceef2
提示优化
2024-12-30 13:51:31 +08:00
管欢
4269ce58db
Accept Merge Request #1668 : (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/1668?initial=true
2024-12-30 11:37:04 +08:00
guanhuan
3555be86c6
提示优化
2024-12-30 11:35:08 +08:00
廖丹龙
764472111f
Accept Merge Request #1667 : (feature/part_number -> develop)
...
Merge Request: 批量调拨
Created By: @廖丹龙
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1667?initial=true
2024-12-30 10:31:05 +08:00
liaodanlong
ce4fc8b8ab
批量调拨
2024-12-30 10:29:29 +08:00
马广威
67f4917491
Accept Merge Request #1666 : (feature/制造功能优化 -> develop)
...
Merge Request: Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1666?initial=true
2024-12-30 10:02:51 +08:00
mgw
ad885f1e39
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2024-12-30 10:02:09 +08:00
mgw
993d720c40
sf-采购询价单【上传合同】按钮展示条件修改
2024-12-30 10:01:43 +08:00
禹翔辉
da75a8cd35
Accept Merge Request #1665 : (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/1665
2024-12-30 09:59:32 +08:00
yuxianghui
b35f842915
调整托盘解绑修改顺序
2024-12-30 09:57:36 +08:00
guanhuan
4e7993d035
追溯参考号
2024-12-30 09:56:49 +08:00
禹翔辉
946f02003e
Accept Merge Request #1664 : (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/1664?initial=true
2024-12-30 09:54:58 +08:00
yuxianghui
435315a166
Merge branch 'feature/夹具物料查询优化' into feature/夹具物料查询优化_1
2024-12-30 09:53:49 +08:00
yuxianghui
676f8eb7eb
添加点击工单的解绑托盘按钮时,修改对应托盘状态为空闲
2024-12-30 09:52:32 +08:00
管欢
6e9f66506a
Accept Merge Request #1663 : (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/1663
2024-12-30 09:48:30 +08:00
guanhuan
f3e08f5ccc
新增零件名称,零件图号
2024-12-30 09:43:20 +08:00
廖丹龙
c9d7d70d3c
Accept Merge Request #1662 : (feature/part_number -> develop)
...
Merge Request: 委外加工采购单与制造订单进行关联
Created By: @廖丹龙
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1662?initial=true
2024-12-30 09:41:08 +08:00
liaodanlong
ee6e457bbd
委外加工采购单与制造订单进行关联
2024-12-30 09:38:51 +08:00
guanhuan
ab5b4c477f
新增零件名称,零件图号
2024-12-30 09:33:00 +08:00
mgw
9330be3753
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2024-12-30 08:57:49 +08:00
mgw
a3a2c96d00
添加紧急采购字段
2024-12-30 08:57:05 +08:00
禹翔辉
31187755b9
Accept Merge Request #1661 : (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/1661
2024-12-30 08:42:16 +08:00
yuxianghui
178f538997
Merge branch 'feature/销售、采购页面优化' into feature/夹具物料查询优化
2024-12-30 08:34:58 +08:00
马广威
304f6ad5ba
Accept Merge Request #1659 : (feature/part_number -> develop)
...
Merge Request: 销售订单交付状态修改
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1659?initial=true
2024-12-28 14:55:55 +08:00
liaodanlong
8b40714dad
销售订单交付状态修改
2024-12-28 14:55:17 +08:00
马广威
cb8e415e60
Accept Merge Request #1658 : (feature/part_number -> develop)
...
Merge Request: 表面工艺确认回退再重新确认调拨单报错问题
Created By: @廖丹龙
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1658
2024-12-28 14:30:47 +08:00
liaodanlong
889049b107
表面工艺确认回退再重新确认调拨单报错问题
2024-12-28 14:28:34 +08:00
廖丹龙
610028c5f4
Accept Merge Request #1657 : (feature/part_number -> develop)
...
Merge Request: sorted_workorders变量过滤
Created By: @廖丹龙
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1657
2024-12-28 09:13:42 +08:00
liaodanlong
abfac28094
sorted_workorders变量过滤
2024-12-28 09:12:27 +08:00
廖丹龙
24d8d37e0a
Accept Merge Request #1656 : (feature/part_number -> develop)
...
Merge Request: sorted_workorders变量定义
Created By: @廖丹龙
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1656?initial=true
2024-12-28 09:08:20 +08:00
liaodanlong
6780d4e758
sorted_workorders变量定义
2024-12-28 09:07:02 +08:00
马广威
a1d4e74056
Accept Merge Request #1655 : (feature/制造功能优化 -> develop)
...
Merge Request: Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1655?initial=true
2024-12-28 08:26:44 +08:00
mgw
3c8fbcf9f9
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2024-12-28 08:24:55 +08:00
mgw
c0bb07efb2
修改提示方式
2024-12-28 08:24:31 +08:00
yuxianghui
675fb54d37
夹具物料查询优化
2024-12-27 17:28:24 +08:00
廖丹龙
ead54cfc87
Accept Merge Request #1654 : (feature/part_number -> develop)
...
Merge Request: 两张外协工单报错问题
Created By: @廖丹龙
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1654
2024-12-27 17:08:40 +08:00
liaodanlong
e990f24615
两张外协工单报错问题
2024-12-27 16:21:36 +08:00
胡尧
dc871e0a1d
Accept Merge Request #1653 : (feature/sale_order_route_pick -> develop)
...
Merge Request: 修改消息通知
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1653
2024-12-27 13:57:06 +08:00
胡尧
f71246e9fb
解决冲突
2024-12-27 13:56:41 +08:00
胡尧
133c1a87f2
修改消息通知
2024-12-27 13:53:10 +08:00
管欢
6f14a39347
Accept Merge Request #1652 : (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/1652
2024-12-26 17:18:09 +08:00
guanhuan
6e2ee60616
工单已下发提醒
2024-12-26 17:15:48 +08:00
马广威
3efb30cece
Accept Merge Request #1651 : (feature/制造功能优化 -> develop)
...
Merge Request: 修改确认订单时的判定逻辑,调整提示词
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1651?initial=true
2024-12-26 16:35:57 +08:00
mgw
e56df3d7b9
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2024-12-26 16:34:11 +08:00
mgw
253a06ceaf
修改确认订单时的判定逻辑,调整提示词
2024-12-26 16:33:43 +08:00
禹翔辉
28c6c841be
Accept Merge Request #1650 : (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/1650?initial=true
2024-12-26 16:32:56 +08:00
yuxianghui
f948bf445a
Merge branch 'feature/无效刀自动返工优化' into feature/销售、采购页面优化
2024-12-26 16:29:27 +08:00
yuxianghui
1b278a1432
1、订单详情字段显示优化;2、采购单页面优化
2024-12-26 16:28:39 +08:00
马广威
3fcb3b250f
Accept Merge Request #1649 : (feature/制造功能优化 -> develop)
...
Merge Request: Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1649?initial=true
2024-12-26 15:44:28 +08:00
mgw
57c689b03b
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2024-12-26 15:43:51 +08:00
mgw
158ca95dbb
去掉对审批的跳过
2024-12-26 15:42:43 +08:00
guanhuan
e059d9266d
坯料发料提醒
2024-12-26 15:26:12 +08:00
马广威
8de2a59b88
Accept Merge Request #1648 : (feature/制造功能优化 -> develop)
...
Merge Request: Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1648?initial=true
2024-12-26 14:48:01 +08:00
mgw
9ac60ae283
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2024-12-26 14:47:20 +08:00
mgw
07356b5bb2
sf-询价单-【发起审批】按钮,及必填字段问题
2024-12-26 14:46:17 +08:00
禹翔辉
96c79a78ab
Accept Merge Request #1647 : (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/1647?initial=true
2024-12-26 13:55:49 +08:00
yuxianghui
b03eafcf94
取消自动返工时修改制造订单状态
2024-12-26 13:54:59 +08:00
禹翔辉
0b7d7959c5
Accept Merge Request #1646 : (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/1646
2024-12-26 13:25:05 +08:00
yuxianghui
40865b7c6c
取消制造订单功能刀具状态为无效刀时自动返工修改制造订单的状态;
2024-12-26 13:24:04 +08:00
马广威
8abb6447d2
Accept Merge Request #1645 : (feature/制造功能优化 -> develop)
...
Merge Request: 调整按钮位置
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1645?initial=true
2024-12-26 13:17:33 +08:00
mgw
394c3f9870
调整按钮位置
2024-12-26 13:16:04 +08:00
马广威
b254624d68
Accept Merge Request #1644 : (feature/制造功能优化 -> develop)
...
Merge Request: Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1644
2024-12-26 11:28:47 +08:00
mgw
87b2c0b0f8
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2024-12-26 11:22:53 +08:00
mgw
b0e993dd53
完善采购合同上传功能
2024-12-26 11:22:16 +08:00
廖丹龙
79183761ae
Accept Merge Request #1642 : (feature/part_number -> develop)
...
Merge Request: 多制造订单生成工艺有误
Created By: @廖丹龙
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1642
2024-12-26 10:20:43 +08:00
liaodanlong
c448088906
采购单关联产品
2024-12-26 10:18:17 +08:00
禹翔辉
a7a1779e61
Accept Merge Request #1643 : (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/1643?initial=true
2024-12-26 10:03:13 +08:00
yuxianghui
06842c6df9
1、采购入库,选取目标货位去重校验优化;2、添加功能刀具自动计算当前目标货位的值;
2024-12-26 10:01:42 +08:00
liaodanlong
6532af500f
质量检测添加零件图号与零件名称
2024-12-26 08:57:31 +08:00
liaodanlong
1fb88960db
Merge branch 'refs/heads/develop' into feature/part_number
2024-12-25 17:29:48 +08:00
liaodanlong
4c8071fea2
多制造订单生成工艺有误
2024-12-25 17:16:30 +08:00
禹翔辉
4aac3d42b6
Accept Merge Request #1641 : (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/1641?initial=true
2024-12-25 17:14:44 +08:00
yuxianghui
0f4d25abb4
Merge branch 'feature/工单按钮优化' into feature/销售订单优化
2024-12-25 17:13:24 +08:00
yuxianghui
14cc285ee2
1、销售订单供货方式为委外加工时生成的采购单问题优化
2024-12-25 17:12:38 +08:00
廖丹龙
54b896004b
Accept Merge Request #1640 : (feature/part_number -> develop)
...
Merge Request: 时间获取修改
Created By: @廖丹龙
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1640?initial=true
2024-12-25 15:16:26 +08:00
liaodanlong
7a1237ddf8
时间获取修改
2024-12-25 15:14:07 +08:00
廖丹龙
f80aaf978b
Accept Merge Request #1639 : (feature/part_number -> develop)
...
Merge Request: 工艺确认统一工艺设计
Created By: @廖丹龙
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1639
2024-12-25 14:57:16 +08:00
liaodanlong
64f35b5633
工艺确认统一工艺设计
2024-12-25 14:49:05 +08:00
禹翔辉
9e887076f2
Accept Merge Request #1638 : (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/1638?initial=true
2024-12-25 14:20:31 +08:00
yuxianghui
78fff46452
1、制造订单状态优化
2024-12-25 14:16:34 +08:00
禹翔辉
a6d4f99710
Accept Merge Request #1637 : (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/1637?initial=true
2024-12-25 13:22:25 +08:00
yuxianghui
05f1f1a983
去除工单多余的开始按钮
2024-12-25 13:13:38 +08:00
禹翔辉
f719135abb
Accept Merge Request #1636 : (feature/制造、采购优化 -> develop)
...
Merge Request: 1、处理制造订单返工确认后,状态还是返工的bug;2、隐藏已取消状态的采购单【确认订单】按钮
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1636?initial=true
2024-12-25 13:05:14 +08:00
yuxianghui
82983871fc
Merge branch 'feature/制造订单优化' into feature/制造、采购优化
2024-12-25 13:03:44 +08:00
yuxianghui
7f17ff8b78
1、处理制造订单返工确认后,状态还是返工的bug;2、隐藏已取消状态的采购单【确认订单】按钮
2024-12-25 13:02:49 +08:00
胡尧
9efece315f
Accept Merge Request #1635 : (feature/sale_order_route_pick -> develop)
...
Merge Request: 解决手工创建表面工艺采购单由于没有源单据报错
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1635?initial=true
2024-12-25 11:32:36 +08:00
胡尧
d82cb1e64c
解决手工创建表面工艺采购单由于没有源单据报错
2024-12-25 11:31:27 +08:00
mgw
7ab2894ae8
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2024-12-25 11:02:29 +08:00
mgw
0991888494
采购合同上传基础功能
2024-12-25 11:02:00 +08:00
禹翔辉
42937bcf76
Accept Merge Request #1634 : (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/1634
2024-12-25 09:43:29 +08:00
yuxianghui
32fb6eadbc
1
2024-12-25 09:43:04 +08:00
yuxianghui
5a1ebabc87
处理没有工单时,制造订单就已经完成的问题
2024-12-25 09:41:07 +08:00
马广威
57f51d7cfa
Accept Merge Request #1633 : (feature/制造功能优化 -> develop)
...
Merge Request: 询价单字段排版及增加逻辑验证
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1633?initial=true
2024-12-24 20:42:18 +08:00
mgw
d2ec0cacc3
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2024-12-24 17:27:36 +08:00
mgw
aaf3b20e65
询价单字段排版及增加逻辑验证
2024-12-24 17:27:08 +08:00
禹翔辉
5912a170f1
Accept Merge Request #1632 : (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/1632
2024-12-24 17:21:36 +08:00
yuxianghui
ed3feaf2a0
优化制造订单状态方法
2024-12-24 17:17:53 +08:00
yuxianghui
d953f4e4a0
Merge branch 'feature/采购、外协优化' into feature/制造订单优化
2024-12-24 16:48:19 +08:00
yuxianghui
c2d346282c
1、制造订单隐藏不必的取消按钮、添加取消按钮的隐藏条件;2、添加返工完成后制造订单状态置为加工中
2024-12-24 16:47:10 +08:00
管欢
9d85f56af3
Accept Merge Request #1631 : (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/1631
2024-12-24 15:00:25 +08:00
guanhuan
78eea6aad0
消息提醒
2024-12-24 14:49:17 +08:00
廖丹龙
5306e45f83
Accept Merge Request #1630 : (feature/part_number -> develop)
...
Merge Request: 工艺确认报错问题解决
Created By: @廖丹龙
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1630?initial=true
2024-12-24 09:08:58 +08:00
liaodanlong
4bd40aeeb0
工艺确认报错问题解决
2024-12-24 09:07:11 +08:00
禹翔辉
f6d69ea193
Accept Merge Request #1629 : (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/1629?initial=true
2024-12-23 17:15:43 +08:00
yuxianghui
fe5990ff9a
Merge branch 'feature/制造、采购、工单优化' into feature/采购、外协优化
2024-12-23 17:14:00 +08:00
yuxianghui
6db5e72752
1、采购单的采购类型优化,外协优化
2024-12-23 17:13:12 +08:00
廖丹龙
62fcc93a21
Accept Merge Request #1628 : (feature/part_number -> develop)
...
Merge Request: 工艺确认创建工单通过工艺设计排序再进行数据生成
Created By: @廖丹龙
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1628?initial=true
2024-12-23 15:44:40 +08:00
liaodanlong
d6c8120b7c
工艺确认创建工单通过工艺设计排序再进行数据生成
2024-12-23 15:42:07 +08:00
管欢
20994e6656
Accept Merge Request #1627 : (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/1627
2024-12-23 14:27:24 +08:00
禹翔辉
7a64851761
Accept Merge Request #1626 : (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/1626
2024-12-23 14:22:58 +08:00
guanhuan
88f3155132
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/消息提醒优化
...
# Conflicts:
# sf_sale/views/purchase_order_view.xml
2024-12-23 14:06:11 +08:00
yuxianghui
8bd2250d45
Merge branch 'feature/工单rfid优化' into feature/制造、采购、工单优化
2024-12-23 13:47:22 +08:00
yuxianghui
0e7e7af85a
1、优化销售订单状态;2、优化夹具物料查询的托盘可用状态;3、优化工单开始按键;4、优化采购订单的采购类型,根据销售订单的供货方式和工艺确认时是否外协自动选择对应采购类型;
2024-12-23 13:46:30 +08:00
yuxianghui
098e8c2518
工单工序优化
2024-12-20 17:22:56 +08:00
guanhuan
5a06811732
发送消息
2024-12-20 16:12:30 +08:00
guanhuan
c4b02f7717
发送消息
2024-12-20 15:31:55 +08:00
廖丹龙
a2f29766e6
Accept Merge Request #1625 : (feature/part_number -> develop)
...
Merge Request: 零件图号零件名称
Created By: @廖丹龙
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1625
2024-12-20 15:25:27 +08:00
liaodanlong
091b9940ef
零件图号零件名称
2024-12-20 14:59:26 +08:00
liaodanlong
c0db279414
Merge branch 'refs/heads/develop' into feature/part_number
...
# Conflicts:
# sf_manufacturing/models/purchase_order.py
2024-12-20 14:56:46 +08:00
liaodanlong
41096c9c65
零件图号零件名称
2024-12-20 14:55:04 +08:00
guanhuan
bf227e3e92
交期状态
2024-12-20 14:33:23 +08:00
胡尧
fa9ed5885b
Accept Merge Request #1624 : (feature/sale_order_route_pick -> develop)
...
Merge Request: 修复 工艺外协工序采购单已创建账单并且过账,退回调整删除后报错的问题
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1624?initial=true
2024-12-20 14:16:59 +08:00
胡尧
c8df5ed179
修复 工艺外协工序采购单已创建账单并且过账,退回调整删除后报错的问题
2024-12-20 14:16:25 +08:00
guanhuan
9d883d112c
消息提醒
2024-12-20 13:51:11 +08:00
胡尧
142b94139c
Accept Merge Request #1623 : (feature/sale_order_route_pick -> develop)
...
Merge Request: 选择工序时,排除已经选择的工序
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1623?initial=true
2024-12-20 13:02:37 +08:00
胡尧
2a20d54530
选择工序时,排除已经选择的工序
2024-12-20 13:02:10 +08:00
胡尧
f2e8d0175b
选择工序时,排除已经选择的工序
2024-12-20 12:51:42 +08:00
禹翔辉
690e8ca1b2
Accept Merge Request #1622 : (feature/工单rfid优化 -> develop)
...
Merge Request: 1、处理工单返工时就解除rfid绑定问题;2、同步bfm的订单状态到销售订单
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1622?initial=true
2024-12-20 11:09:07 +08:00
yuxianghui
18073cb726
Merge branch 'feature/制造、工单优化' into feature/工单rfid优化
2024-12-20 11:07:48 +08:00
yuxianghui
bdac1e7460
1、处理工单返工时就解除rfid绑定问题;2、同步bfm的订单状态到销售订单
2024-12-20 11:06:41 +08:00
廖丹龙
8cfccfb2e0
Accept Merge Request #1621 : (feature/delivery_status -> develop)
...
Merge Request: 工序外协工单没有自动触发工单开始、结束的优化需求处理
Created By: @廖丹龙
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1621?initial=true
2024-12-20 10:36:46 +08:00
禹翔辉
283950db39
Accept Merge Request #1620 : (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/1620
2024-12-19 17:22:40 +08:00
yuxianghui
9cb1cff671
Merge branch 'feature/销售、制造、返工优化' into feature/制造、工单优化
2024-12-19 17:21:04 +08:00
yuxianghui
03dbeaf988
1、隐藏返工状态工单的开始按钮;2、优化工单状态方法;3、优化制造订单状态
2024-12-19 17:14:48 +08:00
胡尧
bef8ba46cd
Accept Merge Request #1619 : (feature/sale_order_route_pick -> develop)
...
Merge Request: 增加agv配送重新下发与取消
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1619?initial=true
2024-12-19 17:02:34 +08:00
胡尧
23afbc14c9
增加agv配送重新下发与取消
2024-12-19 17:00:40 +08:00
guanhuan
72bf8ad011
消息提醒
2024-12-19 14:36:16 +08:00
禹翔辉
93b87ec8ff
Accept Merge Request #1618 : (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/1618?initial=true
2024-12-19 13:47:26 +08:00
yuxianghui
d4fb6ef049
Merge branch 'feature/返工、工序优化' into feature/销售、制造、返工优化
2024-12-19 13:46:01 +08:00
yuxianghui
97facdaf9c
1、销售订单状态添加【加工中】、【物流中】、【已交付】三种状态;2、优化 获取mrs下发的编程单 接口,添加对返工重新编程的处理
2024-12-19 13:45:10 +08:00
guanhuan
5eda4427df
消息提醒
2024-12-19 13:09:20 +08:00
马广威
6b2b792df8
Accept Merge Request #1617 : (feature/制造功能优化 -> develop)
...
Merge Request: sf-创建员工时提示员工已存在
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1617?initial=true
2024-12-18 16:58:50 +08:00
mgw
aad68b23ac
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2024-12-18 16:56:53 +08:00
mgw
ff91aa1ad6
sf-创建员工时提示员工已存在
2024-12-18 16:56:26 +08:00
yuxianghui
15eb36a5bc
1、优化销售订单列表页、详情页字段显示;2、优化新增采购订单列表页、详情页字段显示;
2024-12-18 16:39:54 +08:00
guanhuan
79d188fb5c
消息提醒
2024-12-18 16:26:28 +08:00
guanhuan
42444e6c83
消息提醒
2024-12-17 17:21:36 +08:00
guanhuan
d7a25580d1
消息提醒
2024-12-17 14:42:15 +08:00
guanhuan
1da3989fa3
消息提醒
2024-12-17 11:34:24 +08:00
yuxianghui
202fafac84
采购模块界面优化、采购类型新增【工序外协】、【外购订单】选项
2024-12-16 17:22:39 +08:00
yuxianghui
2b9a44761f
1、采购单详情页添加销售订单号关联字段,关联跳转至对应销售订单;2、采购页面优化
2024-12-13 17:03:45 +08:00
管欢
d24b0e8af8
Accept Merge Request #1616 : (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/1616
2024-12-13 16:29:45 +08:00
guanhuan
b551777d49
逾期工单不能批量重新安排的优化需求
2024-12-13 16:24:25 +08:00
yuxianghui
3253b26818
1、报价、销售订单列表视图添加平台订单号字段。2、销售订单详情的采购链接按采购类型拆分为委外加工和采购的跳转链接;
2024-12-13 13:38:22 +08:00
liaodanlong
9f67dbe9aa
工序外协工单没有自动触发工单开始、结束的优化需求处理
2024-12-12 16:06:55 +08:00
guanhuan
01fa7bbe87
批量重新安排
2024-12-12 14:39:10 +08:00
廖丹龙
e8644962c5
Accept Merge Request #1614 : (feature/delivery_status -> develop)
...
Merge Request: 制造订单退回调整删除表面工艺再次确认后-没被删除的表面工艺的外协出入库单变成了草稿状态问题处理
Created By: @廖丹龙
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1614?initial=true
2024-12-12 09:32:37 +08:00
guanhuan
c793089131
工艺确认弹框优化
2024-12-12 09:29:48 +08:00
禹翔辉
8fe7a47367
Accept Merge Request #1615 : (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/1615
2024-12-11 17:27:19 +08:00
yuxianghui
b7e35ce5e5
Merge branch 'feature/制造、销售、采购优化' into feature/返工、工序优化
2024-12-11 17:25:24 +08:00
yuxianghui
7c17241882
1、制造订单点击返工按钮添加新的过滤条件;2、优化工单工序逻辑;3、返工添加校验限制条件;
2024-12-11 17:24:32 +08:00
liaodanlong
ab32f881c2
制造订单退回调整删除表面工艺再次确认后-没被删除的表面工艺的外协出入库单变成了草稿状态问题处理
2024-12-11 17:09:51 +08:00
廖丹龙
b06becead4
Accept Merge Request #1613 : (feature/delivery_status -> develop)
...
Merge Request: 修改日志的使用库
Created By: @廖丹龙
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1613
2024-12-11 11:23:34 +08:00
liaodanlong
f32ca13dff
修改日志的使用库
2024-12-11 11:05:25 +08:00
禹翔辉
83028b3b3d
Accept Merge Request #1612 : (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/1612
2024-12-11 10:36:24 +08:00
yuxianghui
ad74fd989b
Merge branch 'feature/返工入口' into feature/制造、销售、采购优化
2024-12-11 10:34:09 +08:00
yuxianghui
179ce86bef
1、去除工单页面的时效状态自动筛选项;2、坯料制造订单添加批量确认加工工艺功能;3、处理返工新生成的工单工序错误问题;4、采购、销售页面优化
2024-12-11 10:33:10 +08:00
廖丹龙
1b321b424e
Accept Merge Request #1611 : (feature/delivery_status -> develop)
...
Merge Request: 销售订单与制造订单关联
Created By: @廖丹龙
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1611
2024-12-11 10:16:19 +08:00
liaodanlong
d1ba2cc3d4
Merge branch 'refs/heads/develop' into feature/delivery_status
...
# Conflicts:
# sf_manufacturing/models/mrp_production.py
2024-12-11 10:07:34 +08:00
liaodanlong
4738b03a45
销售订单与制造订单关联
2024-12-11 10:03:20 +08:00
guanhuan
83e57b63ec
报废新生成的制造订单没关联新采购单
2024-12-10 17:18:33 +08:00
禹翔辉
e14e750bd9
Accept Merge Request #1610 : (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/1610?initial=true
2024-12-09 16:08:52 +08:00
yuxianghui
1c4a6ca85e
开放返工入口
2024-12-09 16:07:34 +08:00
管欢
c922ae1571
Accept Merge Request #1609 : (feature/manufactur_order -> develop)
...
Merge Request: 手动创建的采购单生成的内部调拨单没有源单据
Created By: @管欢
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @管欢
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1609
2024-12-09 09:48:12 +08:00
guanhuan
ed6189a963
Merge remote-tracking branch 'origin/feature/manufactur_order' into feature/manufactur_order
2024-12-09 09:36:08 +08:00
guanhuan
a6979b213b
手动创建的采购单生成的内部调拨单没有源单据
2024-12-09 09:35:41 +08:00
马广威
f873ebe079
Accept Merge Request #1608 : (release/release_2.6 -> develop)
...
Merge Request: Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1608
2024-12-05 18:26:29 +08:00
mgw
ab692dfb25
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2024-12-05 18:25:08 +08:00
马广威
e50b601ccf
Accept Merge Request #1607 : (feature/制造功能优化 -> develop)
...
Merge Request: 对合并后的采购单修改匹配逻辑
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1607?initial=true
2024-12-05 18:15:09 +08:00
mgw
37c47b0a54
对合并后的采购单修改匹配逻辑
2024-12-05 18:14:19 +08:00
马广威
6f9cea2759
Accept Merge Request #1606 : (feature/制造功能优化 -> develop)
...
Merge Request: 特殊表面工艺采购单还是有合并的情况-且重复了
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1606?initial=true
2024-12-05 17:03:08 +08:00
mgw
0601e123fb
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2024-12-05 17:01:36 +08:00
mgw
08e4541a96
特殊表面工艺采购单还是有合并的情况-且重复了
2024-12-05 17:01:10 +08:00
胡尧
66acc19e89
Accept Merge Request #1605 : (feature/sale_order_route_pick -> develop)
...
Merge Request: 工艺设计新增工序只选择了参数时确认增加提示
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1605?initial=true
2024-12-05 16:56:20 +08:00
胡尧
5b94a0624c
工艺设计新增工序只选择了参数时确认增加提示
2024-12-05 16:55:51 +08:00
胡尧
1b5b2fd6f9
Accept Merge Request #1604 : (feature/sale_order_route_pick -> develop)
...
Merge Request: 处理供应商相同的特殊表面工艺不能删除的问题
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1604?initial=true
2024-12-05 16:36:55 +08:00
胡尧
54c502dd64
处理供应商相同的特殊表面工艺不能删除的问题
2024-12-05 16:36:33 +08:00
胡尧
e3db40ae25
Accept Merge Request #1603 : (feature/sale_order_route_pick -> develop)
...
Merge Request: 解决删除表面工艺,多增加了采购单的bug
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1603
2024-12-05 15:09:49 +08:00
胡尧
52ab962ace
解决删除表面工艺,多增加了采购单的bug
2024-12-05 15:09:04 +08:00
胡尧
05247ee8d9
Accept Merge Request #1602 : (feature/sale_order_route_pick -> develop)
...
Merge Request: 特殊表面工艺工单没有完成对应采购单时工单处于等待组件
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1602?initial=true
2024-12-05 13:42:33 +08:00
胡尧
dbf75684ee
特殊表面工艺工单没有完成对应采购单时工单处于等待组件
2024-12-05 13:42:07 +08:00
马广威
cb2319492b
Accept Merge Request #1601 : (feature/制造功能优化 -> develop)
...
Merge Request: 制造订单退回调整-删除表面工艺后对应的外协出入库单没有变成取消状态
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1601
2024-12-05 11:49:03 +08:00
mgw
731e6abc90
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
...
# Conflicts:
# sf_manufacturing/models/mrp_workorder.py
2024-12-05 11:48:07 +08:00
mgw
58b33b6c8d
制造订单退回调整-删除表面工艺后对应的外协出入库单没有变成取消状态
2024-12-05 11:05:43 +08:00
胡尧
43c8bbda71
Accept Merge Request #1600 : (feature/sale_order_route_pick -> develop)
...
Merge Request: 解决表面工艺工单完成后,生产入库单未就绪的问题
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1600?initial=true
2024-12-05 09:32:00 +08:00
胡尧
e011e4cfd6
解决表面工艺工单完成后,生产入库单未就绪的问题
2024-12-05 09:31:06 +08:00
胡尧
c8fd2d69bd
Accept Merge Request #1599 : (feature/sale_order_route_pick -> develop)
...
Merge Request: 修改工艺外协工单
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1599?initial=true
2024-12-05 08:37:05 +08:00
胡尧
ef1f7b1d08
解决冲突
2024-12-05 08:36:48 +08:00
胡尧
5f12976d8f
修改表面工艺外协工单流程
2024-12-05 01:33:46 +08:00
胡尧
ef60f36c90
修改工艺外协工单
2024-12-04 20:42:34 +08:00
廖丹龙
c8ed45b1a7
Accept Merge Request #1598 : (feature/manufactur_order -> develop)
...
Merge Request: 坯料长宽高修改
Created By: @廖丹龙
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1598?initial=true
2024-12-04 16:43:58 +08:00
liaodanlong
57fe68bae8
Merge remote-tracking branch 'origin/feature/manufactur_order' into feature/manufactur_order
2024-12-04 16:42:13 +08:00
liaodanlong
aa32fdcd07
坯料长宽高修改
2024-12-04 16:41:42 +08:00
管欢
d0d59135e3
Accept Merge Request #1597 : (feature/manufactur_order -> develop)
...
Merge Request: 多个制造订单菜单修复
Created By: @管欢
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @管欢
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1597
2024-12-04 16:39:44 +08:00
guanhuan
27ec5b1b74
多个制造订单菜单修复
2024-12-04 16:13:55 +08:00
禹翔辉
2c1caabce6
Accept Merge Request #1596 : (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/1596
2024-12-04 15:41:11 +08:00
yuxianghui
8f3cd9ff36
Merge branch 'feature/隐藏返工入口' into feature/界面优化
2024-12-04 15:39:05 +08:00
yuxianghui
6366904c91
添加客供料入库单的合并选项
2024-12-04 15:37:58 +08:00
马广威
7f3e6de127
Accept Merge Request #1595 : (feature/制造功能优化 -> develop)
...
Merge Request: 处理“制造订单退回调整删除特殊表面工艺后对应坯料的采购单也变成取消状态了”
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1595?initial=true
2024-12-04 12:24:18 +08:00
yuxianghui
5b43cceb94
计划模块的【制造订单生产计划】页面菜单名称改为【CNC产线计划排程】
2024-12-04 11:56:38 +08:00
mgw
d933416b2d
处理“制造订单退回调整删除特殊表面工艺后对应坯料的采购单也变成取消状态了”
2024-12-04 11:52:52 +08:00
yuxianghui
e260ef01f0
隐藏销售模块的 快速订单 菜单
2024-12-04 11:43:02 +08:00
廖丹龙
0fef3d7a63
Accept Merge Request #1594 : (feature/manufactur_order -> develop)
...
Merge Request: 表面工艺采购单与调拨单拆分
Created By: @廖丹龙
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1594?initial=true
2024-12-04 10:49:12 +08:00
liaodanlong
dc5c0b1d1e
Merge branch 'refs/heads/develop' into feature/manufactur_order
2024-12-04 10:46:38 +08:00
liaodanlong
9a1cde6abc
表面工艺采购单与调拨单拆分
2024-12-04 10:45:46 +08:00
胡尧
29864b8bb2
Accept Merge Request #1591 : (feature/manufactur_order -> develop)
...
Merge Request: 修复表面工艺询价单查询
Created By: @管欢
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1591
2024-12-04 10:23:35 +08:00
胡尧
aa5294f110
Accept Merge Request #1593 : (feature/sale_order_route_pick -> develop)
...
Merge Request: 处理报错是英文的问题
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1593?initial=true
2024-12-04 10:23:19 +08:00
胡尧
4387d343b5
处理报错是英文的问题
2024-12-04 10:22:50 +08:00
胡尧
ff979aa34b
Accept Merge Request #1592 : (feature/sale_order_route_pick -> develop)
...
Merge Request: 解决外协调拨单不能完成的bug
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1592?initial=true
2024-12-04 10:17:34 +08:00
胡尧
21af368068
解决外协调拨单不能完成的bug
2024-12-04 10:16:30 +08:00
guanhuan
d6afd556d3
询价单查询
2024-12-03 15:59:10 +08:00
胡尧
778d2c4ec5
Accept Merge Request #1590 : (feature/sale_order_route_pick -> develop)
...
Merge Request: 去掉多余的视图
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1590?initial=true
2024-12-03 10:04:29 +08:00
禹翔辉
fff29b36ee
Accept Merge Request #1587 : (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/1587
2024-12-03 10:04:23 +08:00
胡尧
fedb79a142
去掉多余的视图
2024-12-03 10:03:05 +08:00
胡尧
d06816052f
Accept Merge Request #1589 : (feature/sale_order_route_pick -> develop)
...
Merge Request: 修改文件位置
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1589?initial=true
2024-12-02 19:48:02 +08:00
胡尧
5739e167f4
修改文件位置
2024-12-02 19:46:45 +08:00
胡尧
a249548a20
Accept Merge Request #1588 : (feature/sale_order_route_pick -> develop)
...
Merge Request: 修改文件位置
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1588?initial=true
2024-12-02 16:37:26 +08:00
胡尧
7b6538d01e
修改文件位置
2024-12-02 16:29:33 +08:00
yuxianghui
7025bde56e
隐藏手动返工报废入口
2024-12-02 13:46:20 +08:00
胡尧
3585af0cea
Accept Merge Request #1586 : (feature/sale_order_route_pick -> develop)
...
Merge Request: 调整文件结构
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1586?initial=true
2024-12-02 11:03:46 +08:00
胡尧
5406224c6f
调整文件结构
2024-12-02 11:02:32 +08:00
胡尧
18ff0bba54
Accept Merge Request #1585 : (feature/sale_order_route_pick -> develop)
...
Merge Request: 调整文件结构
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1585?initial=true
2024-12-02 10:36:36 +08:00
胡尧
7c13e57ea2
调整文件结构
2024-12-02 10:36:06 +08:00
胡尧
b8605b9a97
Accept Merge Request #1584 : (feature/sale_order_route_pick -> develop)
...
Merge Request: 调整文件结构,解决依赖问题
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1584?initial=true
2024-12-02 10:07:11 +08:00
胡尧
4baa7a9b44
调整文件结构,解决依赖问题
2024-12-02 10:06:11 +08:00
黄焱
3af2f3e03b
Accept Merge Request #1583 : (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/1583?initial=true
2024-11-29 16:27:46 +08:00
hy
dc68ecb584
计划排程列表和工单列表筛选项和数量显示重叠了
2024-11-29 16:26:32 +08:00
马广威
421f107728
Accept Merge Request #1582 : (feature/制造功能优化 -> develop)
...
Merge Request: 调整库存概览翻译
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1582?initial=true
2024-11-29 15:59:40 +08:00
mgw
1f1bdd08ed
调整库存概览翻译
2024-11-29 15:59:04 +08:00
黄焱
1a7059aad1
Accept Merge Request #1581 : (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/1581
2024-11-29 14:40:43 +08:00
hy
8d461e61b3
甘特图增加判断
2024-11-29 14:37:48 +08:00
马广威
fa0ca83709
Accept Merge Request #1580 : (feature/制造功能优化 -> develop)
...
Merge Request: 调整内部转账翻译
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1580?initial=true
2024-11-29 14:33:46 +08:00
mgw
a783f9c271
调整内部转账翻译
2024-11-29 14:32:58 +08:00
胡尧
b4901e89d6
Accept Merge Request #1579 : (feature/sale_order_route_pick -> develop)
...
Merge Request: 权限调整
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1579
2024-11-29 14:15:06 +08:00
胡尧
6690d3f2cb
权限调整
2024-11-29 14:14:14 +08:00
马广威
21d6989182
Accept Merge Request #1578 : (feature/制造功能优化 -> develop)
...
Merge Request: 调整计划调度岗对工单的权限
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1578?initial=true
2024-11-29 11:30:30 +08:00
mgw
97ad3567e3
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2024-11-29 11:24:50 +08:00
mgw
22a69df31b
调整计划调度岗对工单的权限
2024-11-29 11:24:27 +08:00
胡尧
c0ad9d8977
Accept Merge Request #1577 : (feature/sale_order_route_pick -> develop)
...
Merge Request: 解决单个制造的bug
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1577?initial=true
2024-11-29 10:49:24 +08:00
胡尧
a927d0e9cb
解决单个制造的bug
2024-11-29 10:44:48 +08:00
杨金灵
5759ca1ca5
Accept Merge Request #1576 : (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/1576
2024-11-29 10:07:57 +08:00
jinling.yang
9955157dd3
还原代码
2024-11-29 10:07:17 +08:00
jinling.yang
d42de42709
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复外协出入库单
2024-11-29 10:04:23 +08:00
jinling.yang
a7dc3a1227
修复表面外协
2024-11-29 10:03:44 +08:00
胡尧
9c5f525e90
Accept Merge Request #1575 : (feature/sale_order_route_pick -> develop)
...
Merge Request: 处理工单中的工艺外协按钮点击报错的问题
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1575?initial=true
2024-11-29 09:45:38 +08:00
胡尧
db8bd659c3
处理工单中的工艺外协按钮点击报错的问题
2024-11-29 09:45:06 +08:00
胡尧
0dab394d1b
Accept Merge Request #1574 : (feature/sale_order_route_pick -> develop)
...
Merge Request: 解决精坯料计算精度问题,排程加上预留时间
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1574?initial=true
2024-11-29 09:00:32 +08:00
胡尧
9a9e47b4ff
解决精坯料计算精度问题,排程加上预留时间
2024-11-29 08:59:52 +08:00
jinling.yang
deb2f6ca64
修复采购
2024-11-28 18:01:29 +08:00
禹翔辉
5bce9bb816
Accept Merge Request #1573 : (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/1573
2024-11-28 17:52:46 +08:00
yuxianghui
ccda6b627d
Merge branch 'feature/制造订单状态优化_1' into feature/坯料制造序号优化
2024-11-28 17:51:22 +08:00
yuxianghui
20cfbf7230
处理 坯料的制造订单生成的批次序列号不对 的bug
2024-11-28 17:50:12 +08:00
jinling.yang
805eabd07e
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复外协出入库单
2024-11-28 16:01:11 +08:00
jinling.yang
c42c053d66
修复表面工艺外协及工艺设计
2024-11-28 15:59:17 +08:00
禹翔辉
d8e51f44ac
Accept Merge Request #1572 : (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/1572
2024-11-28 15:54:12 +08:00
yuxianghui
0b5645496b
Merge branch 'feature/工单状态优化_2' into feature/制造订单状态优化_1
2024-11-28 15:52:31 +08:00
yuxianghui
2c37dbf5c4
制造订单状态优化
2024-11-28 15:51:54 +08:00
胡尧
cd6dc7a47e
Accept Merge Request #1571 : (feature/sale_order_route_pick -> develop)
...
Merge Request: 修改坯料冗余描述
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1571?initial=true
2024-11-28 15:42:05 +08:00
胡尧
7362f0cd30
修改坯料冗余描述
2024-11-28 15:41:39 +08:00
胡尧
de2924883c
Accept Merge Request #1570 : (feature/sale_order_route_pick -> develop)
...
Merge Request: 修改排程逻辑
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1570?initial=true
2024-11-28 15:22:23 +08:00
胡尧
942aa469e3
修改排程逻辑
2024-11-28 15:21:54 +08:00
胡尧
d57cc59115
修改排程逻辑
2024-11-28 15:20:56 +08:00
禹翔辉
f8ff3a18a0
Accept Merge Request #1569 : (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/1569?initial=true
2024-11-28 15:11:30 +08:00
胡尧
96171013d6
修改排程
2024-11-28 15:10:45 +08:00
yuxianghui
d741d6ccf5
Merge branch 'feature/制造订单状态优化' into feature/工单状态优化_2
2024-11-28 15:09:51 +08:00
yuxianghui
8ff73d5647
工单状态优化
2024-11-28 15:09:11 +08:00
胡尧
5d3d04b5d3
Accept Merge Request #1567 : (feature/sale_order_route_pick -> develop)
...
Merge Request: 解决询价单中自动化产线加工的订单不生成编程单的问题
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1567
2024-11-28 15:05:57 +08:00
马广威
75ed1a6889
Accept Merge Request #1568 : (feature/制造功能优化 -> develop)
...
Merge Request: 修复仓储岗角色权限问题
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1568?initial=true
2024-11-28 13:39:47 +08:00
mgw
9bfbea11db
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2024-11-28 13:38:43 +08:00
mgw
5eea260618
修复仓储岗角色权限问题
2024-11-28 13:38:14 +08:00
胡尧
f1e70d2c66
解决询价单中自动化产线加工的订单不生成编程单的问题
2024-11-28 11:36:32 +08:00
jinling.yang
da22cb301e
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-11-28 10:48:28 +08:00
jinling.yang
2b93f2a253
Merge branch 'feature/修复制造订单-采购单' into develop
2024-11-28 10:46:42 +08:00
杨金灵
8ab42ff7da
Accept Merge Request #1566 : (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/1566?initial=true
2024-11-28 10:45:25 +08:00
jinling.yang
9bf57005f0
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复制造订单-采购单
2024-11-28 10:41:13 +08:00
jinling.yang
a80d498eab
修复制造订单-采购单
2024-11-28 10:40:48 +08:00
胡尧
4847596072
Accept Merge Request #1565 : (feature/sale_order_route_pick -> develop)
...
Merge Request: 修改排程单的问题
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1565?initial=true
2024-11-28 10:18:35 +08:00
胡尧
d4ba58b55a
修改排程单的问题
2024-11-28 10:17:03 +08:00
liaodanlong
73ab43f16a
人工线下加工
2024-11-28 10:05:17 +08:00
杨金灵
306d5074f2
Accept Merge Request #1563 : (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/1563
2024-11-28 10:03:05 +08:00
马广威
745abaab2e
Accept Merge Request #1564 : (feature/制造功能优化 -> develop)
...
Merge Request: 修复计划调度岗和生产总监权限问题
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1564?initial=true
2024-11-28 10:00:24 +08:00
jinling.yang
c22b91f9d9
优化采购:一个制造订单对应一个采购单
2024-11-28 09:59:01 +08:00
yuxianghui
0bea93ea46
1、添加返工向导中选择返工工单限制条件
2024-11-27 17:54:59 +08:00
jinling.yang
ecf683e663
修复采购
2024-11-27 17:54:31 +08:00
胡尧
0af7ef905d
Accept Merge Request #1562 : (feature/sale_order_route_pick -> develop)
...
Merge Request: 解决工单完成的问题
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1562?initial=true
2024-11-27 17:40:58 +08:00
胡尧
c169c0a80b
解决工单完成的问题
2024-11-27 17:40:35 +08:00
禹翔辉
878d62f483
Accept Merge Request #1561 : (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/1561?initial=true
2024-11-27 16:31:34 +08:00
yuxianghui
8a33cea8bd
Merge branch 'feature/工序排序优化' into feature/制造订单状态优化
2024-11-27 16:19:18 +08:00
yuxianghui
d6c194eaa8
处理制造订单状态问题。
2024-11-27 16:18:18 +08:00
胡尧
13d32c26b6
Accept Merge Request #1560 : (feature/sale_order_route_pick -> develop)
...
Merge Request: 成品委外,坯料自加工的制造排程单生成
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1560?initial=true
2024-11-27 15:03:51 +08:00
胡尧
df146a4b58
成品委外,坯料自加工的制造排程单生成
2024-11-27 15:02:42 +08:00
廖丹龙
4a02034ee3
Accept Merge Request #1559 : (feature/delivery_status -> develop)
...
Merge Request: 排程 采购单条件判断
Created By: @廖丹龙
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1559
2024-11-27 14:52:18 +08:00
liaodanlong
acb24d69e3
排程 采购单条件判断
2024-11-27 14:42:41 +08:00
胡尧
56cfeac214
修改坯料冗余描述
2024-11-27 11:16:11 +08:00
胡尧
b86ad6e5bb
Accept Merge Request #1558 : (release/release_2.6 -> develop)
...
Merge Request: 修改数据初始化
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1558?initial=true
2024-11-27 11:15:36 +08:00
胡尧
f57c95496a
修改数据初始化
2024-11-27 11:06:05 +08:00
禹翔辉
826b2c3e94
Accept Merge Request #1557 : (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/1557?initial=true
2024-11-27 11:05:30 +08:00
yuxianghui
29b43c6ab8
Merge branch 'feature/返工优化_5' into feature/工序排序优化
2024-11-27 11:01:49 +08:00
yuxianghui
a434227807
1、工序排序方法优化;2、返工优化
2024-11-27 11:01:10 +08:00
胡尧
3a7fb81276
Accept Merge Request #1556 : (feature/sale_order_route_pick -> develop)
...
Merge Request: 解决工单开始结束的问题
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1556?initial=true
2024-11-27 09:54:04 +08:00
胡尧
12224fc892
解决工单开始结束的问题
2024-11-27 09:53:17 +08:00
胡尧
64fdedf726
修改工单开始
2024-11-27 08:37:12 +08:00
yuxianghui
d3b61f320f
1、返工优化
2024-11-26 18:01:02 +08:00
jinling.yang
6be7c05415
优化代码
2024-11-26 17:05:45 +08:00
mgw
92b924754d
修复计划调度岗和生产总监权限问题
2024-11-26 16:56:47 +08:00
jinling.yang
40ddfdd48f
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-11-26 16:47:22 +08:00
杨金灵
afa5ad36f2
Accept Merge Request #1554 : (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/1554
2024-11-26 16:32:47 +08:00
黄焱
916a5c1054
Accept Merge Request #1555 : (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/1555?initial=true
2024-11-26 16:31:28 +08:00
jinling.yang
ea914be4c7
修复采购链接
2024-11-26 16:21:17 +08:00
jinling.yang
e6eb41ad24
优化代码
2024-11-26 16:15:50 +08:00
jinling.yang
43ee2d1836
回滚代码
2024-11-26 16:08:30 +08:00
jinling.yang
3bd4e6723e
Merge branch 'feature/修复表面工艺' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复表面工艺
2024-11-26 16:05:52 +08:00
jinling.yang
0e763c2ca6
还原代码
2024-11-26 16:05:37 +08:00
jinling.yang
34353e3614
修复表面工艺
2024-11-26 16:05:23 +08:00
jinling.yang
d91c7b22d7
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-11-26 16:04:10 +08:00
jinling.yang
ac4861c76e
Merge branch 'feature/修复表面工艺' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复表面工艺
2024-11-26 16:01:59 +08:00
jinling.yang
6edd124556
优化
2024-11-26 16:01:20 +08:00
jinling.yang
f426183d22
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复表面工艺
2024-11-26 15:59:31 +08:00
jinling.yang
33db91f799
Revert "修复表面工艺"
...
This reverts commit b5beaad7bf .
2024-11-26 15:56:22 +08:00
jinling.yang
8803380a30
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/new1
2024-11-26 15:37:40 +08:00
jinling.yang
b5beaad7bf
修复表面工艺
2024-11-26 15:37:19 +08:00
hy
304259c653
增加列表多选配置
2024-11-26 15:22:41 +08:00
胡尧
5ccc836b20
Accept Merge Request #1553 : (feature/sale_order_route_pick -> develop)
...
Merge Request: 修改排程单bug
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1553?initial=true
2024-11-26 11:51:47 +08:00
胡尧
087bb0e8fe
取消制造订单排程时,将其下所有子制造订单改为已排状态的逻辑
2024-11-26 11:51:09 +08:00
胡尧
09a476ffa5
修改子制造订单的销售订单
2024-11-26 11:26:17 +08:00
禹翔辉
429ad2b77c
Accept Merge Request #1552 : (feature/返工优化_5 -> develop)
...
Merge Request: 1、返工向导模型添加新的工单字段;2、工单tree视图添加重新加工分类
Created By: @禹翔辉
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1552
2024-11-26 11:17:22 +08:00
yuxianghui
c215e3dc27
Merge branch 'feature/采购优化' into feature/返工优化_5
2024-11-26 11:15:56 +08:00
yuxianghui
0a1da79487
1、返工向导模型添加新的工单字段;2、工单tree视图添加重新加工分类
2024-11-26 11:14:45 +08:00
jinling.yang
42e4e15cdb
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-11-26 10:58:20 +08:00
胡尧
a3e7a23979
Accept Merge Request #1551 : (feature/sale_order_route_pick -> develop)
...
Merge Request: 采购单根据采购类型拆分
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1551
2024-11-26 10:48:25 +08:00
胡尧
430a628e18
Merge branch 'develop' into feature/sale_order_route_pick
2024-11-26 10:47:32 +08:00
胡尧
5f70690af5
采购单根据采购类型拆分
2024-11-26 10:45:43 +08:00
杨金灵
b852933a9e
Accept Merge Request #1550 : (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/1550
2024-11-26 10:44:56 +08:00
jinling.yang
074c45aa3d
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复制造订单问题
...
# Conflicts:
# sf_manufacturing/models/stock.py
2024-11-26 10:41:30 +08:00
jinling.yang
a52545d19a
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-11-26 10:39:23 +08:00
jinling.yang
3e55bb4717
修复制造订单批量调整
2024-11-26 10:39:04 +08:00
jinling.yang
be408b98de
修复制造订单相关问题
2024-11-25 18:00:06 +08:00
马广威
12cc5fd0d2
Accept Merge Request #1549 : (feature/制造功能优化 -> develop)
...
Merge Request: 内部调拨单缺少源单据
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1549?initial=true
2024-11-25 17:25:38 +08:00
mgw
589df289be
内部调拨单缺少源单据
2024-11-25 17:24:14 +08:00
胡尧
7abc88f2c3
Accept Merge Request #1548 : (feature/sale_order_route_pick -> develop)
...
Merge Request: 测试坯料采购单根据采购类型合并
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1548?initial=true
2024-11-25 17:19:22 +08:00
胡尧
f318dc758b
测试坯料采购单根据采购类型合并
2024-11-25 17:18:57 +08:00
胡尧
6628e22ac0
Accept Merge Request #1547 : (feature/sale_order_route_pick -> develop)
...
Merge Request: 子制造订单增加拍承担
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1547?initial=true
2024-11-25 16:46:33 +08:00
管欢
c4cf4e2392
Accept Merge Request #1546 : (feature/model_type_update -> develop)
...
Merge Request: 修复模型类型详情界面的配置工序不能删除
Created By: @管欢
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @管欢
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1546?initial=true
2024-11-25 16:44:45 +08:00
胡尧
56dfb98df5
子制造订单增加拍承担
2024-11-25 16:43:46 +08:00
guanhuan
4251e6dec7
修复模型类型详情界面的配置工序不能删除
2024-11-25 16:41:47 +08:00
jinling.yang
bcc9f0301c
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-11-25 16:23:09 +08:00
jinling.yang
17f2571be3
Merge branch 'feature/修复工序' into develop
2024-11-25 16:22:53 +08:00
杨金灵
a9b24f7961
Accept Merge Request #1545 : (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/1545
2024-11-25 16:22:38 +08:00
jinling.yang
321125adf6
还原代码
2024-11-25 16:18:41 +08:00
jinling.yang
5c0db45223
修复工单开始
2024-11-25 16:03:40 +08:00
jinling.yang
76cc8845d2
修复工序
2024-11-25 15:40:41 +08:00
jinling.yang
38031a2537
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-11-25 15:02:08 +08:00
jinling.yang
1fe64e2b5d
Merge branch 'feature/修复制造订单问题' into develop
2024-11-25 15:01:26 +08:00
杨金灵
d572529a9d
Accept Merge Request #1544 : (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/1544
2024-11-25 15:00:40 +08:00
jinling.yang
cb29baa698
还原代码
2024-11-25 14:31:02 +08:00
jinling.yang
696d0e2a40
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复制造订单问题
2024-11-25 14:00:04 +08:00
jinling.yang
75bbcd23a4
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-11-25 13:59:40 +08:00
jinling.yang
25002406b8
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复制造订单问题
2024-11-25 13:59:22 +08:00
廖丹龙
ed3ea32f45
Accept Merge Request #1543 : (feature/delivery_status -> develop)
...
Merge Request: 智能工厂空模型处理
Created By: @廖丹龙
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1543
2024-11-25 11:52:20 +08:00
jinling.yang
63b1f732db
注释代码
2024-11-25 11:40:33 +08:00
liaodanlong
84ebce0786
智能工厂空模型处理
2024-11-25 11:40:01 +08:00
胡尧
ed747ae4d9
Accept Merge Request #1542 : (feature/sale_order_route_pick -> develop)
...
Merge Request: 人工编程不能选择自动化产线加工
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1542?initial=true
2024-11-25 10:44:10 +08:00
胡尧
8a103a7555
人工编程不能选择自动化产线加工
2024-11-25 10:43:34 +08:00
jinling.yang
e8c166be31
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-11-25 10:25:52 +08:00
jinling.yang
d887a89988
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/new
2024-11-25 10:25:28 +08:00
禹翔辉
cb02319453
Accept Merge Request #1541 : (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/1541
2024-11-25 09:20:26 +08:00
yuxianghui
7f5f65f07f
Merge branch 'feature/客供料入库单优化' into feature/采购优化
2024-11-25 09:17:40 +08:00
yuxianghui
c45200aaee
采购单优化
2024-11-25 09:04:41 +08:00
jinling.yang
d2351a67b0
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-11-25 08:53:14 +08:00
杨金灵
52873021cb
Accept Merge Request #1540 : (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/1540
2024-11-25 08:50:32 +08:00
yuxianghui
3f276f4177
1、优化返工按钮;2、优化工单状态;
2024-11-22 17:57:18 +08:00
jinling.yang
f01a300aae
还原代码
2024-11-22 17:56:59 +08:00
jinling.yang
8e11ef6e72
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造订单报废
...
# Conflicts:
# sf_manufacturing/models/stock.py
2024-11-22 17:54:21 +08:00
jinling.yang
52c0df9b83
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-11-22 17:51:52 +08:00
jinling.yang
33b9c48e87
优化制造订单报废
2024-11-22 17:51:40 +08:00
禹翔辉
aa2f562ca8
Accept Merge Request #1539 : (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/1539
2024-11-22 09:53:39 +08:00
yuxianghui
77ce078e91
1
2024-11-22 09:52:03 +08:00
yuxianghui
5450c9996f
Merge branch 'feature/返工优化_1' into feature/客供料入库单优化
...
# Conflicts:
# sf_manufacturing/models/stock.py
2024-11-22 09:46:42 +08:00
jinling.yang
70f8aadd66
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造订单报废
2024-11-22 09:42:38 +08:00
jinling.yang
119083ac2b
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-11-22 09:42:11 +08:00
jinling.yang
dd768e938c
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造订单报废
2024-11-22 09:41:06 +08:00
yuxianghui
611aa0fe05
1、优化客供料入库单的追溯参考字段自动计算方法
2024-11-22 09:40:33 +08:00
马广威
73564d574c
Accept Merge Request #1538 : (feature/制造功能优化 -> develop)
...
Merge Request: 调整开料要求展示范围
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1538?initial=true
2024-11-22 09:24:49 +08:00
mgw
ea5231adff
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2024-11-22 09:23:59 +08:00
mgw
2b3da48e9b
调整开料要求展示范围
2024-11-22 09:23:36 +08:00
jinling.yang
2632c4a5a0
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-11-22 09:22:54 +08:00
胡尧
2420987f95
Accept Merge Request #1537 : (feature/sale_order_route_pick -> develop)
...
Merge Request: 修改调拨单的追溯参考
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1537
2024-11-22 08:57:33 +08:00
胡尧
d80f3c4d5c
修改调拨单的追溯参考
2024-11-21 17:56:57 +08:00
jinling.yang
5cb726bb2d
注释代码
2024-11-21 17:45:53 +08:00
胡尧
f6b8fa5665
Accept Merge Request #1536 : (feature/sale_order_route_pick -> develop)
...
Merge Request: 增加追踪参考
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1536?initial=true
2024-11-21 17:45:10 +08:00
胡尧
113d0abb4b
增加追踪参考
2024-11-21 17:44:55 +08:00
胡尧
3f3c494f7f
增加追踪参考
2024-11-21 17:43:50 +08:00
jinling.yang
3632a3f98f
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-11-21 17:43:04 +08:00
jinling.yang
73402d1c5a
Merge branch 'feature/工单添加工艺设计id字段' into develop
2024-11-21 17:42:22 +08:00
杨金灵
4e41efd423
Accept Merge Request #1535 : (feature/工单添加工艺设计id字段 -> 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/1535?initial=true
2024-11-21 17:42:06 +08:00
jinling.yang
0b931f8255
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/工单添加工艺设计id字段
2024-11-21 17:41:07 +08:00
jinling.yang
b49135f5f9
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-11-21 17:40:26 +08:00
jinling.yang
ed6d28cc21
工单添加工艺设计id字段
2024-11-21 17:40:04 +08:00
禹翔辉
9857787d5a
Accept Merge Request #1534 : (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/1534
2024-11-21 17:32:57 +08:00
yuxianghui
c6e62f65b6
Merge remote-tracking branch 'origin/feature/返工优化' into feature/返工优化_1
...
# Conflicts:
# sf_manufacturing/models/mrp_workorder.py
2024-11-21 17:26:49 +08:00
jinling.yang
6c0b034147
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-11-21 17:24:19 +08:00
jinling.yang
c0d520a47f
Merge branch 'feature/优化外协采购和出入库单(工艺退回调整)' into develop
2024-11-21 17:23:57 +08:00
杨金灵
de11c57800
Accept Merge Request #1533 : (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/1533
2024-11-21 17:23:18 +08:00
jinling.yang
d4ff4be32e
还原注释代码
2024-11-21 17:19:41 +08:00
jinling.yang
48371b01cd
还原注释代码
2024-11-21 17:13:38 +08:00
jinling.yang
310d8b33df
优化制造订单报废
2024-11-21 17:12:50 +08:00
yuxianghui
6d61e45028
删除无用的模块引用
2024-11-21 17:08:40 +08:00
yuxianghui
fff22a74b1
工单状态优化
2024-11-21 17:02:32 +08:00
胡尧
3588288434
Accept Merge Request #1532 : (feature/sale_order_route_pick -> develop)
...
Merge Request: 处理订单客供料的问题
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1532?initial=true
2024-11-21 15:48:50 +08:00
胡尧
7408cc00f9
处理订单客供料的问题
2024-11-21 15:48:17 +08:00
马广威
9b3d1170b0
Accept Merge Request #1531 : (feature/制造功能优化 -> develop)
...
Merge Request: 线切割、人工线下加工生成工单异常处理
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1531
2024-11-21 15:38:04 +08:00
mgw
a774c74e6a
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2024-11-21 15:36:45 +08:00
mgw
1d53f47488
线切割、人工线下加工生成工单异常处理
2024-11-21 15:36:16 +08:00
jinling.yang
60cc49238c
Merge branch 'feature/返工优化' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化外协采购和出入库单(工艺退回调整)
2024-11-21 11:46:54 +08:00
jinling.yang
b415278997
优化坯料的制造订单
2024-11-21 11:45:48 +08:00
胡尧
ac32494944
Accept Merge Request #1530 : (feature/sale_order_route_pick -> develop)
...
Merge Request: 更新模块时不更新初始化数据,修改子MO子为子MO
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1530?initial=true
2024-11-21 11:34:11 +08:00
胡尧
8c81315c33
更新时不更新初始化数据
2024-11-21 11:33:04 +08:00
yuxianghui
1d66c1dbea
工单状态优化
2024-11-21 11:25:00 +08:00
jinling.yang
085d26669f
Merge branch 'feature/返工优化' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化外协采购和出入库单(工艺退回调整)
2024-11-21 10:44:51 +08:00
jinling.yang
bb7b72b540
优化工序设计
2024-11-21 10:44:11 +08:00
yuxianghui
ded0d06f86
工单状态方法优化
2024-11-21 10:43:22 +08:00
马广威
fe08ee4173
Accept Merge Request #1529 : (feature/制造功能优化 -> develop)
...
Merge Request: 工序类型增加项目
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1529?initial=true
2024-11-21 10:42:28 +08:00
mgw
25ee849796
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2024-11-21 10:41:41 +08:00
mgw
bafcf35ac9
工序类型增加项目
2024-11-21 10:41:07 +08:00
胡尧
cc1455b22c
修改制造订单中子MO子为子MO
2024-11-21 10:21:18 +08:00
胡尧
1d38334c81
Accept Merge Request #1528 : (feature/sale_order_route_pick -> develop)
...
Merge Request: 解决bug
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1528?initial=true
2024-11-21 10:01:01 +08:00
胡尧
13d99b1bcc
成品的零件图号修改为零件图号
2024-11-21 09:49:12 +08:00
胡尧
269be36d86
隐藏制造订单待生产按钮,人工线下加工状态下的功能刀具
2024-11-21 09:48:26 +08:00
胡尧
ebd76afb29
Accept Merge Request #1527 : (feature/sale_order_route_pick -> develop)
...
Merge Request: 修复不同产品调拨单合并的bug
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1527
2024-11-21 09:28:04 +08:00
胡尧
a1807e05db
修复不同产品调拨单合并的bug
2024-11-21 09:26:23 +08:00
jinling.yang
11866629c5
修复工艺设计
2024-11-20 17:56:29 +08:00
yuxianghui
f8f5286568
返工流程优化
2024-11-20 17:34:46 +08:00
胡尧
36908f13d3
Accept Merge Request #1525 : (feature/sale_order_route_pick -> develop)
...
Merge Request: 修改订单客供料显示,修改内部调拨、生产发料合并单据
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1525?initial=true
2024-11-20 16:53:50 +08:00
胡尧
a7ed317b09
修改订单客供料显示,修改内部调拨、生产发料合并单据
2024-11-20 16:53:15 +08:00
jinling.yang
fe4346b802
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化外协采购和出入库单(工艺退回调整)
2024-11-20 16:08:54 +08:00
jinling.yang
23da273af1
修复bug和优化制造订单报废
2024-11-20 16:08:27 +08:00
廖丹龙
68fdea4520
Accept Merge Request #1523 : (feature/delivery_status -> develop)
...
Merge Request: 人工线下加工工单的计划时间计算优化需求
Created By: @廖丹龙
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1523
2024-11-20 15:32:01 +08:00
liaodanlong
c5ac62060d
Merge branch 'refs/heads/develop' into feature/delivery_status
...
# Conflicts:
# sf_manufacturing/models/mrp_production.py
2024-11-20 15:23:07 +08:00
马广威
350cf0a74b
Accept Merge Request #1524 : (feature/制造功能优化 -> develop)
...
Merge Request: 调整采购单查找逻辑
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1524?initial=true
2024-11-20 15:19:08 +08:00
mgw
e204d693cf
调整采购单查找逻辑
2024-11-20 15:18:08 +08:00
mgw
a6422330b6
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2024-11-20 12:01:38 +08:00
mgw
230e87a9f1
增加日志输出
2024-11-20 10:29:32 +08:00
jinling.yang
e634e9726f
优化工艺设计显示
2024-11-19 17:56:21 +08:00
liaodanlong
e8d07abe05
人工线下加工工单的计划时间计算优化需求
2024-11-19 14:18:44 +08:00
胡尧
808bbd7b22
Accept Merge Request #1522 : (feature/sale_order_route_pick -> develop)
...
Merge Request: 排程单过滤掉关联制造订单处于草稿跟工艺设计状态
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1522?initial=true
2024-11-19 14:18:08 +08:00
胡尧
fabcca1188
排程单过滤掉关联制造订单处于草稿跟工艺设计状态
2024-11-19 14:15:29 +08:00
胡尧
97c8b1dcc1
Accept Merge Request #1521 : (feature/sale_order_route_pick -> develop)
...
Merge Request: 修改坯料冗余
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1521?initial=true
2024-11-19 11:57:29 +08:00
胡尧
f99a35932f
修改坯料冗余
2024-11-19 11:56:49 +08:00
胡尧
ce7dfdbd36
Accept Merge Request #1520 : (feature/sale_order_route_pick -> develop)
...
Merge Request: 增加坯料冗余量
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1520?initial=true
2024-11-19 09:00:38 +08:00
胡尧
d53f3837c3
增加坯料冗余量
2024-11-19 08:59:52 +08:00
jinling.yang
1cb646ec48
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化外协采购和出入库单(工艺退回调整)
2024-11-18 17:41:10 +08:00
jinling.yang
c73706555f
优化外协采购和出入库单(工艺退回调整)
2024-11-18 17:40:41 +08:00
胡尧
21f961d893
Accept Merge Request #1519 : (feature/sale_order_route_pick -> develop)
...
Merge Request: 增加坯料冗余量
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1519
2024-11-18 15:00:56 +08:00
胡尧
08a682143f
增加坯料冗余量
2024-11-18 15:00:05 +08:00
杨金灵
ebdeb95b0e
Accept Merge Request #1518 : (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/1518
2024-11-18 11:45:12 +08:00
杨金灵
0f26cac68d
Merge branch refs/heads/develop into refs/heads/feature/新增工艺退回调整
2024-11-18 11:43:12 +08:00
jinling.yang
45c96276ff
还原代码
2024-11-18 11:42:35 +08:00
jinling.yang
a2855f1f08
还原代码
2024-11-18 11:40:24 +08:00
jinling.yang
e8c006d495
还原代码
2024-11-18 11:25:19 +08:00
jinling.yang
9671efeced
外协出入库修复
2024-11-18 11:24:32 +08:00
胡尧
1e3fd6bc09
Accept Merge Request #1517 : (feature/sale_order_route_pick -> develop)
...
Merge Request: 增加依赖
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1517?initial=true
2024-11-18 10:55:08 +08:00
胡尧
73aa4af118
增加依赖
2024-11-18 10:54:48 +08:00
胡尧
38a8a298b5
Accept Merge Request #1516 : (feature/sale_order_route_pick -> develop)
...
Merge Request: 增加坯料冗余量,调整坯料客供料的名称
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1516?initial=true
2024-11-18 09:45:48 +08:00
胡尧
bc0b8bdecb
增加坯料冗余量,调整坯料客供料的名称
2024-11-18 09:44:50 +08:00
jinling.yang
a8e9fe40ac
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_production_addional_change.xml
2024-11-15 18:08:31 +08:00
jinling.yang
5c5606749a
优化制造订单
2024-11-15 18:06:32 +08:00
jinling.yang
8add4b5ad1
优化制造订单
2024-11-15 17:31:28 +08:00
胡尧
f579c8928c
Accept Merge Request #1515 : (feature/sale_order_route_pick -> develop)
...
Merge Request: 增加制造类型字段,增加依赖
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1515
2024-11-15 15:31:22 +08:00
胡尧
9410ca82db
解决冲突
2024-11-15 15:30:35 +08:00
胡尧
73c986cd50
增加制造类型字段,增加依赖
2024-11-15 15:29:04 +08:00
胡尧
f8a9a38778
Accept Merge Request #1514 : (feature/sale_order_route_pick -> develop)
...
Merge Request: 修改人工线下加工状态的继承位置
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1514?initial=true
2024-11-15 15:03:31 +08:00
胡尧
9d723c5e00
修改人工线下加工状态的继承位置
2024-11-15 15:03:06 +08:00
liaodanlong
722a044707
移动deadline_of_delivery 方法位置
2024-11-15 11:37:14 +08:00
廖丹龙
967effe8f1
Accept Merge Request #1505 : (feature/delivery_status -> develop)
...
Merge Request: 交期状态
Created By: @廖丹龙
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1505
2024-11-15 10:44:10 +08:00
liaodanlong
5f5877699c
交期状态修改
2024-11-15 10:39:45 +08:00
liaodanlong
4787cb451d
Merge branch 'refs/heads/develop' into feature/delivery_status
...
# Conflicts:
# sf_manufacturing/__manifest__.py
2024-11-15 10:37:13 +08:00
liaodanlong
811a79c7c1
交期状态修改
2024-11-15 10:33:47 +08:00
胡尧
153f599fe8
Accept Merge Request #1513 : (feature/sale_order_route_pick -> develop)
...
Merge Request: 给坯料模板增加按订单补给
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1513?initial=true
2024-11-15 09:13:16 +08:00
胡尧
f6f9d14f0a
给坯料模板增加按订单补给
2024-11-15 09:12:34 +08:00
jinling.yang
018d51e25f
批量处理工艺调整
2024-11-14 18:02:24 +08:00
胡尧
ac03192119
Accept Merge Request #1512 : (feature/sale_order_route_pick -> develop)
...
Merge Request: 增加依赖
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1512?initial=true
2024-11-14 16:59:40 +08:00
胡尧
b8d5d655ea
增加依赖
2024-11-14 16:59:18 +08:00
胡尧
00f986cdb5
Accept Merge Request #1511 : (feature/sale_order_route_pick -> develop)
...
Merge Request: 增加加工类型
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1511?initial=true
2024-11-14 16:53:19 +08:00
胡尧
5dc5c814c8
增加加工类型
2024-11-14 16:52:58 +08:00
胡尧
c64ede58fd
Accept Merge Request #1510 : (feature/sale_order_route_pick -> develop)
...
Merge Request: 增加是否线下加工日志
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1510?initial=true
2024-11-14 16:36:46 +08:00
胡尧
6e17bb933f
增加是否线下加工日志
2024-11-14 16:36:02 +08:00
胡尧
99aa161834
Accept Merge Request #1509 : (feature/sale_order_route_pick -> develop)
...
Merge Request: 修改注释
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1509?initial=true
2024-11-14 15:36:24 +08:00
胡尧
ed641c85b3
修改注释
2024-11-14 15:36:01 +08:00
胡尧
cf7756f51e
Accept Merge Request #1508 : (feature/sale_order_route_pick -> develop)
...
Merge Request: 增加制造类型
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1508?initial=true
2024-11-14 15:15:22 +08:00
胡尧
a75269b3a3
增加制造类型
2024-11-14 15:14:57 +08:00
胡尧
6b184d7df3
Accept Merge Request #1507 : (feature/sale_order_route_pick -> develop)
...
Merge Request: 将数据初始化由产品辩题改为为模板
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1507?initial=true
2024-11-14 15:04:50 +08:00
胡尧
daba7d5155
将数据初始化由产品辩题改为为模板
2024-11-14 15:02:11 +08:00
jinling.yang
33a1837274
优化工单
2024-11-13 17:59:47 +08:00
禹翔辉
6b3e3aa49c
Accept Merge Request #1506 : (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/1506?initial=true
2024-11-13 17:36:06 +08:00
yuxianghui
a7b5fc898e
优化自动生成批次序列号方法
2024-11-13 17:34:39 +08:00
liaodanlong
9a9bfd198b
交期状态
2024-11-13 14:46:58 +08:00
禹翔辉
2446065172
Accept Merge Request #1504 : (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/1504?initial=true
2024-11-13 13:41:58 +08:00
yuxianghui
7565094077
Merge branch 'feature/工单工序优化_y' into feature/单据页面优化
2024-11-13 13:40:25 +08:00
yuxianghui
ac2708404a
处理sf工厂单据页面优化需求
2024-11-13 13:39:41 +08:00
胡尧
63b9f495e9
Merge branch 'develop' into feature/sale_order_route_pick
2024-11-13 11:49:02 +08:00
胡尧
012bb9fd54
初始化更新模板categ_type字段
2024-11-13 11:37:16 +08:00
廖丹龙
7bcb54861b
Accept Merge Request #1503 : (feature/delivery_status -> develop)
...
Merge Request: 交期状态开发
Created By: @廖丹龙
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1503
2024-11-13 11:25:12 +08:00
胡尧
2f64a3a612
Accept Merge Request #1502 : (feature/sale_order_route_pick -> develop)
...
Merge Request: 修改细节
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1502?initial=true
2024-11-13 10:51:32 +08:00
胡尧
5365211f49
修改细节
2024-11-13 10:50:48 +08:00
liaodanlong
e38407c0a5
交期状态开发
2024-11-13 10:37:19 +08:00
胡尧
13ef106c0e
Accept Merge Request #1501 : (feature/sale_order_route_pick -> develop)
...
Merge Request: 修改工艺工程师菜单权限
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1501?initial=true
2024-11-13 09:08:01 +08:00
胡尧
433f3bd2dc
修改工艺工程师菜单权限
2024-11-13 09:07:14 +08:00
jinling.yang
ff072a32bb
添加退回调整
2024-11-12 17:53:17 +08:00
胡尧
de7098a7d4
Accept Merge Request #1500 : (feature/sale_order_route_pick -> develop)
...
Merge Request: 多供货路线选择提交
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1500?initial=true
2024-11-12 15:21:06 +08:00
胡尧
205bfd0538
修改人工线下加工工序domain
2024-11-12 15:19:57 +08:00
胡尧
37538141bf
修改材料型号获取方式名称
2024-11-12 14:57:59 +08:00
胡尧
975ced08cb
增加成品工序模板(人工线下加工)
2024-11-12 14:00:27 +08:00
jinling.yang
d646019c93
修复表面工艺
2024-11-12 13:56:40 +08:00
jinling.yang
efa1e2b60f
表面工艺生成采购单
2024-11-12 11:51:18 +08:00
jinling.yang
8bbc65ef88
新增退回调整
2024-11-12 11:43:40 +08:00
胡尧
e1121cc3b5
增加快速订单逻辑,修改报价筛选逻辑
2024-11-12 11:16:42 +08:00
jinling.yang
026bf17a68
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增工艺退回调整
2024-11-12 09:12:37 +08:00
马广威
fdcd825142
Accept Merge Request #1499 : (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/1499
2024-11-12 09:02:39 +08:00
jinling.yang
317f44d6c2
修复工艺设计
2024-11-12 09:00:45 +08:00
jinling.yang
7d5c7bceb1
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-11-12 08:59:47 +08:00
jinling.yang
359fd40ed3
添加工艺退回调整
2024-11-11 17:55:05 +08:00
禹翔辉
13a930b59c
Accept Merge Request #1497 : (feature/工单工序优化_y -> develop)
...
Merge Request: 工单工序排序方法重构
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1497
2024-11-11 16:53:50 +08:00
jinling.yang
359a246793
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-11-11 16:42:30 +08:00
胡尧
2b658d7be0
Accept Merge Request #1498 : (feature/sale_order_route_pick -> develop)
...
Merge Request: 多供货方式选择
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1498?initial=true
2024-11-11 16:40:49 +08:00
胡尧
cd9f485fc0
增加零件名称
2024-11-11 16:38:28 +08:00
yuxianghui
dda627f20a
工单工序排序方法重构
2024-11-11 16:38:06 +08:00
jinling.yang
e8858559f6
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-11-11 16:35:41 +08:00
胡尧
d68a9249c6
解决冲突
2024-11-11 16:32:54 +08:00
胡尧
eebb143778
多供货方式选择
2024-11-11 16:26:45 +08:00
杨金灵
a12eb12678
Accept Merge Request #1495 : (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/1495
2024-11-11 15:41:36 +08:00
禹翔辉
f5f67c52af
Accept Merge Request #1496 : (feature/sf视图展示界面优化 -> 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/1496
2024-11-11 14:58:07 +08:00
yuxianghui
3df2306e1b
Merge branch 'feature/客供料入库单优化_1' into feature/sf视图展示界面优化
2024-11-11 14:55:23 +08:00
yuxianghui
5dae0ea973
1、sf视图展示界面优化
2024-11-11 14:52:44 +08:00
jinling.yang
e7b18233f0
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复表面工艺工单完成入库操作
2024-11-11 14:51:11 +08:00
jinling.yang
e55e42fe6b
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-11-11 14:50:52 +08:00
jinling.yang
741f2ad8b2
还原代码
2024-11-11 14:50:38 +08:00
胡尧
1b87a81a5a
多供货方式选择
2024-11-11 11:06:56 +08:00
管欢
7042eb0d7b
Accept Merge Request #1494 : (feature/10月迭代优化 -> develop)
...
Merge Request: 新增零件名称
Created By: @管欢
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @管欢
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1494
2024-11-11 10:32:21 +08:00
胡尧
28788e2a81
Merge branch 'develop' into feature/sale_order_route_pick
2024-11-11 10:24:14 +08:00
胡尧
0f37b45b30
开发
2024-11-11 10:22:53 +08:00
jinling.yang
38c4aba45c
根据工序生成工单
2024-11-08 18:01:23 +08:00
guanhuan
3b686a8272
新增零件名称
2024-11-08 16:56:00 +08:00
胡尧
2798ce6183
开发
2024-11-08 16:23:34 +08:00
jinling.yang
e981d68805
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复表面工艺工单完成入库操作
...
# Conflicts:
# sf_manufacturing/models/stock.py
# sf_manufacturing/security/ir.model.access.csv
2024-11-08 09:27:45 +08:00
jinling.yang
cd3ab04728
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-11-08 09:26:14 +08:00
jinling.yang
d419efa3c3
优化工艺确认
2024-11-07 17:59:28 +08:00
马广威
8b4eb325ef
Accept Merge Request #1493 : (feature/制造功能优化 -> develop)
...
Merge Request: 询价单区分类型
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1493?initial=true
2024-11-07 16:40:11 +08:00
yuxianghui
330726007d
1、添加只有客供料入库单才能看见收货人/联系地址/电话号码等字段;
2024-11-07 16:26:48 +08:00
mgw
4d7b1f557b
询价单区分类型
2024-11-07 14:26:33 +08:00
禹翔辉
1699f61d3f
Accept Merge Request #1492 : (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/1492?initial=true
2024-11-07 11:24:19 +08:00
yuxianghui
a0eec00749
暂时删除权限
2024-11-07 11:22:31 +08:00
禹翔辉
f5365b4a3a
Accept Merge Request #1491 : (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/1491?initial=true
2024-11-07 10:45:30 +08:00
yuxianghui
8b9aa1c454
Merge branch 'feature/客供料入库单优化' into feature/客供料入库单优化_1
2024-11-07 10:43:58 +08:00
yuxianghui
9a4d7e87ec
1、处理销售单的依赖导致的更新报错问题;2、优化客供料单据获取销售单字段信息和成品信息方法;
2024-11-07 10:43:08 +08:00
胡尧
6679c200e1
开发
2024-11-07 08:41:25 +08:00
jinling.yang
01df55ef35
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-11-06 17:54:29 +08:00
胡尧
d2b028ed4e
Merge branch 'develop' into feature/sale_order_route_pick
2024-11-06 17:53:52 +08:00
jinling.yang
de1b97bfb7
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-11-06 17:53:44 +08:00
胡尧
111c0f6dae
开发
2024-11-06 17:53:33 +08:00
jinling.yang
11da893b17
Merge branch 'feature/添加工艺工程师权限组' into develop
2024-11-06 17:50:57 +08:00
杨金灵
b434329fc4
Accept Merge Request #1490 : (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/1490
2024-11-06 17:50:43 +08:00
jinling.yang
72998f04c6
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/添加工艺工程师权限组
2024-11-06 17:49:01 +08:00
jinling.yang
23db164452
制造模块添加工艺工程师权限组
2024-11-06 17:48:27 +08:00
jinling.yang
1f11d188c1
添加工艺工程师权限组
2024-11-06 17:46:14 +08:00
jinling.yang
fa30e0c1da
添加工艺设计
2024-11-06 17:44:13 +08:00
禹翔辉
5106768330
Accept Merge Request #1489 : (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/1489?initial=true
2024-11-06 17:27:52 +08:00
yuxianghui
6c0d9486fc
Merge branch 'feature/报价单优化' into feature/客供料入库单优化
2024-11-06 17:24:57 +08:00
yuxianghui
211d74d9ff
处理 客供料入库单优化 需求
2024-11-06 17:24:10 +08:00
jinling.yang
84db3a92be
表面工艺外协采购单添加“采购类型",默认consignment(委外加工)
2024-11-06 10:46:21 +08:00
jinling.yang
487a2936c3
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复表面工艺工单完成入库操作
2024-11-06 10:41:27 +08:00
jinling.yang
aa9bdfe372
添加工艺设计
2024-11-06 10:40:11 +08:00
马广威
6134ac3b4c
Accept Merge Request #1488 : (feature/制造功能优化 -> develop)
...
Merge Request: 添加采购类型字段
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1488
2024-11-06 09:24:43 +08:00
mgw
85c24e3d94
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2024-11-06 09:23:42 +08:00
mgw
106945fba7
添加采购类型字段
2024-11-06 09:23:14 +08:00
yuxianghui
8ea72198ea
1、完成报价单优化需求;2、修改制造订单内装夹工单的‘返工’按钮为’异常反馈‘
2024-11-05 17:52:18 +08:00
禹翔辉
41cd76ad14
Accept Merge Request #1486 : (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/1486?initial=true
2024-11-05 09:53:48 +08:00
yuxianghui
e20510bc4f
Merge branch 'feature/工单优化_返工' into feature/部分警告信息处理
2024-11-05 09:52:07 +08:00
yuxianghui
1d14ab27af
警告信息处理
2024-11-05 09:50:24 +08:00
jinling.yang
7d6699fe7a
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复表面工艺工单完成入库操作
2024-11-01 16:00:53 +08:00
胡尧
fd55abec72
Accept Merge Request #1485 : (release/release_2.5 -> develop)
...
Merge Request: 在下发编程单时,如果已经排程,在修改工单起止时间时先设置大的结束时间,避免设置时间出错
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1485
2024-10-31 11:34:46 +08:00
胡尧
76597f6ccb
在下发编程单时,如果已经排程,在修改工单起止时间时先设置大的结束时间,避免设置时间出错
2024-10-31 11:15:06 +08:00
管欢
d7779e969d
Accept Merge Request #1483 : (feature/weid_sync_update -> 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/1483
2024-10-29 15:55:39 +08:00
guanhuan
9d28eccd1b
用户创建员工同时修改用户的企微id
2024-10-29 15:50:38 +08:00
管欢
27339afaae
Accept Merge Request #1482 : (feature/weid_sync_update -> 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/1482
2024-10-29 15:05:59 +08:00
guanhuan
8dc3f2698b
修改员工绑定用户同时修改用户的企微id
2024-10-29 14:50:00 +08:00
马广威
4fd7ad8d03
Accept Merge Request #1481 : (feature/制造功能优化 -> develop)
...
Merge Request: rfid手动输入推送
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1481?initial=true
2024-10-29 14:30:06 +08:00
mgw
3bc33fe2fc
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2024-10-29 14:28:44 +08:00
mgw
c21319a127
rfid手动输入推送
2024-10-29 14:28:24 +08:00
管欢
02e21a8fde
Accept Merge Request #1480 : (feature/weid_sync_update -> 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/1480
2024-10-29 11:10:47 +08:00
管欢
2cf578de65
Accept Merge Request #1479 : (feature/message_update -> develop)
...
Merge Request: 发送消息添加权限
Created By: @管欢
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @管欢
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1479
2024-10-29 09:02:03 +08:00
guanhuan
9665cdfc84
发送消息添加权限
2024-10-29 08:58:33 +08:00
胡尧
bef7376827
Accept Merge Request #1478 : (feature/plan_slow -> develop)
...
Merge Request: 增加日志
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1478?initial=true
2024-10-28 17:43:21 +08:00
胡尧
e73e9d6960
增加日志
2024-10-28 17:42:44 +08:00
胡尧
892f5d0e70
Accept Merge Request #1477 : (feature/plan_slow -> develop)
...
Merge Request: 增加销售订单确认日志
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1477?initial=true
2024-10-28 17:26:58 +08:00
胡尧
61339da204
增加销售订单确认日志
2024-10-28 17:26:27 +08:00
胡尧
25db392864
Accept Merge Request #1476 : (feature/plan_slow -> develop)
...
Merge Request: 增加销售订单确认日志
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1476?initial=true
2024-10-28 17:23:00 +08:00
胡尧
745fd429c2
增加销售订单确认日志
2024-10-28 17:21:51 +08:00
胡尧
5c59a27a81
增加采购总监消息推送权限
2024-10-28 16:30:46 +08:00
管欢
9bac3675f6
Accept Merge Request #1475 : (feature/message_update -> develop)
...
Merge Request: 精度显示修改
Created By: @管欢
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @管欢
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1475
2024-10-28 11:54:04 +08:00
guanhuan
b4fbbd48fb
精度显示修改
2024-10-28 11:46:36 +08:00
guanhuan
3559d67c05
精度显示修改
2024-10-28 11:43:10 +08:00
禹翔辉
816623b1fe
Accept Merge Request #1474 : (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/1474
2024-10-28 11:00:03 +08:00
yuxianghui
91b913a7bd
Merge branch 'feature/维保请求优化' into feature/工单优化_返工
2024-10-28 10:58:04 +08:00
yuxianghui
ba8393a8c7
返工操作时工单状态优化
2024-10-28 10:55:18 +08:00
管欢
06d061165b
Accept Merge Request #1473 : (feature/message_update -> develop)
...
Merge Request: 辅助文件上传
Created By: @管欢
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @管欢
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1473
2024-10-28 10:30:02 +08:00
guanhuan
18a7dbbff9
辅助文件上传
2024-10-28 10:21:33 +08:00
胡尧
dc545e6d49
Accept Merge Request #1472 : (feature/plan_slow -> develop)
...
Merge Request: 修改排程逻辑
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1472?initial=true
2024-10-28 09:45:24 +08:00
胡尧
1467dbf88c
修改排程逻辑
2024-10-28 09:44:52 +08:00
胡尧
e9caf78b81
Accept Merge Request #1471 : (feature/plan_slow -> develop)
...
Merge Request: 修复未编程的制造订单排程问题
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1471?initial=true
2024-10-28 09:43:42 +08:00
胡尧
aa1353cf99
修改排程逻辑
2024-10-28 09:38:50 +08:00
管欢
14d49f2944
Accept Merge Request #1469 : (feature/message_update -> develop)
...
Merge Request: 快速订单创建报错
Created By: @管欢
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @管欢
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1469
2024-10-25 17:41:02 +08:00
杨金灵
8560069b19
Accept Merge Request #1470 : (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/1470
2024-10-25 17:24:07 +08:00
jinling.yang
8dc23a638f
去掉注释
2024-10-25 17:21:45 +08:00
jinling.yang
537fbf7e14
添加注释
2024-10-25 17:19:10 +08:00
guanhuan
5363557faf
快速订单创建报错
2024-10-25 16:36:54 +08:00
jinling.yang
3e684a308c
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复表面工艺工单完成入库操作
2024-10-25 15:52:32 +08:00
杨金灵
3c026004f3
Accept Merge Request #1468 : (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/1468
2024-10-25 15:42:56 +08:00
jinling.yang
651c8f266b
修复CNC工单消息提醒跳转
2024-10-25 15:41:23 +08:00
杨金灵
a3bfbe66c4
Accept Merge Request #1467 : (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/1467
2024-10-25 15:18:25 +08:00
jinling.yang
563e40adc6
修复工单链接跳转
2024-10-25 15:15:11 +08:00
jinling.yang
f88a784a87
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-10-25 14:58:44 +08:00
jinling.yang
7227e1e59c
注释occ代码
2024-10-25 14:58:29 +08:00
廖丹龙
01df5e86cd
Accept Merge Request #1466 : (feature/machining_accuracy_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/1466
2024-10-25 14:42:12 +08:00
管欢
41f853b6c9
Accept Merge Request #1465 : (feature/message_update -> develop)
...
Merge Request: 加工精度修改
Created By: @管欢
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @管欢
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1465
2024-10-25 14:27:06 +08:00
liaodanlong
906a0ea767
采购按钮位置修改
2024-10-25 14:25:47 +08:00
jinling.yang
6162c731f2
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-10-25 14:11:56 +08:00
guanhuan
4f1d518ef3
加工精度修改
2024-10-25 14:02:37 +08:00
liaodanlong
06eaebd098
产品类别过滤缺陷
2024-10-25 14:02:37 +08:00
liaodanlong
8578a9a538
Merge remote-tracking branch 'origin/feature/machining_accuracy_sync' into feature/machining_accuracy_sync
2024-10-25 14:01:52 +08:00
liaodanlong
b9039ef466
刀具标准库page样式问题
2024-10-25 14:01:38 +08:00
杨金灵
a97f581c99
Accept Merge Request #1464 : (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/1464?initial=true
2024-10-25 13:52:15 +08:00
jinling.yang
036179ec4d
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/工单消息提醒添加已排过滤
2024-10-25 13:50:28 +08:00
jinling.yang
d33188dedf
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-10-25 13:50:07 +08:00
jinling.yang
7033f95273
工单消息提醒添加已排过滤
2024-10-25 13:49:55 +08:00
管欢
00689d76cc
Accept Merge Request #1463 : (feature/message_update -> develop)
...
Merge Request: 工单下发url调整,加工精度取值调整,2D加工图纸和质检标准位置调整
Created By: @管欢
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @管欢
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1463
2024-10-25 13:38:25 +08:00
guanhuan
86d97ef331
2D加工图纸和质检标准位置调整
2024-10-25 11:55:43 +08:00
jinling.yang
05a183f46f
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-10-25 11:36:12 +08:00
jinling.yang
50959d2e9c
Merge branch 'feature/修复消息提醒时区问题' into develop
2024-10-25 11:35:56 +08:00
guanhuan
519ce0d5bb
工单下发调整
2024-10-25 11:29:13 +08:00
杨金灵
f06842cdcb
Accept Merge Request #1461 : (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/1461
2024-10-25 11:28:41 +08:00
jinling.yang
d5a1caad10
还原代码
2024-10-25 11:26:18 +08:00
jinling.yang
e51fff4120
修复消息提醒时区问题
2024-10-25 11:25:37 +08:00
guanhuan
2fe8e0e356
工单下发调整
2024-10-25 11:11:24 +08:00
guanhuan
bbe2e5792f
Merge branch 'refs/heads/develop' into feature/machining_accuracy_sync
2024-10-25 09:58:45 +08:00
jinling.yang
a1a520ec39
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复消息提醒时区问题
2024-10-25 09:55:12 +08:00
jinling.yang
1b714a9962
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-10-25 09:54:51 +08:00
jinling.yang
9d133096c7
修复消息提醒时区问题
2024-10-25 09:54:37 +08:00
guanhuan
69f3453134
加工精度修改
2024-10-25 09:48:57 +08:00
管欢
ab10271b4d
Accept Merge Request #1460 : (feature/machining_accuracy_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/1460
2024-10-25 09:04:47 +08:00
guanhuan
516a98e102
Merge remote-tracking branch 'origin/feature/machining_accuracy_sync' into feature/machining_accuracy_sync
2024-10-25 08:58:34 +08:00
guanhuan
390213881a
加工精度修改
2024-10-25 08:58:05 +08:00
jinling.yang
ac2eba4734
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-10-24 17:39:36 +08:00
jinling.yang
b64893436b
Merge branch 'feature/修复销售订单和工单消息提醒' into develop
2024-10-24 17:36:00 +08:00
杨金灵
ee148239d2
Accept Merge Request #1459 : (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/1459
2024-10-24 17:35:44 +08:00
jinling.yang
4cc03aee9b
优化模版
2024-10-24 17:35:21 +08:00
jinling.yang
31a703952c
修复销售订单和工单消息提醒
2024-10-24 17:32:40 +08:00
guanhuan
69c63f708d
修改和新增员工时根据邮箱获取企微id
2024-10-24 17:06:31 +08:00
jinling.yang
ae08c5b56e
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-10-24 16:55:43 +08:00
jinling.yang
dc76dcdc2f
Merge branch 'feature/修复销售订单完成时效' into develop
2024-10-24 16:52:08 +08:00
杨金灵
6a040d16ea
Accept Merge Request #1458 : (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/1458?initial=true
2024-10-24 16:51:52 +08:00
jinling.yang
30e8d04b70
添加销售订单是否完成并恢复正常时效定时器
2024-10-24 16:50:27 +08:00
jinling.yang
2b3375ad41
修复销售订单完成时效
2024-10-24 16:40:25 +08:00
jinling.yang
8a059a5520
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-10-24 16:20:38 +08:00
jinling.yang
49a2f02b54
Merge branch 'feature/修复工单提醒' into develop
2024-10-24 16:20:09 +08:00
禹翔辉
ef92f24d35
Accept Merge Request #1456 : (feature/维保请求优化 -> develop)
...
Merge Request: 1、添加维保请求的相关权限;2、优化维保请求tree视图、form视图和搜索视图;
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1456
2024-10-24 16:18:08 +08:00
杨金灵
0207914592
Accept Merge Request #1457 : (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/1457
2024-10-24 16:17:54 +08:00
jinling.yang
5776c97744
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复工单提醒
2024-10-24 16:16:11 +08:00
jinling.yang
180cdf2a08
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-10-24 16:15:51 +08:00
jinling.yang
47720948ff
修复工单提醒
2024-10-24 16:15:30 +08:00
yuxianghui
7814a2b622
Merge branch 'feature/工单状态优化' into feature/维保请求优化
2024-10-24 16:12:57 +08:00
yuxianghui
06981fb894
1、添加维保请求的相关权限;2、优化维保请求tree视图、form视图和搜索视图;
2024-10-24 16:12:09 +08:00
马广威
19dbd9901d
Accept Merge Request #1455 : (feature/制造功能优化 -> develop)
...
Merge Request: 处理工单的组件不存在时报错的问题
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1455?initial=true
2024-10-24 16:06:50 +08:00
mgw
4985b0a85d
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2024-10-24 16:05:03 +08:00
mgw
39f99d6ce7
处理工单的组件不存在时报错的问题
2024-10-24 16:04:38 +08:00
马广威
c8f25ea4b3
Accept Merge Request #1454 : (feature/制造功能优化 -> develop)
...
Merge Request: 增加对Enter的判断
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1454?initial=true
2024-10-24 15:51:11 +08:00
mgw
cab9e08066
增加对Enter的判断
2024-10-24 15:50:32 +08:00
马广威
2b83f82989
Accept Merge Request #1453 : (feature/制造功能优化 -> develop)
...
Merge Request: 将扫描rfid绑定并开启装夹工单写成widget形式
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1453
2024-10-24 15:34:06 +08:00
mgw
598e8fee9c
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2024-10-24 15:32:41 +08:00
mgw
6f3a788101
将扫描rfid绑定并开启装夹工单写成widget形式
2024-10-24 15:32:15 +08:00
jinling.yang
30ff349b37
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-10-24 15:17:59 +08:00
管欢
e264306fed
Accept Merge Request #1452 : (feature/auxiliary_files_upload -> develop)
...
Merge Request: 零件图纸,质检标准显示位置修改
Created By: @管欢
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @管欢
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1452
2024-10-24 14:58:34 +08:00
jinling.yang
4018797384
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-10-24 14:57:01 +08:00
guanhuan
f557cb8d10
零件图纸,质检标准显示位置修改
2024-10-24 14:55:36 +08:00
jinling.yang
a1efde6ef9
Merge branch 'feature/修复销售订单逾期过期' into develop
2024-10-24 14:41:10 +08:00
杨金灵
cf34e28e35
Accept Merge Request #1451 : (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/1451?initial=true
2024-10-24 14:40:28 +08:00
jinling.yang
b7595fe4ec
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复销售订单逾期过期
2024-10-24 14:28:07 +08:00
jinling.yang
2551d82a99
修复销售订单逾期过期
2024-10-24 14:27:44 +08:00
管欢
0cedba8ea4
Accept Merge Request #1450 : (feature/auxiliary_files_upload -> develop)
...
Merge Request: 制造订单零件图纸,质检标准显示位置修改
Created By: @管欢
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @管欢
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1450
2024-10-24 14:24:18 +08:00
胡尧
3f84972bfd
删除多余代码
2024-10-24 13:57:26 +08:00
guanhuan
d64a814251
制造订单零件图纸,质检标准显示
2024-10-24 11:33:10 +08:00
胡尧
86d5de4fa1
Accept Merge Request #1449 : (feature/plan_slow -> develop)
...
Merge Request: 解决排程报错
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1449?initial=true
2024-10-24 11:30:06 +08:00
胡尧
ed15958319
解决报错
2024-10-24 11:29:36 +08:00
廖丹龙
0bf9c752f6
Accept Merge Request #1442 : (feature/machining_accuracy_sync -> 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/1442
2024-10-24 11:23:20 +08:00
杨金灵
e62eb060fb
Accept Merge Request #1448 : (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/1448?initial=true
2024-10-24 10:54:00 +08:00
jinling.yang
563b44adb1
添加输出
2024-10-24 10:53:04 +08:00
liaodanlong
a094946428
按钮位置修改
2024-10-24 10:37:50 +08:00
jinling.yang
d28fd5d787
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-10-24 10:35:52 +08:00
jinling.yang
41c357d124
Merge branch 'feature/修复设备文件' into develop
2024-10-24 10:32:46 +08:00
杨金灵
f94d52a4d9
Accept Merge Request #1447 : (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/1447?initial=true
2024-10-24 10:30:39 +08:00
jinling.yang
74dc31b083
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-10-24 10:28:41 +08:00
jinling.yang
3b1fca529a
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-10-24 10:28:07 +08:00
jinling.yang
843eeb8a89
修复设备文件
2024-10-24 10:27:46 +08:00
胡尧
12e81ec702
Accept Merge Request #1446 : (feature/plan_slow -> develop)
...
Merge Request: 解决排程慢的问题
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1446
2024-10-24 10:15:55 +08:00
jinling.yang
fe2af8a4ce
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-10-24 10:13:28 +08:00
jinling.yang
f337a30aba
Merge branch 'feature/优化加工质检' into develop
2024-10-24 10:09:45 +08:00
杨金灵
7f3a8d877f
Accept Merge Request #1445 : (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/1445
2024-10-24 10:09:29 +08:00
jinling.yang
5e6a7d0a39
还原代码
2024-10-24 10:07:56 +08:00
jinling.yang
5788a157c5
还原代码
2024-10-24 10:03:18 +08:00
胡尧
0b70447333
修改排程逻辑
2024-10-24 09:47:20 +08:00
jinling.yang
de8ba77bef
优化加工质检页面
2024-10-24 09:22:35 +08:00
胡尧
1026c0edd0
修改排程逻辑
2024-10-24 09:18:21 +08:00
管欢
f366b650d0
Accept Merge Request #1444 : (feature/auxiliary_files_upload -> develop)
...
Merge Request: 附件文件名
Created By: @管欢
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @管欢
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1444
2024-10-23 17:54:42 +08:00
guanhuan
6054ce39f3
附件文件名
2024-10-23 17:43:03 +08:00
禹翔辉
e1e9dc425b
Accept Merge Request #1443 : (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/1443
2024-10-23 17:12:17 +08:00
yuxianghui
3a2a942f3b
Merge branch 'feature/设备维保优化' into feature/工单状态优化
2024-10-23 17:05:47 +08:00
yuxianghui
bf9d848f10
1、工单状态优化
2024-10-23 17:04:35 +08:00
liaodanlong
add7d404a0
质检单类型翻译
2024-10-23 17:03:16 +08:00
liaodanlong
7e6fa7b6c7
产品类别隐藏
2024-10-23 17:02:24 +08:00
禹翔辉
3fd17302f5
Accept Merge Request #1440 : (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/1440
2024-10-23 15:51:06 +08:00
胡尧
db9cee3e28
Accept Merge Request #1441 : (feature/workorder_exceptions -> develop)
...
Merge Request: 修改工单通知筛选条件
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1441?initial=true
2024-10-23 15:50:31 +08:00
胡尧
97a26dfa06
修改工单通知筛选条件
2024-10-23 15:50:01 +08:00
yuxianghui
cebd895811
Merge branch 'feature/设备模块优化' into feature/设备维保优化
2024-10-23 15:49:13 +08:00
yuxianghui
bb6c208d37
设备维保计划优化
2024-10-23 15:48:33 +08:00
胡尧
921f2c3503
Accept Merge Request #1439 : (feature/workorder_exceptions -> develop)
...
Merge Request: 修改工单通知筛选条件
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1439?initial=true
2024-10-23 15:38:55 +08:00
胡尧
1224e0e094
修改工单通知筛选条件
2024-10-23 15:38:09 +08:00
胡尧
a571a870d3
修改工单通知筛选条件
2024-10-23 15:33:48 +08:00
胡尧
a28d20b3bf
修改排程逻辑
2024-10-23 15:30:05 +08:00
管欢
d4e0d36166
Accept Merge Request #1438 : (feature/machining_accuracy_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/1438
2024-10-23 14:00:41 +08:00
jinling.yang
39579aef10
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化加工质检
...
# Conflicts:
# sf_message/models/sf_message_maintenance_logs.py
2024-10-23 11:56:16 +08:00
jinling.yang
1fe8fd6933
优化定时器代码
2024-10-23 11:55:43 +08:00
liaodanlong
3b1caca62b
还原
2024-10-23 11:00:19 +08:00
liaodanlong
3fe8c957be
加工精度字段信息修改
2024-10-23 10:41:32 +08:00
yuxianghui
98923c1797
1、设备维保优化
2024-10-22 17:52:20 +08:00
guanhuan
8661dd16c1
加工精度同步
2024-10-22 15:37:41 +08:00
guanhuan
7157ea1587
加工精度同步
2024-10-22 15:35:34 +08:00
廖丹龙
a580a12d69
Accept Merge Request #1437 : (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/1437?initial=true
2024-10-22 13:56:38 +08:00
liaodanlong
0d512e2e43
制造订单添加订单交期字段信息
2024-10-22 13:55:24 +08:00
廖丹龙
103069c554
Accept Merge Request #1436 : (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/1436?initial=true
2024-10-22 13:48:28 +08:00
yuxianghui
f2482b5128
处理功能刀具产生库存移动时,功能刀具列表的功能刀具位置没有实时发生变更的问题
2024-10-22 13:45:08 +08:00
liaodanlong
da38d24111
制造订单添加订单交期字段信息
2024-10-22 13:33:53 +08:00
廖丹龙
1f0ebe71c7
Accept Merge Request #1435 : (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/1435?initial=true
2024-10-22 11:56:28 +08:00
liaodanlong
f897955f68
制造订单添加订单交期字段信息
2024-10-22 11:45:08 +08:00
胡尧
451e70b7c7
Accept Merge Request #1434 : (feature/workorder_exceptions -> develop)
...
Merge Request: 修改无功能刀具原因话术
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1434
2024-10-21 17:03:34 +08:00
胡尧
6c1c2ca0fc
修改无功能刀具原因话术
2024-10-21 17:02:59 +08:00
廖丹龙
e7420365cf
Accept Merge Request #1433 : (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/1433
2024-10-21 16:09:08 +08:00
liaodanlong
736a18518c
制造订单添加订单交期字段信息
2024-10-21 16:07:43 +08:00
liaodanlong
41b287d559
制造订单添加订单交期字段信息
2024-10-21 16:06:03 +08:00
胡尧
5d8e0bda08
Accept Merge Request #1432 : (feature/workorder_exceptions -> develop)
...
Merge Request: 处理设备故障的问题
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1432?initial=true
2024-10-21 15:41:06 +08:00
胡尧
e9dbbaedf4
处理设备故障的问题
2024-10-21 15:40:38 +08:00
胡尧
92ae6be3bd
Accept Merge Request #1431 : (feature/workorder_exceptions -> develop)
...
Merge Request: 修改模板标题
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1431
2024-10-21 14:59:57 +08:00
胡尧
b00038aaed
修改YC0004消息推送
2024-10-21 14:59:16 +08:00
胡尧
86c1880cdb
修改模板标题
2024-10-21 14:41:09 +08:00
廖丹龙
cfd2dda4e6
Accept Merge Request #1430 : (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/1430
2024-10-21 14:34:07 +08:00
liaodanlong
c01e9a4d39
制造订单添加订单交期字段信息
2024-10-21 14:18:53 +08:00
廖丹龙
88ff4bbaa9
Accept Merge Request #1429 : (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/1429?initial=true
2024-10-21 14:01:20 +08:00
liaodanlong
f62c70d354
Merge branch 'refs/heads/develop' into feature/销售和排程添加消息推送
2024-10-21 13:57:24 +08:00
liaodanlong
22c9de86f6
制造订单添加订单交期字段信息
2024-10-21 13:56:34 +08:00
胡尧
b362f74336
Accept Merge Request #1428 : (feature/workorder_exceptions -> develop)
...
Merge Request: 修改接口参数
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1428?initial=true
2024-10-21 13:47:36 +08:00
胡尧
81cfbfb540
修改接口参数
2024-10-21 11:46:14 +08:00
胡尧
668db4475f
Accept Merge Request #1427 : (feature/workorder_exceptions -> develop)
...
Merge Request: 修改单元测试
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1427?initial=true
2024-10-21 11:37:48 +08:00
胡尧
2af21bc4ee
修改单元测试
2024-10-21 11:37:01 +08:00
管欢
e6614a624f
Accept Merge Request #1426 : (feature/auxiliary_files_upload -> develop)
...
Merge Request: 辅助文件上传
Created By: @管欢
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @管欢
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1426
2024-10-21 10:11:36 +08:00
guanhuan
124bc8478e
辅助文件上传
2024-10-21 10:09:19 +08:00
guanhuan
1a3a178ec6
Revert "辅助文件上传"
...
This reverts commit cae5149fba .
2024-10-21 10:08:35 +08:00
guanhuan
cae5149fba
辅助文件上传
2024-10-21 10:07:49 +08:00
管欢
5c4c036948
Accept Merge Request #1425 : (feature/auxiliary_files_upload -> develop)
...
Merge Request: 辅助文件上传
Created By: @管欢
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @管欢
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1425
2024-10-21 10:01:22 +08:00
guanhuan
4003d6a652
Merge branch 'refs/heads/develop' into feature/auxiliary_files_upload
...
# Conflicts:
# sf_dlm_management/views/product_template_management_view.xml
2024-10-21 09:50:09 +08:00
胡嘉莹
0e8e81e4cb
Accept Merge Request #1423 : (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/1423
2024-10-18 16:44:46 +08:00
hujiaying
8cff3d8377
sf销售订单详情新增是否带料,带料尺寸,修改bfm分配工厂,sf接收订单生成销售订单新增两个字段,并修改订单详情及订单详情表单新增字段显示
2024-10-18 16:39:15 +08:00
guanhuan
b132771c92
辅助文件上传
2024-10-18 14:32:20 +08:00
马广威
cbaf0d79c1
Accept Merge Request #1422 : (feature/制造功能优化 -> develop)
...
Merge Request: 增加设备oee处获取数据的定时器
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1422?initial=true
2024-10-18 10:18:28 +08:00
mgw
953d675dcf
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2024-10-18 10:17:38 +08:00
mgw
182eb83090
暂时屏蔽24数据
2024-10-18 10:17:22 +08:00
mgw
67a607b053
增加设备oee处获取数据的定时器
2024-10-18 10:05:55 +08:00
guanhuan
00a04af94f
加工精度
2024-10-18 09:30:20 +08:00
禹翔辉
33d23c28b1
Accept Merge Request #1421 : (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/1421
2024-10-18 09:21:43 +08:00
yuxianghui
571fb29482
Merge branch 'feature/用刀校验优化' into feature/工单状态优化
2024-10-18 09:14:39 +08:00
yuxianghui
1dae20e055
处理制造订单、工单的状态计算方法没有触发的问题
2024-10-18 09:13:34 +08:00
hujiaying
6be9d44572
Merge remote-tracking branch 'origin/develop' into feature/临时分支
2024-10-18 08:40:57 +08:00
mgw
8a459e7e90
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2024-10-17 17:54:59 +08:00
mgw
4c486e53aa
设备oee界面数据准备
2024-10-17 17:54:32 +08:00
yuxianghui
19509a3ce2
1
2024-10-17 17:54:08 +08:00
胡嘉莹
4d424e90d3
Accept Merge Request #1420 : (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/1420?initial=true
2024-10-17 17:49:26 +08:00
hujiaying
9bbf613bcb
修改生成完工入库提醒,订单发货提醒跳转到表单详情
2024-10-17 17:39:43 +08:00
guanhuan
cc40d479a9
加工精度同步
2024-10-17 17:20:51 +08:00
禹翔辉
f5ea0ec153
Accept Merge Request #1419 : (feature/用刀校验优化 -> 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/1419?initial=true
2024-10-17 17:04:12 +08:00
yuxianghui
ea6c0f7d0b
Merge branch 'feature/程序用刀校验优化' into feature/用刀校验优化
2024-10-17 17:02:17 +08:00
yuxianghui
763009a3c0
1、优化手动返工时,cnc用刀校验逻辑
2024-10-17 17:01:20 +08:00
guanhuan
cf34ac5bbc
辅助文件上传
2024-10-17 16:31:13 +08:00
禹翔辉
0faedd35d7
Accept Merge Request #1418 : (feature/程序用刀校验优化 -> 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/1418
2024-10-17 16:01:42 +08:00
yuxianghui
135b97d4f8
1
2024-10-17 16:00:44 +08:00
yuxianghui
61f3aff768
Merge branch 'feature/制造订单状态优化_3' into feature/程序用刀校验优化
2024-10-17 15:52:06 +08:00
yuxianghui
9e369f0150
修改调用创建cam程序用刀计划方法的判断条件
2024-10-17 15:51:00 +08:00
杨金灵
16d50f5bf2
Accept Merge Request #1417 : (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/1417?initial=true
2024-10-17 15:40:23 +08:00
jinling.yang
80f0454996
工作中心添加质检权限
2024-10-17 15:37:08 +08:00
jinling.yang
9b9d811594
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-10-17 15:33:51 +08:00
jinling.yang
008ae20329
Merge branch 'feature/检测结果添加质检权限' into develop
2024-10-17 15:33:29 +08:00
杨金灵
80b3b4b0f7
Accept Merge Request #1416 : (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/1416
2024-10-17 15:26:29 +08:00
jinling.yang
d64b480496
检测结果添加质检权限
2024-10-17 15:25:13 +08:00
禹翔辉
854ec8da4e
Accept Merge Request #1415 : (feature/制造订单状态优化_3 -> 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/1415?initial=true
2024-10-17 14:43:48 +08:00
yuxianghui
d25b871854
1
2024-10-17 14:42:35 +08:00
禹翔辉
37aafe7b30
Accept Merge Request #1414 : (feature/制造订单状态优化_3 -> develop)
...
Merge Request: 1、优化手动获取编程的接口,添加获取编程完成之后进行用刀校验;2、处理 权限问题-工单详情缺少【时间跟踪】tab;3、用刀校验方法添加日志
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1414
2024-10-17 14:29:32 +08:00
yuxianghui
26910f7b15
Merge branch 'feature/制造订单状态优化_2' into feature/制造订单状态优化_3
2024-10-17 14:25:05 +08:00
杨金灵
3ea2acd46e
Accept Merge Request #1413 : (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/1413?initial=true
2024-10-17 14:23:36 +08:00
yuxianghui
303462ba9c
Merge branch 'feature/制造订单状态优化_1' into feature/制造订单状态优化_2
2024-10-17 14:22:59 +08:00
jinling.yang
53fad50af6
修复工单定时器
2024-10-17 14:22:43 +08:00
yuxianghui
1245323b9d
1、优化手动获取编程的接口,添加获取编程完成之后进行用刀校验;2、处理 权限问题-工单详情缺少【时间跟踪】tab;3、用刀校验方法添加日志
2024-10-17 14:22:09 +08:00
杨金灵
4d8e86cff3
Accept Merge Request #1412 : (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/1412
2024-10-17 14:08:18 +08:00
jinling.yang
7bc7d2059c
还原代码
2024-10-17 14:06:16 +08:00
jinling.yang
f9c209e85c
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-10-17 13:47:40 +08:00
jinling.yang
6ae783387c
Merge branch 'feature/修复加工质检' into develop
2024-10-17 13:47:18 +08:00
杨金灵
7c0202afc6
Accept Merge Request #1411 : (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/1411?initial=true
2024-10-17 13:47:00 +08:00
jinling.yang
9ad582612b
还原注释代码
2024-10-17 13:43:43 +08:00
jinling.yang
d1db917432
修复加工质检
2024-10-17 11:58:54 +08:00
杨金灵
847293385d
Accept Merge Request #1410 : (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/1410?initial=true
2024-10-17 11:34:40 +08:00
jinling.yang
4e8eccfd0b
还原代码
2024-10-17 11:33:20 +08:00
jinling.yang
5cb5306471
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-10-17 11:19:28 +08:00
jinling.yang
9a5b45b969
Merge branch 'feature/加工质检添加权限' into develop
2024-10-17 11:19:04 +08:00
杨金灵
7c82bbf3da
Accept Merge Request #1409 : (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/1409?initial=true
2024-10-17 11:18:39 +08:00
jinling.yang
9177acf277
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/加工质检添加权限
...
# Conflicts:
# sf_quality/views/quality_cnc_test_view.xml
2024-10-17 11:03:08 +08:00
jinling.yang
93187d7f4a
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-10-17 11:01:57 +08:00
jinling.yang
94b1551de2
加工质检添加权限
2024-10-17 11:01:42 +08:00
马广威
1c713d3278
Accept Merge Request #1408 : (feature/制造功能优化 -> develop)
...
Merge Request: 修改维护翻译为设备
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1408?initial=true
2024-10-17 10:26:36 +08:00
禹翔辉
bdef93fca3
Accept Merge Request #1407 : (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/1407?initial=true
2024-10-17 10:17:02 +08:00
yuxianghui
e9e55c72b9
Merge branch 'feature/制造订单状态优化' into feature/制造订单状态优化_1
2024-10-17 10:15:23 +08:00
yuxianghui
919450aafb
优化制造订单无效刀自动编程方法
2024-10-17 10:13:54 +08:00
jinling.yang
78f486ad7c
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-10-17 10:12:36 +08:00
jinling.yang
ccdfcb5e50
Merge branch 'feature/优化加工质检' into develop
2024-10-17 10:12:20 +08:00
杨金灵
9b275536e9
Accept Merge Request #1406 : (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/1406?initial=true
2024-10-17 10:10:51 +08:00
jinling.yang
bf39ed10b4
还原代码
2024-10-17 10:03:45 +08:00
jinling.yang
0e8bda3369
修复加工质检
2024-10-17 09:58:24 +08:00
mgw
87bb22857a
修改维护翻译为设备
2024-10-17 09:19:47 +08:00
jinling.yang
9cd8d9d823
修复验证
2024-10-16 17:59:34 +08:00
马广威
931732f75e
Accept Merge Request #1405 : (feature/制造功能优化 -> develop)
...
Merge Request: CNC自动生产线生产业绩看板优化需求
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1405?initial=true
2024-10-16 17:33:34 +08:00
mgw
35ace3b3eb
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2024-10-16 17:29:41 +08:00
mgw
4b4601ae85
CNC自动生产线生产业绩看板优化需求
2024-10-16 17:29:25 +08:00
禹翔辉
46337855a4
Accept Merge Request #1404 : (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/1404?initial=true
2024-10-16 17:04:00 +08:00
yuxianghui
43f8aec70a
Merge branch 'feature/刀具页面存档权限设置' into feature/制造订单状态优化
2024-10-16 17:02:18 +08:00
yuxianghui
a21b4302d4
1、处理 因为权限导致的功能刀具安全库存列表点击任意数据报错; 2、处理 下发程序校验刀具有无效刀时制造订单状态不对问题
2024-10-16 17:01:15 +08:00
jinling.yang
4adc3b700a
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/工单定时器修复时区问题
2024-10-16 15:32:47 +08:00
杨金灵
42b5a32708
Accept Merge Request #1403 : (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/1403?initial=true
2024-10-16 15:00:58 +08:00
jinling.yang
296e30e5fd
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-10-16 14:59:16 +08:00
jinling.yang
90718cc989
Merge branch 'feature/修复工单write方法' into develop
2024-10-16 14:53:37 +08:00
杨金灵
857930e169
Accept Merge Request #1402 : (feature/修复工单write方法 -> develop)
...
Merge Request: 修复工单write方法
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1402
2024-10-16 14:50:14 +08:00
jinling.yang
9b1b6e2b72
修复工单修改方法
2024-10-16 14:49:54 +08:00
jinling.yang
37217b0dd9
修复工单write方法
2024-10-16 14:46:31 +08:00
杨金灵
f138eab47a
Accept Merge Request #1401 : (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/1401?initial=true
2024-10-16 14:16:54 +08:00
jinling.yang
4e4c53927b
下发编程单接口添加输出
2024-10-16 14:15:37 +08:00
jinling.yang
fab1d77d64
还原注释代码
2024-10-16 14:07:35 +08:00
jinling.yang
f4f7087465
添加2D图纸和质量标准2个字段
2024-10-16 14:06:18 +08:00
jinling.yang
020da1d510
Merge branch 'feature/auxiliary_files_upload' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化加工质检
2024-10-16 11:49:37 +08:00
jinling.yang
2956f13ee7
优化加工质检
2024-10-16 11:49:05 +08:00
guanhuan
939f3d58f4
产品新增2D加工图纸,质检标准
2024-10-16 11:41:15 +08:00
胡尧
3d85b7863c
Accept Merge Request #1400 : (feature/workorder_exceptions -> develop)
...
Merge Request: 工单异常记录及消息通知
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1400?initial=true
2024-10-16 10:23:19 +08:00
胡尧
54abb7a9f7
增加备注
2024-10-16 10:22:30 +08:00
胡尧
9ca9b337ef
解决sf_quality报错问题,增加单元测试
2024-10-16 10:19:41 +08:00
胡尧
92c4bcb049
解决冲突
2024-10-15 15:25:31 +08:00
胡尧
ce5cb17e31
工单异常处理
2024-10-15 15:14:16 +08:00
杨金灵
6330929c04
Accept Merge Request #1399 : (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/1399?initial=true
2024-10-15 11:56:14 +08:00
jinling.yang
79a753b609
优化质检生产仓看板
2024-10-15 11:55:10 +08:00
jinling.yang
30ebc62697
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-10-15 09:30:58 +08:00
jinling.yang
28b218a13b
Merge branch 'feature/销售订单和工单逾期消息推送' into develop
2024-10-15 09:30:25 +08:00
杨金灵
cd24430ea9
Accept Merge Request #1398 : (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/1398
2024-10-15 09:30:08 +08:00
jinling.yang
f4daf94f7b
还原代码
2024-10-15 09:29:23 +08:00
jinling.yang
4acce194d9
Merge branch 'feature/销售订单和工单逾期消息推送' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/销售订单和工单逾期消息推送
2024-10-15 09:27:16 +08:00
jinling.yang
761e8d4579
还原代码
2024-10-15 09:26:55 +08:00
杨金灵
284c66ad86
Merge branch refs/heads/develop into refs/heads/feature/销售订单和工单逾期消息推送
2024-10-15 09:17:21 +08:00
jinling.yang
6c7c10924a
还原注释代码
2024-10-15 09:07:11 +08:00
jinling.yang
8f2d5129b1
还原代码
2024-10-15 09:06:13 +08:00
jinling.yang
2a067778bc
优化质量检测(加工检测)及消息推送
2024-10-14 17:53:38 +08:00
禹翔辉
299cc2f12f
Accept Merge Request #1397 : (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/1397?initial=true
2024-10-14 16:04:41 +08:00
yuxianghui
ce705abd20
刀具页面存档权限设置为只有超级管理员才能存档
2024-10-14 16:03:21 +08:00
胡尧
e2bd36ca16
工单异常处理
2024-10-14 15:18:27 +08:00
禹翔辉
e2dbd41e8f
Accept Merge Request #1396 : (feature/工单form视图优化 -> develop)
...
Merge Request: 工件装夹工单详情页版面优化
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1396
2024-10-14 13:47:43 +08:00
yuxianghui
050a61f334
Merge branch 'feature/制造订单功能刀具状态优化' into feature/工单form视图优化
2024-10-14 13:45:24 +08:00
马广威
0fa7c1b2d7
Accept Merge Request #1395 : (feature/制造功能优化 -> develop)
...
Merge Request: 调整“驾驶舱”的机床状态与工厂产线实际不一致的问题
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1395?initial=true
2024-10-14 13:45:17 +08:00
yuxianghui
e1af6ba2f5
1、完成 工件装夹工单详情页版面优化需求
2024-10-14 13:41:52 +08:00
禹翔辉
4a928735eb
Accept Merge Request #1394 : (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/1394?initial=true
2024-10-11 17:59:10 +08:00
yuxianghui
fdc2af4a39
Merge branch 'feature/销售订单按钮优化' into feature/制造订单功能刀具状态优化
2024-10-11 17:56:51 +08:00
yuxianghui
70b3daad73
1、删除功能刀具tree视图图片字段;2、修改货位看板关联展示字段;3、获取编程单接口调用cnc用刀校验方法添加报错处理;
2024-10-11 17:53:12 +08:00
jinling.yang
d8bade64e1
优化质量:添加加工质检
2024-10-11 17:52:33 +08:00
胡尧
f779c492d8
Accept Merge Request #1393 : (feature/流程用扫码完成 -> develop)
...
Merge Request: 解决销售单不能新增的bug
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1393?initial=true
2024-10-11 15:04:50 +08:00
胡尧
a7b98f1e5e
解决销售单不能新增的bug
2024-10-11 15:03:46 +08:00
胡嘉莹
797eb9b159
Accept Merge Request #1392 : (feature/临时分支 -> 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/1392?initial=true
2024-10-11 10:10:57 +08:00
hujiaying
c3e40fd3aa
修改消息发送前已入库或已发货消息发送内容为null
2024-10-11 09:52:42 +08:00
胡嘉莹
0ed07b024a
Accept Merge Request #1391 : (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/1391?initial=true
2024-10-11 08:54:03 +08:00
hujiaying
22da51729b
修改项目升级初始化数据问题
2024-10-11 08:47:56 +08:00
廖丹龙
c3be2894c9
Accept Merge Request #1386 : (feature/销售和排程添加消息推送 -> develop)
...
Merge Request: 产品 qty_available字段名称修改为库存数量
Created By: @廖丹龙
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1386
2024-10-10 17:55:49 +08:00
胡嘉莹
e08f968f1a
Accept Merge Request #1390 : (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/1390
2024-10-10 17:53:57 +08:00
jinling.yang
351815ad91
优化销售订单+工单逾期预警和已1逾期代码
2024-10-10 17:36:35 +08:00
yuxianghui
25a90f3966
1、获取mrs编程接口优化,重新编程接口优化,创建CAM方法优化,cnc用刀校验逻辑优化
2024-10-10 17:31:56 +08:00
hujiaying
50bb50f5ab
修改计划排程,超过小时产能提示产线的小时产能以及超出的件数
2024-10-10 16:47:25 +08:00
hujiaying
d1ff7c196d
解决合并冲突
2024-10-10 16:08:23 +08:00
hujiaying
298d2391de
Merge remote-tracking branch 'origin/develop' into feature/临时分支
...
# Conflicts:
# sf_message/models/sf_message_stock_picking.py
2024-10-10 15:54:07 +08:00
hujiaying
49cbeee261
编写sf生产完工入库提醒,订单发货提醒代码
2024-10-10 15:52:14 +08:00
mgw
b104b358ea
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2024-10-10 14:01:56 +08:00
mgw
786fca2937
调整“驾驶舱”的机床状态与工厂产线实际不一致的问题
2024-10-10 14:01:39 +08:00
马广威
ca6d1f51df
Accept Merge Request #1388 : (feature/制造功能优化 -> develop)
...
Merge Request: 调整24h开机时长为0的问题;去掉x偏差角度的控制
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1388?initial=true
2024-10-10 11:49:22 +08:00
mgw
f324453351
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2024-10-10 11:36:35 +08:00
mgw
d0f5aca707
调整24h开机时长为0的问题;去掉x偏差角度的控制
2024-10-10 11:36:18 +08:00
胡尧
f0cb047e8c
Accept Merge Request #1387 : (release/release_2.4 -> develop)
...
Merge Request: 解决空料架配送的问题
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1387
2024-10-10 11:06:01 +08:00
胡尧
b74bc62804
处理下发AGV小车任务报错的问题
2024-10-10 10:49:16 +08:00
jinling.yang
02467d5220
优化工单消息推送
2024-10-09 17:58:47 +08:00
yuxianghui
f18c0e3eaf
1、重构cnc用刀校验方法,优化下发编程单后校验cnc用刀的逻辑;2、优化CAM创建方法;3、优化获取mrs编程单接口、优化编程单更新接口;
2024-10-09 17:52:20 +08:00
liaodanlong
c55f0b4c39
产品 qty_available字段名称修改为库存数量
2024-10-09 17:45:57 +08:00
胡尧
94f57629e5
增加空料架配送菜单权限
2024-10-09 17:23:03 +08:00
jinling.yang
2639a6ac6b
优化销售订单逾期和预警消息推送
2024-10-09 16:42:53 +08:00
廖丹龙
52c1992814
Accept Merge Request #1383 : (feature/销售和排程添加消息推送 -> develop)
...
Merge Request: 消息推送url链接逻辑修改
Created By: @廖丹龙
Reviewed By: @胡尧 @胡嘉莹
Approved By: @胡尧
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1383
2024-10-09 16:35:27 +08:00
胡嘉莹
b1fbf4344e
Accept Merge Request #1385 : (feature/临时分支 -> develop)
...
Merge Request: 修改custom_many2many_checkboxes组件,优化图片展示方式,及点击图片放大的预览样式
Created By: @胡嘉莹
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @胡嘉莹
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1385
2024-10-09 16:28:52 +08:00
hujiaying
a1b9f2dd3b
产品看板新增品牌字段,如果产品没有品牌字段则不展示品牌字段
2024-10-09 16:21:14 +08:00
hujiaying
441cfaffce
优化代码
2024-10-09 16:01:27 +08:00
hujiaying
75e1f5387d
修改coustom_many2many_checkboxes组件的展示方式,控制图片展示大小,修改点击预览图展示的样式优化
2024-10-09 16:01:12 +08:00
胡尧
e4c845a9f6
解决空料架配送不能正常下发AGV任务的问题
2024-10-09 14:08:38 +08:00
胡尧
d239509299
解决空料架配送不能正常下发AGV任务的问题
2024-10-09 13:53:49 +08:00
马广威
3f0fda7aac
Accept Merge Request #1384 : (feature/制造功能优化 -> develop)
...
Merge Request: 调整依赖、配置
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1384?initial=true
2024-10-09 10:50:58 +08:00
liaodanlong
cc5452d14c
消息推送url链接逻辑修改
2024-10-09 10:26:20 +08:00
liaodanlong
5aff8c1737
消息推送url链接逻辑修改
2024-10-09 10:14:48 +08:00
jinling.yang
a00f4af923
优化销售订单逾期
2024-10-08 17:50:59 +08:00
yuxianghui
62a2aed7d9
销售订单按钮顺序优化为: 确认接单/拒绝接单/创建结算单/通过Email发送
2024-10-08 14:26:12 +08:00
胡尧
e99f01104e
Accept Merge Request #1382 : (release/release_2.4 -> develop)
...
Merge Request: 解决logo不显示的问题
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1382?initial=true
2024-10-08 09:20:31 +08:00
胡尧
457f0aa2ac
修复login页logo不显示的问题
2024-10-08 09:19:06 +08:00
mgw
1de4704046
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
...
# Conflicts:
# sf_message/__manifest__.py
2024-09-30 10:51:54 +08:00
mgw
0d65e67140
调整依赖
2024-09-30 10:48:40 +08:00
jinling.yang
ccd01c9c75
优化合并多条发送销售订单逾期预警
2024-09-29 17:51:50 +08:00
胡嘉莹
84266364e3
Accept Merge Request #1381 : (develop -> release/release_2.4)
...
Merge Request: 修改计划排程
Created By: @胡嘉莹
Accepted By: @胡嘉莹
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1381?initial=true
2024-09-29 17:25:11 +08:00
liaodanlong
0b127ff419
Merge remote-tracking branch 'origin/feature/销售和排程添加消息推送' into feature/销售和排程添加消息推送
2024-09-29 17:12:25 +08:00
liaodanlong
d4a01d9b8a
处理会计凭证生成重复名称报错问题
2024-09-29 17:11:37 +08:00
管欢
ea88d8284a
Accept Merge Request #1380 : (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/1380
2024-09-29 17:09:47 +08:00
guanhuan
d2ec420f57
域名获取修改
2024-09-29 17:05:42 +08:00
guanhuan
97d33adabd
域名获取修改
2024-09-29 17:03:49 +08:00
胡尧
c11f3cc66c
Merge branch 'develop' into release/release_2.4
2024-09-29 16:51:41 +08:00
廖丹龙
6b4a7e35a9
Accept Merge Request #1375 : (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/1375
2024-09-29 16:48:53 +08:00
guanhuan
11100c9260
域名获取修改
2024-09-29 16:47:35 +08:00
胡嘉莹
941c3ca43a
Accept Merge Request #1379 : (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/1379?initial=true
2024-09-29 16:47:10 +08:00
hujiaying
05f9528ca9
修改计划排程代码
2024-09-29 16:44:48 +08:00
杨金灵
b205945f65
Accept Merge Request #1378 : (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/1378?initial=true
2024-09-29 16:43:54 +08:00
jinling.yang
c1dc28488a
修复待接单路径
2024-09-29 16:42:32 +08:00
jinling.yang
c6065653f0
优化逾期
2024-09-29 16:40:52 +08:00
jinling.yang
fd0de5ae09
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/销售订单和工单逾期消息推送
...
# Conflicts:
# sf_message/__manifest__.py
# sf_message/data/bussiness_node.xml
# sf_message/models/sf_message_sale.py
2024-09-29 15:43:19 +08:00
jinling.yang
547d6608e6
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-09-29 15:40:50 +08:00
jinling.yang
dacb3cc076
Merge branch 'feature/消息模版初始化添加相关模版' into develop
2024-09-29 15:33:51 +08:00
胡尧
282657fbca
Merge branch 'release/release_2.4' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into release/release_2.4
2024-09-29 15:32:37 +08:00
杨金灵
7e516c6f0b
Accept Merge Request #1377 : (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/1377
2024-09-29 15:31:28 +08:00
jinling.yang
34e2a49bef
注释部分不上的代码
2024-09-29 15:30:18 +08:00
jinling.yang
ff4bdd2f2d
还原代码
2024-09-29 15:27:27 +08:00
jinling.yang
b239fdf847
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-09-29 15:24:39 +08:00
jinling.yang
47feb4cf3c
消息模版初始化添加相关模版
2024-09-29 15:24:28 +08:00
mgw
83ca18d7d5
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2024-09-29 14:02:04 +08:00
mgw
11666b9ae1
静态数据时序库移位后的相应配置调整
2024-09-29 14:01:44 +08:00
胡嘉莹
63b732ff42
Accept Merge Request #1376 : (develop -> release/release_2.4)
...
Merge Request: 排程计划bug合并
Created By: @胡嘉莹
Accepted By: @胡嘉莹
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1376?initial=true
2024-09-29 11:42:53 +08:00
胡嘉莹
50d63c28d6
Accept Merge Request #1374 : (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/1374?initial=true
2024-09-29 10:36:32 +08:00
hujiaying
73b7ff7d1b
修改计划排程选择日期有生成量,不能排程问题
2024-09-29 10:33:19 +08:00
jinling.yang
ccdcd01372
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
...
# Conflicts:
# sf_message/__manifest__.py
2024-09-29 09:18:07 +08:00
liaodanlong
198296f0f8
价格计算
2024-09-27 18:04:39 +08:00
廖丹龙
f122343e31
Accept Merge Request #1373 : (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/1373?initial=true
2024-09-27 18:02:25 +08:00
liaodanlong
82fa39f1a3
价格计算
2024-09-27 18:00:34 +08:00
廖丹龙
841e1b4ce2
Accept Merge Request #1372 : (feature/销售和排程添加消息推送 -> develop)
...
Merge Request: d刀具标准库数据同步
Created By: @廖丹龙
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1372?initial=true
2024-09-27 17:46:09 +08:00
liaodanlong
1ab62d7724
d刀具标准库数据同步
2024-09-27 17:43:47 +08:00
胡尧
28a46d395b
Accept Merge Request #1371 : (feature/程序用刀异常提醒 -> develop)
...
Merge Request: 增加日志
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1371
2024-09-27 15:19:21 +08:00
胡尧
64c66f1272
增加日志
2024-09-27 15:18:27 +08:00
马广威
f8d957486b
Accept Merge Request #1370 : (feature/制造功能优化 -> develop)
...
Merge Request: 优化调整相关数据返回结构等
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1370
2024-09-27 14:47:16 +08:00
mgw
1866607967
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2024-09-27 14:41:41 +08:00
mgw
40efdf6f3b
隐藏status字段
2024-09-27 14:41:23 +08:00
胡尧
f910df3ce5
Accept Merge Request #1369 : (feature/程序用刀异常提醒 -> develop)
...
Merge Request: 去掉多余的无效刀异常推送
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1369?initial=true
2024-09-27 14:39:55 +08:00
胡尧
c99c96a9ea
去掉多余的无效刀异常推送
2024-09-27 14:39:29 +08:00
胡尧
95cc557577
Accept Merge Request #1368 : (feature/程序用刀异常提醒 -> develop)
...
Merge Request: 程序用刀异常提醒
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1368?initial=true
2024-09-27 14:38:10 +08:00
mgw
fa78389f47
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2024-09-27 14:31:39 +08:00
mgw
f7381c43aa
调整url的获取方式;暂时屏蔽历史日志部分
2024-09-27 14:31:22 +08:00
mgw
76c5db61da
增加24h的oee参数
2024-09-27 14:13:57 +08:00
胡尧
88ffc34a68
程序用刀异常提醒
2024-09-27 14:00:56 +08:00
禹翔辉
4f65b34aeb
Accept Merge Request #1367 : (feature/无效刀校验优化 -> 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/1367?initial=true
2024-09-27 13:36:44 +08:00
yuxianghui
4a26d18b46
Merge branch 'feature/下发编程优化' into feature/无效刀校验优化
2024-09-27 13:34:10 +08:00
yuxianghui
664ac8128a
cnc校验刀无效刀创建检测结果时先检测是否已经存在待处理记录
2024-09-27 13:32:55 +08:00
廖丹龙
ce285818cf
Accept Merge Request #1366 : (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/1366?initial=true
2024-09-27 11:55:16 +08:00
liaodanlong
6f7811a843
调拨入库、刀具组装,拆解消息推送模板预置数据
2024-09-27 11:53:55 +08:00
廖丹龙
54ed90e892
Accept Merge Request #1365 : (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/1365?initial=true
2024-09-27 10:32:56 +08:00
liaodanlong
f8060113d9
产品关联数据字段修改
2024-09-27 10:14:13 +08:00
mgw
48ab891991
调整设备oee结构,去掉设备运行日志
2024-09-27 10:07:02 +08:00
guanhuan
7f384c3f56
消息模板初始数据
2024-09-27 09:36:51 +08:00
guanhuan
01a2771dfb
Revert "消息模板初始数据"
...
This reverts commit 45b6214ddd .
2024-09-27 09:35:18 +08:00
guanhuan
45b6214ddd
消息模板初始数据
2024-09-27 09:33:17 +08:00
mgw
c96ff3f5b4
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2024-09-27 09:20:36 +08:00
mgw
d84758232e
优化值为空时的逻辑
2024-09-27 09:20:19 +08:00
廖丹龙
479953e082
Accept Merge Request #1364 : (feature/销售和排程添加消息推送 -> develop)
...
Merge Request: r角默认值
Created By: @廖丹龙
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1364?initial=true
2024-09-27 09:12:03 +08:00
jinling.yang
7235f242b2
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/销售订单和工单逾期消息推送
...
# Conflicts:
# sf_message/__manifest__.py
# sf_message/data/bussiness_node.xml
2024-09-27 09:11:56 +08:00
jinling.yang
27881589d4
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
...
# Conflicts:
# sf_message/__manifest__.py
# sf_message/models/sf_message_workorder.py
2024-09-27 09:10:19 +08:00
liaodanlong
79ec3f2c91
r角默认值
2024-09-27 09:09:48 +08:00
管欢
715b4181be
Accept Merge Request #1363 : (feature/销售和排程添加消息推送 -> develop)
...
Merge Request: 删除重复we_employee_id
Created By: @管欢
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @管欢
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1363
2024-09-26 18:05:49 +08:00
liaodanlong
0ccda10c65
Merge remote-tracking branch 'origin/feature/销售和排程添加消息推送' into feature/销售和排程添加消息推送
2024-09-26 17:58:20 +08:00
liaodanlong
5b4376b5f9
r角默认值
2024-09-26 17:58:04 +08:00
guanhuan
1050f7616b
删除重复we_employee_id
2024-09-26 17:57:17 +08:00
禹翔辉
3a9cc0c09c
Accept Merge Request #1362 : (feature/下发编程优化 -> 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/1362?initial=true
2024-09-26 16:38:07 +08:00
yuxianghui
4d63b90373
屏蔽重新下发编程单时调用删除CAM程序用刀计划记录方法
2024-09-26 16:36:49 +08:00
胡尧
43c4614650
Accept Merge Request #1361 : (feature/程序用刀异常提醒 -> develop)
...
Merge Request: 屏蔽title写死JIKIMO的代码
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1361
2024-09-26 15:34:46 +08:00
胡尧
eba9ccf083
屏蔽title写死JIKIMO的代码
2024-09-26 15:33:39 +08:00
廖丹龙
947100a9d4
Accept Merge Request #1360 : (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/1360?initial=true
2024-09-26 14:57:11 +08:00
liaodanlong
ed4924651a
Merge remote-tracking branch 'origin/feature/销售和排程添加消息推送' into feature/销售和排程添加消息推送
2024-09-26 14:55:32 +08:00
liaodanlong
3cc2bb94fe
刀具拆解消息推送
2024-09-26 14:54:43 +08:00
管欢
8ecb3eb50a
Accept Merge Request #1358 : (feature/销售和排程添加消息推送 -> develop)
...
Merge Request: 消息通知url修改
Created By: @管欢
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @管欢
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1358
2024-09-26 14:09:10 +08:00
禹翔辉
819d89c278
Accept Merge Request #1359 : (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/1359?initial=true
2024-09-26 14:06:53 +08:00
yuxianghui
66d47c60bc
Merge branch 'feature/CAM优化' into feature/刀具标准库同步接口优化
2024-09-26 14:05:09 +08:00
mgw
0340563749
筛选加工时间不为空的24h数据
2024-09-26 14:04:35 +08:00
yuxianghui
271e23a67f
1、刀具标准库数据同步接口优化
2024-09-26 14:01:03 +08:00
guanhuan
de42382f58
Merge branch 'refs/heads/feature/程序用刀异常提醒' into feature/销售和排程添加消息推送
...
# Conflicts:
# sf_message/models/sf_message_workorder.py
2024-09-26 13:54:28 +08:00
guanhuan
3728809d10
消息通知url修改
2024-09-26 13:43:47 +08:00
guanhuan
d4e2ace8a6
消息通知url修改
2024-09-26 12:36:00 +08:00
mgw
1d4188df7e
增加24h的故障时间返回
2024-09-26 11:11:46 +08:00
胡尧
a2323293ca
Accept Merge Request #1357 : (feature/程序用刀异常提醒 -> develop)
...
Merge Request: 无效刀判断后调用cloud发送消息推送接口
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1357
2024-09-26 10:31:26 +08:00
胡尧
29bd1c2968
解决冲突
2024-09-26 10:30:40 +08:00
胡尧
6c35ec13fd
无效刀判断后调用cloud发送消息推送接口
2024-09-26 10:28:38 +08:00
廖丹龙
83107b05e2
Accept Merge Request #1356 : (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/1356?initial=true
2024-09-26 09:38:52 +08:00
liaodanlong
5fb7165306
调拨入库消息推送
2024-09-26 09:22:02 +08:00
liaodanlong
c569b60d5c
手动创建的拆解单不生成消息推送
2024-09-26 09:21:04 +08:00
mgw
bd2748659a
去掉关机率
2024-09-25 17:57:24 +08:00
jinling.yang
7fef8f4c77
添加业务节点
2024-09-25 17:50:00 +08:00
jinling.yang
3ee233c0bc
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-09-25 17:45:34 +08:00
jinling.yang
d63081dffa
优化销售订单+工单逾期
2024-09-25 17:45:15 +08:00
马广威
0932ec95bf
Accept Merge Request #1355 : (feature/制造功能优化 -> develop)
...
Merge Request: 调整设备故障日志;增加24小时的运行数据
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1355?initial=true
2024-09-25 16:32:12 +08:00
mgw
7361da0e5d
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2024-09-25 16:29:05 +08:00
mgw
2dbddf532c
增加24小时的运行数据
2024-09-25 16:28:45 +08:00
管欢
eb867e62d8
Accept Merge Request #1354 : (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/1354
2024-09-25 14:39:12 +08:00
liaodanlong
d75504960a
Merge remote-tracking branch 'origin/feature/销售和排程添加消息推送' into feature/销售和排程添加消息推送
2024-09-25 14:37:05 +08:00
liaodanlong
93efbf742e
产品刀具参数物料与物料号数据关联
2024-09-25 14:36:32 +08:00
guanhuan
7c3ac138b5
工单已下发通知
2024-09-25 14:31:31 +08:00
mgw
63444d3dd1
调整默认值
2024-09-25 14:10:11 +08:00
mgw
2fcad742b8
调整alarm logs的返回数据
2024-09-25 14:08:05 +08:00
mgw
f341ef5e83
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2024-09-25 13:51:09 +08:00
mgw
d488824e3d
增加分页接口;合并日志状态相同数据
2024-09-25 13:50:50 +08:00
杨金灵
0c28700f75
Accept Merge Request #1353 : (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/1353
2024-09-25 13:35:56 +08:00
禹翔辉
48d97f3e57
Accept Merge Request #1352 : (feature/CAM优化 -> develop)
...
Merge Request: 添加CNC缺刀创建CAM日志
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1352?initial=true
2024-09-25 12:27:10 +08:00
jinling.yang
ef17c9920c
修复销售+排程消息推送
2024-09-25 12:00:46 +08:00
yuxianghui
ef643a5a72
Merge branch 'feature/程序用刀校验优化' into feature/CAM优化
2024-09-25 11:53:10 +08:00
yuxianghui
b7ff8d0bd5
添加CNC缺刀创建CAM日志
2024-09-25 11:52:29 +08:00
mgw
1e721d68bf
调整视图与增加字段
2024-09-25 11:41:23 +08:00
mgw
7454297dcd
调整设备故障日志
2024-09-25 11:24:01 +08:00
jinling.yang
2e3a9a8b80
添加提醒时间
2024-09-25 11:18:37 +08:00
guanhuan
4e0a023c36
Merge remote-tracking branch 'origin/feature/销售和排程添加消息推送' into feature/销售和排程添加消息推送
2024-09-25 10:49:10 +08:00
guanhuan
155c5eb329
坯料采购提醒
2024-09-25 10:48:35 +08:00
jinling.yang
45718ab925
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-09-25 09:49:43 +08:00
廖丹龙
562c8dda8d
Accept Merge Request #1350 : (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/1350?initial=true
2024-09-24 17:59:43 +08:00
liaodanlong
84a37a970f
调拨入库消息推送
2024-09-24 17:57:03 +08:00
管欢
37cc02e97a
Accept Merge Request #1349 : (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/1349
2024-09-24 16:33:23 +08:00
guanhuan
7a8753408b
连接跳转
2024-09-24 16:23:45 +08:00
黄焱
eb853d0be9
Accept Merge Request #1345 : (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/1345
2024-09-24 15:37:33 +08:00
廖丹龙
52438733d7
Accept Merge Request #1348 : (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/1348?initial=true
2024-09-24 15:04:58 +08:00
liaodanlong
b986dd8473
刀具组装与拆解信息推送
2024-09-24 14:58:32 +08:00
jinling.yang
98fdb581fb
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-09-24 13:57:01 +08:00
胡尧
ea7380288c
Accept Merge Request #1347 : (feature/流程用扫码完成 -> develop)
...
Merge Request: 修改任务下发逻辑
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1347?initial=true
2024-09-24 11:43:54 +08:00
胡尧
9beecab21d
修改任务下发逻辑
2024-09-24 11:42:58 +08:00
jinling.yang
2e6932e054
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-09-24 11:39:33 +08:00
杨金灵
5ca9e028d8
Accept Merge Request #1346 : (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/1346?initial=true
2024-09-24 11:19:11 +08:00
hy
64e2b71a34
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/前端样式修改
2024-09-24 11:15:10 +08:00
jinling.yang
8d52c94aed
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-09-24 11:15:04 +08:00
jinling.yang
9d91a1c99f
删除不要的模块
2024-09-24 11:14:55 +08:00
hy
d6fdeafef6
制造-刀具标准库界面样式显示有问题
2024-09-24 11:14:08 +08:00
guanhuan
371b3a9d65
Merge remote-tracking branch 'origin/feature/销售和排程添加消息推送' into feature/销售和排程添加消息推送
2024-09-24 10:57:02 +08:00
guanhuan
36c1c7b170
单已下发通知
2024-09-24 10:56:23 +08:00
liaodanlong
38d3a7901d
刀具组装与拆解信息推送
2024-09-24 10:23:09 +08:00
禹翔辉
2223259d13
Accept Merge Request #1344 : (feature/程序用刀校验优化 -> develop)
...
Merge Request: CAM用刀添加编程单号字段,优化CNC程序用刀校验缺刀生成的CAM用刀计划记录的判断条件,优化tree和form视图;
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1344?initial=true
2024-09-24 09:53:35 +08:00
yuxianghui
aba270182d
Merge branch 'feature/产品优化' into feature/程序用刀校验优化
2024-09-24 09:51:42 +08:00
yuxianghui
c9378fc9fe
CAM用刀添加编程单号字段,优化CNC程序用刀校验缺刀生成的CAM用刀计划记录的判断条件,优化tree和form视图;
2024-09-24 09:50:44 +08:00
liaodanlong
378850682d
错误日志信息调整
2024-09-23 17:50:25 +08:00
liaodanlong
02c35803da
Merge remote-tracking branch 'origin/feature/销售和排程添加消息推送' into feature/销售和排程添加消息推送
2024-09-23 17:47:30 +08:00
liaodanlong
75b60c1ec8
bom清单整体式刀具匹配条件修改
2024-09-23 17:47:03 +08:00
guanhuan
2cd4424ba1
Merge remote-tracking branch 'origin/feature/销售和排程添加消息推送' into feature/销售和排程添加消息推送
2024-09-23 17:12:26 +08:00
guanhuan
d52f0aed6e
坯料发料提醒
2024-09-23 17:11:53 +08:00
liaodanlong
d197fc5b9e
保留小数点后两位
2024-09-23 16:58:58 +08:00
guanhuan
34280fe24b
坯料发料提醒
2024-09-23 16:43:29 +08:00
胡尧
fd88a37aec
Accept Merge Request #1343 : (feature/wechat_message -> develop)
...
Merge Request: 修改屏蔽登录页footer
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1343
2024-09-23 16:38:19 +08:00
胡尧
0082a308fa
修改屏蔽登录页footer
2024-09-23 16:37:36 +08:00
胡尧
b5f5826c80
Accept Merge Request #1342 : (feature/wechat_message -> develop)
...
Merge Request: 处理皮肤问题
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1342?initial=true
2024-09-23 16:10:00 +08:00
胡尧
5024a9254d
删除皮肤文件
2024-09-23 16:08:49 +08:00
马广威
2a14a630d5
Accept Merge Request #1341 : (feature/制造功能优化 -> develop)
...
Merge Request: 调整记录匹配条件;优化排程单状态变化
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1341?initial=true
2024-09-23 14:30:57 +08:00
mgw
ef8ea2599f
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2024-09-23 14:30:09 +08:00
mgw
e9ab4270a9
调整记录匹配条件;优化排程单状态变化
2024-09-23 14:29:52 +08:00
廖丹龙
a99d651509
Accept Merge Request #1340 : (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/1340
2024-09-23 14:25:01 +08:00
胡嘉莹
c54a5b36d4
Accept Merge Request #1339 : (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/1339
2024-09-23 14:24:03 +08:00
胡尧
ae844cf203
Merge branch 'develop' into feature/wechat_message
2024-09-23 14:03:18 +08:00
管欢
ec66ea76ba
Accept Merge Request #1330 : (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/1330
2024-09-23 13:36:06 +08:00
liaodanlong
8643c41193
代码还原
2024-09-23 13:33:05 +08:00
liaodanlong
bed0483496
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/销售和排程添加消息推送
2024-09-23 13:31:52 +08:00
liaodanlong
a648208656
Merge remote-tracking branch 'origin/feature/销售和排程添加消息推送' into feature/销售和排程添加消息推送
2024-09-23 13:31:46 +08:00
liaodanlong
98af6d0530
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/销售和排程添加消息推送
2024-09-23 13:31:27 +08:00
guanhuan
5af1953e04
坯料采购提醒
2024-09-23 13:20:31 +08:00
hujiaying
b1a08be57b
bfm加工订单隐藏字段 ,待发货明细中,接单日期、发货日期顺序改变,欠单如果没有发货不要显示发货时间 、更改逾期状态逻辑。
2024-09-23 12:27:31 +08:00
马广威
15981aadf1
Accept Merge Request #1338 : (feature/制造功能优化 -> develop)
...
Merge Request: 去掉工单明细处删除按钮;已完成工单取24小时内
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1338?initial=true
2024-09-23 12:09:20 +08:00
mgw
e19cb52e70
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2024-09-23 12:08:30 +08:00
mgw
5269d09d0e
去掉工单明细处删除按钮;已完成工单取24小时内
2024-09-23 12:08:02 +08:00
liaodanlong
e7e64720c6
消息推送
2024-09-23 11:55:28 +08:00
liaodanlong
a6701a842e
刀尖r角字段修改
2024-09-23 11:55:11 +08:00
胡尧
d697bd13a1
Accept Merge Request #1337 : (feature/修改网站标题 -> develop)
...
Merge Request: 修改网站标题写死的问题
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1337
2024-09-23 11:21:58 +08:00
胡尧
6e20a466ce
修改网站标题写死的问题
2024-09-23 11:21:17 +08:00
胡尧
dd5c9775fc
去掉修改网页标题的代码
2024-09-23 11:18:40 +08:00
黄焱
82c274591c
Accept Merge Request #1336 : (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/1336?initial=true
2024-09-23 11:00:15 +08:00
hy
4f73f57ddf
漏提交代码
2024-09-23 10:59:10 +08:00
黄焱
269141dfb2
Accept Merge Request #1335 : (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/1335?initial=true
2024-09-23 10:56:37 +08:00
hy
cab0e1ce0b
顶部菜单支持多级菜单
2024-09-23 10:54:37 +08:00
禹翔辉
d4ff7ffaa9
Accept Merge Request #1334 : (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/1334?initial=true
2024-09-23 10:51:00 +08:00
yuxianghui
d238d09cc3
Merge branch 'feature/刀具优化' into feature/产品优化
2024-09-23 10:49:36 +08:00
yuxianghui
4cee5213bb
产品字段值优化
2024-09-23 10:48:48 +08:00
jinling.yang
759e4a481d
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-09-23 10:32:27 +08:00
jinling.yang
1213afe834
Merge branch 'feature/销售和排程添加消息推送' into develop
2024-09-23 10:32:18 +08:00
杨金灵
35fda7106a
Accept Merge Request #1333 : (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/1333
2024-09-23 10:32:05 +08:00
jinling.yang
b8baa84270
还原代码
2024-09-23 10:30:51 +08:00
jinling.yang
6591e663b6
修复待排程的消息推送
2024-09-23 10:26:53 +08:00
jinling.yang
bad5c8d489
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/销售和排程添加消息推送
2024-09-23 08:56:59 +08:00
mgw
68f8c94332
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2024-09-23 08:55:40 +08:00
mgw
ddfb233452
修复按钮固定条件显示问题
2024-09-23 08:55:23 +08:00
jinling.yang
bbf62d2302
消息模块添加权限
2024-09-20 17:32:02 +08:00
jinling.yang
17b09c1f6d
Merge branch 'feature/wechat_message' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/销售和排程添加消息推送
2024-09-20 16:57:19 +08:00
禹翔辉
e0fc70ec60
Accept Merge Request #1332 : (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/1332?initial=true
2024-09-20 16:55:14 +08:00
yuxianghui
4558fc0336
Merge branch 'feature/库存优化' into feature/刀具优化
2024-09-20 16:51:39 +08:00
yuxianghui
4609ec442a
1、刀具标准库优化,整体式刀具物料产品优化;刀具同步接口优化;2、新增组装单扫描确认组装和获取测量值功能;组装单更换物料弹窗信息优化;
2024-09-20 16:50:55 +08:00
mgw
eb7d9e4168
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
2024-09-20 16:38:30 +08:00
mgw
8706e25b0d
增加24h与历史日志的数据拿取
2024-09-20 16:33:56 +08:00
黄焱
85fea64f49
Accept Merge Request #1331 : (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/1331?initial=true
2024-09-20 16:31:57 +08:00
hy
f74215c9f6
修改顶部下拉菜单
2024-09-20 16:27:12 +08:00
jinling.yang
cc8906980c
销售和排程添加消息推送
2024-09-20 15:42:07 +08:00
guanhuan
56f1ba0f25
用户新增企业微信id
2024-09-20 14:24:50 +08:00
马广威
0990d73075
Accept Merge Request #1329 : (feature/制造功能优化 -> develop)
...
Merge Request: 处理提示词制造订单重复问题;处理获取数据按钮显隐问题
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1329?initial=true
2024-09-20 11:46:38 +08:00
mgw
7d877a0cbb
处理提示词制造订单重复问题;处理获取数据按钮显隐问题
2024-09-20 11:45:23 +08:00
胡尧
e13bad8483
Merge branch 'develop' into feature/wechat_message
2024-09-20 10:43:41 +08:00
胡尧
22ebb1bbe1
增加扩展
2024-09-20 10:43:13 +08:00
廖丹龙
bc888d7984
Accept Merge Request #1328 : (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/1328
2024-09-20 10:42:55 +08:00
胡尧
c92d4f7868
增加扩展
2024-09-20 10:41:41 +08:00
管欢
667a2a81fb
Accept Merge Request #1327 : (feature/org_info_synchronous -> develop)
...
Merge Request: 左侧图标修改
Created By: @管欢
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @管欢
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1327
2024-09-20 10:40:26 +08:00
liaodanlong
4a22071f94
Merge branch 'refs/heads/develop' into feature/tax_sync
...
# Conflicts:
# sf_manufacturing/models/res_config_setting.py
# sf_manufacturing/views/res_config_settings_views.xml
# sf_mrs_connect/models/res_config_setting.py
2024-09-20 10:35:47 +08:00
liaodanlong
ec2075c874
刀具岗权限调整
2024-09-20 10:32:30 +08:00
liaodanlong
ebc9716019
agv 配置调整位置
2024-09-20 10:32:08 +08:00
guanhuan
d067c5b8c4
左侧图标修改
2024-09-20 09:49:13 +08:00
胡尧
72c9c9872e
Accept Merge Request #1326 : (feature/流程用扫码完成 -> develop)
...
Merge Request: 修复扫码确认后接驳站点被清除的bug
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1326?initial=true
2024-09-20 09:39:21 +08:00
胡尧
2b541fe041
修复扫码确认后接驳站点被清除的bug
2024-09-20 09:38:32 +08:00
jinling.yang
f6e371f223
Merge branch 'feature/wechat_message' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/new
2024-09-20 09:25:00 +08:00
胡尧
0aefe9e656
修改目录结构
2024-09-20 09:19:34 +08:00
胡尧
4f8f29e41a
新增消息通知模块
2024-09-19 17:56:00 +08:00
廖丹龙
ffb32c7ce2
Accept Merge Request #1325 : (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/1325?initial=true
2024-09-19 17:38:32 +08:00
liaodanlong
3cacca80e9
隐藏新建字段
2024-09-19 17:35:57 +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
liaodanlong
1b6ca170c0
bom组装默认值
2024-09-19 15:15:30 +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
jinling.yang
9acdcc0429
新增同步cloud的刀具标准库接口
2023-10-13 17:29:34 +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
qihao.gong@jikimo.com
0077d97cfa
master-sf1.0
2023-05-06 16:03:00 +08:00