jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,575 Commits 134 Branches 31 Tags
ab91ce01d452df183afb2c635f9e5c0aedc72cb4
Commit Graph

1575 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
马广威
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