jinling.yang
fbf86a69e3
1.采购订单Tree列表新增审核状态
2023-12-29 11:24:48 +08:00
jinling.yang
f3ec784383
还原产品页面代码
2023-12-28 16:38:37 +08:00
马广威
032b13b2ad
Accept Merge Request #741 : (feature/制造代码优化 -> develop)
...
Merge Request: 修复image小组件图片路径拼接失败的问题
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/741
2023-12-28 09:00:56 +08:00
mgw
e33ca7cd33
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化
2023-12-27 17:23:25 +08:00
mgw
3a7a6e480a
修复image小组件图片路径拼接失败的问题
2023-12-27 17:23:05 +08:00
杨金灵
51b67c0dcd
Accept Merge Request #740 : (feature/修复销售库存权限 -> develop)
...
Merge Request: 修复销售库存访问权限
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/740?initial=true
2023-12-27 15:50:23 +08:00
jinling.yang
8124818bad
修复销售库存访问权限
2023-12-27 15:48:48 +08:00
杨金灵
3a62d4406f
Accept Merge Request #739 : (feature/修复销售和质量权限 -> develop)
...
Merge Request: 修复销售和质量权限
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/739?initial=true
2023-12-27 15:00:38 +08:00
龚启豪
8b8b30602b
Accept Merge Request #738 : (feature/修改机床参数bug -> develop)
...
Merge Request: 区分tree和form继承视图
Created By: @龚启豪
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/738?initial=true
2023-12-27 14:51:18 +08:00
jinling.yang
7a5fcd79d8
修改功能刀具安全库存的创建权限
2023-12-27 14:42:43 +08:00
qihao.gong@jikimo.com
93fe4d8c62
区分tree和form继承视图
2023-12-27 14:41:53 +08:00
jinling.yang
cdeec93e76
产品增加销售的权限组的访问权限,质量标签和质量理由增加质量的权限组的访问权限
2023-12-27 10:18:09 +08:00
jinling.yang
1a2d9592d1
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2023-12-26 14:22:48 +08:00
jinling.yang
71a64c36ca
Merge branch 'feature/修复刀具管理模块' into develop
2023-12-26 14:22:32 +08:00
杨金灵
5f026e3b1e
Accept Merge Request #737 : (feature/修复刀具管理模块 -> develop)
...
Merge Request: 修复刀具管理
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/737?initial=true
2023-12-26 14:22:04 +08:00
jinling.yang
d50f8716b5
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复刀具管理模块
2023-12-26 14:17:38 +08:00
jinling.yang
6cd2637983
1.修复客户和用户的name_search方法2.销售的采购经理权限组代码还原查询销售订单3.新增销售的权限组访问标签权限4.刀具管理去掉引用样式css文件
2023-12-26 14:17:25 +08:00
马广威
ab91ce01d4
Accept Merge Request #736 : (feature/制造代码优化 -> develop)
...
Merge Request: 修复配置文件问题
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/736
2023-12-26 09:40:32 +08:00
mgw
8f1897c4ff
修复配置文件问题
2023-12-26 09:39:52 +08:00
杨金灵
1e2c80c38f
Accept Merge Request #735 : (feature/修改数据库 -> develop)
...
Merge Request: 修改数据库
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/735?initial=true
2023-12-25 17:32:45 +08:00
jinling.yang
db8ad0f425
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改数据库
...
# Conflicts:
# odoo.conf
2023-12-25 17:31:13 +08:00
jinling.yang
eedce8338b
1.修改数据库2.数据库去掉demo数据指令3.工单的获取cnc车程序按钮代码还原
2023-12-25 17:30:32 +08:00
马广威
b132cb8713
Accept Merge Request #734 : (feature/制造代码优化 -> develop)
...
Merge Request: 修复权限,修改数据库名称
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/734?initial=true
2023-12-25 16:08:04 +08:00
mgw
66d6fe8f0a
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化
...
# Conflicts:
# odoo.conf
2023-12-25 16:07:23 +08:00
mgw
97e57f9b3c
修复权限,修改数据库名称
2023-12-25 16:05:23 +08:00
杨金灵
57cfa56081
Accept Merge Request #733 : (feature/优化采购编辑 -> develop)
...
Merge Request: 优化采购
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/733?initial=true
2023-12-25 16:03:59 +08:00
jinling.yang
1d464dd00e
新建数据库
2023-12-25 16:01:25 +08:00
jinling.yang
fdc38afcbd
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化采购编辑
2023-12-25 16:00:33 +08:00
jinling.yang
2e9dc3d006
采购总监查看审核状态不为空的询价/采购单
2023-12-25 16:00:20 +08:00
禹翔辉
c54a8308c6
Accept Merge Request #732 : (feature/自动根据功能刀具安全库存创建组装单 -> develop)
...
Merge Request: 自动按照功能刀具安全库存创建功能刀具组装单
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/732
2023-12-25 15:40:59 +08:00
yuxianghui
1934708d78
Merge remote-tracking branch 'origin/feature/功能刀具组装流程bug优化' into feature/自动根据功能刀具安全库存创建组装单
2023-12-25 15:38:45 +08:00
yuxianghui
e7bfff491b
1、新增库存位置:功能刀具组装位置,2、完善根据功能刀具安全库存自动生成组装单功能。3、功能刀具组装tree视图新增默认筛选未组装状态记录
2023-12-25 15:37:14 +08:00
jinling.yang
97e36c249b
1.产品新增计划岗权限,页面部分字段新增只读控制2.采购优化确认订单按钮
2023-12-25 15:15:35 +08:00
jinling.yang
6d93d5ef87
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2023-12-25 11:35:17 +08:00
jinling.yang
e8a0b3da93
Merge branch 'feature/优化客户' into develop
2023-12-25 11:34:37 +08:00
杨金灵
e9acd98ccc
Accept Merge Request #730 : (feature/优化客户 -> develop)
...
Merge Request: 优化客户,供应商.销售订单和采购订单权限需求
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/730
2023-12-25 11:34:24 +08:00
马广威
535d69f4d9
Accept Merge Request #731 : (feature/制造代码优化 -> develop)
...
Merge Request: 优化计划处代码
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/731?initial=true
2023-12-25 11:34:14 +08:00
mgw
603a59b6d7
优化计划处代码
2023-12-25 11:33:39 +08:00
jinling.yang
ca2f30fdbd
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2023-12-25 11:06:28 +08:00
jinling.yang
4c92c08f84
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化客户
2023-12-25 11:06:11 +08:00
jinling.yang
2fd8483a52
优化客户,供应商.销售订单和采购订单权限需求
2023-12-25 11:05:56 +08:00
马广威
71bdd6334f
Accept Merge Request #729 : (feature/制造代码优化 -> develop)
...
Merge Request: 代码优化
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/729?initial=true
2023-12-25 09:41:00 +08:00
mgw
194f6f52dc
代码优化
2023-12-25 09:40:04 +08:00
jinling.yang
93ce482d40
优化采购和销售
2023-12-22 17:43:25 +08:00
yuxianghui
96c5c3dcf5
1、新增按照功能刀具安全库存数量自动触发创建功能刀具组装单;
2023-12-22 17:37:10 +08:00
马广威
6bcf7ec53a
Accept Merge Request #728 : (feature/制造代码优化 -> develop)
...
Merge Request: 权限优化、代码优化、工单处增加一些字段
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/728
2023-12-22 15:07:17 +08:00
mgw
a7d760bc5e
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化
2023-12-22 15:00:30 +08:00
mgw
e196b6b1e3
优化权限相关展示
2023-12-22 14:58:39 +08:00
黄焱
9cb9872a5e
Accept Merge Request #727 : (feature/前端样式修改 -> develop)
...
Merge Request: sf样式修改,保存,返回按钮修改
Created By: @黄焱
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @黄焱
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/727?initial=true
2023-12-21 17:57:18 +08:00
jinling.yang
58d4b3813b
销售1.新增进度状态字段,选项为:待排程、待加工、待发货、待收货、已收货,
...
2.销售和报价页面的所有按钮根据审核状态和状态做隐藏显示控制
3.销售订单Form和Tree视图新增进度状态字段,且form表单根据状态字段的值为销售和取消时,表单不可编辑
4.产品页面的所有按钮根据销售和采购的权限组做显示和隐藏控制
2023-12-21 17:45:29 +08:00
龚启豪
34d0e989d6
Accept Merge Request #726 : (feature/修改机床参数bug -> develop)
...
Merge Request: 机床型号同步以及设备机床参数修改以及机床注册接口
Created By: @龚启豪
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/726?initial=true
2023-12-21 17:38:15 +08:00
qihao.gong@jikimo.com
c52af21477
1
2023-12-21 17:36:13 +08:00
qihao.gong@jikimo.com
149d6778f5
放开注释
2023-12-21 17:28:55 +08:00
mgw
98c9f3098b
工单详情处增加实际开始时间、实际结束时间,是否合格、加工人、检测人、实际加工机台等字段信息
2023-12-21 10:53:13 +08:00
mgw
ff904ad68c
权限暂存
2023-12-20 17:54:14 +08:00
黄焱
932f82ac6c
需求-客户、供应商视图展示优化
...
库存-库存概览界面的显示需优化
工厂端所有新建编辑页面的保存和取消按钮样式及文字要优化
【刀具组装】功能刀具组装单详情界面有个字段标题显示不全
制造-刀具管理-机床换刀申请界面标题显示重叠了
2023-12-20 17:51:46 +08:00
jinling.yang
bbb5ddb177
1.修复销售总监看不到销售订单2.优化销售审核向导3.优化销售
2023-12-20 17:45:29 +08:00
禹翔辉
7cbbf58309
Accept Merge Request #724 : (feature/功能刀具组装流程bug优化 -> develop)
...
Merge Request: 功能刀具组装流程bug优化
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/724
2023-12-20 15:26:32 +08:00
yuxianghui
8edee62d3a
Merge remote-tracking branch 'origin/feature/换刀申请优化' into feature/功能刀具组装流程bug优化
2023-12-20 15:22:59 +08:00
yuxianghui
ce67b7985b
1、优化功能刀具组装和功能刀具组装弹窗界面的刀具物料信息,添加刀具物料规格字段;2、优化功能刀具组装确认功能,创建刀具组装入库作业时新增name字段内容,新增作业自动验证;3、优化自动生成功能刀具序列号方法
2023-12-20 15:21:06 +08:00
jinling.yang
ef47597cf9
1.强制必填字段
...
(1)【客户名称】、【税ID】、【Email】、【销售员】、【标签】为强制必填
(2)【电话】、【手机】两个字段控制为二选一强制必填
2.客户校验规则:
(1)【客户名称】+【税ID】两个字段分别与已经创建客户的档案信息进行校验,任意一项100%吻合则不允许创建客户
3.强制必填字段
(1)【名称】、【Email】、【销售员】为强制必填
(2)【电话】、【手机】两个字段控制为二选一强制必填
4.个人校验规则:
(1)【名称】+【Email】两个字段分别与已经创建客户的档案信息进行校验,两项一起100%吻合则不允许创建个人
5.下拉仅显示销售人员的账户用户名(非相关用户及姓名不显示),字段为强制必填
(1)创建人的权限为销售经理,则【销售员】字段自动默认为当前账号的用户姓名,且不可修改
(2)创建人的权限为销售总监,则【销售员】字段自动默认为当前账号的用户姓名,可下拉选择,修改销售人员姓名
2023-12-19 17:48:30 +08:00
qihao.gong@jikimo.com
9e8d5aaf6a
修改机床同步注册接口
2023-12-19 17:33:24 +08:00
yuxianghui
363463e31d
1、新增安装时自动配置刀具房位置,重新配置了刀具组装入库的作业类型,增加名称为刀具组装入库的参考序列配置;2、功能刀具所以的装刀长改为总长度;3、机床换刀申请和刀具组装单弹窗界面做字段必填控制,对新刀隐藏切削相关字段;4、刀具组装单弹窗增加一些字段的数值自动填写和计算;
2023-12-19 17:31:37 +08:00
mgw
8ff635e901
优化计划中的菜单项目
2023-12-19 16:32:09 +08:00
qihao.gong@jikimo.com
c65e13a83e
修改设备类别以及机床参数
2023-12-18 17:38:24 +08:00
jinling.yang
8721bc2de1
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2023-12-18 09:36:32 +08:00
jinling.yang
ec344cc918
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2023-12-18 09:36:18 +08:00
马广威
905df2b79e
Accept Merge Request #723 : (feature/制造代码优化 -> develop)
...
Merge Request: 优化权限相关
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/723
2023-12-17 10:52:59 +08:00
mgw
e73fb5791a
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化
2023-12-17 10:50:18 +08:00
mgw
6738a855bb
优化权限相关
2023-12-17 10:48:51 +08:00
jinling.yang
3c82020e5e
Merge branch 'feature/修复销售权限组' into develop
2023-12-15 17:56:04 +08:00
杨金灵
422074fcec
Accept Merge Request #722 : (feature/修复销售权限组 -> develop)
...
Merge Request: 修复销售采购质量权限
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/722
2023-12-15 17:53:41 +08:00
jinling.yang
897f5b76f0
修复质量的权限
2023-12-15 17:49:33 +08:00
jinling.yang
ee565d3796
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复销售权限组
2023-12-15 17:39:16 +08:00
jinling.yang
912b50246a
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2023-12-15 17:39:01 +08:00
jinling.yang
df2ba048f4
1.修复采购权限和销售权限2.销售新增审核向导
2023-12-15 17:38:40 +08:00
qihao.gong@jikimo.com
ef2f7d3ecb
修改机床设备参数,处理同步bug,以及机床设备视图布局
2023-12-15 17:28:42 +08:00
qihao.gong@jikimo.com
2391c08485
修改i机床接口同步以及参数
2023-12-14 17:33:28 +08:00
jinling.yang
85ac3d7a3e
报价Tree视图筛选框去掉默认的我的报价的条件
2023-12-13 17:30:40 +08:00
jinling.yang
b96723d9a5
修复销售权限组
2023-12-12 17:40:22 +08:00
禹翔辉
19b9db66d3
Accept Merge Request #721 : (feature/换刀申请优化 -> develop)
...
Merge Request: 放开机床换刀申请模块记录没有功能刀具信息时换刀申请按键的权限
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/721
2023-12-11 17:10:28 +08:00
yuxianghui
8371875d62
放开机床换刀申请模块记录没有功能刀具信息时换刀申请按键的权限
2023-12-11 15:41:31 +08:00
jinling.yang
a3f6fdda2a
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
...
# Conflicts:
# sf_tool_management/__init__.py
# sf_tool_management/models/base.py
2023-12-11 14:54:23 +08:00
杨金灵
4a10335379
Accept Merge Request #720 : (feature/权限去掉继承 -> develop)
...
Merge Request: 权限去掉继承
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/720
2023-12-11 14:51:36 +08:00
禹翔辉
1132acfa40
Accept Merge Request #719 : (feature/刀具管理模块安装时更新数据 -> develop)
...
Merge Request: 1、新增刀具管理模块安装时根据已有机床设备存在的刀位创建机台换刀申请记录
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/719
2023-12-11 14:48:37 +08:00
jinling.yang
7138dab1b5
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/权限去掉继承
2023-12-11 14:48:08 +08:00
jinling.yang
6bf3df0ef4
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/权限去掉继承
2023-12-11 14:47:34 +08:00
jinling.yang
55594c119f
产品添加质量权限组访问权限
2023-12-11 14:47:06 +08:00
马广威
0a3bd37224
Accept Merge Request #718 : (feature/制造代码优化 -> develop)
...
Merge Request: 修改京东物流寻单据部分逻辑
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/718?initial=true
2023-12-11 14:46:23 +08:00
yuxianghui
60abdfb372
Merge remote-tracking branch 'origin/feature/CAM工单程序用刀计划重构' into feature/刀具管理模块安装时更新数据
2023-12-11 14:46:16 +08:00
mgw
facdf5712a
修改京东物流寻单据部分逻辑
2023-12-11 14:45:55 +08:00
yuxianghui
94df139110
1、新增刀具管理模块安装时根据已有机床设备存在的刀位创建机台换刀申请记录
2023-12-11 14:41:31 +08:00
jinling.yang
e4f6bc4632
权限去掉继承
2023-12-11 14:36:34 +08:00
马广威
6f0dbe3625
Accept Merge Request #717 : (feature/制造代码优化 -> develop)
...
Merge Request: 修改cs环境数据库为t环境数据库
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/717?initial=true
2023-12-11 14:09:56 +08:00
mgw
c00cd5a00a
修改cs环境数据库为t环境数据库
2023-12-11 14:09:02 +08:00
禹翔辉
b487b6fc40
Accept Merge Request #716 : (feature/CAM工单程序用刀计划重构 -> develop)
...
Merge Request: CAM工单程序用刀计划重构
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/716
2023-12-08 17:34:02 +08:00
yuxianghui
8489a67e64
Merge remote-tracking branch 'origin/feature/机床换刀申请优化' into feature/CAM工单程序用刀计划重构
2023-12-08 17:31:54 +08:00
yuxianghui
f8426ae4c3
1、重构CAM工单程序用刀计划模型;2、机床换刀申请模型的申请换刀、转移按键增加显示条件,关闭换刀申请弹窗和功能刀具组装弹窗的功能刀具类型字段创建记录的功能;
2023-12-08 17:29:32 +08:00
马广威
c4021d02ce
Accept Merge Request #715 : (feature/制造代码优化 -> develop)
...
Merge Request: 修改权限依赖
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/715?initial=true
2023-12-08 17:26:19 +08:00
mgw
bd01ad7bbf
修改权限依赖
2023-12-08 17:25:40 +08:00
龚启豪
9650f45ba2
Accept Merge Request #714 : (feature/修改机床参数bug -> develop)
...
Merge Request: 库存根据权限增加审核按钮 以及审核状态
Created By: @龚启豪
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/714?initial=true
2023-12-08 15:21:32 +08:00
qihao.gong@jikimo.com
cfed77d1a5
库存根据权限增加审核按钮 以及审核状态
2023-12-08 15:18:41 +08:00
禹翔辉
94c795a68f
Accept Merge Request #713 : (feature/机床换刀申请优化 -> develop)
...
Merge Request: 机床换刀申请及功能刀具出入库模型优化
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/713?initial=true
2023-12-08 09:05:39 +08:00
yuxianghui
2fba2ad488
Merge remote-tracking branch 'origin/feature/功能刀具库存优化' into feature/机床换刀申请优化
2023-12-08 09:02:51 +08:00
qihao.gong@jikimo.com
31260e8921
新增权限审核按钮
2023-12-07 17:31:28 +08:00
yuxianghui
4d04b37582
1、机台换刀申请tree视图隐藏机床字段,机台号字段内容自动同步位机床名称;功能刀具出入库记录模型机台号字段内容自动同步位机床名称;2、解决功能刀具有的出入库记录机床字段没有内容的问题;3、新增继承机床刀位模型,将新建机床刀位时创建机台换刀申请记录从原机床刀位模型移动到继承后的机床刀位模型中;
2023-12-07 17:31:18 +08:00
马广威
eec27b26f7
Accept Merge Request #711 : (feature/制造代码优化 -> develop)
...
Merge Request: 优化物流、计划权限及库存的一些问题
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/711
2023-12-07 11:28:22 +08:00
jinling.yang
e300ca1822
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2023-12-07 10:58:25 +08:00
jinling.yang
c8a3bee099
Merge branch 'feature/新增采购权限组' into develop
2023-12-07 10:58:04 +08:00
杨金灵
35c051e730
Accept Merge Request #712 : (feature/新增采购权限组 -> develop)
...
Merge Request: 新增采购和质量的权限
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/712?initial=true
2023-12-07 10:57:45 +08:00
jinling.yang
950ec3a1e1
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2023-12-07 10:52:09 +08:00
jinling.yang
1c1a038156
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增采购权限组
2023-12-07 10:51:32 +08:00
jinling.yang
640bf79dc8
新增质量团队和控制点的审核按钮
2023-12-07 10:50:36 +08:00
mgw
1ccc32cbcb
优化物流、计划权限及库存的一些问题
2023-12-07 10:11:59 +08:00
禹翔辉
f8d8d885bb
Accept Merge Request #710 : (feature/功能刀具库存优化 -> develop)
...
Merge Request: 功能刀具自动计算库存
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/710
2023-12-07 09:13:11 +08:00
yuxianghui
7c8c869172
Merge remote-tracking branch 'origin/feature/功能刀具列表自动计算库存' into feature/功能刀具库存优化
2023-12-07 09:07:53 +08:00
jinling.yang
8d5a4ed4c8
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增采购权限组
2023-12-06 17:27:29 +08:00
yuxianghui
981872b0b1
1、根据机台换刀申请的状态,如果为报警状态就自动创建功能刀具预警记录;2、自动检索功能刀具列表的序列号所在位置,计算功能刀具的当前位置及数量;3、功能刀具安全库存模型,根据当前记录的功能刀具对象自动计算出该规则的功能刀具的当前库存,根据当前库存和最低库存量自动计算是否需要补货,如需补货,补货的数量是多少;4、关闭功能刀具预警模型界面的创建、修改、删除功能,新增搜索面板中按机床、刀位分组搜索;5、功能刀具组装模型和组装单模型新增图片字段;
2023-12-06 17:25:47 +08:00
黄焱
d8a74c17f0
Accept Merge Request #709 : (feature/前端样式修改 -> develop)
...
Merge Request: 前端样式修改,甘特图增加功能
Created By: @黄焱
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @黄焱
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/709?initial=true
2023-12-06 15:46:02 +08:00
黄焱
fe6d207099
甘特图增加滚轮事件,点击事件
2023-12-06 15:39:07 +08:00
黄焱
206043a1a0
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/前端样式修改
2023-12-06 15:37:38 +08:00
jinling.yang
6a2a465569
注释掉自动报价的文件
2023-12-06 15:07:06 +08:00
jinling.yang
1767ada489
释放注释的代码
2023-12-06 15:03:07 +08:00
jinling.yang
d7f85967c9
优化质量的访问权限
2023-12-06 15:01:42 +08:00
jinling.yang
1a95f5e4ac
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2023-12-06 14:57:10 +08:00
jinling.yang
abd7364658
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增采购权限组
...
# Conflicts:
# sf_base/security/group_security.xml
# sf_sale/security/group_security.xml
2023-12-06 14:56:31 +08:00
jinling.yang
26ec1c9f6e
修改质量模块的权限组名称
2023-12-06 14:53:38 +08:00
龚启豪
490aa3fe04
Accept Merge Request #707 : (feature/修改机床参数bug -> develop)
...
Merge Request: 制造设备库存权限
Created By: @龚启豪
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/707
2023-12-06 14:52:35 +08:00
jinling.yang
924a28e957
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2023-12-06 11:39:24 +08:00
jinling.yang
e58ceb3ac8
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增采购权限组
2023-12-06 11:38:49 +08:00
龚启豪
61c3b16a69
Merge branch refs/heads/develop into refs/heads/feature/修改机床参数bug
2023-12-06 11:35:01 +08:00
qihao.gong@jikimo.com
70109c0965
修改制造模块权限
2023-12-06 11:31:59 +08:00
马广威
74b4fd1367
Accept Merge Request #705 : (feature/制造代码优化 -> develop)
...
Merge Request: 完成计划权限,优化警告错误
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/705
2023-12-06 10:30:55 +08:00
禹翔辉
c206dc3097
Accept Merge Request #706 : (feature/功能刀具组装流程优化 -> develop)
...
Merge Request: 功能刀具组装流程优化
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/706?initial=true
2023-12-06 09:14:29 +08:00
yuxianghui
4c1c8e7683
Merge remote-tracking branch 'origin/feature/功能刀具安全库存优化' into feature/功能刀具组装流程优化
2023-12-06 09:03:55 +08:00
yuxianghui
0d8d54c05b
1、机床换刀申请新增确认换刀时,依次检索线边刀库、刀具房是否有满足条件的功能刀具,如果有就返回刀具信息,没有就发起组装申请;2、刀具安全库存模型详情页新增可修改的最低库存量、最高库存量、批次补货量字段;
2023-12-05 17:37:47 +08:00
jinling.yang
71147eb7f9
新增质量权限组
2023-12-05 17:28:32 +08:00
qihao.gong@jikimo.com
c753df768d
库存模块权限开发
2023-12-05 17:24:19 +08:00
jinling.yang
45df8f5bc2
新增采购权限
2023-12-04 17:34:23 +08:00
yuxianghui
29a55f3ff8
1、新增设备创建刀位时自动创建对应刀位的机床换刀申请记录;2、机床换刀申请模型的设备、刀位字段修改为只读,搜索视图新增按设备搜索;
2023-12-04 17:30:19 +08:00
qihao.gong@jikimo.com
94c0b00c2d
机床注册按钮根据权限组区分
2023-12-04 17:28:54 +08:00
黄焱
32473d302f
生产驾驶舱列表点击【工单】按钮有时候进入的是机台详情界面
...
工厂端订单详情title显示不美观-建议优化
工厂端材料型号详情界面弹框顶部和底部显示透明了
2023-11-30 17:03:47 +08:00
mgw
2cf4958f46
完成计划权限,优化警告错误
2023-11-29 20:58:12 +08:00
qihao.gong@jikimo.com
893aa2111c
处理coding报错
2023-11-29 17:34:15 +08:00
jinling.yang
6cf26e8029
新增采购权限组
2023-11-29 17:25:40 +08:00
禹翔辉
e796bbe990
Accept Merge Request #704 : (feature/功能刀具安全库存优化 -> develop)
...
Merge Request: 功能刀具安全库存修改字段类型
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/704
2023-11-29 10:23:11 +08:00
yuxianghui
c2d2d16948
Merge remote-tracking branch 'origin/feature/功能刀具组装功能优化' into feature/功能刀具安全库存优化
2023-11-29 10:21:07 +08:00
yuxianghui
c3ba11bed4
1、修改功能刀具安全库存模型的刀尖特征、柄部类型字段的字段类型为many2one
2023-11-29 10:17:43 +08:00
马广威
37815d603a
Accept Merge Request #703 : (feature/制造代码优化 -> develop)
...
Merge Request: 优化货位代码
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/703
2023-11-29 09:43:09 +08:00
mgw
ca0b59e95b
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化
2023-11-29 09:40:03 +08:00
mgw
7c478ec4fd
优化货位代码
2023-11-29 09:39:11 +08:00
qihao.gong@jikimo.com
5b1d347fd4
增加设备模块权限角色,优化coding代码扫描警告
2023-11-28 17:23:49 +08:00
马广威
e738d40b75
Accept Merge Request #702 : (feature/制造代码优化 -> develop)
...
Merge Request: 库存货架货位修改基本完成,推送测试
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/702
2023-11-28 17:23:20 +08:00
mgw
685eced709
货位代码优化
2023-11-28 17:21:29 +08:00
jinling.yang
ffc40c70d2
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2023-11-28 17:15:07 +08:00
jinling.yang
cc3ee289d3
Merge branch 'feature/修改刀具标准库部分字段类型' into develop
2023-11-28 17:14:51 +08:00
杨金灵
487b452519
Accept Merge Request #701 : (feature/修改刀具标准库部分字段类型 -> develop)
...
Merge Request: 修改刀具标准库部分字段类型
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/701
2023-11-28 17:14:34 +08:00
jinling.yang
4a62af7545
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改刀具标准库部分字段类型
2023-11-28 17:09:10 +08:00
jinling.yang
07be7c3074
1.同步刀具标准库接口修改刀片形状,柄部类型,刀尖特征,压紧方式
2023-11-28 17:08:56 +08:00
mgw
ddad1e9114
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化
2023-11-28 16:42:54 +08:00
mgw
2c1a101c24
库存货架货位修改基本完成,推送测试
2023-11-28 16:42:19 +08:00
禹翔辉
ab1af72727
Accept Merge Request #700 : (feature/功能刀具组装功能优化 -> develop)
...
Merge Request: 功能刀具组装功能优化
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/700
2023-11-28 16:37:29 +08:00
yuxianghui
bc186a9723
Merge remote-tracking branch 'origin/feature/功能刀具组装优化' into feature/功能刀具组装功能优化
2023-11-28 16:34:31 +08:00
yuxianghui
de04d452b3
1优化功能刀具组装单的刀具物料过滤条件,取消功能刀具列表的自动计算库存的方法
2023-11-28 16:28:48 +08:00
禹翔辉
66b808dfc9
Accept Merge Request #699 : (feature/功能刀具组装优化 -> develop)
...
Merge Request: 功能刀具组装功能优化
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/699
2023-11-28 15:02:36 +08:00
yuxianghui
ad36b37f27
Merge remote-tracking branch 'origin/feature/功能刀具安全库存重构' into feature/功能刀具组装优化
2023-11-28 14:57:40 +08:00
yuxianghui
e403f2f8e6
1、按面向对象的思想优化功能刀具组装功能的整个流程;2、新增刀具组装完成时的刀具物料出库到刀具组装位置;
2023-11-28 14:52:43 +08:00
马广威
24b850a508
Accept Merge Request #698 : (feature/制造代码优化 -> develop)
...
Merge Request: 优化警告问题
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/698
2023-11-28 09:00:03 +08:00
mgw
4d8b463cb3
优化警告问题
2023-11-28 08:59:01 +08:00
mgw
9fef877d12
优化警告问题
2023-11-27 22:40:56 +08:00
马广威
c323d9995e
Accept Merge Request #697 : (feature/制造代码优化 -> develop)
...
Merge Request: 物流可见性控制,优化警告问题
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/697?initial=true
2023-11-27 21:33:35 +08:00
mgw
4f83c5f29a
优化警告问题
2023-11-27 21:30:45 +08:00
jinling.yang
ed5f47cc31
1.修改刀具标准库刀片形状,柄部类型,压紧方式,刀尖特征,字段类型及对应控件显示
...
2.修改产品页面:刀片形状,柄部类型,压紧方式,刀尖特征,字段类型及对应控件显示
2023-11-27 17:34:23 +08:00
龚启豪
66bb55a823
Accept Merge Request #696 : (feature/修改机床参数bug -> develop)
...
Merge Request: 修改coding代码扫描警告
Created By: @龚启豪
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/696?initial=true
2023-11-27 17:30:01 +08:00
yuxianghui
5926d71d27
1、新增功能刀具列表模型自动计算功能刀具在刀具房数量功能;2、优化功能刀具安全库存模型相同功能刀具的检索条件;3、修改功能刀具组装单组装的初始位置为Production,修改功能刀具序列号的生成规则
2023-11-27 17:27:55 +08:00
qihao.gong@jikimo.com
c78ea6fbe5
修改coding代码扫描警告
2023-11-27 17:08:11 +08:00
mgw
96df8f971c
物流相关可见性控制
2023-11-27 15:40:16 +08:00
马广威
35511effae
Accept Merge Request #695 : (feature/制造代码优化 -> develop)
...
Merge Request: 优化物流下单等代码
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/695
2023-11-27 12:18:47 +08:00
mgw
54912f15b9
优化物流下单等代码
2023-11-27 12:17:57 +08:00
马广威
e8a13f1721
Accept Merge Request #694 : (feature/制造代码优化 -> develop)
...
Merge Request: 优化代码,修改库存货架货位为标签
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/694?initial=true
2023-11-24 21:46:16 +08:00
禹翔辉
1532293918
Accept Merge Request #693 : (feature/功能刀具安全库存重构 -> develop)
...
Merge Request: 功能刀具安全库存模型重构
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/693?initial=true
2023-11-24 17:18:59 +08:00
yuxianghui
030ef14633
Merge remote-tracking branch 'origin/feature/功能刀具出入库优化' into feature/功能刀具安全库存重构
2023-11-24 17:15:26 +08:00
yuxianghui
bf8b45609c
1、功能刀具列表模型新增查询功能刀具安全库存功能;2、重构功能刀具安全库存模型;3、功能刀具组装单弹窗界面的刀具物料新增位置为刀具房的过滤筛选;
2023-11-24 17:12:44 +08:00
龚启豪
964618d365
Accept Merge Request #692 : (feature/修改机床参数bug -> develop)
...
Merge Request: 代码规范
Created By: @龚启豪
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/692
2023-11-24 10:31:39 +08:00
杨金灵
06eeb1ed1f
Accept Merge Request #691 : (feature/优化代码格式 -> develop)
...
Merge Request: 优化代码格式
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/691?initial=true
2023-11-24 10:30:42 +08:00
qihao.gong@jikimo.com
deb732dc5e
代码规范
2023-11-24 10:30:33 +08:00
jinling.yang
5737d7b0bc
优化代码格式
2023-11-24 10:27:21 +08:00
mgw
5fd0beab95
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化
...
# Conflicts:
# sf_manufacturing/models/stock.py
2023-11-23 22:23:21 +08:00
mgw
858c163cbe
库存调整货架货位为标签
2023-11-23 22:14:56 +08:00
mgw
fee3572f38
错误问题处理
2023-11-23 22:14:12 +08:00
jinling.yang
f2862af565
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2023-11-23 17:44:16 +08:00
jinling.yang
c1c3639611
Merge branch 'feature/销售权限' into develop
2023-11-23 17:43:55 +08:00
杨金灵
41017412cd
Accept Merge Request #690 : (feature/销售权限 -> develop)
...
Merge Request: 优化销售权限
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/690
2023-11-23 17:43:39 +08:00
jinling.yang
e552502fd1
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2023-11-23 17:39:58 +08:00
jinling.yang
61da25a031
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/销售权限
...
# Conflicts:
# sf_manufacturing/models/product_template.py
2023-11-23 17:39:35 +08:00
龚启豪
aafafd682d
Accept Merge Request #689 : (feature/修改机床参数bug -> develop)
...
Merge Request: 修改代码不规范问题
Created By: @龚启豪
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/689?initial=true
2023-11-23 17:38:52 +08:00
jinling.yang
98ed831a85
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2023-11-23 17:38:49 +08:00
jinling.yang
e9be2e9c43
优化代码格式
2023-11-23 17:38:30 +08:00
qihao.gong@jikimo.com
b73a449b01
修改代码不规范问题
2023-11-23 17:37:06 +08:00
jinling.yang
45d04e1a05
1.销售新增审核状态,选项为已审核和待审核,销售模型新增权限规则:销售总监查看所有的订单,销售经理只能查看自己的订单
...
2.报价单Form视图新增审核按钮,该按钮只有销售总监可以看到,且确认按钮只有在销售经理审核完才可显示,报价Tree视图新增审核状态
2023-11-23 17:28:58 +08:00
禹翔辉
fc17063507
Accept Merge Request #688 : (feature/功能刀具出入库优化 -> develop)
...
Merge Request: 功能刀具出入库模型优化
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/688
2023-11-23 17:23:11 +08:00
yuxianghui
b3fbbeb85c
Merge remote-tracking branch 'origin/feature/功能刀具组装流程及界面优化' into feature/功能刀具出入库优化
2023-11-23 17:18:43 +08:00
yuxianghui
97d760cd56
1、基于原生的移动历史重构功能刀具出入库记录模型;2、功能刀具列表模型新增查询当前功能刀具出入库记录按钮;3、删除旧的功能刀具出入库记录模型和出入库记录人模型;4、机台换刀申请模型的功能刀具名称字段改为绑定功能刀具组装单;5、优化功能刀具组装单确认组装功能的创建移动历史记录功能。
2023-11-23 17:15:34 +08:00
龚启豪
9d911a5c2b
Accept Merge Request #687 : (feature/修改机床参数bug -> develop)
...
Merge Request: 设备名称生辰规则,制造模块新定义权限组
Created By: @龚启豪
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/687
2023-11-23 16:53:24 +08:00
龚启豪
9bb3b88fd6
Merge branch refs/heads/develop into refs/heads/feature/修改机床参数bug
2023-11-23 16:37:53 +08:00
qihao.gong@jikimo.com
baaeac10eb
修改设备生成名称规则,修改制造模块权限组定义
2023-11-23 16:33:09 +08:00
mgw
2510f5fbf3
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化
2023-11-23 10:22:58 +08:00
mgw
f77691251e
计划模块增加跟踪消息组件,form视图增加归档取消归档按钮,增加归档未归档的筛选项目
2023-11-23 10:21:42 +08:00
jinling.yang
5292826c72
新增销售权限
2023-11-22 17:58:41 +08:00
mgw
6fed64ba2a
计划模块增加权限控制
2023-11-22 17:55:30 +08:00
禹翔辉
8e5f5cf0d1
Accept Merge Request #686 : (feature/功能刀具组装流程及界面优化 -> develop)
...
Merge Request: 功能刀具组装流程及界面优化
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/686?initial=true
2023-11-22 17:39:17 +08:00
qihao.gong@jikimo.com
b4b5207aea
开发测试制造模块权限,修改设备机床类别的布局以及编码规则
2023-11-22 17:36:50 +08:00
yuxianghui
ca61537e21
Merge remote-tracking branch 'origin/feature/功能刀具组装优化' into feature/功能刀具组装流程及界面优化
...
# Conflicts:
# sf_manufacturing/models/product_template.py
2023-11-22 17:31:35 +08:00
yuxianghui
83da8f58e2
1、功能刀具列表模型新增大量字段,新增计算库存数量方法,新增查看当前功能刀具的预警记录按键;2、重构功能刀具预警模型(已完成);3、功能刀具组装模型name字段展示内容改为功能刀具名称;
2023-11-22 17:19:25 +08:00
马广威
a36c30b5c1
Accept Merge Request #685 : (feature/制造代码优化 -> develop)
...
Merge Request: 修改机床链接模块,优化规范代码
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/685?initial=true
2023-11-22 14:24:35 +08:00
mgw
ae6ec7183e
修改sf_machine_connect模块以适配新的设备构成
2023-11-22 14:22:41 +08:00
mgw
cc58425f50
规范问题优化
2023-11-22 10:29:04 +08:00
马广威
dda3aad95d
Accept Merge Request #684 : (feature/制造代码优化 -> develop)
...
Merge Request: 优化现有代码问题
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/684?initial=true
2023-11-22 09:58:21 +08:00
mgw
d6dcb6bf55
优化现有代码问题
2023-11-22 09:54:31 +08:00
马广威
4b672f3c23
Accept Merge Request #683 : (feature/制造代码优化 -> develop)
...
Merge Request: 优化sf_machine_connect的manifest文件
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/683?initial=true
2023-11-21 17:50:39 +08:00
mgw
423d5cec8e
优化sf_machine_connect的manifest文件
2023-11-21 17:49:58 +08:00
qihao.gong@jikimo.com
e6bb5db0e1
开发sf制造模块权限角色
2023-11-21 17:42:36 +08:00
jinling.yang
f0e66c6d90
新增销售权限
2023-11-21 17:30:07 +08:00
yuxianghui
8a1dfe14e6
1、功能刀具列表模型新增部分字段;2、机台换刀申请新增根据报警值和有效值计算当前状态,重构根据状态自动换刀申请的功能,重构撤销换刀申请功能;3、功能刀具组装单模型新增大量字段,优化tree视图和form视图的布局;4、组装单弹窗模型新增大量字段,优化确认组装按键功能,
2023-11-21 17:26:18 +08:00
jinling.yang
5113de7e97
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2023-11-21 16:31:41 +08:00
jinling.yang
e06002e05a
Merge branch 'feature/新增销售权限' into develop
2023-11-21 16:31:27 +08:00
杨金灵
8b7b52ee2c
Accept Merge Request #682 : (feature/新增销售权限 -> develop)
...
Merge Request: 新增销售和计划权限组和优化代码格式
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/682?initial=true
2023-11-21 16:31:19 +08:00
jinling.yang
6738f38131
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增销售权限
...
# Conflicts:
# sf_bf_connect/models/process_status.py
2023-11-21 16:11:24 +08:00
jinling.yang
ab115ab71c
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2023-11-21 16:10:27 +08:00
jinling.yang
6ec6094c5e
1.新增销售和计划权限组2.优化代码格式
2023-11-21 16:10:05 +08:00
马广威
321c40d31d
Accept Merge Request #681 : (feature/制造代码优化 -> develop)
...
Merge Request: 优化js代码过长的问题,优化未用到的变量
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/681?initial=true
2023-11-21 14:18:44 +08:00
mgw
890b73e108
优化js代码过长的问题,优化未用到的变量
2023-11-21 14:18:01 +08:00
马广威
247b3e4444
Accept Merge Request #676 : (feature/制造代码优化 -> develop)
...
Merge Request: 优化代码结构
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/676?initial=true
2023-11-20 17:42:54 +08:00
mgw
7391b1324d
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化
...
# Conflicts:
# sf_manufacturing/models/stock.py
2023-11-20 17:41:51 +08:00
mgw
d53e664881
修复导入错误,优化不使用的模块
2023-11-20 17:38:03 +08:00
yuxianghui
b49b5890a0
1、机台换刀申请及其弹窗新增生产线字段,2、机台换刀申请tree视图搜索面板改为按生产线和状态搜索,3、优化功能刀具组装单,新增大量字段,优化tree试图布局,优化form视图布局,tree视图搜索面板新增按状态搜索,4、重构了机台换刀申请模型申请换刀功能;5、重构刀具转移模型,
2023-11-20 17:36:13 +08:00
jinling.yang
690543e2d4
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2023-11-20 17:08:13 +08:00
jinling.yang
f296e1ba1a
Merge branch 'feature/产品验证' into develop
2023-11-20 17:05:43 +08:00
杨金灵
31f07c5156
Accept Merge Request #675 : (feature/产品验证 -> develop)
...
Merge Request: 产品验证及代码格式修复
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/675
2023-11-20 17:05:06 +08:00
龚启豪
63d6ce6da8
Accept Merge Request #674 : (feature/修改机床参数bug -> develop)
...
Merge Request: import requests
Created By: @龚启豪
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/674
2023-11-20 16:50:06 +08:00
qihao.gong@jikimo.com
580f95f338
importrequests修改
2023-11-20 15:48:43 +08:00
qihao.gong@jikimo.com
326181fa81
Merge branch 'feature/修改机床参数bug' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
...
# Conflicts:
# sf_manufacturing/models/stock.py
2023-11-20 15:44:43 +08:00
qihao.gong@jikimo.com
6fc735063a
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
...
# Conflicts:
# sf_manufacturing/models/stock.py
2023-11-20 15:41:50 +08:00
qihao.gong@jikimo.com
499261f62e
放开依赖
2023-11-20 15:39:07 +08:00
jinling.yang
6912160232
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/产品验证
...
# Conflicts:
# sf_manufacturing/models/stock.py
# sf_wxwork_approval/models/model.py
2023-11-20 15:11:43 +08:00
jinling.yang
04e63dcc59
修复代码规范
2023-11-20 15:10:01 +08:00
jinling.yang
7ceaadb9c4
修复引入库
2023-11-20 15:04:39 +08:00
龚启豪
fdf1b786fe
Merge branch refs/heads/develop into refs/heads/feature/修改机床参数bug
2023-11-20 15:03:36 +08:00
qihao.gong@jikimo.com
1da7a0195d
根据odoo规则修改py文件中得import顺序
2023-11-20 14:59:06 +08:00
马广威
b093b11ec2
Accept Merge Request #671 : (feature/制造代码优化 -> develop)
...
Merge Request: 优化代码结构
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/671?initial=true
2023-11-20 13:30:58 +08:00
mgw
718b1f9edf
优化代码结构
2023-11-20 13:23:37 +08:00
马广威
5bdd3982ae
Accept Merge Request #669 : (feature/制造代码优化 -> develop)
...
Merge Request: 优化wrong-import-order问题
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/669?initial=true
2023-11-20 12:44:35 +08:00
mgw
a606cbfc6d
优化wrong-import-order问题
2023-11-20 12:42:48 +08:00
马广威
1a5fcf09e1
Accept Merge Request #666 : (feature/制造代码优化 -> develop)
...
Merge Request: 测试优化后的代码扫描效果,优化代码
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/666?initial=true
2023-11-20 10:49:58 +08:00
mgw
d2899fe38e
测试优化代码后的代码扫描效果,优化部分代码审查问题
2023-11-20 10:48:43 +08:00
mgw
24e75f8895
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化
2023-11-17 17:51:57 +08:00
mgw
5bc5766507
优化代码格式至PEP8格式
2023-11-17 17:49:08 +08:00
jinling.yang
49f021ed7a
产品新增适配刀片形状,适合加工方式,刀尖特征,走刀方向,柄部类型,冷却液,压紧方式验证
2023-11-17 17:45:41 +08:00
黄焱
94031e68ad
Accept Merge Request #659 : (feature/前端样式修改 -> develop)
...
Merge Request: 修改规格字段位置
Created By: @黄焱
Reviewed By: @马广威
Accepted By: @黄焱
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/659?initial=true
2023-11-17 17:45:05 +08:00
黄焱
182348f427
修改规格字段位置
2023-11-17 17:42:41 +08:00
yuxianghui
c885f3ce8c
1、设备机床的刀位对象新增name字段,并自动添加值;2、根据需求重构了机床换刀申请模型,重构机床换刀弹窗对象;
2023-11-17 17:30:37 +08:00
jinling.yang
e5b0960e3a
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2023-11-17 10:43:16 +08:00
jinling.yang
dd5d4e7748
Merge branch 'feature/自动报价代码还原' into develop
2023-11-17 10:43:00 +08:00
杨金灵
369980d655
Accept Merge Request #530 : (feature/自动报价代码还原 -> develop)
...
Merge Request: 自动报价代码还原
Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/530?initial=true
2023-11-17 10:37:52 +08:00
jinling.yang
2096d05cdb
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/自动报价代码还原
2023-11-17 10:35:42 +08:00
jinling.yang
fbab054324
代码还原
2023-11-17 10:35:10 +08:00
马广威
e3ff9e9fde
Accept Merge Request #529 : (feature/制造代码优化 -> develop)
...
Merge Request: 测试coding代码审查
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/529?initial=true
2023-11-17 10:03:04 +08:00
mgw
c3ee544ca6
测试coding代码审查
2023-11-17 09:55:41 +08:00
jinling.yang
08581c8bc4
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2023-11-17 09:15:29 +08:00
jinling.yang
49cbf2fde2
Merge branch 'feature/产品优化' into develop
2023-11-17 09:13:54 +08:00
杨金灵
2f2522c99e
Accept Merge Request #527 : (feature/产品优化 -> develop)
...
Merge Request: 产品优化
Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/527?initial=true
2023-11-17 09:13:36 +08:00
jinling.yang
fefa14a47b
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/产品优化
...
# Conflicts:
# sf_dlm/models/product_supplierinfo.py
2023-11-17 09:12:41 +08:00
yuxianghui
329d7b6464
1、机床换刀申请界面新增搜索面板和设备字段根据设备的设备类型等于机床的过滤条件;2、隐藏功能刀具出入库记录菜单;3、功能刀具列表form视图新增预警跳转按键(跳转功能未完成);
2023-11-16 17:36:09 +08:00
jinling.yang
f36c2ac096
产品优化
2023-11-16 17:35:04 +08:00
马广威
9c6367c053
Accept Merge Request #526 : (feature/制造代码优化 -> develop)
...
Merge Request: 产品模板修改>>>增加“规格”字段specification_id
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/526?initial=true
2023-11-16 17:03:24 +08:00
mgw
076866e9b7
产品模板修改>>>增加“规格”字段specification_id
2023-11-16 17:01:14 +08:00
mgw
3a64a2106a
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化
2023-11-16 15:14:04 +08:00
黄焱
ead39c9649
Accept Merge Request #525 : (feature/前端样式修改 -> develop)
...
Merge Request: 修改生产线看板样式
Created By: @黄焱
Accepted By: @黄焱
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/525?initial=true
2023-11-16 15:12:44 +08:00
黄焱
25d1a99239
修改生产线看板样式
2023-11-16 15:02:27 +08:00
龚启豪
9a318d45f3
Accept Merge Request #524 : (feature/修改机床参数bug -> develop)
...
Merge Request: wms路线规则动态选取
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/524?initial=true
2023-11-15 16:22:56 +08:00
qihao.gong@jikimo.com
41a9aa86a7
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
2023-11-15 16:21:52 +08:00
qihao.gong@jikimo.com
2322758e50
wms路线规则动态选取
2023-11-15 16:21:40 +08:00
mgw
d216478679
调整这两个文件的__manifest__.py文件
2023-11-15 15:28:32 +08:00
禹翔辉
b487ee127a
Accept Merge Request #523 : (feature/功能刀具组装优化 -> develop)
...
Merge Request: 功能刀具组装刀具物料型号字段绑定对象更改为刀具标准库,并优化组装确认功能。
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/523?initial=true
2023-11-14 16:49:08 +08:00
yuxianghui
2a964bc30e
功能刀具组装刀具物料型号字段绑定对象更改为刀具标准库,并优化组装确认功能。
2023-11-14 16:48:11 +08:00
马广威
d0132dbc3a
Accept Merge Request #522 : (feature/制造代码优化 -> develop)
...
Merge Request: 去掉sf_plan模块中的 工作中心计划 菜单
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/522?initial=true
2023-11-14 16:15:19 +08:00
mgw
acccb4b6f9
去掉sf_plan模块中的 工作中心计划 菜单
2023-11-14 15:42:54 +08:00
马广威
48f75ad600
Accept Merge Request #521 : (feature/制造代码优化 -> develop)
...
Merge Request: 修改订单排程功能为通用方法,同时增加动态判断计划时间是否与获取cnc程序的时间冲突功能,如果冲突,时间自动延后1h;优化gantt显示
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/521?initial=true
2023-11-14 12:22:12 +08:00
mgw
daeae46820
修改订单排程功能为通用方法,同时增加动态判断计划时间是否与获取cnc程序的时间冲突功能,如果冲突,时间自动延后1h;优化gantt显示
2023-11-14 12:21:08 +08:00
马广威
77535fa70e
Accept Merge Request #520 : (feature/制造代码优化 -> develop)
...
Merge Request: 修复gantt图修改日视图后其他视图的pill左移的bug。优化字段默认宽度的逻辑
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/520?initial=true
2023-11-13 15:08:44 +08:00
mgw
913780bc2b
修复gantt图修改日视图后其他视图的pill左移的bug。优化字段默认宽度的逻辑
2023-11-13 15:07:50 +08:00
马广威
f566fc1c08
Accept Merge Request #519 : (feature/制造代码优化 -> develop)
...
Merge Request: 修复订单状态回传的问题
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/519?initial=true
2023-11-13 09:42:56 +08:00
mgw
a97ce9b0a7
修复订单状态回传的问题
2023-11-10 18:06:21 +08:00
马广威
d0e18fbd44
Accept Merge Request #518 : (feature/制造代码优化 -> develop)
...
Merge Request: 解决遗漏代码错误
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/518?initial=true
2023-11-10 16:29:16 +08:00
mgw
3845041f7f
解决遗漏代码错误
2023-11-10 16:28:06 +08:00
马广威
f313a171cb
Accept Merge Request #517 : (feature/图文项目单选功能 -> develop)
...
Merge Request: 图文项目单选功能本地开发测试完成,推送线上测试
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/517?initial=true
2023-11-10 16:21:21 +08:00
mgw
93731a4777
图文项目单选功能本地开发测试完成,推送线上测试
2023-11-10 16:20:48 +08:00
马广威
dba17d5c7a
Accept Merge Request #516 : (feature/制造优化 -> develop)
...
Merge Request: 梳理计划模块结构,删除不必要的代码
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/516
2023-11-10 16:13:11 +08:00
杨金灵
2a984ba2c0
Accept Merge Request #515 : (feature/修复单一制造 -> develop)
...
Merge Request: 修复单一制造
Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/515
2023-11-09 16:32:48 +08:00
jinling.yang
dbfd75b139
修复单一制造
2023-11-09 16:30:05 +08:00
mgw
db1dc18c28
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造优化
2023-11-09 16:21:53 +08:00
mgw
523f7a0942
梳理计划模块结构
2023-11-09 16:20:26 +08:00
龚启豪
16b3df87c9
Accept Merge Request #514 : (feature/修改机床参数bug -> develop)
...
Merge Request: 修改cs数据库
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/514?initial=true
2023-11-09 11:35:15 +08:00
qihao.gong@jikimo.com
8d952aa046
更换cs数据库
2023-11-09 11:34:20 +08:00
qihao.gong@jikimo.com
e3e253fab8
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
2023-11-09 09:44:41 +08:00
mgw
fe96004111
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造优化
2023-11-08 17:47:57 +08:00
jinling.yang
8483be5d2d
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2023-11-08 17:44:45 +08:00
jinling.yang
b6964e29bc
Merge branch 'feature/去掉注释' into develop
2023-11-08 17:44:33 +08:00
杨金灵
56d1a98c53
Accept Merge Request #513 : (feature/去掉注释 -> develop)
...
Merge Request: 去掉注释及硬度的字段类型改为整数型
Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/513?initial=true
2023-11-08 17:43:47 +08:00
jinling.yang
01f0902937
去掉注释,及修改转换3d模型文件的位置
2023-11-08 17:41:18 +08:00
jinling.yang
6335c03cef
硬度相关字段的类型改为整数型
2023-11-08 17:35:16 +08:00
jinling.yang
4f898dd8ce
去掉注释,硬度的字段类型改为整数型
2023-11-08 17:29:38 +08:00
mgw
d012066428
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造优化
2023-11-08 17:21:07 +08:00
jinling.yang
4c57bbe791
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2023-11-08 17:20:07 +08:00
jinling.yang
b8d590de6d
Merge branch 'feature/整合产品和销售模块' into develop
2023-11-08 17:19:53 +08:00
杨金灵
82a31c6f31
Accept Merge Request #512 : (feature/整合产品和销售模块 -> develop)
...
Merge Request: 整合所有模块依赖
Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/512?initial=true
2023-11-08 17:17:55 +08:00
jinling.yang
30a7f762c2
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/整合产品和销售模块
2023-11-08 17:14:01 +08:00
jinling.yang
3a1acb0f5a
整合所有模块依赖
2023-11-08 17:13:18 +08:00
mgw
c0b759aa9d
优化代码
2023-11-08 11:24:05 +08:00
马广威
7f5ac4ef90
Accept Merge Request #511 : (feature/制造优化 -> develop)
...
Merge Request: 增加排程后各工单时间预估功能
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/511?initial=true
2023-11-07 10:19:39 +08:00
mgw
f1c835800e
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造优化
2023-11-07 10:17:52 +08:00
mgw
77852900a3
增加排程后各工单时间预估功能
2023-11-07 10:17:06 +08:00
qihao.gong@jikimo.com
b2a9088354
修改路线规则
2023-11-03 15:48:42 +08:00
杨金灵
3be0d1ffad
Accept Merge Request #510 : (feature/同步刀具标准库(刀杆) -> develop)
...
Merge Request: 修复刀具标准库(刀杆)
Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/510?initial=true
2023-11-03 10:44:46 +08:00
jinling.yang
686c049e52
修复刀具标准库
2023-11-03 10:42:09 +08:00
qihao.gong@jikimo.com
780dbd5dda
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
2023-11-02 17:19:06 +08:00
杨金灵
53ad002f3b
Accept Merge Request #509 : (feature/修复刀具标准库包含同步新增 -> develop)
...
Merge Request: 修复同步刀具标准库
Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/509?initial=true
2023-11-02 17:18:38 +08:00
jinling.yang
36270477d5
修复同步刀具标准库
2023-11-02 17:17:34 +08:00
qihao.gong@jikimo.com
a45ee59a76
修改
2023-11-02 14:34:17 +08:00
qihao.gong@jikimo.com
d2782446b0
修改
2023-11-02 14:24:27 +08:00
杨金灵
eb835ae5c8
Accept Merge Request #508 : (feature/去掉模型代码转换注释 -> develop)
...
Merge Request: 去掉模型代码转换注释
Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/508?initial=true
2023-11-01 17:52:18 +08:00
jinling.yang
401103f17b
去掉模型代码转换注释
2023-11-01 17:51:46 +08:00
jinling.yang
e592d49983
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2023-11-01 17:49:28 +08:00
jinling.yang
de0cb1ebbc
Merge branch 'feature/刀具产品调取Cloud刀具标准库(10.11)' into develop
2023-11-01 17:49:16 +08:00
杨金灵
8e91aec7f1
Accept Merge Request #507 : (feature/刀具产品调取Cloud刀具标准库(10.11) -> develop)
...
Merge Request: 优化刀具标准库
Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/507?initial=true
2023-11-01 17:49:00 +08:00
jinling.yang
0b7dc6d09a
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具产品调取Cloud刀具标准库(10.11)
2023-11-01 17:46:24 +08:00
jinling.yang
108cb96ca5
修复刀具产品及同步刀具标准库
2023-11-01 17:45:54 +08:00
禹翔辉
03efa01a85
Accept Merge Request #506 : (feature/功能刀具组装优化 -> develop)
...
Merge Request: 1、优化CAM申请的组装单中功能刀具名称没有内容的问题,优化组装单等的form表名称问题;2、去除组装单弹窗输出语句
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/506?initial=true
2023-11-01 17:40:30 +08:00
JIKIMO-YXH\xianghui
ba19175472
Merge remote-tracking branch 'origin/feature/功能刀具' into feature/功能刀具组装优化
2023-11-01 17:39:21 +08:00
龚启豪
aa9464face
Accept Merge Request #505 : (feature/修改机床参数bug -> develop)
...
Merge Request: 修改维保项目多图片展示
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/505?initial=true
2023-11-01 17:35:05 +08:00
qihao.gong@jikimo.com
0c788df2f2
修改维保项目多图片展示
2023-11-01 17:33:50 +08:00
JIKIMO-YXH\xianghui
cbc9264b2c
1、优化CAM申请的组装单中功能刀具名称没有内容的问题,优化组装单等的form表名称问题;2、去除组装单弹窗输出语句
2023-11-01 17:26:23 +08:00
马广威
82ce347ca4
Accept Merge Request #504 : (feature/制造-计划优化 -> develop)
...
Merge Request: 本地已处理完序号导致的label变形问题,线上测试
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/504?initial=true
2023-11-01 17:10:53 +08:00
mgw
d13071272a
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造-计划优化
2023-11-01 16:53:15 +08:00
mgw
74523c710f
本地测试优化完序号展示问题,准备线上测试
2023-11-01 16:52:26 +08:00
mgw
fc35ef687b
优化序号导致字段label变形的问题
2023-11-01 12:15:26 +08:00
禹翔辉
a71d960e2d
Accept Merge Request #503 : (feature/功能刀具 -> develop)
...
Merge Request: 功能刀具组装后流程和功能刀具组装优化
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/503?initial=true
2023-11-01 09:44:01 +08:00
JIKIMO-YXH\xianghui
0cbf01b9ec
Merge remote-tracking branch 'origin/feature/功能刀具组装后' into feature/功能刀具
2023-11-01 09:26:04 +08:00
mgw
869b389420
研究下载模板和列宽问题
2023-11-01 09:01:49 +08:00
JIKIMO-YXH\xianghui
d429a8b4b8
1、删除功能刀具缓存对象,删除出库弹窗对像,删除功能刀具组装、机台换刀申请和CAM换刀的界面跳转按钮,并在form界面添加管理界面字段;2、优化组装单编码的生成;3、将刀具管理下所以功能刀具相关的模型中的功能刀具名称字段改为绑定功能刀具产品对象,编码改为序列号并绑定产品序列号对象,4、优化刀具管理下的功能刀具界面,5、优化从组装申请到组装完成所以流程功能
2023-10-31 17:45:45 +08:00
JIKIMO-YXH\xianghui
deccb6e3cd
1、删除功能刀具组装的取消组装功能和出库功能;2、删除功能刀具组装单的单据来源跳转按钮;3、新增组装单编码字段和自动生成编码的方法;4、新增功能刀具序列号,绑定功能刀具产品序列号;5、完成功能刀具组装后的产品入库到位置【组装后】
2023-10-30 17:43:28 +08:00
jinling.yang
2a9c5276ab
优化刀具产品
2023-10-30 17:32:16 +08:00
马广威
db0c83bd2b
Accept Merge Request #502 : (feature/制造-计划优化 -> develop)
...
Merge Request: 解决row number导致字段label变形的问题
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/502
2023-10-30 15:47:37 +08:00
mgw
f81ee155e7
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造-计划优化
2023-10-30 15:45:21 +08:00
mgw
76368398ba
解决row number导致字段label变形的问题
2023-10-30 15:44:45 +08:00
龚启豪
8e5fc5eb61
Accept Merge Request #500 : (feature/修改机床参数bug -> develop)
...
Merge Request: 解决无法生成采购单的bug
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/500
2023-10-30 11:15:32 +08:00
qihao.gong@jikimo.com
a0804758f5
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
2023-10-30 11:14:42 +08:00
qihao.gong@jikimo.com
4634393f6c
修改form全局宽度
2023-10-30 11:14:29 +08:00
jinling.yang
5ffe2ce0e2
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具产品调取Cloud刀具标准库(10.11)
...
# Conflicts:
# sf_maintenance/views/maintenance_views.xml
2023-10-30 10:48:13 +08:00
杨金灵
911f464aca
Accept Merge Request #501 : (feature/修复获取编程单 -> develop)
...
Merge Request: 获取编程单修复
Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/501
2023-10-30 09:38:47 +08:00
jinling.yang
9f30a029c5
机床id改为设备id
2023-10-30 09:36:52 +08:00
JIKIMO-YXH\xianghui
5b9fcb2e53
1、创建创建功能刀具该批次/序列号位置
2023-10-27 17:46:19 +08:00
jinling.yang
46807003e1
产品新增刀具物料为刀片,刀盘,刀杆,夹头,刀柄,相关联的字段,及对应页面的优化
2023-10-27 17:44:12 +08:00
qihao.gong@jikimo.com
593944cac2
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
2023-10-27 15:07:12 +08:00
qihao.gong@jikimo.com
018b51e1e5
解决无法生成采购单的bug
2023-10-27 15:06:49 +08:00
龚启豪
a29dbca0e4
Accept Merge Request #499 : (feature/修改机床参数bug -> develop)
...
Merge Request: 制造标准改成执行标准
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/499?initial=true
2023-10-27 10:31:53 +08:00
qihao.gong@jikimo.com
47a408d034
制造标准改成执行标准
2023-10-27 10:31:10 +08:00
龚启豪
d14120dfa2
Accept Merge Request #498 : (feature/修改机床参数bug -> develop)
...
Merge Request: 长宽高
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/498?initial=true
2023-10-27 09:38:17 +08:00
qihao.gong@jikimo.com
b88c6a53ab
长宽高
2023-10-27 09:37:23 +08:00
JIKIMO-YXH\xianghui
e3d58c2a9e
1、优化产初始化生成功能刀具,解决作业类型无法选择功能刀具的问题;2、优化取消功能刀具组装功能;3、新增功能刀具组装确定后生成功能刀具序列号,生成刀具组装入库单
2023-10-26 17:39:33 +08:00
龚启豪
04261036a5
Accept Merge Request #497 : (feature/修改机床参数bug -> develop)
...
Merge Request: 修改设备菜单默认展示页面
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/497?initial=true
2023-10-26 17:34:01 +08:00
qihao.gong@jikimo.com
0eaed68b82
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
2023-10-26 17:32:15 +08:00
qihao.gong@jikimo.com
ccb53a61de
修改设备菜单默认展示页面
2023-10-26 17:32:00 +08:00
jinling.yang
4a01132b91
新增产品刀具参数里的走刀量
2023-10-26 10:10:47 +08:00
jinling.yang
9fffcd4f04
新增规格改变事件
2023-10-25 17:37:17 +08:00
JIKIMO-YXH\xianghui
ce86a66e92
1、新增产品初始化时生成功能刀具产品类别和功能刀具模版;2、新增库存初始化时生成组装后位置和刀具组装入库的作业类型。
2023-10-25 17:35:12 +08:00
jinling.yang
65dd8372dd
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具产品调取Cloud刀具标准库(10.11)
2023-10-25 15:07:52 +08:00
jinling.yang
39f97131a2
1.去掉不要的代码2,.产品页面新增规格字段
2023-10-25 15:07:29 +08:00
jinling.yang
7b471be4cf
洗澡基本参数回显
2023-10-24 17:47:05 +08:00
龚启豪
802bd4285c
Accept Merge Request #496 : (feature/修改机床参数bug -> develop)
...
Merge Request: 修改设备日志列表展示
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/496
2023-10-24 17:32:39 +08:00
qihao.gong@jikimo.com
e7de773f28
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
2023-10-24 17:31:52 +08:00
qihao.gong@jikimo.com
4098dda5b8
修改设备日志列表展示
2023-10-24 17:31:42 +08:00
禹翔辉
2c67f7a286
Accept Merge Request #495 : (feature/功能刀具组装和产品优化 -> develop)
...
Merge Request: 1、优化产品模块下夹具类别下的零点托盘参数显示;2、调整功能刀具组装单的刀具物料字段布局。
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/495?initial=true
2023-10-24 17:12:28 +08:00
JIKIMO-YXH\xianghui
a953ca189e
1、优化产品模块下夹具类别下的零点托盘参数显示;2、调整功能刀具组装单的刀具物料字段布局。
2023-10-24 17:11:37 +08:00
杨金灵
0a09c54690
Accept Merge Request #494 : (feature/修复快速订单 -> develop)
...
Merge Request: 修复销售方法的传参
Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/494?initial=true
2023-10-24 14:56:30 +08:00
jinling.yang
076c4a2bcb
修复销售方法的传参
2023-10-24 14:55:45 +08:00
杨金灵
0e2cbf06ca
Accept Merge Request #493 : (feature/修复创建销售订单 -> develop)
...
Merge Request: 修复创建销售
Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/493?initial=true
2023-10-24 14:45:16 +08:00
jinling.yang
575c856f27
修复创建销售
2023-10-24 14:43:11 +08:00
jinling.yang
103b00a635
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具产品调取Cloud刀具标准库(10.11)
...
# Conflicts:
# sf_sale/models/quick_easy_order.py
2023-10-24 14:39:45 +08:00
jinling.yang
38c77e7fbb
新增选择刀具规格基本参数
2023-10-24 14:38:35 +08:00
杨金灵
272ab8daa0
Accept Merge Request #492 : (feature/添加日志 -> develop)
...
Merge Request: 添加日志输出·
Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/492?initial=true
2023-10-24 11:24:26 +08:00
jinling.yang
acff814e9b
添加注释
2023-10-24 11:23:29 +08:00
jinling.yang
1bc3f756fe
新增按钮
2023-10-24 11:18:33 +08:00
杨金灵
99ea796f2e
Accept Merge Request #491 : (feature/快速订单 -> develop)
...
Merge Request: 快速订单代码还原
Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/491?initial=true
2023-10-24 10:30:06 +08:00
jinling.yang
4ef82ee7cf
代码还原
2023-10-24 10:29:10 +08:00
jinling.yang
4bed65d1df
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具产品调取Cloud刀具标准库(10.11)
...
# Conflicts:
# sf_sale/models/quick_easy_order.py
2023-10-24 09:59:11 +08:00
杨金灵
2b9e768793
Accept Merge Request #490 : (feature/注释自动报价 -> develop)
...
Merge Request: 注释自动报价
Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/490
2023-10-24 09:52:50 +08:00
jinling.yang
f4a878ced9
注释自动报价
2023-10-24 09:51:31 +08:00
jinling.yang
093724a277
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具产品调取Cloud刀具标准库(10.11)
...
# Conflicts:
# sf_sale/models/quick_easy_order.py
2023-10-24 09:45:35 +08:00
qihao.gong@jikimo.com
8346f40b79
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
2023-10-24 09:41:43 +08:00
qihao.gong@jikimo.com
a9ba65ec17
去除输入框居中的样式
2023-10-24 09:41:28 +08:00
jinling.yang
8f29696b64
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2023-10-24 09:41:23 +08:00
jinling.yang
2d32419a7d
修改计算方法
2023-10-24 09:41:05 +08:00
禹翔辉
2c636c5e64
Accept Merge Request #489 : (feature/功能刀具组装优化 -> develop)
...
Merge Request: 1、完成刀具组装单扫描绑定刀具物料的功能;2、完成刀具组装单刀具物料绑定库存的刀具物料序列号
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/489?initial=true
2023-10-23 17:38:16 +08:00
yuxianghui
270338868b
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/功能刀具组装优化
2023-10-23 17:36:44 +08:00
yuxianghui
845d606b36
完成刀具组装单扫描绑定刀具物料的功能
2023-10-23 17:36:27 +08:00
jinling.yang
919a200750
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2023-10-23 17:36:15 +08:00
jinling.yang
ad11f2ea63
Merge branch 'feature/注释自动报价方法' into develop
2023-10-23 14:32:54 +08:00
杨金灵
a414f7cd25
Accept Merge Request #487 : (feature/注释自动报价方法 -> develop)
...
Merge Request: 注释代码
Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/487?initial=true
2023-10-23 14:32:34 +08:00
jinling.yang
2a8558f5a2
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/注释自动报价方法
2023-10-23 14:31:23 +08:00
jinling.yang
13555d91e2
注释上色代码
2023-10-23 14:30:46 +08:00
杨金灵
5ccc186bd1
Accept Merge Request #486 : (feature/注释自动报价方法 -> develop)
...
Merge Request: 注释自动报价方法
Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/486?initial=true
2023-10-23 11:38:37 +08:00
jinling.yang
27259fb8f7
注释自动报价方法
2023-10-23 11:34:56 +08:00
杨金灵
b733c4168f
Accept Merge Request #485 : (feature/自动报价代码释放 -> develop)
...
Merge Request: 自动报价代码释放
Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/485?initial=true
2023-10-23 10:01:19 +08:00
jinling.yang
1e243e4500
代码释放
2023-10-23 09:59:25 +08:00
yuxianghui
ef2e84e411
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/功能刀具组装优化
2023-10-23 09:44:06 +08:00
马广威
4f644b1e25
Accept Merge Request #484 : (feature/制造-计划优化 -> develop)
...
Merge Request: 解决sequence bug,增加“丢弃”二次确认模态框
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/484
2023-10-23 00:21:50 +08:00
马广威
a5cb2dc93b
Merge branch refs/heads/develop into refs/heads/feature/制造-计划优化
2023-10-23 00:21:20 +08:00
mgw
749473f9dc
form视图的丢弃按钮增加二次确认功能
2023-10-23 00:17:05 +08:00
jinling.yang
dc8aecba93
产品新增刀具规格向导
2023-10-20 18:41:58 +08:00
mgw
587e2a4e3e
修复sequence导致字段值移动位置的bug
2023-10-20 10:50:35 +08:00
jinling.yang
d83255cc67
优化同步刀具标准库接口(包含全部合并每日)
2023-10-19 17:23:53 +08:00
jinling.yang
14edbd85f4
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具产品调取Cloud刀具标准库(10.11)
...
# Conflicts:
# sf_base/models/tool_base.py
# sf_base/models/tool_base_new.py
# sf_maintenance/views/maintenance_views.xml
# sf_mrs_connect/models/res_config_setting.py
2023-10-19 10:53:03 +08:00
jinling.yang
e7df6c14b1
同步刀具标准库
2023-10-19 10:49:54 +08:00
yuxianghui
e2c13a8194
1、功能刀具组装组装功能对象的六个刀具物料对象的序列号绑定库存的刀具物料序列号,2、优化功能刀具组装和功能刀具组装组装弹窗的刀具物料布局
2023-10-18 17:34:19 +08:00
龚启豪
9b5a0162ff
Accept Merge Request #483 : (feature/修改机床参数bug -> develop)
...
Merge Request: 设备其他table增加参数
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/483?initial=true
2023-10-17 15:11:40 +08:00
qihao.gong@jikimo.com
a57cdbe2f3
设备其他table增加参数
2023-10-17 15:10:25 +08:00
龚启豪
d02e0cf455
Accept Merge Request #482 : (feature/修改机床参数bug -> develop)
...
Merge Request: 修改设备table布局
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/482?initial=true
2023-10-16 17:24:17 +08:00
qihao.gong@jikimo.com
e3bdf9409f
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
2023-10-16 17:23:21 +08:00
qihao.gong@jikimo.com
93a6b4ccb4
修改设备table布局
2023-10-16 17:23:04 +08:00
龚启豪
d532ff8c05
Accept Merge Request #481 : (feature/修改机床参数bug -> develop)
...
Merge Request: 修改设备table布局
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/481?initial=true
2023-10-16 17:12:28 +08:00
qihao.gong@jikimo.com
0f15814916
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
2023-10-16 17:11:37 +08:00
qihao.gong@jikimo.com
f02d1a0ace
修改设备table布局
2023-10-16 17:11:24 +08:00
马广威
cbc298f6ad
Accept Merge Request #480 : (feature/制造-计划优化 -> develop)
...
Merge Request: tree视图记录左侧增加序号展示记录数
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/480?initial=true
2023-10-16 15:19:08 +08:00
mgw
e02ab7fd95
tree视图记录左侧增加序号展示记录数
2023-10-16 15:18:18 +08:00
jinling.yang
9acdcc0429
新增同步cloud的刀具标准库接口
2023-10-13 17:29:34 +08:00
龚启豪
dbbddfadab
Accept Merge Request #479 : (feature/修改机床参数bug -> develop)
...
Merge Request: 修改设备table格式布局
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/479?initial=true
2023-10-13 16:43:45 +08:00
qihao.gong@jikimo.com
1f090fdd20
修改设备table格式布局
2023-10-13 16:42:16 +08:00
龚启豪
0b72c59335
Accept Merge Request #415 : (feature/修改机床参数bug -> develop)
...
Merge Request: 修改机床注册接口
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/415?initial=true
2023-10-13 14:28:06 +08:00
qihao.gong@jikimo.com
7c6dd76464
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
2023-10-13 14:26:49 +08:00
qihao.gong@jikimo.com
01ad3e7d8c
修改机床注册接口
2023-10-13 14:26:38 +08:00
龚启豪
53f7f75795
Accept Merge Request #414 : (feature/修改机床参数bug -> develop)
...
Merge Request: 设备过滤能力特征库只关联加工能力
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/414?initial=true
2023-10-12 14:50:13 +08:00
qihao.gong@jikimo.com
a80ab33c50
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
2023-10-12 14:49:41 +08:00
qihao.gong@jikimo.com
3bd5c7efb3
设备过滤能力特征库只关联加工能力
2023-10-12 14:49:25 +08:00
龚启豪
aa2e9e8c1f
Accept Merge Request #413 : (feature/修改机床参数bug -> develop)
...
Merge Request: 修改设备table的样式 修改关联品牌根据各不同类别展示
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/413?initial=true
2023-10-12 14:11:26 +08:00
qihao.gong@jikimo.com
8db9ed68c1
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
2023-10-12 14:10:47 +08:00
qihao.gong@jikimo.com
53e307cd55
修改设备table的样式 修改关联品牌根据各不同类别展示
2023-10-12 14:10:29 +08:00
jinling.yang
c04e138d6b
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具产品调取Cloud刀具标准库(10.11)
...
# Conflicts:
# sf_mrs_connect/models/sync_common.py
2023-10-11 17:41:19 +08:00
jinling.yang
296efcc395
新增调取cloud的刀具标准库接口
2023-10-11 17:39:46 +08:00
龚启豪
e4fb6edb05
Accept Merge Request #412 : (feature/修改机床参数bug -> develop)
...
Merge Request: 处理同步报错bug
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/412?initial=true
2023-10-11 15:42:52 +08:00
qihao.gong@jikimo.com
6724d0e0c1
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
2023-10-11 15:42:06 +08:00
qihao.gong@jikimo.com
e505285a91
处理同步报错bug
2023-10-11 15:41:55 +08:00
龚启豪
2ecc130fd1
Accept Merge Request #411 : (feature/修改机床参数bug -> develop)
...
Merge Request: 设备参数根据不同类别修改必填项, 新增刀具库位table
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/411?initial=true
2023-10-11 14:57:29 +08:00
qihao.gong@jikimo.com
ecb1f4140e
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
...
# Conflicts:
# sf_mrs_connect/models/res_config_setting.py
# sf_mrs_connect/models/sync_common.py
2023-10-11 14:56:18 +08:00
qihao.gong@jikimo.com
b1d2cd1ceb
设备类别参数根据不同类别必填 设备增加刀具库位table 并自动生成
2023-10-11 14:45:35 +08:00
杨金灵
0752ba9d2d
Accept Merge Request #410 : (feature/刀具产品调取Cloud刀具标准库 -> develop)
...
Merge Request: 优化能力特征库
Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/410?initial=true
2023-10-10 17:27:39 +08:00
jinling.yang
6b7b536236
1.优化同步cloud的静态资源库的定时器的代码
...
2.新增能力特征库的接口
2023-10-10 17:19:11 +08:00
qihao.gong@jikimo.com
b9d6e0ea35
材料型号同步接口修改 新增国际标准和材料应用
2023-10-09 17:35:39 +08:00
杨金灵
8f4eff6d1c
Accept Merge Request #409 : (feature/bug修复 -> develop)
...
Merge Request: 同步cloud资源库静态资源Bug修复及代码优化
Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/409?initial=true
2023-10-09 15:23:57 +08:00
jinling.yang
708889b1ed
去掉不要的代码及刀具型号的定时器
2023-10-09 15:21:41 +08:00
jinling.yang
59514cc433
去掉刀具型号的同步方法
2023-10-09 15:15:52 +08:00
qihao.gong@jikimo.com
ea3dbb290f
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
2023-10-08 17:28:09 +08:00
qihao.gong@jikimo.com
30cebea5a1
修改材料型号参数类型
2023-10-08 17:27:51 +08:00
jinling.yang
e586ed8e3b
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/bug修复
2023-10-08 17:19:22 +08:00
jinling.yang
7551bf38ef
销售模块新增依赖引用
2023-10-08 17:19:02 +08:00
龚启豪
34beb03a6a
Accept Merge Request #408 : (feature/修改机床参数bug -> develop)
...
Merge Request: 新增设备AGV小车,机器人,检测设备参数
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/408?initial=true
2023-10-08 09:11:39 +08:00
qihao.gong@jikimo.com
af05d3ec30
设备增加AGV小车,机械臂,检测设备参数
2023-10-07 17:26:09 +08:00
qihao.gong@jikimo.com
ac6315c76a
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
2023-09-28 16:20:24 +08:00
qihao.gong@jikimo.com
960bea5bb0
设备新增参数 AGV小车table页
2023-09-28 16:20:03 +08:00
龚启豪
69bae5b853
Accept Merge Request #407 : (feature/修改机床参数bug -> develop)
...
Merge Request: 故障日志bug
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/407?initial=true
2023-09-27 14:33:03 +08:00
qihao.gong@jikimo.com
6b375ee64d
修改故障日志bug
2023-09-27 14:30:38 +08:00
qihao.gong@jikimo.com
84b211911f
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
2023-09-26 17:29:37 +08:00
qihao.gong@jikimo.com
22a4ccad6b
修改维保生成编码和名称的规则
2023-09-26 17:29:14 +08:00
马广威
f6fd70bb51
Accept Merge Request #406 : (feature/制造-计划优化 -> develop)
...
Merge Request: 测试背景图片在线上展示
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/406?initial=true
2023-09-26 14:55:05 +08:00
mgw
9c5900e4fe
测试背景图片在线上展示
2023-09-26 14:54:13 +08:00
马广威
51f4c1787f
Accept Merge Request #405 : (feature/制造-计划优化 -> develop)
...
Merge Request: 调整菜单顺序等,优化gantt显示
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/405?initial=true
2023-09-26 14:26:29 +08:00
mgw
81cae99093
屏蔽测试内容
2023-09-26 14:24:43 +08:00
mgw
587daef6ee
Merge branch 'feature/制造-计划优化' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造-计划优化
2023-09-26 14:11:51 +08:00
mgw
9217372097
调整代码结构
2023-09-26 14:09:25 +08:00
mgw
256d86567e
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造-计划优化
...
# Conflicts:
# jikimo_frontend/static/src/scss/custom_style.scss
2023-09-26 11:36:59 +08:00
mgw
37541fdcd6
优化gantt的间隔为变量
2023-09-26 11:34:03 +08:00
mgw
b574175a56
调整菜单顺序,修改”开票“翻译为”应收应付“,增加背景图片
2023-09-26 11:31:14 +08:00
许何哲
8e13d2011c
Accept Merge Request #404 : (feature/sf看板样式统一 -> develop)
...
Merge Request: 表头固定bug修改
Created By: @许何哲
Accepted By: @许何哲
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/404?initial=true
2023-09-25 15:12:03 +08:00
WEB许何哲\xuhez
aba664375f
表头固定bug修改
2023-09-25 15:10:50 +08:00
禹翔辉
a50501e75e
Accept Merge Request #403 : (feature/功能刀具优化 -> develop)
...
Merge Request: 计划管理模块和刀具管理模块优化
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/403?initial=true
2023-09-25 13:44:19 +08:00
yuxianghui
16534bb348
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/功能刀具优化
2023-09-25 13:43:27 +08:00
yuxianghui
a538477272
1、计划管理-产线设备资源设置模块优化,工作日历设置模块优化,添加选择提示;2、刀具管理-功能刀具组装、列表、预警、实时分布、出入库记录和组装界面的刀具物料字段绑定对象更改为库存下的刀具物料;3、功能刀具组装-组装界面添加选择提示,4、功能刀具列表下的能力参数对没有选择的图片不展示
2023-09-25 13:43:08 +08:00
许何哲
9c2d4dbc24
Accept Merge Request #402 : (feature/sf看板样式统一 -> develop)
...
Merge Request: 工作中心增加字段并调整样式
Created By: @许何哲
Accepted By: @许何哲
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/402?initial=true
2023-09-25 09:21:11 +08:00
WEB许何哲\xuhez
1acfefa555
Merge branch 'develop' into feature/sf看板样式统一
2023-09-22 17:34:57 +08:00
mgw
52a7e2d698
新时间尺度下pill已可正确展示(包括左边距和宽度)
2023-09-22 17:34:45 +08:00
WEB许何哲\xuhez
d8363f2637
看板添加字段并调整样式
2023-09-22 17:33:56 +08:00
龚启豪
f42383fd10
Accept Merge Request #401 : (feature/修改机床参数bug -> develop)
...
Merge Request: 设备类别增加参数
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/401
2023-09-22 17:20:32 +08:00
qihao.gong@jikimo.com
c919f0724a
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
2023-09-22 17:01:28 +08:00
qihao.gong@jikimo.com
681b769356
设备类别新增选项
2023-09-22 17:01:03 +08:00
mgw
cee39f3e1f
优化看板样式展示
2023-09-22 11:13:13 +08:00
mgw
9dc653694a
修改前暂存
2023-09-22 09:31:56 +08:00
jinling.yang
a9f51df151
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/bug修复
2023-09-21 16:11:04 +08:00
jinling.yang
3aa34ee0cf
http权限代码优化
2023-09-21 16:10:18 +08:00
马广威
cde801a837
Accept Merge Request #400 : (feature/制造-计划优化 -> develop)
...
Merge Request: 增加排程结果反馈给制造订单的功能
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/400?initial=true
2023-09-21 14:33:32 +08:00
mgw
e9e25c582e
增加排程结果反馈给制造订单的功能
2023-09-21 14:32:05 +08:00
禹翔辉
90fa7c159a
Accept Merge Request #399 : (feature/功能刀具优化 -> develop)
...
Merge Request: 功能刀具优化
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/399?initial=true
2023-09-19 17:32:33 +08:00
yuxianghui
d4180df7e9
1、刀具管理模块下的功能刀具内的刀具物料字段类型从many2many更改为many2one,绑定对象从刀具型号更改为刀具物料;2、对功能刀具组装的组装功能和取消组装功能进行了逻辑优化;3、新增功能刀具组装弹窗对象的刀具物料信息根据所选功能刀具字段计算功能;4、关闭了功能刀具列表、预警、实时分布、出入库记录的创建、修改、删除功能;5、功能刀具列表对象新增刀具能力参数;6、优化了刀具管理模块的权限相关警告;
2023-09-19 16:14:29 +08:00
jinling.yang
ab42bde8f2
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/bug修复
2023-09-18 17:42:13 +08:00
jinling.yang
a96c7a34c1
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/bug修复
2023-09-18 17:40:30 +08:00
龚启豪
0ac82acbad
Accept Merge Request #398 : (feature/修改机床参数bug -> develop)
...
Merge Request: 优化sf容器
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/398
2023-09-18 10:41:33 +08:00
qihao.gong@jikimo.com
f03b77f9bb
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
2023-09-18 10:40:48 +08:00
qihao.gong@jikimo.com
dc796abd4a
优化sf容器
2023-09-18 10:40:29 +08:00
龚启豪
cf7551011e
Accept Merge Request #397 : (feature/修改机床参数bug -> develop)
...
Merge Request: 优化sf容器
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/397?initial=true
2023-09-18 10:08:31 +08:00
qihao.gong@jikimo.com
586dc5dbe2
优化sf容器
2023-09-18 10:07:52 +08:00
许何哲
3dbc6f0d6a
Accept Merge Request #396 : (feature/sf看板样式统一 -> develop)
...
Merge Request: 表头固定优化
Created By: @许何哲
Accepted By: @许何哲
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/396?initial=true
2023-09-15 17:18:30 +08:00
WEB许何哲\xuhez
0ae5d724d6
表头固定优化
2023-09-15 17:15:35 +08:00
许何哲
2dcd9bef53
Accept Merge Request #395 : (feature/sf看板样式统一 -> develop)
...
Merge Request: 优化表头固定
Created By: @许何哲
Accepted By: @许何哲
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/395?initial=true
2023-09-15 14:44:50 +08:00
WEB许何哲\xuhez
38331f1501
优化表头固定
2023-09-15 14:42:12 +08:00
龚启豪
e35b4af123
Accept Merge Request #394 : (feature/修改机床参数bug -> develop)
...
Merge Request: 取消注释occ
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/394?initial=true
2023-09-15 14:37:14 +08:00
qihao.gong@jikimo.com
618d4718c9
取消注释occ
2023-09-15 14:36:29 +08:00
龚启豪
f36e9c3d99
Accept Merge Request #393 : (feature/修改机床参数bug -> develop)
...
Merge Request: BT50
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/393?initial=true
2023-09-15 14:28:25 +08:00
qihao.gong@jikimo.com
0de26c4f2f
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
...
# Conflicts:
# sf_maintenance/views/maintenance_views.xml
2023-09-15 14:27:16 +08:00
qihao.gong@jikimo.com
d78fe872ae
BT50
2023-09-15 14:26:04 +08:00
马广威
3c25b829e2
Accept Merge Request #392 : (feature/制造-计划优化 -> develop)
...
Merge Request: 增加表头固定
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/392?initial=true
2023-09-15 11:19:50 +08:00
mgw
fd60505eec
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造-计划优化
2023-09-15 11:17:32 +08:00
mgw
42cc64db74
表头固定
2023-09-15 11:17:07 +08:00
许何哲
496fb40807
Accept Merge Request #391 : (feature/sf看板样式统一 -> develop)
...
Merge Request: 设备清单看板优化
Created By: @许何哲
Accepted By: @许何哲
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/391?initial=true
2023-09-15 11:16:51 +08:00
WEB许何哲\xuhez
e3e717ea60
设备清单看板优化
2023-09-15 11:15:40 +08:00
马广威
1e29f7010a
Accept Merge Request #390 : (feature/制造-计划优化 -> develop)
...
Merge Request: 工作中心看板、图文展示样式修改
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/390?initial=true
2023-09-15 11:00:33 +08:00
mgw
c514af2511
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造-计划优化
2023-09-15 10:59:28 +08:00
禹翔辉
6d4221a565
Accept Merge Request #389 : (feature/刀具优化 -> develop)
...
Merge Request: 解决功能刀具组装时选取刀具型号报错问题;
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/389?initial=true
2023-09-15 10:59:06 +08:00
mgw
5148ad3952
工作中心看板样式修改
2023-09-15 10:58:53 +08:00
yuxianghui
be3df9817c
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具优化
2023-09-15 10:57:19 +08:00
yuxianghui
95e095c184
解决功能刀具组装时选取刀具型号报错问题;
2023-09-15 10:56:58 +08:00
mgw
db5d9863b1
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造-计划优化
...
# Conflicts:
# jikimo_frontend/static/src/scss/custom_style.scss
# sf_manufacturing/views/mrp_workcenter_views.xml
2023-09-15 10:40:30 +08:00
mgw
2cc03c21ed
优化图文展示样式
2023-09-15 10:37:20 +08:00
禹翔辉
480d628125
Accept Merge Request #388 : (feature/刀具优化 -> develop)
...
Merge Request: 修改机床换刀申请字段状态,新增选择字段提示;
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/388?initial=true
2023-09-15 09:52:01 +08:00
yuxianghui
9e212a2684
修改机床换刀申请字段状态,新增选择字段提示;
2023-09-15 09:51:53 +08:00
jinling.yang
a7da1dbadd
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/bug修复
2023-09-14 18:08:05 +08:00
jinling.yang
99f078fad9
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2023-09-14 18:07:47 +08:00
jinling.yang
0445c3bbc4
Merge branch 'feature/页面优化' into develop
2023-09-14 18:07:35 +08:00
杨金灵
23214ae6e6
Accept Merge Request #387 : (feature/页面优化 -> develop)
...
Merge Request: 优化销售和报价及快速订单
Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/387?initial=true
2023-09-14 18:07:07 +08:00
jinling.yang
b966bdd8da
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/页面优化
2023-09-14 18:04:41 +08:00
jinling.yang
5fa9d1e16e
1.优化生成销售订单和产品的接口:bfm分配工厂时将“结算方式”和“支付方式”传到该接口内的生成报价订单方法里
...
2.优化销售和报价查询及详情页面:新增“结算方式”和“支付方式”两个字段;销售的tree列表的“号码”显示改为“订单号”;报价的tree列表的“号码”显示改为“订单号”,创建时间改为“下单时间”
3.优化快速订单:tree列表去掉“表面工艺参数”字段,新增“创建人”和“创建时间”2个字段;详情页面新增“加工时长”字段
2023-09-14 18:04:04 +08:00
许何哲
c45c45607f
Accept Merge Request #386 : (feature/sf看板样式统一 -> develop)
...
Merge Request: sf看板样式统一
Created By: @许何哲
Accepted By: @许何哲
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/386?initial=true
2023-09-14 17:25:37 +08:00
WEB许何哲\xuhez
69506af2ab
sf看板样式统一
2023-09-14 17:23:50 +08:00
龚启豪
00cb9cb8db
Accept Merge Request #385 : (feature/修改机床参数bug -> develop)
...
Merge Request: 维保计划关联维保项目many2many
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/385?initial=true
2023-09-14 10:57:29 +08:00
qihao.gong@jikimo.com
757a1ef102
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
2023-09-14 10:56:03 +08:00
qihao.gong@jikimo.com
5416ecb709
维保计划关联维保项目
2023-09-14 10:55:43 +08:00
jinling.yang
766771e435
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/页面优化
2023-09-14 09:47:14 +08:00
jinling.yang
eb0d83aa3a
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/页面优化
...
# Conflicts:
# sf_manufacturing/models/stock.py
2023-09-14 09:46:28 +08:00
禹翔辉
826119aea6
Accept Merge Request #384 : (feature/刀具优化 -> develop)
...
Merge Request: 解决图文展示中图片不显示问题;新增刀具物料能力对象的form视图。
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/384?initial=true
2023-09-14 09:45:22 +08:00
jinling.yang
650bf2cf86
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/bug修复
2023-09-14 09:30:48 +08:00
jinling.yang
ad0603f921
报价和销售订单页面优化
2023-09-14 09:29:03 +08:00
马广威
4613dc791b
Accept Merge Request #383 : (feature/制造-计划优化 -> develop)
...
Merge Request: 排产代码优化后合并
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/383?initial=true
2023-09-14 09:19:49 +08:00
mgw
6026244783
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造-计划优化
2023-09-14 09:18:05 +08:00
mgw
43d9c54626
优化代码结构
2023-09-14 09:17:38 +08:00
yuxianghui
400f4b6201
解决图文展示中图片不显示问题;新增刀具物料能力对象的form视图。
2023-09-13 17:13:21 +08:00
龚启豪
ce62f90ede
Accept Merge Request #382 : (feature/修改机床参数bug -> develop)
...
Merge Request: 设备图文展示
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/382?initial=true
2023-09-13 16:54:29 +08:00
qihao.gong@jikimo.com
778ce3e409
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
2023-09-13 16:52:56 +08:00
qihao.gong@jikimo.com
532e4a4c7a
设备图文展示
2023-09-13 16:52:40 +08:00
mgw
4d9c0474e6
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造-计划优化
...
# Conflicts:
# sf_plan/models/custom_plan.py
2023-09-13 15:42:18 +08:00
mgw
c1739feabb
优化现有逻辑
2023-09-13 15:40:36 +08:00
龚启豪
6dbdcd2eb9
Accept Merge Request #381 : (feature/修改机床参数bug -> develop)
...
Merge Request: 设备图文展示
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/381?initial=true
2023-09-13 15:40:22 +08:00
qihao.gong@jikimo.com
2e508c7a85
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
2023-09-13 15:39:45 +08:00
qihao.gong@jikimo.com
e3b7d5ad02
设备图文展示
2023-09-13 15:39:27 +08:00
禹翔辉
a65a3ecfbe
Accept Merge Request #380 : (feature/刀具优化 -> develop)
...
Merge Request: 解决产品-整体式刀具-刃部直径字段数据同步问题。
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/380?initial=true
2023-09-13 15:24:20 +08:00
yuxianghui
1f0f7ae0c7
解决产品-整体式刀具-刃部直径字段数据同步问题。
2023-09-13 15:21:51 +08:00
qihao.gong@jikimo.com
0ffe66b501
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
2023-09-13 14:32:51 +08:00
qihao.gong@jikimo.com
9e424600bc
处理机床能力数据
2023-09-13 14:32:32 +08:00
禹翔辉
f9e41f262c
Accept Merge Request #379 : (feature/刀具优化 -> develop)
...
Merge Request: 刀具优化
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/379?initial=true
2023-09-12 17:38:20 +08:00
yuxianghui
7fcd079535
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具优化
2023-09-12 17:37:08 +08:00
yuxianghui
165f961fb4
注释刀具管理-刀具物料查询-整体式刀具参数限制,调整整体式刀具参数位置,添加能力参数图文展示功能,直径类参数增加φ的前缀单位;注释产品-刀具参数-cutting_tool_screw。
2023-09-12 17:36:45 +08:00
禹翔辉
2793bd2472
Accept Merge Request #378 : (feature/刀具优化 -> develop)
...
Merge Request: 放开配备螺丝参数注释
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/378?initial=true
2023-09-12 15:06:47 +08:00
yuxianghui
f554c2073f
放开配备螺丝参数注释
2023-09-12 15:06:21 +08:00
马广威
3a9f408be2
Accept Merge Request #377 : (feature/制造-计划优化 -> develop)
...
Merge Request: 冗余菜单优化完成
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/377?initial=true
2023-09-12 11:13:14 +08:00
mgw
4bcb12d3f1
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造-计划优化
2023-09-12 11:12:19 +08:00
mgw
7cbaf7373a
冗余菜单处理完成
2023-09-12 11:12:00 +08:00
禹翔辉
d6960c2717
Accept Merge Request #376 : (feature/刀具优化 -> develop)
...
Merge Request: 隐藏功能刀具组装的创建按钮;刀具物料功能每齿走刀量模型新增加工方式字段,解决新增记录报错问题;解决计划管理-工作日历设置不自动生成工作日历的问题。
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/376?initial=true
2023-09-11 17:24:51 +08:00
yuxianghui
cf7e6ea33d
隐藏功能刀具组装的创建按钮;刀具物料功能每齿走刀量模型新增加工方式字段,解决新增记录报错问题;解决计划管理-工作日历设置不自动生成工作日历的问题。
2023-09-11 17:21:32 +08:00
jinling.yang
49d41539b0
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2023-09-08 17:28:58 +08:00
jinling.yang
0d40171f13
Merge branch 'feature/刀柄和夹头反注册到Cloud生成动态刀具物料' into develop
2023-09-08 17:28:41 +08:00
杨金灵
e919858e63
Accept Merge Request #375 : (feature/刀柄和夹头反注册到Cloud生成动态刀具物料 -> develop)
...
Merge Request: 整体式刀具,刀柄和夹头反注册到Cloud生成动态刀具物料
Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/375?initial=true
2023-09-08 17:28:21 +08:00
jinling.yang
c1be9a90fe
采购刀具产品反注册接口新增图片字段,3d模型代码放开
2023-09-08 17:14:57 +08:00
jinling.yang
26db256336
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀柄和夹头反注册到Cloud生成动态刀具物料
2023-09-08 17:06:02 +08:00
jinling.yang
aa17de3384
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀柄和夹头反注册到Cloud生成动态刀具物料
...
# Conflicts:
# sf_dlm/views/product_template_view.xml
2023-09-08 17:05:44 +08:00
许何哲
9cbc1428e9
Accept Merge Request #374 : (feature/sf品牌页面表格样式的修改 -> develop)
...
Merge Request: many2many图文展示及点击交互效果
Created By: @许何哲
Accepted By: @许何哲
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/374?initial=true
2023-09-08 16:34:56 +08:00
WEB许何哲\xuhez
857a26231d
Merge branch 'develop' into feature/sf品牌页面表格样式的修改
2023-09-08 16:32:19 +08:00
WEB许何哲\xuhez
b76c192f33
many2many图文展示及点击交互效果
2023-09-08 16:31:06 +08:00
jinling.yang
e50f0c4465
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀柄和夹头反注册到Cloud生成动态刀具物料
...
# Conflicts:
# sf_manufacturing/models/product_template.py
2023-09-08 14:10:48 +08:00
jinling.yang
41641f69fe
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀柄和夹头反注册到Cloud生成动态刀具物料
...
# Conflicts:
# sf_manufacturing/models/product_template.py
2023-09-08 14:08:08 +08:00
禹翔辉
5802c55ab3
Accept Merge Request #373 : (feature/整体式刀具能力参数补充 -> develop)
...
Merge Request: 放开OCC相关的代码
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/373?initial=true
2023-09-08 10:41:09 +08:00
yuxianghui
b12880da50
放开OCC相关的代码
2023-09-08 10:39:47 +08:00
禹翔辉
a23fe9942d
Accept Merge Request #372 : (feature/整体式刀具能力参数补充 -> develop)
...
Merge Request: 刀具物料功能模型从sf_base模块迁移到sf_manufacturing模块;新增每齿走刀量模型;整体式刀具物料新增关联每齿走刀量对象字段;
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/372?initial=true
2023-09-08 10:25:41 +08:00
yuxianghui
5e9b376721
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/整体式刀具能力参数补充
2023-09-08 10:23:01 +08:00
yuxianghui
35afdd3b2a
刀具物料功能模型从sf_base模块迁移到sf_manufacturing模块;新增每齿走刀量模型;整体式刀具物料新增关联每齿走刀量对象字段;
2023-09-08 10:20:52 +08:00
马广威
00dd03bb2c
Accept Merge Request #371 : (feature/参考web模块将widget统一管理 -> develop)
...
Merge Request: custom_many2many widget整合到前端包中
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/371?initial=true
2023-09-07 17:57:49 +08:00
mgw
121217d70f
custom_many2many widget整合到前端包中
2023-09-07 17:54:07 +08:00
jinling.yang
3225916629
1.优化产品页面:
...
①“产品类别”字段放在开票策略后面;“内部编码”和“条码”字段放在产品标签后面;当“产品类别”为“成品”时“上传模型文件“和“模型“字段放在"销售价格"前面;
②当“产品类别”为“刀具”时,且“刀具物料”字段为“整体式刀具”,"刀柄"或"夹头"时,页面根据选择的刀具物料而新增所对应需要的字段及页面布局展示
2.采购产品时,产品的“产品类别”为”刀具“且“刀具物料”为“整体式刀具”,"刀柄"或"夹头"时,在收货单进行验证操作时,优化实时注册到Cloud的动态资源里的工厂刀具物料的接口
3.优化“产品模板"模型的部分字段
2023-09-07 17:46:22 +08:00
马广威
75fabfb63d
Accept Merge Request #370 : (feature/生产排程 -> develop)
...
Merge Request: 调整“程序下载”按钮位置,更新本地代码
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/370
2023-09-07 17:02:51 +08:00
mgw
255786325b
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/生产排程
2023-09-07 15:38:28 +08:00
mgw
797a7207e9
调整“程序下载”按钮位置
2023-09-07 15:32:15 +08:00
马广威
f49f63a32a
Accept Merge Request #369 : (feature/生产排程 -> develop)
...
Merge Request: 实现Many2many的图文展示,并增加图片方法功能
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/369?initial=true
2023-09-07 15:17:22 +08:00
mgw
e0bfea40e1
增加点击图片放大图片的功能
2023-09-07 15:16:03 +08:00
mgw
78e3a0f24f
自定义widget显示many2many图文基本实现
2023-09-07 12:33:35 +08:00
禹翔辉
408a5c72c8
Accept Merge Request #368 : (feature/整体式刀具能力参数补充 -> develop)
...
Merge Request: 新增切削速度Vc对象,产品-整体式刀具物料新增切削速度Vc关联字段;删除部分产品-整体式刀具同步配置-刀具型号-整体式刀具参数。
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/368?initial=true
2023-09-07 09:35:35 +08:00
yuxianghui
ae3f7c9c0c
新增切削速度Vc对象,产品-整体式刀具物料新增切削速度Vc关联字段;删除部分产品-整体式刀具同步配置-刀具型号-整体式刀具参数。
2023-09-06 17:24:08 +08:00
禹翔辉
093badd3a7
Accept Merge Request #367 : (feature/整体式刀具能力参数补充 -> develop)
...
Merge Request: 撤销制造-配置-刀具型号新增的参数;对产品刀具物料字段的限制优化
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/367?initial=true
2023-09-06 16:49:08 +08:00
yuxianghui
9331a22a10
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/整体式刀具能力参数补充
2023-09-06 16:48:43 +08:00
yuxianghui
5353630975
撤销制造-配置-刀具型号新增的参数;对产品刀具物料字段的限制优化
2023-09-06 16:48:07 +08:00
jinling.yang
ecc9bd446f
材料等同步Bug修复
2023-09-06 16:32:25 +08:00
禹翔辉
1983271a9b
Accept Merge Request #366 : (feature/整体式刀具能力参数补充 -> develop)
...
Merge Request: 配置-刀具型号新增整体式刀具能力参数补充;补充产品-整体式刀具同步配置-刀具型号-整体式刀具参数。
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/366?initial=true
2023-09-06 11:11:55 +08:00
yuxianghui
0b8042f07a
配置-刀具型号新增整体式刀具能力参数补充;补充产品-整体式刀具同步配置-刀具型号-整体式刀具参数。
2023-09-06 11:02:55 +08:00
马广威
1f5cabad1a
Accept Merge Request #365 : (feature/生产排程 -> develop)
...
Merge Request: 生产计划优化
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/365?initial=true
2023-09-06 09:23:50 +08:00
mgw
48e30865af
生产计划优化
2023-09-06 09:22:58 +08:00
yuxianghui
fe78d91fa9
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/整体式刀具能力参数补充
2023-09-06 09:12:11 +08:00
许何哲
4ac95c20ad
Accept Merge Request #364 : (feature/sf品牌页面表格样式的修改 -> develop)
...
Merge Request: 对sf样式进行集中管理
Created By: @许何哲
Accepted By: @许何哲
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/364?initial=true
2023-09-05 17:24:19 +08:00
WEB许何哲\xuhez
4a712ff9f1
Merge branch 'develop' into feature/sf品牌页面表格样式的修改
2023-09-05 17:22:58 +08:00
yuxianghui
f8c5553837
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/整体式刀具能力参数补充
2023-09-05 17:22:45 +08:00
WEB许何哲\xuhez
7ea997219b
对sf的css样式进行集中管理
2023-09-05 17:22:37 +08:00
yuxianghui
a6ddfa22a1
对产品的整体式刀具能力参数进行补充,对参数字段进行优化;对刀具物料查询的字段类型进行调整。
2023-09-05 17:21:39 +08:00
许何哲
b6a071d33a
Accept Merge Request #363 : (feature/sf品牌页面表格样式的修改 -> develop)
...
Merge Request: 修改tree视图样式bug
Created By: @许何哲
Accepted By: @许何哲
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/363?initial=true
2023-09-05 16:46:42 +08:00
WEB许何哲\xuhez
26f07a00c3
Merge branch 'develop' into feature/sf品牌页面表格样式的修改
2023-09-05 16:45:32 +08:00
WEB许何哲\xuhez
b47dbe29c0
修改tree视图样式bug
2023-09-05 16:44:42 +08:00
马广威
dbeb975cf6
Accept Merge Request #362 : (feature/生产排程 -> develop)
...
Merge Request: 创建制造订单时同步创建排程单
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/362?initial=true
2023-09-05 10:41:22 +08:00
mgw
e5213d06ae
创建制造订单时同步创建排程单
2023-09-05 10:40:25 +08:00
马广威
a0affba407
Accept Merge Request #361 : (feature/生产排程 -> develop)
...
Merge Request: 基本排程功能合并
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/361?initial=true
2023-09-05 09:33:01 +08:00
禹翔辉
940d2cead8
Accept Merge Request #360 : (feature/整体式刀具能力参数补充 -> develop)
...
Merge Request: 新增加工方式、刀尖特征、柄部类型、走刀方向、适合冷却液五个模型对象;刀具物料查询新增上述五个关联对象;对产品的整体式刀具物料能力参数进行补充。
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/360?initial=true
2023-09-04 17:38:39 +08:00
yuxianghui
c8129478d5
新增加工方式、刀尖特征、柄部类型、走刀方向、适合冷却液五个模型对象;刀具物料查询新增上述五个关联对象;对产品的整体式刀具物料能力参数进行补充。
2023-09-04 17:29:20 +08:00
禹翔辉
4342a2a175
Accept Merge Request #359 : (feature/整体式刀具能力参数补充 -> develop)
...
Merge Request: 整体式刀具基本参数补充,float类型字段增加非零验证,增加相关字段必填属性。
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/359?initial=true
2023-09-01 17:18:50 +08:00
yuxianghui
19f19d5fd0
整体式刀具基本参数补充,float类型字段增加非零验证,增加相关字段必填属性。
2023-09-01 17:17:56 +08:00
qihao.gong@jikimo.com
18259c73a2
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
2023-09-01 16:57:24 +08:00
qihao.gong@jikimo.com
32b773c486
设备新增图文展示table
2023-09-01 16:57:04 +08:00
jinling.yang
699728963c
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2023-08-31 17:39:15 +08:00
jinling.yang
d66d320e7d
Merge branch 'feature/快速订单Bug修复' into develop
2023-08-31 17:38:55 +08:00
杨金灵
c56be1641e
Accept Merge Request #358 : (feature/快速订单Bug修复 -> develop)
...
Merge Request: 快速订单Bug修复
Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/358?initial=true
2023-08-31 17:38:39 +08:00
jinling.yang
7351ea675b
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/快速订单Bug修复
2023-08-31 17:37:27 +08:00
jinling.yang
e51fc8a68e
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2023-08-31 17:36:59 +08:00
jinling.yang
4ec6e7c7a4
Merge branch 'feature/产品点击库存应用没有在cloud生成动态的夹具和刀具物料Bug修复' into develop
2023-08-31 17:36:44 +08:00
杨金灵
44872d4c9f
Accept Merge Request #357 : (feature/产品点击库存应用没有在cloud生成动态的夹具和刀具物料Bug修复 -> develop)
...
Merge Request: 产品库存应用没有在cloud生成动态的夹具和刀具物料Bug修复
Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/357?initial=true
2023-08-31 17:36:32 +08:00
jinling.yang
8bf726382d
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/产品点击库存应用没有在cloud生成动态的夹具和刀具物料Bug修复
2023-08-31 17:35:05 +08:00
jinling.yang
d07098bae1
产品库存应用没有在cloud生成动态的夹具和刀具物料Bug修复
2023-08-31 17:32:42 +08:00
许何哲
c575ea51cd
Accept Merge Request #356 : (feature/sf品牌页面表格样式的修改 -> develop)
...
Merge Request: sf品牌页面表格的样式修改
Created By: @许何哲
Accepted By: @许何哲
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/356?initial=true
2023-08-31 10:18:26 +08:00
WEB许何哲\xuhez
2b22215853
sf品牌页面表格的样式修改
2023-08-31 10:16:16 +08:00
mgw
b4eb57f3df
修改原生gantt图样式(日期格式等去符合国内习惯)
2023-08-30 17:52:13 +08:00
mgw
41566a4d74
基础排程基本完成
2023-08-30 17:50:43 +08:00
jinling.yang
e64cf88809
1.加工工艺去掉form表单展示
...
2.机床型号页面优化
2023-08-30 16:26:19 +08:00
jinling.yang
2fdcd3a009
快速订单页面优化
2023-08-30 16:19:38 +08:00
jinling.yang
76af8c6f2d
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2023-08-29 17:44:03 +08:00
jinling.yang
eae06ccdd7
Merge branch 'feature/获取cnc工单Bug修复' into develop
2023-08-29 17:43:51 +08:00
杨金灵
d322754798
Accept Merge Request #355 : (feature/获取cnc工单Bug修复 -> develop)
...
Merge Request: 获取cnc工单Bug修复
Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/355?initial=true
2023-08-29 17:43:23 +08:00
jinling.yang
908e8b3ff2
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/获取cnc工单Bug修复
2023-08-29 17:41:23 +08:00
jinling.yang
e9afce298d
SF点击后获取cnc程序按钮,cloud生成的编程单的编号未显示Bug修复
2023-08-29 17:40:16 +08:00
禹翔辉
f373c69430
Accept Merge Request #354 : (feature/自建模块日志警告信息处理 -> develop)
...
Merge Request: 库存模块日志警告信息处理
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/354?initial=true
2023-08-29 17:29:26 +08:00
yuxianghui
8ece696775
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/自建模块日志警告信息处理
2023-08-29 17:28:49 +08:00
yuxianghui
5ea6158e8d
库存模块日志警告信息处理
2023-08-29 17:28:20 +08:00
龚启豪
a799793ca8
Accept Merge Request #353 : (feature/修改机床参数bug -> develop)
...
Merge Request: 修改设备table,品牌图片改成图片
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/353?initial=true
2023-08-29 15:50:08 +08:00
qihao.gong@jikimo.com
27571942c9
增肌OCC
2023-08-29 15:49:14 +08:00
qihao.gong@jikimo.com
e6a68eb1eb
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
2023-08-29 15:48:48 +08:00
qihao.gong@jikimo.com
b7f2c4a000
sf修改设备table,品牌图片改成图片
2023-08-29 15:47:58 +08:00
许何哲
3e922df2f8
Accept Merge Request #352 : (feature/必填字段label添加星号 -> develop)
...
Merge Request: sf品牌页面表格样式的修改
Created By: @许何哲
Accepted By: @许何哲
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/352?initial=true
2023-08-29 15:15:20 +08:00
WEB许何哲\xuhez
7713ade077
sf品牌页面表格样式的修改
2023-08-29 15:13:59 +08:00
禹翔辉
12ead3579e
Accept Merge Request #351 : (feature/自建模块日志警告信息处理 -> develop)
...
Merge Request: 智能工厂所有自建模块日志警告信息处理
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/351?initial=true
2023-08-29 11:22:16 +08:00
yuxianghui
be0f62ffe0
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/自建模块日志警告信息处理
...
# Conflicts:
# sf_base/models/fixture.py
# sf_manufacturing/models/model_type.py
# sf_manufacturing/models/product_template.py
# sf_sale/models/quick_easy_order.py
2023-08-29 11:21:13 +08:00
yuxianghui
5ccd754261
所有自建模块日志警告信息处理
2023-08-29 11:06:59 +08:00
杨金灵
dea565f8c6
Accept Merge Request #350 : (feature/去掉警告 -> develop)
...
Merge Request: 去掉警告
Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/350?initial=true
2023-08-29 10:31:28 +08:00
jinling.yang
6e6b0b66d3
去掉警告
2023-08-29 10:22:12 +08:00
jinling.yang
ed96f8dc0e
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2023-08-28 17:44:46 +08:00
jinling.yang
8f6bfa2a9b
Merge branch 'feature/快速订单Bug修复' into develop
2023-08-28 17:43:45 +08:00
杨金灵
d92dcbd4e6
Accept Merge Request #349 : (feature/快速订单Bug修复 -> develop)
...
Merge Request: 快速订单Bug修复
Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/349?initial=true
2023-08-28 17:43:22 +08:00
jinling.yang
c765682311
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/快速订单Bug修复
...
# Conflicts:
# web_widget_model_viewer/__manifest__.py
2023-08-28 17:41:31 +08:00
jinling.yang
fb717c22ad
1.模型为上色Bug修复(cloud代码注释引起)
...
2.创建产品和订单未成功Bug修复
2023-08-28 17:40:19 +08:00
yuxianghui
39feda07e5
自建模块日志警告信息处理
2023-08-28 17:31:41 +08:00
禹翔辉
5d30dae189
Accept Merge Request #348 : (feature/刀具管理加粗字段调整及界面布局优化 -> develop)
...
Merge Request: 刀具管理加粗字段调整, zpl_print,web_widget模块添加 'license': 'LGPL-3'
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/348?initial=true
2023-08-28 10:02:47 +08:00
yuxianghui
19b4cfd078
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具管理加粗字段调整及界面布局优化
2023-08-28 10:00:57 +08:00
yuxianghui
1e1ed20231
刀具管理加粗字段调整, zpl_print,web_widget模块添加 'license': 'LGPL-3'
2023-08-28 10:00:14 +08:00
jinling.yang
df650edefd
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2023-08-25 15:54:20 +08:00
jinling.yang
7cb94f79a0
Merge branch 'feature/产品模板优化' into develop
2023-08-25 15:51:43 +08:00
杨金灵
cd3ad6f975
Accept Merge Request #347 : (feature/产品模板优化 -> develop)
...
Merge Request: 产品模板优化
Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/347?initial=true
2023-08-25 15:51:13 +08:00
jinling.yang
425b926948
品牌Tree列表图片放在备注前面
2023-08-25 15:49:32 +08:00
jinling.yang
71ca6d27ce
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/产品模板优化
2023-08-25 15:47:16 +08:00
jinling.yang
7174de3de6
产品模板的型号手动输入时型号对象的编码,联装类型,夹具物料字段的值显示
2023-08-25 15:46:41 +08:00
龚启豪
194faf5a55
Accept Merge Request #346 : (feature/修改机床参数bug -> develop)
...
Merge Request: 维保项目可以上传多张图片的功能
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/346?initial=true
2023-08-25 11:12:46 +08:00
qihao.gong@jikimo.com
caeff1e17a
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
2023-08-25 11:10:46 +08:00
qihao.gong@jikimo.com
a9954c1231
维保计划中维保项目可以上传多张图片
2023-08-25 11:10:28 +08:00
mgw
e3f58ccee8
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/生产排程
2023-08-25 10:43:39 +08:00
mgw
7e071151a8
删除制造订单处排程相关的部分,排程模块架构改造完成
2023-08-25 10:43:22 +08:00
jinling.yang
e4af4ca0b6
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2023-08-25 10:42:09 +08:00
jinling.yang
3ef20d64ac
Merge branch 'feature/新增上传模型功能' into develop
2023-08-25 10:41:49 +08:00
杨金灵
c6a6eec5b7
Accept Merge Request #345 : (feature/新增上传模型功能 -> develop)
...
Merge Request: 新增上传模型(快速订单)功能
Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/345?initial=true
2023-08-25 10:41:20 +08:00
jinling.yang
5de04449e4
对模型进行上色和特征识别及自动报价
2023-08-25 10:39:31 +08:00
mgw
eda57036bd
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/生产排程
2023-08-25 09:14:34 +08:00
mgw
e33a25e47a
更改排程结构前备份
2023-08-25 09:14:15 +08:00
jinling.yang
e7d32e5041
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增上传模型功能
2023-08-24 17:32:59 +08:00
jinling.yang
55504c2725
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增上传模型功能
2023-08-24 17:32:25 +08:00
龚启豪
9318be0f09
Accept Merge Request #344 : (feature/修改机床参数bug -> develop)
...
Merge Request: 修改工作中心看板,设备清单看板
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/344?initial=true
2023-08-24 15:01:56 +08:00
qihao.gong@jikimo.com
f31a6d0d43
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
...
# Conflicts:
# sf_maintenance/views/maintenance_views.xml
2023-08-24 15:00:41 +08:00
qihao.gong@jikimo.com
3b3847990d
工作重心看板展示设备状态以及图片,设备看板增加负责人
2023-08-24 14:51:03 +08:00
mgw
c699cdff0a
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/生产排程
2023-08-24 11:36:30 +08:00
许何哲
bbfb29f60b
Accept Merge Request #343 : (feature/必填字段label添加星号 -> develop)
...
Merge Request: 修改文字颜色
Created By: @许何哲
Accepted By: @许何哲
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/343?initial=true
2023-08-24 11:35:01 +08:00
WEB许何哲\xuhez
28a50a1d94
Merge branch 'develop' into feature/必填字段label添加星号
2023-08-24 11:33:48 +08:00
WEB许何哲\xuhez
623d89bf31
修改文字颜色
2023-08-24 11:33:24 +08:00
mgw
7a4dd55fa4
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/生产排程
2023-08-24 11:24:48 +08:00
mgw
bf7ef78b20
搭建排程基础架构
2023-08-24 11:24:27 +08:00
许何哲
bcb05cb2e2
Accept Merge Request #342 : (feature/必填字段label添加星号 -> develop)
...
Merge Request: 3d模型无法展示的时候用文字替换
Created By: @许何哲
Accepted By: @许何哲
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/342?initial=true
2023-08-24 11:10:06 +08:00
WEB许何哲\xuhez
9c52e23e44
Merge branch 'develop' into feature/必填字段label添加星号
2023-08-24 11:09:07 +08:00
WEB许何哲\xuhez
1c50e11a43
3d模型无法展示的时候用文字替换
2023-08-24 11:07:54 +08:00
许何哲
a2f5dbd70d
Accept Merge Request #341 : (feature/必填字段label添加星号 -> develop)
...
Merge Request: 修改看板样式
Created By: @许何哲
Accepted By: @许何哲
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/341?initial=true
2023-08-24 09:04:02 +08:00
WEB许何哲\xuhez
0f283c1eda
Merge branch 'develop' into feature/必填字段label添加星号
2023-08-24 09:03:20 +08:00
WEB许何哲\xuhez
f67c8169bf
修改看板样式
2023-08-24 09:02:15 +08:00
jinling.yang
f9e4b73fb0
新增上传模型功能
2023-08-23 17:34:06 +08:00
禹翔辉
e31858c9d7
Accept Merge Request #340 : (feature/刀具管理加粗字段调整及界面布局优化 -> develop)
...
Merge Request: 刀具管理模块中的所有模型界面的加粗字段都改为name字段;优化了刀具物料查询界面布局。
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/340?initial=true
2023-08-23 17:33:34 +08:00
yuxianghui
4f70f7ef70
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具管理加粗字段调整及界面布局优化
2023-08-23 17:32:58 +08:00
yuxianghui
11a06df0a4
刀具管理模块中的所有模型界面的加粗字段都改为name字段;优化了刀具物料查询界面布局。
2023-08-23 17:32:22 +08:00
马广威
da8caf42f5
Accept Merge Request #339 : (feature/生产排程 -> develop)
...
Merge Request: 更新3D模型展示代码
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/339?initial=true
2023-08-23 15:48:04 +08:00
mgw
0b30408aae
更新3D模型展示代码
2023-08-23 15:47:17 +08:00
龚启豪
e2f5ce42e6
Accept Merge Request #338 : (feature/修改机床参数bug -> develop)
...
Merge Request: 刀把类型新增bt50 处理品牌图片同步报错问题
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/338?initial=true
2023-08-23 14:40:10 +08:00
qihao.gong@jikimo.com
90868d4a09
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
2023-08-23 14:37:20 +08:00
qihao.gong@jikimo.com
b01a5a4216
刀把类型新增bt50 修改同步品牌图片报错问题
2023-08-23 14:37:02 +08:00
jinling.yang
c27bfb5990
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2023-08-23 10:31:21 +08:00
jinling.yang
589f99db1a
Merge branch 'feature/同步夹具型号Bug修复' into develop
2023-08-23 10:31:01 +08:00
杨金灵
7d0e35a9f4
Accept Merge Request #337 : (feature/同步夹具型号Bug修复 -> develop)
...
Merge Request: 夹具型号同步修复和页面名称加大醒目
Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/337?initial=true
2023-08-23 10:30:43 +08:00
jinling.yang
a64d24d8ff
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/同步夹具型号Bug修复
2023-08-23 10:29:09 +08:00
jinling.yang
2ae7b2c8ec
页面名称加大醒目
2023-08-23 10:28:54 +08:00
jinling.yang
cd33fb9fb9
夹具型号同步修复
2023-08-23 10:09:47 +08:00
禹翔辉
1176aee38b
Accept Merge Request #336 : (feature/产线设备资源设置模块优化 -> develop)
...
Merge Request: 计划管理-基础设置内模型的界面布局和字段优化
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/336?initial=true
2023-08-22 11:43:15 +08:00
yuxianghui
e781bce27e
1、优化了产线设备资源设置和工作日历设置界面布局;删除工作日历、班次、休息日模型的form视图,新增tree视图修改功能;2、修复产线设备资源设置的设备信息显示问题,修改了机台号字段名称;3、新增工作日历设置班次字段必填;4、调整产线设备资源设置和工作日历设置菜单位置
2023-08-22 11:40:35 +08:00
qihao.gong@jikimo.com
10292df48d
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
2023-08-21 17:23:26 +08:00
qihao.gong@jikimo.com
76293f5cca
修改维保table
2023-08-21 17:22:53 +08:00
马广威
16de3e40df
Accept Merge Request #335 : (feature/cnc工单处增加下载按钮 -> develop)
...
Merge Request: cnc工单处增加NC文件下载的功能已完成
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/335?initial=true
2023-08-21 17:22:10 +08:00
mgw
642007d29b
cnc工单处增加NC文件下载的功能已完成
2023-08-21 17:20:52 +08:00
龚启豪
3c281230cc
Accept Merge Request #334 : (feature/修改机床参数bug -> develop)
...
Merge Request: 修改设备看板
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/334
2023-08-21 15:42:12 +08:00
qihao.gong@jikimo.com
a5a9ae150f
修改设备看板
2023-08-21 15:41:40 +08:00
jinling.yang
c2e2de4ab5
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2023-08-21 15:37:34 +08:00
jinling.yang
e49e3b6981
Merge branch 'feature/页面布局' into develop
2023-08-21 15:37:20 +08:00
杨金灵
1b3c929fa7
Accept Merge Request #333 : (feature/页面布局 -> develop)
...
Merge Request: 去掉厂家型号字段
Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/333?initial=true
2023-08-21 15:37:03 +08:00
jinling.yang
fb8ca5f145
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/页面布局
2023-08-21 15:35:50 +08:00
jinling.yang
dfc5c206fd
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2023-08-21 11:51:32 +08:00
jinling.yang
3ab0fcb337
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/页面布局
2023-08-21 11:50:36 +08:00
jinling.yang
f6841e5e9f
同步材料型号及优化材料型号页面及新增拉伸强度,硬度,粗加工,精加工
2023-08-21 11:49:24 +08:00
龚启豪
2cb84c5f55
Accept Merge Request #332 : (feature/修改机床参数bug -> develop)
...
Merge Request: 设备改成维保
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/332?initial=true
2023-08-21 10:28:46 +08:00
qihao.gong@jikimo.com
ff60824291
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
2023-08-21 10:28:12 +08:00
qihao.gong@jikimo.com
82322b5024
修改设备table和跳转到维保 设备改为维保
2023-08-21 10:27:50 +08:00
jinling.yang
bfa51d378c
Merge branch 'feature/制造基础数据删除按钮放开' into develop
2023-08-21 10:25:13 +08:00
禹翔辉
78ddf4e52f
Accept Merge Request #331 : (feature/功能刀具优化 -> develop)
...
Merge Request: 功能刀具优化
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/331?initial=true
2023-08-21 10:21:25 +08:00
yuxianghui
8a50a10b23
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/功能刀具优化
2023-08-21 10:19:09 +08:00
杨金灵
80f7da7979
Accept Merge Request #330 : (feature/制造基础数据删除按钮放开 -> develop)
...
Merge Request: 制造基础数据删除按钮放开
Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/330?initial=true
2023-08-21 10:18:17 +08:00
jinling.yang
eec6dce4fc
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造基础数据删除按钮放开
2023-08-21 10:16:47 +08:00
jinling.yang
cd671bdc88
1.删除按钮放开
...
2.刀具类型同步代码还原
2023-08-21 10:16:30 +08:00
yuxianghui
0fa2656aad
优化功能刀具的刀具物料字段
2023-08-21 10:11:54 +08:00
许何哲
109da940ba
Accept Merge Request #329 : (feature/必填字段label添加星号 -> develop)
...
Merge Request: 修改制造订单页面样式bug
Created By: @许何哲
Accepted By: @许何哲
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/329?initial=true
2023-08-21 10:10:45 +08:00
WEB许何哲\xuhez
64143798e0
Merge branch 'develop' into feature/必填字段label添加星号
2023-08-21 10:09:42 +08:00
WEB许何哲\xuhez
d8489a5f07
制造订单页面样式bug修改
2023-08-21 10:08:55 +08:00
禹翔辉
8ae4d0dce8
Accept Merge Request #328 : (feature/生产线优化 -> develop)
...
Merge Request: 生产线新增关联工作中心字段,优化看板和form视图布局
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/328?initial=true
2023-08-18 15:14:41 +08:00
yuxianghui
f88dd790a0
生产线新增关联工作中心字段,优化看板和form视图布局
2023-08-18 15:11:36 +08:00
龚启豪
baea2d2a3e
Accept Merge Request #327 : (feature/修改机床参数bug -> develop)
...
Merge Request: 品牌备注增加
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/327?initial=true
2023-08-18 14:39:39 +08:00
qihao.gong@jikimo.com
43d6794151
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
...
# Conflicts:
# sf_base/views/base_view.xml
# sf_mrs_connect/models/sync_common.py
2023-08-18 14:34:37 +08:00
qihao.gong@jikimo.com
c924426725
品牌备注
2023-08-18 14:31:28 +08:00
杨金灵
607eac90c6
Accept Merge Request #326 : (feature/刀具物料与夹具物料的反注册 -> develop)
...
Merge Request: 刀具及夹具物料反注册
Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/326?initial=true
2023-08-18 11:41:23 +08:00
jinling.yang
06b1e30670
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具物料与夹具物料的反注册
2023-08-18 11:38:02 +08:00
jinling.yang
5644ee2670
刀具页面优化
2023-08-18 11:37:30 +08:00
许何哲
6fccd63916
Accept Merge Request #325 : (feature/必填字段label添加星号 -> develop)
...
Merge Request: 修改样式bug
Created By: @许何哲
Accepted By: @许何哲
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/325?initial=true
2023-08-18 11:04:40 +08:00
WEB许何哲\xuhez
bed385d025
Merge branch 'develop' into feature/必填字段label添加星号
2023-08-18 11:02:46 +08:00
WEB许何哲\xuhez
77b1ef2d91
消息发送界面的样式bug修改
2023-08-18 11:01:30 +08:00
jinling.yang
3cef87ea46
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具物料与夹具物料的反注册
...
# Conflicts:
# sf_base/views/base_view.xml
# sf_base/views/common_view.xml
# sf_tool_management/models/base.py
2023-08-17 18:09:19 +08:00
jinling.yang
97fcf6d91f
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具物料与夹具物料的反注册
...
# Conflicts:
# sf_base/views/base_view.xml
2023-08-17 18:03:12 +08:00
龚启豪
ae07a515b7
Accept Merge Request #324 : (feature/修改机床参数bug -> develop)
...
Merge Request: 移除托盘对象,并清除关联方法,关联关系等
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/324?initial=true
2023-08-17 16:35:07 +08:00
qihao.gong@jikimo.com
422698ce34
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
2023-08-17 16:34:09 +08:00
qihao.gong@jikimo.com
08ac2978a1
移除托盘对象 并清除所有关联关系
2023-08-17 16:33:40 +08:00
禹翔辉
92a9894757
Accept Merge Request #323 : (feature/品牌增加按类别显示的搜索面板 -> develop)
...
Merge Request: 品牌增加按类别显示的搜索面板
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/323?initial=true
2023-08-17 15:28:25 +08:00
yuxianghui
093b0e63ce
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/品牌增加按类别显示的搜索面板
2023-08-17 15:26:28 +08:00
yuxianghui
07564248d2
品牌增加按类别显示的搜索面板
2023-08-17 15:25:53 +08:00
龚启豪
908d247f98
Accept Merge Request #322 : (feature/修改机床参数bug -> develop)
...
Merge Request: 设备看板优化以及表单视图修改
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/322?initial=true
2023-08-17 11:58:38 +08:00
qihao.gong@jikimo.com
6193fa3c09
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
2023-08-17 11:48:54 +08:00
禹翔辉
5c1ba207b6
Accept Merge Request #321 : (feature/刀具管理界面布局优化 -> develop)
...
Merge Request: 刀具管理下除刀具物料外的界面布局及字段的优化
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/321?initial=true
2023-08-17 11:22:24 +08:00
yuxianghui
21bfad2f95
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具管理界面布局优化
2023-08-17 11:20:31 +08:00
yuxianghui
8b88f31672
刀具管理下除刀具物料外的界面布局及字段的优化
2023-08-17 11:19:59 +08:00
qihao.gong@jikimo.com
28fcf5c4fa
优化机场看板以及机床表单
2023-08-17 11:11:47 +08:00
qihao.gong@jikimo.com
f5653ce1dd
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
...
# Conflicts:
# sf_base/static/src/scss/test.scss
2023-08-17 10:13:19 +08:00
许何哲
23b11fce15
Accept Merge Request #320 : (feature/必填字段label添加星号 -> develop)
...
Merge Request: 修復bug
Created By: @许何哲
Accepted By: @许何哲
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/320?initial=true
2023-08-17 10:09:42 +08:00
WEB许何哲\xuhez
facd5d23d7
修复了样式调整后a标签文字变蓝的bug
2023-08-17 10:06:59 +08:00
qihao.gong@jikimo.com
a8c817d704
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
2023-08-16 17:30:40 +08:00
qihao.gong@jikimo.com
cd0f455db3
修改设备模块看板
2023-08-16 17:30:30 +08:00
qihao.gong@jikimo.com
fac3450257
设备基础参数
2023-08-16 15:00:03 +08:00
qihao.gong@jikimo.com
fcf5963079
修改设备清单看板
2023-08-16 11:56:41 +08:00
WEB许何哲\xuhez
2f732e41ed
Merge remote-tracking branch 'origin/develop' into feature/必填字段label添加星号
2023-08-16 11:23:46 +08:00
WEB许何哲\xuhez
1747f38bca
必填字段label添加星号
2023-08-16 11:22:50 +08:00
禹翔辉
d17cfc7793
Accept Merge Request #319 : (feature/制造工单界面布局优化 -> develop)
...
Merge Request: 将记录的讨论和评论窗口从form视图右侧移动到视图最下方。
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/319?initial=true
2023-08-16 11:03:05 +08:00
yuxianghui
ddce0ab436
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造工单界面布局优化
2023-08-16 11:01:11 +08:00
yuxianghui
9d025c10b4
将记录的讨论和评论窗口从form视图右侧移动到视图最下方。
2023-08-16 11:00:34 +08:00
马广威
928257f125
Accept Merge Request #318 : (feature/坯料排程 -> develop)
...
Merge Request: 修改生产线驾驶舱形式为searchpanel,贴近整体布局
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/318?initial=true
2023-08-16 10:14:48 +08:00
mgw
2169c10417
修改生产线驾驶舱形式为searchpanel,贴近整体布局
2023-08-16 10:11:40 +08:00
mgw
ab61902deb
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/坯料排程
2023-08-16 09:43:29 +08:00
mgw
06ed10bd5e
优化界面展示
2023-08-16 09:42:51 +08:00
许何哲
4e2bf6534a
Accept Merge Request #317 : (feature/tree视图表格样式修改 -> develop)
...
Merge Request: 完成tree视图样式修改
Created By: @许何哲
Accepted By: @许何哲
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/317?initial=true
2023-08-16 09:28:58 +08:00
WEB许何哲\xuhez
b780b50a42
Merge branch 'develop' into feature/tree视图表格样式修改
2023-08-16 09:26:19 +08:00
WEB许何哲\xuhez
f4428fde9f
gantt图样式修改
2023-08-16 09:25:13 +08:00
龚启豪
42066865be
Accept Merge Request #316 : (feature/修改机床参数bug -> develop)
...
Merge Request: 修改机床型号参数缺陷
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/316?initial=true
2023-08-15 17:32:13 +08:00
jinling.yang
8a99bd8589
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具物料与夹具物料的反注册
2023-08-15 17:31:49 +08:00
qihao.gong@jikimo.com
e0f43fa9fe
修改机床型号参数缺陷
2023-08-15 17:31:27 +08:00
qihao.gong@jikimo.com
0ecd4e4c3b
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2023-08-15 14:27:03 +08:00
qihao.gong@jikimo.com
a79a3ef64f
Merge branch 'feature/修改设备模块' into develop
2023-08-15 14:26:47 +08:00
龚启豪
5b64664bbb
Accept Merge Request #315 : (feature/修改设备模块 -> develop)
...
Merge Request: 修改控制系统同步接口
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/315?initial=true
2023-08-15 14:26:34 +08:00
qihao.gong@jikimo.com
0f5e5d6ebe
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改设备模块
2023-08-15 14:23:23 +08:00
qihao.gong@jikimo.com
abddb82f94
修改数控系统同步参数
2023-08-15 14:21:41 +08:00
龚启豪
9856bb65fb
Accept Merge Request #314 : (feature/修改设备模块 -> develop)
...
Merge Request: 新增主生产计划模块
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/314?initial=true
2023-08-15 10:36:38 +08:00
qihao.gong@jikimo.com
1533ef7be9
新增主生产计划模块
2023-08-15 10:36:04 +08:00
马广威
4a5fb0c6e4
Accept Merge Request #313 : (feature/坯料排程 -> develop)
...
Merge Request: 解决翻译问题
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/313?initial=true
2023-08-14 10:25:05 +08:00
mgw
ea958ed489
解决翻译问题
2023-08-14 10:24:39 +08:00
马广威
5556274d8b
Accept Merge Request #312 : (feature/坯料排程优化 -> develop)
...
Merge Request: 临时解决看板报错的问题
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/312?initial=true
2023-08-14 08:53:53 +08:00
mgw
d3e6315269
临时解决看板报错的问题
2023-08-14 08:52:51 +08:00
龚启豪
9c7d27f860
Accept Merge Request #311 : (feature/修改设备模块 -> develop)
...
Merge Request: 处理控制系统参数缺失 以及name同步不全问题
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/311?initial=true
2023-08-11 17:08:33 +08:00
qihao.gong@jikimo.com
9e90c98454
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改设备模块
2023-08-11 17:07:13 +08:00
qihao.gong@jikimo.com
ce3ffb75ae
处理控制系统参数丢失问题
2023-08-11 17:06:57 +08:00
禹翔辉
b83a3cc185
Accept Merge Request #310 : (feature/刀具管理缺陷优化 -> develop)
...
Merge Request: 新增出入库记录对象,功能刀具出入库记录对象多对一关联出入库记录对象,优化功能刀具出入库布局;新增功能刀具列表、刀具物料查询的分组展示全部信息;对刀具物料查询对象的字段根据所选的刀具物料不同展示不同的刀具物料信息字段
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/310?initial=true
2023-08-11 17:05:32 +08:00
yuxianghui
d103a1cd29
新增出入库记录对象,功能刀具出入库记录对象多对一关联出入库记录对象,优化功能刀具出入库布局;新增功能刀具列表、刀具物料查询的分组展示全部信息;对刀具物料查询对象的字段根据所选的刀具物料不同展示不同的刀具物料信息字段
2023-08-11 17:04:08 +08:00
qihao.gong@jikimo.com
150c40f9b1
处理数控系统同步数据 name缺失问题
2023-08-11 16:55:50 +08:00
马广威
4d650a9aca
Accept Merge Request #309 : (feature/坯料排程 -> develop)
...
Merge Request: char字段聚焦全选功能已完成,坯料排程基本功能已完成
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/309?initial=true
2023-08-11 12:28:28 +08:00
mgw
9b239dbcb2
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/坯料排程
2023-08-11 12:24:35 +08:00
mgw
68805fee4a
char字段聚焦全选功能已完成
2023-08-11 12:22:59 +08:00
mgw
fc490f1612
坯料排程基本功能完成
2023-08-11 12:18:47 +08:00
龚启豪
e6a496d062
Accept Merge Request #308 : (feature/修改设备模块 -> develop)
...
Merge Request: 处理同步报错bug
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/308?initial=true
2023-08-11 10:28:14 +08:00
qihao.gong@jikimo.com
fb2cc0e504
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改设备模块
2023-08-11 10:26:35 +08:00
qihao.gong@jikimo.com
94efe4e7ca
处理同步报错
2023-08-11 10:26:15 +08:00
WEB许何哲\xuhez
8a736775d8
Merge branch 'develop' into feature/tree视图表格样式修改
2023-08-11 10:19:47 +08:00
WEB许何哲\xuhez
4b34335963
看板视图样式还原
2023-08-11 10:19:00 +08:00
禹翔辉
6116434399
Accept Merge Request #307 : (feature/刀具管理缺陷优化 -> develop)
...
Merge Request: 刀具管理测试的缺陷优化
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/307?initial=true
2023-08-10 17:15:42 +08:00
yuxianghui
eccc4c3ade
新增功能刀具组装对象组装新刀具时创建功能刀具预警、功能刀具实时分布、功能刀具出入库记录的记录;新增新刀具取消组装时删除功能刀具预警、功能刀具实时分布、功能刀具出入库记录的记录;新增同步功能刀具列表数据到功能刀具预警、功能刀具实时分布、功能刀具出入库记录对象;新增同步功能刀具组装数据到功能刀具预警对象;新增功能刀具出入库记录和功能刀具实时分布对象分组展示全部功能刀具类型。
2023-08-10 16:41:41 +08:00
禹翔辉
a764f42d23
Accept Merge Request #306 : (feature/刀具管理问题优化 -> develop)
...
Merge Request: 优化了刀具管理模块的功能刀具组装、CAM工单程序用刀计划、机床换刀申请模型的问题。
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/306?initial=true
2023-08-09 15:04:02 +08:00
yuxianghui
650a29b74f
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具管理问题优化
2023-08-09 15:01:39 +08:00
yuxianghui
1e1b0dd359
新增功能刀具组装界面和CAM工单程序用刀计划界面、机床换刀申请界面相互跳转功能按钮;功能刀具预警新增展示分组展示全部CNC机床,功能刀具实时分布修改数量相关字段类型为Integer,并新增自动计算合计数和总数功能
2023-08-09 15:00:59 +08:00
龚启豪
8d126a0024
Accept Merge Request #305 : (feature/修改设备模块 -> develop)
...
Merge Request: 修改路线多规则条件选取
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/305?initial=true
2023-08-09 10:00:17 +08:00
qihao.gong@jikimo.com
06d73a815f
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改设备模块
2023-08-09 09:59:11 +08:00
qihao.gong@jikimo.com
386b5eb11c
修改采购入库路线多规则条件选取
2023-08-09 09:58:51 +08:00
jinling.yang
9fe58a1fba
刀具型号页面布局
2023-08-08 18:17:49 +08:00
yuxianghui
924b838a83
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具管理问题优化
2023-08-08 18:09:49 +08:00
yuxianghui
b2012c004a
新增刀具管理按键使用提示,调整相关按键布局;新增机床换刀申请、CAM装刀申请界面、功能刀具组装界面的tree视图左侧分组显示全部信息;优化三个界面相关字段;新增功能刀具组装界面刀具物料信息无数据隐藏,功能刀具组装申请组装界面刀具物料信息根据不同情况隐藏;新增功能刀具组装的刀具物料字段根据所选型号自动带出。
2023-08-08 18:08:53 +08:00
jinling.yang
e638245b8a
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具物料与夹具物料的反注册
...
# Conflicts:
# sf_mrs_connect/models/res_config_setting.py
2023-08-08 17:18:06 +08:00
许何哲
be53b012f1
Accept Merge Request #304 : (feature/tree视图表格样式修改 -> develop)
...
Merge Request: 调试线上sf的bug
Created By: @许何哲
Accepted By: @许何哲
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/304?initial=true
2023-08-08 14:45:47 +08:00
WEB许何哲\xuhez
35ef00a8cd
Merge branch 'develop' into feature/tree视图表格样式修改
2023-08-08 14:43:48 +08:00
WEB许何哲\xuhez
0e292ea597
调试线上sf的bug
2023-08-08 14:42:10 +08:00
jinling.yang
b3f2065edd
夹具物料注册
2023-08-07 17:29:17 +08:00
许何哲
7fb585dfdd
Accept Merge Request #303 : (feature/tree视图表格样式修改 -> develop)
...
Merge Request: 标签页筛选完后看板视图的样式修改
Created By: @许何哲
Accepted By: @许何哲
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/303?initial=true
2023-08-07 16:58:41 +08:00
WEB许何哲\xuhez
194bb28085
Merge branch 'develop' into feature/tree视图表格样式修改
2023-08-07 16:51:09 +08:00
WEB许何哲\xuhez
46f40ec480
修改标签页筛选完后看板视图的样式
2023-08-07 16:49:36 +08:00
龚启豪
a99fe44408
Accept Merge Request #302 : (feature/修改设备模块 -> develop)
...
Merge Request: 修改设备基础参数以及同步方法
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/302?initial=true
2023-08-07 16:06:08 +08:00
qihao.gong@jikimo.com
432920b100
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改设备模块
2023-08-07 16:03:13 +08:00
qihao.gong@jikimo.com
f0e1939b95
修改设备参数以及机床型号基础参数以及同步cloud方法
2023-08-07 16:00:26 +08:00
WEB许何哲\xuhez
f85a0e4c85
删除searchPannel
2023-08-07 15:06:35 +08:00
WEB许何哲\xuhez
578d9c46d9
Merge branch 'develop' into feature/tree视图表格样式修改
...
# Conflicts:
# sf_manufacturing/static/src/js/kanban_change.js
# sf_manufacturing/static/src/scss/kanban_change.scss
# sf_manufacturing/views/mrp_workcenter_views.xml
2023-08-07 14:51:55 +08:00
WEB许何哲\xuhez
5a28ec7579
工作中心看板视图标签页的动态添加并实现点击筛选
2023-08-07 14:48:55 +08:00
马广威
d971cbd5f1
Accept Merge Request #301 : (feature/坯料排程 -> develop)
...
Merge Request: 看板视图一句标签进行筛选基础功能已完成
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/301?initial=true
2023-08-07 14:39:48 +08:00
mgw
72a0be3a54
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/坯料排程
2023-08-07 14:38:18 +08:00
mgw
5f04cbb896
看板视图css调整(老许做的)
2023-08-07 14:37:58 +08:00
mgw
4f893929ca
工作中心看板视图动态添加标签页并可初步进行点击晒选
2023-08-07 10:50:44 +08:00
mgw
de32f5db78
看板视图筛选实现功能的条件已具备(看板已抠,字段存在),待优化
2023-08-07 08:58:50 +08:00
jinling.yang
aa7e39c28a
新增采购入库时实时注册夹具产品到cloud
2023-08-04 17:33:21 +08:00
qihao.gong@jikimo.com
0838ff417f
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改设备模块
2023-08-04 17:32:09 +08:00
qihao.gong@jikimo.com
2321304e2a
修改设备
2023-08-04 17:31:47 +08:00
禹翔辉
1910b461f3
Accept Merge Request #300 : (feature/刀具管理 -> develop)
...
Merge Request: 优化了功能刀具组装对象组装和取消组装时功能刀具列表的many2many类型字段赋值为[]时值不修改的问题
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/300?initial=true
2023-08-04 16:54:36 +08:00
yuxianghui
2a1b39b0fb
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具管理
2023-08-04 16:24:43 +08:00
yuxianghui
cd042a8073
优化了功能刀具组装对象组装和取消组装时功能刀具列表的many2many类型字段赋值为[]时值不修改的问题
2023-08-04 16:24:12 +08:00
禹翔辉
c75e1b3c19
Accept Merge Request #299 : (feature/刀具管理 -> develop)
...
Merge Request: 优化了功能刀具组装出库bug,优化了功能刀具组装对象组装旧刀具时的bug
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/299?initial=true
2023-08-04 10:43:02 +08:00
yuxianghui
7f6ea605d2
优化了功能刀具组装出库bug,优化了功能刀具组装对象组装旧刀具时的bug
2023-08-04 10:40:35 +08:00
yuxianghui
9203f13161
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具管理
2023-08-04 09:20:31 +08:00
许何哲
cb011a9bd7
Accept Merge Request #298 : (feature/tree视图表格样式修改 -> develop)
...
Merge Request: sf工作中心看板视图标签页的动态添加
Created By: @许何哲
Accepted By: @许何哲
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/298?initial=true
2023-08-03 17:36:29 +08:00
WEB许何哲\xuhez
da7184d841
Merge branch 'develop' into feature/tree视图表格样式修改
...
# Conflicts:
# sf_manufacturing/static/src/xml/kanban_change.xml
2023-08-03 17:34:54 +08:00
WEB许何哲\xuhez
921336ad13
no message
2023-08-03 17:32:43 +08:00
WEB许何哲\xuhez
17476fdcf4
工作中心看板视图动态添加标签页
2023-08-03 17:31:11 +08:00
yuxianghui
fe310de31d
新增功能刀具列表缓存对象,新增组装旧刀是创建缓存数据,新增取消组装时清除缓存数据
2023-08-03 17:29:26 +08:00
马广威
d0fab40b03
Accept Merge Request #297 : (feature/odoo16前端rpc拿取后端生产线数据 -> develop)
...
Merge Request: 实现基础的rpc拿取后端生产线数据功能
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/297?initial=true
2023-08-03 17:25:06 +08:00
mgw
810ef41c05
实现基础的rpc拿取后端生产线数据功能
2023-08-03 17:24:37 +08:00
杨金灵
30ad60c2c1
Accept Merge Request #296 : (feature/夹具型号和功能夹具反向注册到cloud -> develop)
...
Merge Request: 制造模块里的配置内的页面优化
Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/296?initial=true
2023-08-03 16:57:56 +08:00
jinling.yang
5df00e14da
制造模块里的配置内的页面优化
2023-08-03 16:57:18 +08:00
jinling.yang
1929fb1b57
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/夹具型号和功能夹具反向注册到cloud
2023-08-03 15:58:18 +08:00
jinling.yang
06bb0f77c9
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/夹具型号和功能夹具反向注册到cloud
2023-08-03 15:57:38 +08:00
yuxianghui
aed5ac4c3d
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具管理
2023-08-03 14:31:46 +08:00
yuxianghui
03cc5b2281
新增功能刀具组装对象取消组装时删除组装时所创建的功能刀具列表信息,删除了功能刀具组装对象组装时创建功能刀具预警、实时分布、出入库记录信息的功能。
2023-08-03 14:31:16 +08:00
马广威
8c963be133
Accept Merge Request #295 : (feature/odoo16翻译研究 -> develop)
...
Merge Request: 优化未生效翻译
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/295?initial=true
2023-08-03 13:06:19 +08:00
mgw
1afd164712
优化未生效翻译
2023-08-03 13:05:49 +08:00
马广威
0eedca58e9
Accept Merge Request #294 : (feature/odoo16翻译研究 -> develop)
...
Merge Request: 新增翻译问题解决
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/294?initial=true
2023-08-03 11:58:53 +08:00
mgw
95c57a3ffb
新增翻译问题解决
2023-08-03 11:55:46 +08:00
马广威
48d673a48e
Accept Merge Request #293 : (feature/odoo16翻译研究 -> develop)
...
Merge Request: 制造订单处字段调整完成,翻译优化完成
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/293?initial=true
2023-08-02 18:04:16 +08:00
mgw
3f3a72a905
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/odoo16翻译研究
2023-08-02 18:03:41 +08:00
mgw
3c934e3a4b
制造订单处字段调整完成,翻译优化完成
2023-08-02 18:01:28 +08:00
jinling.yang
24afa53028
新增功能夹具接口
2023-08-02 17:35:09 +08:00
禹翔辉
5c2a9f62dc
Accept Merge Request #292 : (feature/刀具管理 -> develop)
...
Merge Request: 优化了刀具管理-功能刀具组装的刀具物料字段,新增功能刀具组装完成时新建功能刀具列表、预警、实时分布、出入库记录数据功能
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/292?initial=true
2023-08-02 17:30:45 +08:00
yuxianghui
57de3f9456
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具管理
2023-08-02 17:29:31 +08:00
yuxianghui
6c001b6950
优化了刀具管理-功能刀具组装的刀具物料字段,新增功能刀具组装完成时新建功能刀具列表、预警、实时分布、出入库记录数据功能
2023-08-02 17:29:02 +08:00
马广威
f940d1bf24
Accept Merge Request #291 : (feature/odoo16翻译研究 -> develop)
...
Merge Request: 补充部分未生效翻译
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/291?initial=true
2023-08-02 10:18:11 +08:00
mgw
aaeab9a241
补充部分未生效翻译
2023-08-02 10:17:00 +08:00
mgw
109674bdb5
修改 概述 为 生产线驾驶舱
2023-08-02 10:10:38 +08:00
马广威
49e0c64dfd
Accept Merge Request #290 : (feature/odoo16翻译研究 -> develop)
...
Merge Request: 修改设备处翻译
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/290?initial=true
2023-08-02 10:00:08 +08:00
mgw
f71c437b46
修改设备处翻译
2023-08-02 09:59:13 +08:00
马广威
26a6d01654
Accept Merge Request #289 : (feature/odoo16翻译研究 -> develop)
...
Merge Request: odoo16质量模块翻译本地测试完成
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/289?initial=true
2023-08-02 09:33:41 +08:00
mgw
1670b3fd78
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/odoo16翻译研究
2023-08-02 09:31:56 +08:00
mgw
d7729028cf
质量模块的改造已完成,本地已测试
2023-08-02 09:31:06 +08:00
yuxianghui
858acf053e
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具管理
2023-08-01 17:41:54 +08:00
yuxianghui
d574925122
1、刀具管理-机床换刀申请、CAM工单程序用刀计划、功能刀具组装增加了机床、功能刀具和功能刀具类型字段的关联关系,增加了tree视图功能按键 2、优化了CAM工单程序用刀计划的按键功能 3、对三个对象的字段的可读性进行了调整
2023-08-01 17:41:21 +08:00
jinling.yang
5c2e7c80da
1.产品模板优化:增加产品类别的搜索面板
...
2.夹具型号注册到cloud:夹具型号的Tree和form视图去掉不可增删改操作,页面新增时编码根据夹具物料回显不同的编码;新增注册按钮及对应的注册接口
3.功能夹具注册到cloud:.功能夹具的Tree和form视图去掉不可增删改操作,页面新增时编码和名称根据功能夹具类型和对应的托盘型号所进行回显
2023-08-01 17:39:40 +08:00
mgw
6abafcaf68
设备处翻译优化完成
2023-08-01 17:15:30 +08:00
杨金灵
f6e50161c6
Accept Merge Request #288 : (feature/产品增加搜索面板 -> develop)
...
Merge Request: 产品新增搜索面板
Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/288?initial=true
2023-08-01 15:09:23 +08:00
jinling.yang
7c8e470199
产品新增搜索面板
2023-08-01 15:08:32 +08:00
马广威
a4f511b47b
Accept Merge Request #287 : (feature/odoo16翻译研究 -> develop)
...
Merge Request: 测试制造模块的翻译效果
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/287?initial=true
2023-08-01 10:17:44 +08:00
mgw
84aeb0d8eb
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/odoo16翻译研究
2023-08-01 10:17:08 +08:00
mgw
501756d4e7
测试制造模块更改后的翻译,本地已生效
2023-08-01 10:16:47 +08:00
龚启豪
06630fb85e
Accept Merge Request #286 : (feature/修改设备模块 -> develop)
...
Merge Request: 修改设备模块bug
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/286?initial=true
2023-07-28 15:46:37 +08:00
qihao.gong@jikimo.com
10fde2b175
Merge branch 'feature/修改设备基础参数' into develop
2023-07-28 15:33:55 +08:00
qihao.gong@jikimo.com
06de46c084
修改设备模块
2023-07-28 15:33:31 +08:00
qihao.gong@jikimo.com
2b69524c57
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改设备基础参数
2023-07-28 15:32:37 +08:00
杨金灵
7eca8110cf
Accept Merge Request #285 : (feature/同步的相关模型页面优化 -> develop)
...
Merge Request: 同步的模型的页面不可增删改
Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/285?initial=true
2023-07-27 15:47:01 +08:00
jinling.yang
47b2e8c709
1.同步的模型的页面不可增删改
...
2.工单的物料里新增长宽高字段
2023-07-27 15:45:45 +08:00
马广威
6380e1ad0a
Accept Merge Request #284 : (feature/库存扫码研究 -> develop)
...
Merge Request: 修改位置占用bug
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/284?initial=true
2023-07-27 09:23:49 +08:00
mgw
0e2973f01e
修改位置占用bug
2023-07-27 09:21:24 +08:00
jinling.yang
d7a7256929
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2023-07-26 18:57:56 +08:00
jinling.yang
eebc4f7a63
Merge branch 'feature/Bug修复' into develop
2023-07-26 18:55:24 +08:00
杨金灵
0f3f27ff26
Accept Merge Request #283 : (feature/Bug修复 -> develop)
...
Merge Request: 夹具优化
Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/283?initial=true
2023-07-26 18:54:18 +08:00
jinling.yang
21a69a1048
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/Bug修复
2023-07-26 18:52:56 +08:00
jinling.yang
7ee652d021
1.夹具物料,联装类型,功能夹具类型的Tree视图去掉删除方法和删除操作;同步的方法里新增active字段
...
2.品牌模型新增厂家型号字段
3.修复3D模型全屏展示及不显示模型Bug
2023-07-26 18:52:27 +08:00
jinling.yang
72b3e736c0
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/Bug修复
2023-07-26 18:39:59 +08:00
马广威
459a9c3fbb
Accept Merge Request #282 : (feature/修复粗心导致的同步bug -> develop)
...
Merge Request: 修复同步bug
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/282?initial=true
2023-07-26 16:53:36 +08:00
mgw
7671830648
修复同步bug
2023-07-26 16:52:56 +08:00
马广威
b1ea52cbe3
Accept Merge Request #281 : (feature/修改缺陷 -> develop)
...
Merge Request: 去掉自定义barcode,暂时取消功能刀具的同步
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/281?initial=true
2023-07-26 15:27:09 +08:00
mgw
503361a847
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改缺陷
2023-07-26 15:25:42 +08:00
mgw
bace7aa175
去掉自定义barcode,暂时取消同步功能刀具
2023-07-26 15:25:12 +08:00
禹翔辉
fd7875b24e
Accept Merge Request #280 : (feature/刀具管理 -> develop)
...
Merge Request: 刀具管理-功能刀具列表、预警、实时分布、出入库记录优化
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/280?initial=true
2023-07-26 15:19:50 +08:00
yuxianghui
e5c5aa6cdd
刀具管理-新增功能刀具预警、功能刀具实时分布、功能刀具出入库记录对象(tree视图、form视图已完成);功能刀具管理对象修改为功能刀具列表对象,并优化了字段信息,优化了tree视图展示字段,新增form视图;解除了功能刀具列表对象与功能刀具对象的继承关系。
2023-07-26 15:17:12 +08:00
yuxianghui
98f9269766
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具管理
2023-07-25 17:43:02 +08:00
yuxianghui
d3c7f8cd56
新增了功能刀具列表的form视图,简化了tree视图字段
2023-07-25 17:42:47 +08:00
qihao.gong@jikimo.com
f246827d3d
修改设备模块布局
2023-07-25 17:27:11 +08:00
禹翔辉
bcec481268
Accept Merge Request #279 : (feature/刀具管理 -> develop)
...
Merge Request: 新增了刀具管理的机床换刀申请、CAM工单程序用刀计划、功能刀具组装的form视图,简化了tree视图的字段
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/279?initial=true
2023-07-25 14:40:12 +08:00
yuxianghui
810ec1fd6c
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具管理
2023-07-25 14:38:24 +08:00
yuxianghui
fc2d77a0dc
新增了刀具管理的机床换刀申请、CAM工单程序用刀计划、功能刀具组装的form视图,简化了tree视图的字段,
2023-07-25 14:38:06 +08:00
qihao.gong@jikimo.com
65157e93a9
设备新需求(根据维保项目生成维保计划)
2023-07-24 17:44:07 +08:00
龚启豪
a43e423c06
Accept Merge Request #278 : (feature/修改设备基础参数 -> develop)
...
Merge Request: 质量模块和库存扫码
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/278?initial=true
2023-07-24 11:44:31 +08:00
qihao.gong@jikimo.com
abc7e1c8c6
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改设备基础参数
2023-07-24 11:42:44 +08:00
qihao.gong@jikimo.com
3c89404543
质量模块和库存扫码
2023-07-24 11:42:15 +08:00
jinling.yang
ae2fdad4f1
1.物料page里的库存模型新增物料长宽高三个字段
...
2.修复功能夹具同步Bug
3.夹具物料新增不可删除控制
2023-07-21 17:35:44 +08:00
qihao.gong@jikimo.com
8d024ad625
修改sf设备修改过的需求
2023-07-21 17:15:43 +08:00
禹翔辉
24e9cc0658
Accept Merge Request #277 : (feature/刀具管理 -> develop)
...
Merge Request: 优化了刀具管理的功能刀具预警,功能刀具列表,功能刀具出入库记录,功能刀具实时分布的字段,优化了功能刀具预警界面显示错误问题
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/277?initial=true
2023-07-20 17:31:38 +08:00
yuxianghui
b15d574d8b
优化了刀具管理的功能刀具预警,功能刀具列表,功能刀具出入库记录,功能刀具实时分布的字段,优化了功能刀具预警界面显示错误问题
2023-07-20 17:29:03 +08:00
yuxianghui
507392b23e
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具管理
2023-07-20 15:40:34 +08:00
杨金灵
8765a00ead
Accept Merge Request #276 : (feature/夹具查询页面去掉创建按钮 -> develop)
...
Merge Request: 夹具相关查询页面去掉创建按钮
Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/276?initial=true
2023-07-20 15:20:41 +08:00
jinling.yang
9334d5cdc8
夹具相关查询页面去掉创建按钮
2023-07-20 15:19:09 +08:00
mgw
a94bc7073d
测试翻译项目是否生效
2023-07-20 12:12:17 +08:00
马广威
fe8402b856
Accept Merge Request #275 : (feature/修改缺陷 -> develop)
...
Merge Request: 修改功能刀具模块继承方式
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/275?initial=true
2023-07-20 09:18:34 +08:00
mgw
b37656d4fe
修改功能刀具模块继承方式
2023-07-20 09:17:21 +08:00
yuxianghui
399aaa9e2d
修改功能刀具出入库记录的字段展示
2023-07-19 17:30:40 +08:00
龚启豪
80616bf9bd
Accept Merge Request #274 : (feature/修改设备基础参数 -> develop)
...
Merge Request: 修改设备模块布局以及报错处理
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/274?initial=true
2023-07-19 17:12:49 +08:00
qihao.gong@jikimo.com
3832b9216f
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改设备基础参数
2023-07-19 17:11:07 +08:00
qihao.gong@jikimo.com
9c556c5f40
修改设备布局
2023-07-19 17:10:49 +08:00
许何哲
532d5cbc6d
Accept Merge Request #273 : (feature/tree视图表格样式修改 -> develop)
...
Merge Request: 修改表格样式css的选择器
Created By: @许何哲
Accepted By: @许何哲
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/273?initial=true
2023-07-19 14:50:04 +08:00
WEB许何哲\xuhez
292af4d1ef
修改表格样式css的选择器
2023-07-19 14:49:42 +08:00
禹翔辉
4b16fc2ec5
Accept Merge Request #272 : (feature/刀具管理 -> develop)
...
Merge Request: 优化刀具管理的弹窗界面布局
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/272?initial=true
2023-07-19 11:26:15 +08:00
yuxianghui
de0b37bf43
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具管理
2023-07-19 11:24:25 +08:00
yuxianghui
89eec3250a
优化刀具管理弹窗界面的展示布局
2023-07-19 11:24:05 +08:00
许何哲
07a06ae598
Accept Merge Request #271 : (feature/tree视图表格样式修改 -> develop)
...
Merge Request: tree视图表格样式修改
Created By: @许何哲
Accepted By: @许何哲
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/271?initial=true
2023-07-19 10:40:47 +08:00
WEB许何哲\xuhez
3b09297600
tree视图表格样式修改
2023-07-19 10:40:15 +08:00
马广威
1bae5ecb55
Accept Merge Request #270 : (feature/修改缺陷 -> develop)
...
Merge Request: sf处功能刀具修改及其同步,目录位置调整
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/270?initial=true
2023-07-19 10:05:04 +08:00
mgw
e44e44df41
sf处功能刀具修改及其同步,目录位置调整
2023-07-19 10:03:53 +08:00
许何哲
e6ecc6068d
Accept Merge Request #269 : (feature/tree视图表格中字段的样式修改 -> develop)
...
Merge Request: tree视图表格中字段样式的修改
Created By: @许何哲
Accepted By: @许何哲
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/269?initial=true
2023-07-18 17:10:00 +08:00
WEB许何哲\xuhez
a7028e00f9
tree视图表格中字段样式的修改
2023-07-18 17:09:17 +08:00
禹翔辉
66f0097b80
Accept Merge Request #268 : (feature/创建工作日历代码测试 -> develop)
...
Merge Request: 工作日历设置---新增将中文的星期转换成英文的星期的方法,删除了大部分日志。
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/268?initial=true
2023-07-18 16:27:26 +08:00
yuxianghui
b5484ecda6
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/创建工作日历代码测试
2023-07-18 16:27:42 +08:00
yuxianghui
2462c3774d
工作日历设置---新增将中文的星期转换成英文的星期的方法,删除了大部分日志。
2023-07-18 16:27:24 +08:00
杨金灵
baf13117dc
Accept Merge Request #267 : (feature/夹具型号新增搜索面板 -> develop)
...
Merge Request: 优化夹具型号功能
Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/267?initial=true
2023-07-18 16:21:16 +08:00
jinling.yang
988f70bf69
1.夹具型号新增搜索面板
...
2.夹具查询列表新增创建人和创建时间字段展示
2023-07-18 16:20:09 +08:00
禹翔辉
4f60118f37
Accept Merge Request #266 : (feature/创建工作日历代码测试 -> develop)
...
Merge Request: 新增工作日历设置的日志
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/266?initial=true
2023-07-18 14:37:03 +08:00
yuxianghui
b7e1bff0f4
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/创建工作日历代码测试
2023-07-18 14:37:00 +08:00
yuxianghui
a0758b4b61
新增工作日历设置的日志
2023-07-18 14:36:44 +08:00
许何哲
b614eed79d
Accept Merge Request #265 : (feature/修改logo图片 -> develop)
...
Merge Request: 修改登录页面logo
Created By: @许何哲
Accepted By: @许何哲
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/265?initial=true
2023-07-18 11:36:41 +08:00
WEB许何哲\xuhez
b22cc7f19f
修改登录页面logo
2023-07-18 11:36:12 +08:00
龚启豪
a11dcc16f0
Accept Merge Request #264 : (feature/修改设备基础参数 -> develop)
...
Merge Request: 修改设备菜单以及二级菜单结构
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/264?initial=true
2023-07-18 10:48:29 +08:00
qihao.gong@jikimo.com
8333a834fc
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改设备基础参数
2023-07-18 10:47:43 +08:00
qihao.gong@jikimo.com
fc93d5c646
修改设备菜单名称以及二级目录结构
2023-07-18 10:47:23 +08:00
禹翔辉
92a04d5f2a
Accept Merge Request #263 : (feature/创建工作日历代码测试 -> develop)
...
Merge Request: 优化产线设备资源设置的form视图界面名字显示
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/263?initial=true
2023-07-18 10:30:08 +08:00
yuxianghui
ff0786def7
优化产线设备资源设置的form视图界面名字显示
2023-07-18 10:30:01 +08:00
yuxianghui
4907f06183
添加工作日历设置创建工作日历时的输出日志
2023-07-18 09:45:53 +08:00
禹翔辉
ad5a8c06a5
Accept Merge Request #262 : (feature/创建工作日历代码测试 -> develop)
...
Merge Request: 添加工作日历设置创建工作日历时的输出日志
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/262?initial=true
2023-07-18 09:45:15 +08:00
许何哲
749765c85d
Accept Merge Request #261 : (feature/一级菜单收起 -> develop)
...
Merge Request: 一级菜单点击收起
Created By: @许何哲
Accepted By: @许何哲
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/261?initial=true
2023-07-18 09:27:43 +08:00
WEB许何哲\xuhez
aafa9317e0
一级菜单点击收起
2023-07-18 09:26:02 +08:00
杨金灵
628a74c3f7
Accept Merge Request #260 : (feature/去掉不用的代码 -> develop)
...
Merge Request: 去掉不要的引用
Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/260?initial=true
2023-07-17 17:36:50 +08:00
jinling.yang
9a392eebad
去掉不要的引用
2023-07-17 17:35:55 +08:00
许何哲
f67850461f
Accept Merge Request #259 : (feature/一级菜单点击收起 -> develop)
...
Merge Request: 一级菜单点击收起
Created By: @许何哲
Accepted By: @许何哲
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/259?initial=true
2023-07-17 17:32:35 +08:00
WEB许何哲\xuhez
ad60e1a624
一级菜单点击收起
2023-07-17 17:32:11 +08:00
jinling.yang
21a594a81e
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2023-07-17 16:51:10 +08:00
jinling.yang
253736221e
Merge branch 'feature/页面展示优化' into develop
2023-07-17 16:50:41 +08:00
杨金灵
1252d11bba
Accept Merge Request #258 : (feature/页面展示优化 -> develop)
...
Merge Request: 修复产品模板Bug
Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/258?initial=true
2023-07-17 16:50:17 +08:00
jinling.yang
b1da9ff18b
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/页面展示优化
2023-07-17 16:48:44 +08:00
禹翔辉
c6d6937f21
Accept Merge Request #257 : (feature/优化生成工作日历记录功能 -> develop)
...
Merge Request: 优化产线设备资源设置新建bug
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/257?initial=true
2023-07-17 16:48:00 +08:00
yuxianghui
f40655b1af
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化生成工作日历记录功能
2023-07-17 16:47:57 +08:00
jinling.yang
f68dce9ee2
修复产品模板中产品类别为刀具和夹具时,根据产品类别为刀具和夹具时,新增的page页面里的字段显示及回显Bug
2023-07-17 16:46:01 +08:00
yuxianghui
ebda457684
优化产线设备资源设置新建bug
2023-07-17 16:45:52 +08:00
禹翔辉
d9a6d1a803
Accept Merge Request #256 : (feature/优化生成工作日历记录功能 -> develop)
...
Merge Request: 优化工作日历设置开始时间和结束时间为根据所选班次自动生成
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/256?initial=true
2023-07-17 16:40:30 +08:00
yuxianghui
fc5a3dcab4
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化生成工作日历记录功能
2023-07-17 16:40:03 +08:00
yuxianghui
5b0df0befd
优化工作日历设置开始时间和结束时间为根据所选班次自动生成
2023-07-17 16:39:30 +08:00
龚启豪
0dd5e5086d
Accept Merge Request #255 : (feature/修改设备基础参数 -> develop)
...
Merge Request: 修改设备参数布局
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/255?initial=true
2023-07-17 15:45:38 +08:00
qihao.gong@jikimo.com
bb464a2351
修改设备参数布局
2023-07-17 15:44:04 +08:00
马广威
c03d683dcb
Accept Merge Request #254 : (feature/修改缺陷 -> develop)
...
Merge Request: 修复工作中心计划报错的问题,修改制造模块目录结构
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/254?initial=true
2023-07-17 15:38:49 +08:00
mgw
344fe1b58b
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改缺陷
2023-07-17 15:37:47 +08:00
mgw
c0d14daf44
修复工作中心计划报错的问题,修改制造模块目录结构
2023-07-17 15:37:23 +08:00
许何哲
cf22c6f6fc
Accept Merge Request #253 : (feature/表头固定 -> develop)
...
Merge Request: 修改表头固定
Created By: @许何哲
Accepted By: @许何哲
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/253?initial=true
2023-07-17 11:10:43 +08:00
WEB许何哲\xuhez
f579875b35
修改表头固定
2023-07-17 11:09:26 +08:00
禹翔辉
b49677d5ba
Accept Merge Request #252 : (feature/优化生成工作日历记录功能 -> develop)
...
Merge Request: 对工作日历设置的name字段进行限制,优化工作日历form视图的显示
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/252?initial=true
2023-07-17 11:04:21 +08:00
马广威
6389186851
Accept Merge Request #251 : (feature/修改制造目录结构 -> develop)
...
Merge Request: 修改制造菜单结构
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/251?initial=true
2023-07-17 10:58:02 +08:00
mgw
d27fedcd0b
修改原生“作业”为“计划管理”
2023-07-17 10:56:43 +08:00
mgw
c1350f04b7
修改制造目录结构,更改原生“作业”为“计划管理”
2023-07-17 10:56:19 +08:00
yuxianghui
b48c231dcc
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化生成工作日历记录功能
2023-07-17 10:43:47 +08:00
yuxianghui
9752b2e49f
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化生成工作日历记录功能
2023-07-17 10:40:49 +08:00
龚启豪
00795ca3e9
Accept Merge Request #249 : (feature/订单计划 -> develop)
...
Merge Request: 修改设备模块菜单名称
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/249?initial=true
2023-07-17 10:40:14 +08:00
yuxianghui
a557a42cf5
对工作日历设置的name字段进行限制,优化工作日历form视图的显示
2023-07-17 10:40:07 +08:00
qihao.gong@jikimo.com
1743801c78
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/订单计划
2023-07-17 10:39:15 +08:00
qihao.gong@jikimo.com
ad84eedda3
修改设备菜单名称
2023-07-17 10:38:54 +08:00
许何哲
6055921556
Accept Merge Request #248 : (feature/tree视图表头固定 -> develop)
...
Merge Request: tree视图表头固定
Created By: @许何哲
Accepted By: @许何哲
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/248?initial=true
2023-07-17 10:17:56 +08:00
WEB许何哲\xuhez
b74a029166
tree视图表头固定
2023-07-17 10:15:50 +08:00
qihao.gong@jikimo.com
4bb3ab3e16
维保计划视图优化
2023-07-14 17:27:11 +08:00
禹翔辉
095b707f0c
Accept Merge Request #247 : (feature/工作日历设置-工作日历表 -> develop)
...
Merge Request: 优化刀具管理form视图的name显示
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/247?initial=true
2023-07-14 17:27:01 +08:00
yuxianghui
992435b1f8
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/工作日历设置-工作日历表
2023-07-14 17:26:01 +08:00
yuxianghui
a4339d1d67
优化刀具管理的form视图表名显示问题
2023-07-14 17:25:35 +08:00
yuxianghui
9c4f51d5f6
优化刀具管理form视图表名显示问题
2023-07-14 17:24:59 +08:00
禹翔辉
90a71326a9
Accept Merge Request #246 : (feature/工作日历设置-工作日历表 -> develop)
...
Merge Request: 工作日历设置模型新增查看日历按键,隐藏工作日历菜单
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/246?initial=true
2023-07-14 16:07:02 +08:00
yuxianghui
a8e30a5228
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/工作日历设置-工作日历表
2023-07-14 15:02:15 +08:00
yuxianghui
808f57adfb
工作日历设置模型新增查看日历按键,隐藏工作日历菜单
2023-07-14 15:01:56 +08:00
马广威
a71497d3a8
Accept Merge Request #245 : (feature/解决工作日历无法创建的bug -> develop)
...
Merge Request: 解决冲突与优化结构
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/245?initial=true
2023-07-14 14:45:03 +08:00
mgw
5b6a563a87
更改库存模块库区相关字段
2023-07-14 14:43:06 +08:00
mgw
3de5a95a98
解决工作日历无法创建的bug
2023-07-14 14:35:22 +08:00
马广威
14283ab5e4
Accept Merge Request #244 : (feature/测试皮肤模块 -> develop)
...
Merge Request: 修改.gitignore文件,注释忽略lib文件夹部分;修改制造模块依赖
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/244?initial=true
2023-07-14 12:29:44 +08:00
mgw
3b789d040a
修改制造模块依赖
2023-07-14 12:28:23 +08:00
mgw
f0e7d41ad6
修改.gitignore文件,注释忽略lib文件夹部分
2023-07-14 12:26:21 +08:00
马广威
debcca8b07
Accept Merge Request #242 : (feature/修改字段 -> develop)
...
Merge Request: 修改关联关系的字段
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/242?initial=true
2023-07-14 12:00:13 +08:00
mgw
741c2b34bf
修改关联关系的字段
2023-07-14 11:58:56 +08:00
龚启豪
3b8ea6874b
Accept Merge Request #241 : (feature/订单计划 -> develop)
...
Merge Request: 更换数据库
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/241?initial=true
2023-07-14 10:45:39 +08:00
qihao.gong@jikimo.com
381505bd9d
更换数据库
2023-07-14 10:45:02 +08:00
许何哲
28b6f854cb
Accept Merge Request #240 : (feature/主题logo添加中文 -> develop)
...
Merge Request: 添加中文logo
Created By: @许何哲
Accepted By: @许何哲
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/240?initial=true
2023-07-14 10:38:18 +08:00
WEB许何哲\xuhez
cb4dc2a057
Merge branch 'develop' into feature/主题logo添加中文
2023-07-14 10:35:07 +08:00
WEB许何哲\xuhez
412083e2aa
主题logo添加中文
2023-07-14 10:33:11 +08:00
杨金灵
ad565d0096
Accept Merge Request #239 : (feature/设备模块文件解决冲突 -> develop)
...
Merge Request: 设备模块文件解决冲突
Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/239?initial=true
2023-07-14 10:16:51 +08:00
jinling.yang
31d335af48
设备模块文件解决冲突
2023-07-14 10:16:22 +08:00
jinling.yang
48cb394b3f
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2023-07-14 10:07:46 +08:00
jinling.yang
c709c046c7
Merge branch 'feature/优化夹具产品模板' into develop
2023-07-14 10:06:37 +08:00
杨金灵
a0744e6713
Accept Merge Request #238 : (feature/优化夹具产品模板 -> develop)
...
Merge Request: 优化夹具产品模板
Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/238?initial=true
2023-07-14 10:06:20 +08:00
jinling.yang
98d3e61d66
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化夹具产品模板
...
# Conflicts:
# sf_maintenance/__manifest__.py
# sf_manufacturing/__manifest__.py
2023-07-14 10:05:01 +08:00
许何哲
7b4d4a0d9a
Accept Merge Request #237 : (feature/修改看板样式 -> develop)
...
Merge Request: 主题
Created By: @许何哲
Accepted By: @许何哲
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/237?initial=true
2023-07-14 09:23:51 +08:00
WEB许何哲\xuhez
a48c8b2baa
上传修改后的主题
2023-07-14 09:21:21 +08:00
WEB许何哲\xuhez
1c022711a1
注释测试字段
2023-07-14 09:11:57 +08:00
WEB许何哲\xuhez
0291ed9a56
Merge branch 'develop' into feature/修改看板样式
...
# Conflicts:
# sf_warehouse/views/view.xml
2023-07-14 09:10:37 +08:00
龚启豪
08e0eeee3d
Accept Merge Request #236 : (feature/订单计划 -> develop)
...
Merge Request: 密码约束模块
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/236?initial=true
2023-07-14 09:05:59 +08:00
qihao.gong@jikimo.com
8f795096c3
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/订单计划
...
# Conflicts:
# sf_maintenance/__manifest__.py
# sf_manufacturing/views/mrp_workcenter_views.xml
2023-07-14 09:02:48 +08:00
马广威
2161f4c140
Accept Merge Request #235 : (feature/工作日历及其设置 -> develop)
...
Merge Request: 工作日历及其设置的bug已解决,优化已完成
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/235?initial=true
2023-07-13 19:21:13 +08:00
mgw
b544e10b0d
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/工作日历及其设置
2023-07-13 19:20:05 +08:00
mgw
9073880aac
工作日历及其设置bug已解决,优化已完成
2023-07-13 19:19:40 +08:00
WEB许何哲\xuhez
b48a835808
修改看板樣式
2023-07-13 17:31:54 +08:00
qihao.gong@jikimo.com
5e8e380a8e
密码模块修改
2023-07-13 17:31:16 +08:00
杨金灵
d7732fe2ff
Accept Merge Request #234 : (feature/新增工件装夹 -> develop)
...
Merge Request: 装夹工单优化
Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/234?initial=true
2023-07-13 17:21:26 +08:00
jinling.yang
36bb77ccb0
工单的完成按钮代码还原
2023-07-13 17:17:48 +08:00
jinling.yang
7a690abe1a
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增工件装夹
...
# Conflicts:
# sf_maintenance/__manifest__.py
2023-07-13 16:58:49 +08:00
jinling.yang
5beb7b3417
优化装夹工单,新增工件装夹page,名字为组件的page名称改为物料,去掉单独的工件装夹功能
2023-07-13 16:57:48 +08:00
马广威
d9adfc30d5
Accept Merge Request #233 : (feature/修改库存模块的部分逻辑 -> develop)
...
Merge Request: 库存模块部分逻辑已修改完成
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/233?initial=true
2023-07-13 16:11:36 +08:00
mgw
3643c5ecb7
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改库存模块的部分逻辑
2023-07-13 16:10:11 +08:00
mgw
f9c63b69a1
库存模块逻辑修改已完成
2023-07-13 16:09:28 +08:00
禹翔辉
701ae26eb4
Accept Merge Request #232 : (feature/工作日历设置-工作日历表 -> develop)
...
Merge Request: 生产线模型搬移至制造模块,新增工作日历模块,新增工作日历设置相关功能
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/232?initial=true
2023-07-13 16:07:20 +08:00
yuxianghui
81842dc5ec
将生产线模型从设备模块搬移到了制造模块,新增工作日历设置修改休息日字段则工作日历创建新记录
2023-07-13 16:05:38 +08:00
yuxianghui
571e32925e
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/工作日历设置-工作日历表
2023-07-11 17:40:46 +08:00
yuxianghui
ef7d9c22d4
新增根据工作日历设置的工作日字段创建工作日历的记录
2023-07-11 17:40:14 +08:00
WEB许何哲\xuhez
b6de9d5e64
Merge branch 'develop' into feature/修改看板样式
...
# Conflicts:
# sf_warehouse/__manifest__.py
# sf_warehouse/static/src/kanban_color_change.scss
# sf_warehouse/views/view.xml
2023-07-11 16:05:53 +08:00
WEB许何哲\xuhez
a3760a7d9d
0711提交
2023-07-11 16:00:21 +08:00
马广威
58b9ea404b
Accept Merge Request #231 : (feature/增加js_class类对看板视图布局进行修改 -> develop)
...
Merge Request: 增加js_class类对看板视图进行布局修改
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/231?initial=true
2023-07-11 15:49:53 +08:00
mgw
feb15e4db2
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/增加js_class类对看板视图布局进行修改
2023-07-11 15:48:44 +08:00
mgw
acd37b6c8c
修改sf_warehouse模块目录结构
2023-07-11 15:48:11 +08:00
mgw
94ffec20db
增加js_class类对看板视图进行布局修改
2023-07-11 15:43:03 +08:00
jinling.yang
7743c9658c
工单菜单优化
2023-07-10 17:33:17 +08:00
qihao.gong@jikimo.com
3544c6a957
密码策略模块测试
2023-07-10 17:33:06 +08:00
yuxianghui
6dfced8541
新增班次对象,新增工作日对象,修改了工作日历设置的班次、工作日字段类型;新增工作日历表对象
2023-07-10 17:26:43 +08:00
qihao.gong@jikimo.com
1502336286
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/订单计划
2023-07-10 10:04:18 +08:00
qihao.gong@jikimo.com
78fd5a7ac3
修改工作中心与设备关联关系
2023-07-10 10:03:02 +08:00
jinling.yang
94856b0c55
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增工件装夹
2023-07-07 17:39:44 +08:00
jinling.yang
a0570cb999
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增工件装夹
2023-07-07 17:38:04 +08:00
禹翔辉
1d970712e3
Accept Merge Request #230 : (feature/计划管理-基础设置 -> develop)
...
Merge Request: 优化了产线设备资源设置模型
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/230?initial=true
2023-07-07 17:37:19 +08:00
yuxianghui
9a03235cfa
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/计划管理-基础设置
2023-07-07 17:36:59 +08:00
yuxianghui
e711ff0ab3
优化了产线设备资源设置,新增根据选取的工作中心自动带出设备的数据,新增根据选择的工作日历自动带出班次的数据,新增搜索视图
2023-07-07 17:36:42 +08:00
jinling.yang
3fdf9130e8
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增工件装夹
2023-07-07 14:39:05 +08:00
禹翔辉
e7075a83ca
Accept Merge Request #229 : (feature/计划管理-基础设置 -> develop)
...
Merge Request: 新增生产线模型,优化了计划管理-基础设置模块
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/229?initial=true
2023-07-07 14:38:15 +08:00
yuxianghui
e78a60b6ef
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/计划管理-基础设置
2023-07-07 14:37:08 +08:00
yuxianghui
5b5d41559c
优化了工作日历时间输入,新增工作日历设置自动计算时长功能,修改了生产线模型的位置(移至sf_maintenance模块下),优化了部分的产线设备资源设置模型
2023-07-07 14:36:27 +08:00
yuxianghui
123adcfc76
在sf_base下新增生产线模型,优化了计划管理-工作日历设置的手动输入时间和手动输入班次的格式
2023-07-06 17:38:08 +08:00
jinling.yang
1a0fa3fdb0
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增工件装夹
2023-07-06 17:33:47 +08:00
马广威
621b75d437
Accept Merge Request #228 : (feature/优化库存模块功能 -> develop)
...
Merge Request: 优化货位状态,以及产品显隐逻辑
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/228?initial=true
2023-07-06 15:05:38 +08:00
mgw
b72c3ce08a
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化库存模块功能
2023-07-06 15:04:11 +08:00
mgw
20c6a67f34
优化货位状态,以及产品显隐逻辑
2023-07-06 15:03:35 +08:00
WEB许何哲\xuhez
c440afa435
Merge branch 'develop' into feature/修改看板样式
...
解决冲突
# Conflicts:
# sf_warehouse/__manifest__.py
# sf_warehouse/static/src/change.scss
2023-07-06 14:41:17 +08:00
许何哲
8dfcd943f0
Accept Merge Request #227 : (feature/前端分支 -> develop)
...
Merge Request: 修改导航栏
Created By: @许何哲
Accepted By: @许何哲
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/227?initial=true
2023-07-06 14:29:10 +08:00
WEB许何哲\xuhez
26319beaa4
样式修改
2023-07-06 14:22:34 +08:00
马广威
c0b7e3679b
Accept Merge Request #226 : (feature/为看板设置颜色 -> develop)
...
Merge Request: 在看板xml中增加判断逻辑选择不同的class属性值,以匹配对应的css颜色
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/226?initial=true
2023-07-06 12:28:00 +08:00
mgw
bc7f516d2d
在看板xml中增加判断逻辑选择不同的class属性值,以匹配对应的css颜色
2023-07-06 12:26:35 +08:00
马广威
f31becc215
Accept Merge Request #225 : (feature/改造原生库存模块 -> develop)
...
Merge Request: 原生库存模块初步升级已完成
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/225?initial=true
2023-07-06 09:44:08 +08:00
mgw
3943b0994e
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/改造原生库存模块
2023-07-06 09:41:42 +08:00
mgw
3a653a9485
优化货位看板显示字段
2023-07-06 09:38:57 +08:00
mgw
b754534b5b
完善库存模块新增功能及编码规则,已实现据货架分别展示下属货位的看板,待优化
2023-07-05 23:02:22 +08:00
jinling.yang
66cd682f7d
优化工件装夹
2023-07-05 17:34:43 +08:00
禹翔辉
52674a6747
Accept Merge Request #224 : (feature/计划管理-基础设置 -> develop)
...
Merge Request: 新增计划管理模块,新增计划管理-工作日志设置模型(未完成),新增计划管理-工序设备资源设置模型(未完成)
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/224?initial=true
2023-07-05 14:51:21 +08:00
yuxianghui
a962af0f57
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/计划管理-基础设置
2023-07-05 14:48:03 +08:00
yuxianghui
caf367b10d
新增工序设备资源设置模型
2023-07-05 14:47:29 +08:00
龚启豪
afa630682c
Accept Merge Request #222 : (feature/设备模块优化,自动生成维保计划 -> develop)
...
Merge Request: 设备模块优化
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/222?initial=true
2023-07-05 14:34:13 +08:00
qihao.gong@jikimo.com
3e6130da15
维保计划新增确认维保计划和标记已完成按钮,处理自动生成维保计划的方法报错的bug
2023-07-05 14:32:22 +08:00
mgw
0d7c269c3b
继承原生库存模块,为位置模型增加库区库位等字段
2023-07-04 20:05:59 +08:00
yuxianghui
f685c9a3d4
新增计划管理模块,新增工作日历设置模块(已完成,手动输入时间部分需优化)
2023-07-04 17:37:20 +08:00
jinling.yang
e693bd97f3
新增工件组装,工件出库,组装工件功能
2023-07-04 17:32:14 +08:00
qihao.gong@jikimo.com
e6060b9bab
修改维保标准维保项目参数为One2many对象 并与设备,维保计划关联,修改原生维保计划方法 根据保养和检修生成不同的维保计划单
2023-07-04 17:30:50 +08:00
jinling.yang
3743c65da9
优化夹具产品模板
2023-06-30 17:35:20 +08:00
马广威
4199a86264
Accept Merge Request #221 : (feature/刀具管理同步优化,增加字段 -> develop)
...
Merge Request: 修改依赖关系,解决依赖冲突
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/221?initial=true
2023-06-30 15:17:49 +08:00
mgw
e0315bafc7
修改依赖关系,解决依赖冲突
2023-06-30 15:17:10 +08:00
马广威
1a937a7476
Accept Merge Request #220 : (feature/刀具管理同步优化,增加字段 -> develop)
...
Merge Request: 解决代码冲突
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/220?initial=true
2023-06-29 20:00:14 +08:00
mgw
576d2d7758
解决代码冲突
2023-06-29 19:59:39 +08:00
杨金灵
1f61cf7b5a
Accept Merge Request #219 : (feature/释放模型转换格式代码 -> develop)
...
Merge Request: 刀具产品模板根据型号展示不同字段和值
Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/219?initial=true
2023-06-29 18:55:52 +08:00
jinling.yang
05227b9022
刀具产品模板根据型号展示不同字段和值
2023-06-29 18:53:11 +08:00
马广威
4212340519
Accept Merge Request #218 : (feature/刀具管理同步优化,增加字段 -> develop)
...
Merge Request: 解决代码冲突问题
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/218?initial=true
2023-06-29 17:43:44 +08:00
mgw
dbb3ea8a35
解决代码冲突问题
2023-06-29 17:43:16 +08:00
jinling.yang
36fe0cab18
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2023-06-29 17:17:05 +08:00
jinling.yang
8f841314b5
Merge branch 'feature/新增夹具功能' into develop
2023-06-29 17:16:51 +08:00
杨金灵
5bcd1e579d
Accept Merge Request #217 : (feature/新增夹具功能 -> develop)
...
Merge Request: 新增夹具功能
Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/217?initial=true
2023-06-29 17:16:35 +08:00
jinling.yang
2c71439a96
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增夹具功能
2023-06-29 17:15:33 +08:00
jinling.yang
0f7f67aade
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增夹具功能
2023-06-29 17:14:48 +08:00
禹翔辉
0c515cd563
Accept Merge Request #216 : (feature/sf刀具功能分支 -> develop)
...
Merge Request: 优化了功能刀具自动申请装刀功能的数据显示问题
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/216?initial=true
2023-06-29 16:54:10 +08:00
yuxianghui
80a88b8afb
优化了功能刀具自动申请装刀功能的数据显示问题
2023-06-29 16:54:18 +08:00
yuxianghui
69cb1adc3e
优化了功能刀具组装的出库弹窗里的确定、取消按键的显示,新增CAM装刀来源的任务出库后修改CAM用刀计划的状态改变为已完成
2023-06-29 15:56:08 +08:00
禹翔辉
7795cfef29
Accept Merge Request #215 : (feature/sf刀具功能分支 -> develop)
...
Merge Request: 优化了功能刀具组装的出库弹窗里的确定、取消按键的显示,新增CAM装刀来源的任务出库后修改CAM用刀计划的状态改变为已完成
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/215?initial=true
2023-06-29 15:55:58 +08:00
马广威
e77eb4d20d
Accept Merge Request #214 : (feature/刀具管理同步优化,增加字段 -> develop)
...
Merge Request: 刀具物料查询功能本地测试完成,推至线上测试
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/214?initial=true
2023-06-29 14:23:53 +08:00
mgw
8664c196f0
刀具物料查询功能本地测试完成,推至线上测试
2023-06-29 14:23:10 +08:00
yuxianghui
d5938bf407
优化了申请换刀功能的数据,
2023-06-29 14:16:10 +08:00
禹翔辉
b32722ca54
Accept Merge Request #213 : (feature/sf刀具功能分支 -> develop)
...
Merge Request: 优化了申请换刀功能的数据
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/213?initial=true
2023-06-29 14:15:57 +08:00
jinling.yang
3907901dc3
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2023-06-29 11:18:13 +08:00
jinling.yang
6ad7a1e613
Merge branch 'feature/刀具产品模板优化' into develop
2023-06-29 11:17:49 +08:00
杨金灵
89475f46a3
Accept Merge Request #212 : (feature/刀具产品模板优化 -> develop)
...
Merge Request: 刀具产品模板优化
Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/212?initial=true
2023-06-29 11:17:30 +08:00
jinling.yang
37b834b3cf
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具产品模板优化
...
# Conflicts:
# sf_mrs_connect/models/res_config_setting.py
2023-06-29 11:15:40 +08:00
马广威
78c13acbab
Accept Merge Request #211 : (feature/刀具管理同步优化,增加字段 -> develop)
...
Merge Request: 刀具管理同步优化基本完成
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/211?initial=true
2023-06-29 09:57:55 +08:00
mgw
2aae162f73
优化sf字段形式
2023-06-29 09:56:31 +08:00
禹翔辉
79dfa10d4e
Accept Merge Request #210 : (feature/sf刀具功能分支 -> develop)
...
Merge Request: 新增批量出库功能(功能已完成,按键未增加),新增自动组装方法(todo),新增出库按键弹窗样式修改
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/210?initial=true
2023-06-29 09:37:09 +08:00
yuxianghui
ec95e09553
新增批量出库功能(功能已完成,按键未增加),新增自动组装方法(todo),新增出库按键弹窗样式修改
2023-06-29 09:36:54 +08:00
mgw
7689701ab1
刀具同步优化完成,字段已添加
2023-06-28 20:49:16 +08:00
jinling.yang
b02cb16dc9
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具产品模板优化
...
# Conflicts:
# sf_tool_management/__manifest__.py
# sf_tool_management/views/tool_base_views.xml
2023-06-28 18:34:39 +08:00
jinling.yang
eab6f0ceee
刀具产品页面刀具物料及型号字段修改
2023-06-28 18:32:45 +08:00
龚启豪
05e69d21fa
Accept Merge Request #209 : (feature/设备维保 -> develop)
...
Merge Request: 设备维保模块
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/209
2023-06-28 10:39:28 +08:00
龚启豪
ec0da8cf76
Merge branch refs/heads/develop into refs/heads/feature/设备维保
2023-06-28 10:39:23 +08:00
马广威
6dc167fae1
Accept Merge Request #208 : (feature/sf刀具基础信息管理 -> develop)
...
Merge Request: 优化search筛选框界面显示异常
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/208?initial=true
2023-06-28 10:17:45 +08:00
禹翔辉
cb56a3ed83
Accept Merge Request #207 : (feature/sf刀具功能分支 -> develop)
...
Merge Request: 新增功能刀具计划模型(已完成),新增功能刀具组装(未完成),优化了功能刀具管理和功能刀具有关的代码
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/207?initial=true
2023-06-28 10:07:21 +08:00
mgw
59ae98a21c
优化search筛选框界面显示异常
2023-06-28 10:03:24 +08:00
yuxianghui
5dba31576a
优化了功能刀具管理的代码
2023-06-28 10:02:59 +08:00
yuxianghui
c94c661506
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/sf刀具功能分支
...
# Conflicts:
# sf_tool_management/views/tool_base_views.xml
2023-06-28 09:15:55 +08:00
qihao.gong@jikimo.com
1eea2bb1c3
处理设备与设备维保标准的关联关系方法,新增设备故障报警日志页面
2023-06-27 17:32:24 +08:00
yuxianghui
d6f749fff5
新增功能刀具组装的组装弹窗按键功能(功能已完成)、取消组装功能按键(功能已完成)、出库弹窗按键(已完成视图)
2023-06-27 17:31:49 +08:00
jinling.yang
aea68f5239
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增夹具功能
...
# Conflicts:
# sf_base/__manifest__.py
# sf_base/models/__init__.py
# sf_mrs_connect/data/ir_cron_data.xml
# sf_mrs_connect/models/sync_common.py
2023-06-27 16:40:58 +08:00
jinling.yang
d18b1808d9
新增同步夹具相关的定时器
2023-06-27 16:35:30 +08:00
马广威
8b94696dc3
Accept Merge Request #205 : (feature/sf刀具基础信息管理 -> develop)
...
Merge Request: sf刀具重构完成,同步方法测试完成
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/205?initial=true
2023-06-27 16:27:32 +08:00
yuxianghui
e880b020c6
增加了机台换刀申请和CAM程序用刀计划的搜索视图,增加了机台换刀申请的自动换刀功能,增加了CAM程序用刀计划的自动换刀申请功能(待完善)
2023-06-27 10:20:31 +08:00
yuxianghui
1348712c83
新增了功能刀具组装界面,新增了功能刀具计划的按键功能,以及按键的显示功能
2023-06-26 18:10:37 +08:00
jinling.yang
87e3f6d04e
新增夹具和功能夹具,及同步mrs的夹具和功能夹具
2023-06-26 18:07:44 +08:00
WEB许何哲\xuhez
65ec935a9f
0626提交
2023-06-26 17:35:55 +08:00
qihao.gong@jikimo.com
cf91ef5604
设备维保计划
2023-06-26 17:32:56 +08:00
qihao.gong@jikimo.com
8b227d9ac9
设备维保
2023-06-25 17:37:55 +08:00
yuxianghui
c37166397e
完成了机台换刀申请的换刀申请按键弹窗数据同步回机台换刀申请界面以及转移按键界面、CAM工单程序用刀计划的申请装刀界面
2023-06-25 17:36:33 +08:00
mgw
65c8d4a4e9
sf刀具重构完成,同步方法测试完成
2023-06-25 16:44:10 +08:00
yuxianghui
f135f0a5e7
完成了弹窗换刀需求信息的视图和默认数据的同步
2023-06-21 17:21:58 +08:00
yuxianghui
6caae0325a
功能刀具计划(换刀申请和CAM工单程序用刀计划)视图已完成
2023-06-20 16:51:06 +08:00
杨金灵
15304d6eb5
Accept Merge Request #204 : (feature/采购刀具产品优化序列号生成规则 -> develop)
...
Merge Request: 采购刀具产品入库优化序列号生成规则
Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/204?initial=true
2023-06-16 17:13:09 +08:00
jinling.yang
6dc2935741
采购入库若选择的产品是刀具,则优化序列号生成规则
2023-06-16 17:10:31 +08:00
禹翔辉
8c9a211295
Accept Merge Request #203 : (feature/sf刀具功能分支 -> develop)
...
Merge Request: 智能工厂类型备注样式调整
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/203?initial=true
2023-06-16 11:13:21 +08:00
龚启豪
7d6bd9119b
Accept Merge Request #202 : (feature/功能刀具页面 -> develop)
...
Merge Request: 处理bug
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/202?initial=true
2023-06-16 11:02:15 +08:00
yuxianghui
062b50d34c
智能工厂类型备注样式调整
2023-06-16 11:01:24 +08:00
qihao.gong@jikimo.com
23aba08c87
处理bug
2023-06-16 10:56:25 +08:00
yuxianghui
b835103cef
功能刀具管理根据所选功能刀具类型自动填充功能刀具数据(该功能已注释)
2023-06-16 10:07:35 +08:00
qihao.gong@jikimo.com
018fecfc59
处理冲突
2023-06-16 10:02:33 +08:00
qihao.gong@jikimo.com
e9ad452c43
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/功能刀具页面
...
# Conflicts:
# sf_tool_management/__init__.py
# sf_tool_management/__manifest__.py
# sf_tool_management/models/__init__.py
# sf_tool_management/models/base.py
# sf_tool_management/security/ir.model.access.csv
# sf_tool_management/views/menu_view.xml
# sf_tool_management/views/tool_base_views.xml
2023-06-16 10:01:23 +08:00
禹翔辉
376731fbd9
Accept Merge Request #201 : (feature/sf刀具功能分支 -> develop)
...
Merge Request: 优化了功能刀具实时分布和出入库记录的视图显示效果
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/201?initial=true
2023-06-15 17:05:26 +08:00
yuxianghui
4f7489f471
优化了功能刀具实时分布和出入库记录的视图显示效果
2023-06-15 17:04:40 +08:00
jinling.yang
ff904c2c02
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2023-06-15 16:19:05 +08:00
WEB许何哲\xuhez
c81730d7ba
0615t提交
2023-06-15 16:18:34 +08:00
jinling.yang
f455f1e7b4
Merge branch 'feature/刀具基础信息生成产品模板' into develop
2023-06-15 16:18:27 +08:00
杨金灵
0259270ece
Accept Merge Request #200 : (feature/刀具基础信息生成产品模板 -> develop)
...
Merge Request: 刀具基础信息生成产品模板
Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/200?initial=true
2023-06-15 16:18:04 +08:00
jinling.yang
8a0d89161b
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具基础信息生成产品模板
2023-06-15 16:15:28 +08:00
jinling.yang
c7ec8be141
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具基础信息生成产品模板
2023-06-15 16:14:50 +08:00
马广威
95870699d5
Accept Merge Request #199 : (feature/sf刀具基础信息管理 -> develop)
...
Merge Request: 修复同步bug
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/199?initial=true
2023-06-15 15:41:41 +08:00
mgw
ba93adfb7b
修复同步bug(刀片类型字段无值)
2023-06-15 15:40:23 +08:00
马广威
a219a17165
Accept Merge Request #198 : (feature/sf刀具基础信息管理 -> develop)
...
Merge Request: 型号对象增加搜索视图
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/198?initial=true
2023-06-15 12:21:00 +08:00
mgw
b1da7a8fda
型号对象增加搜索视图
2023-06-15 12:20:26 +08:00
禹翔辉
8b549a19a8
Accept Merge Request #197 : (feature/sf刀具功能分支 -> develop)
...
Merge Request: 关联了功能刀具和功能刀具管理俩个对象
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/197
2023-06-15 10:00:20 +08:00
yuxianghui
fc6b756aaf
关联了功能刀具和功能刀具管理俩个对象
2023-06-15 09:57:14 +08:00
禹翔辉
1eeafeddb9
Accept Merge Request #196 : (feature/sf刀具功能分支 -> develop)
...
Merge Request: 增加了功能刀具实时分布和出入库记录功能模型
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/196?initial=true
2023-06-15 09:08:56 +08:00
jinling.yang
34cc5bf125
新增刀具及刀具型号联动展示相关字段并显示对应信息,不同刀具的页面布局
2023-06-14 19:22:52 +08:00
马广威
a205220acd
Accept Merge Request #195 : (feature/sf刀具基础信息管理 -> develop)
...
Merge Request: 删除测试模型及其界面
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/195
2023-06-14 17:38:14 +08:00
mgw
f6651ffffb
删除测试模型
2023-06-14 17:36:39 +08:00
qihao.gong@jikimo.com
b8dc06a7c7
sf功能刀具管理页面
2023-06-14 17:18:03 +08:00
马广威
08f8d7f03a
Accept Merge Request #194 : (feature/sf刀具基础信息管理 -> develop)
...
Merge Request: 增加物料刀具同步功能,修复一些问题
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/194?initial=true
2023-06-14 16:35:54 +08:00
mgw
93c5bcebe1
增加刀具物料同步功能
2023-06-14 16:33:53 +08:00
yuxianghui
24fd92fa3b
对功能刀具预警、实时分布和出入库记录的代码进行了合并优化
2023-06-14 16:27:16 +08:00
qihao.gong@jikimo.com
c919dac8cb
刀具管理
2023-06-13 17:33:38 +08:00
WEB许何哲\xuhez
414f485c17
0613修改侧边栏
2023-06-13 17:32:21 +08:00
jinling.yang
6068a55b79
新增sf的刀具模板的相关刀具物料字段
2023-06-13 17:30:35 +08:00
yuxianghui
3236d477c0
sf的功能刀具实时分布和功能刀具出入库记录视图界面已建立
2023-06-13 17:13:15 +08:00
mgw
3d1d5e6ef3
智能工厂刀具物料模型、关联关系及其界面已建立
2023-06-13 14:13:15 +08:00
禹翔辉
6886354fc5
Accept Merge Request #191 : (feature/sf刀具功能分支 -> develop)
...
Merge Request: 夹具基础数据模块和redis夹具数据同步到sf夹具基础数据
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/191?initial=true
2023-06-13 11:22:02 +08:00
yuxianghui
3a8c65c8d1
解决sf代码冲突问题
2023-06-13 11:19:06 +08:00
qihao.gong@jikimo.com
2eadcbe31a
新建刀具管理模块 及菜单
2023-06-13 10:40:58 +08:00
龚启豪
c76c01d78f
Accept Merge Request #189 : (feature/sf机床同步 -> develop)
...
Merge Request: 同步接口新增每日定时器
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/189
2023-06-12 16:19:42 +08:00
qihao.gong@jikimo.com
3baa438c2b
每日同步刀具定时器
2023-06-12 16:17:42 +08:00
马广威
f457890b73
Accept Merge Request #188 : (feature/sf刀具基础信息管理 -> develop)
...
Merge Request: 修正图片同步bug
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/188?initial=true
2023-06-12 15:10:22 +08:00
mgw
06f907ba00
更正图片无法同步的bug
2023-06-12 15:09:30 +08:00
mgw
56580fa22a
同步方法已完成,合并
2023-06-12 14:48:06 +08:00
mgw
3d04200ca7
解决冲突
2023-06-12 14:35:14 +08:00
马广威
e9ccdd958d
Accept Merge Request #187 : (feature/sf刀具基础信息管理 -> develop)
...
Merge Request: sf刀具基础信息同步基本完成
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/187?initial=true
2023-06-12 14:24:41 +08:00
mgw
e0983d0530
解决权限冲突
2023-06-12 14:12:16 +08:00
mgw
a1678f76c2
同步方法基本完成,优化图片展示
2023-06-12 13:17:52 +08:00
jinling.yang
b53a115489
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2023-06-12 10:41:26 +08:00
jinling.yang
41cc8f1d73
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2023-06-12 10:39:34 +08:00
mgw
f95e04afc9
刀具同步方法(cloud >>> sf)基本完成,待测试
2023-06-12 09:24:33 +08:00
mgw
ac66e15d7a
部分cloud>sf同步接口已完成并测试
2023-06-09 18:15:12 +08:00
WEB许何哲\xuhez
8a4320c031
前端修改样式
2023-06-09 17:28:36 +08:00
龚启豪
8c23acceaf
Accept Merge Request #184 : (feature/sf机床同步 -> develop)
...
Merge Request: 修改机床类型,机床型号对象,并从redis同步到工厂
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/184
2023-06-08 15:02:44 +08:00
龚启豪
c481f5776e
Merge branch refs/heads/develop into refs/heads/feature/sf机床同步
2023-06-08 15:02:03 +08:00
马广威
bc8f66c4e5
Accept Merge Request #185 : (feature/sf刀具基础信息管理 -> develop)
...
Merge Request: sf刀具基础信息初步建立
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/185?initial=true
2023-06-08 15:00:26 +08:00
mgw
bf3c7e2b4d
sf刀具基础信息已初步建立
2023-06-08 14:58:40 +08:00
qihao.gong@jikimo.com
99b89f2e15
修改同步所有数据的按钮
2023-06-08 09:36:42 +08:00
qihao.gong@jikimo.com
9d1597089b
修改机床型号同步接口以及基础数据
2023-06-07 15:26:44 +08:00
qihao.gong@jikimo.com
46c57162d7
同步机床类型对象
2023-06-07 10:49:55 +08:00
马广威
7dfab63a89
Accept Merge Request #183 : (feature/企业微信审批接入 -> develop)
...
Merge Request: 同步模板功能接入
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/183
2023-06-02 17:07:17 +08:00
马广威
38961c5ba1
Merge branch refs/heads/develop into refs/heads/feature/企业微信审批接入
2023-06-02 17:07:01 +08:00
mgw
f973bb031d
同步模板功能基本完成
2023-06-02 17:03:03 +08:00
jinling.yang
657293bf06
Merge branch 'feature/新增审批功能' into develop
2023-06-02 16:38:40 +08:00
杨金灵
f462aec08a
Accept Merge Request #182 : (feature/新增审批功能 -> develop)
...
Merge Request: 新增sf与企业微信对接的审批模块
Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/182?initial=true
2023-06-02 16:38:25 +08:00
jinling.yang
bb9c4d1c27
审批历史记录模型新增字段
2023-06-01 17:27:33 +08:00
mgw
8b19e0be38
优化create记录的字典
2023-06-01 16:31:11 +08:00
mgw
1c5d135e48
修改模板模型结构
2023-06-01 15:45:00 +08:00
mgw
48e0809bd7
同步企业微信审批模板~除”控件配置“外基本完成
2023-05-31 18:13:12 +08:00
jinling.yang
29acd4d879
新增审批模型及相关页面
2023-05-31 17:44:27 +08:00
mgw
ce532a6b63
增加审批模板配置对象,当企业微信模板有更新时,从此配置对象读取模板id列表,即可更新odoo中的审批模板
2023-05-30 14:50:18 +08:00
杨金灵
fd943df012
Accept Merge Request #181 : (feature/新增企业微信模块 -> develop)
...
Merge Request: 新增企业微信模块
Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/181?initial=true
2023-05-30 11:27:56 +08:00
jinling.yang
9ae2ff1a2b
新增企业微信模块
2023-05-30 11:26:03 +08:00
马广威
c913973936
Accept Merge Request #180 : (feature/优化代码结构 -> develop)
...
Merge Request: 修复进度反馈问题与时区问题,优化界面问题(下发记录等只显示在cnc加工工单处)与opcua超时时长
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/180?initial=true
2023-05-23 10:46:37 +08:00
mgw
92cbdfd4f5
修复进度不更新到bfm的问题,在sf的设置处增加bfm环境选择(正式、测试、开发)
2023-05-23 10:41:10 +08:00
jinling.yang
0a2454507b
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2023-05-17 14:22:52 +08:00
杨金灵
6ea98623fb
Accept Merge Request #179 : (feature/表面工艺外协优化项 -> develop)
...
Merge Request: 出入库单新增验证及单个外协表面工艺Bug修复
Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/179?initial=true
2023-05-17 14:21:02 +08:00
jinling.yang
f2218f7afb
出入库单新增验证及单个外协表面工艺Bug修复
2023-05-17 14:18:23 +08:00
杨金灵
d04e98a5fd
Accept Merge Request #178 : (feature/表面工艺外协优化项 -> develop)
...
Merge Request: 出入库单状态修复
Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/178?initial=true
2023-05-16 17:35:16 +08:00
jinling.yang
4e81243adc
出入库单状态修复
2023-05-16 17:32:23 +08:00
杨金灵
774d688929
Accept Merge Request #176 : (feature/销售订单行新增模型展示 -> develop)
...
Merge Request: 销售订单行新增模型展示
Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/176?initial=true
2023-05-15 17:08:25 +08:00
jinling.yang
9415599b53
Merge branch 'feature/销售订单行新增模型展示' into develop
2023-05-15 17:08:14 +08:00
jinling.yang
e1a8f68eea
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/销售订单行新增模型展示
2023-05-15 17:02:01 +08:00
杨金灵
7ec8feec2c
Accept Merge Request #175 : (feature/表面工艺外协优化项 -> develop)
...
Merge Request: 表面工艺外协优化
Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/175?initial=true
2023-05-12 17:41:23 +08:00
jinling.yang
cdb5493461
新增出库单验证前置和后置条件,外协工单点击完成时生成询价单
2023-05-12 17:36:59 +08:00
mgw
19531bba04
修复下发时的时区问题
2023-05-06 10:48:26 +08:00
mgw
af5b319d0c
优化界面展示,优化opcua超时时长
2023-05-05 21:08:06 +08:00
jinling.yang
b942696c69
1.销售模块的销售页面的订单行展示模型
...
2.表面工艺及类别菜单的排序
2023-04-24 17:09:16 +08:00