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

440 Commits

Author SHA1 Message Date
mgw
7906ff2836 优化翻译、排序、权限问题 2024-03-26 18:09:23 +08:00
mgw
5b535fae18 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化 2024-03-20 17:33:58 +08:00
mgw
ba79b358a9 调整打印机模型结构 2024-03-20 17:32:17 +08:00
mgw
c788392b36 打印配置初步优化并测试成功，自测流程成功 2024-03-20 16:58:57 +08:00
mgw
f38c062804 打印相关抽象为公用类 2024-03-20 11:28:58 +08:00
yuxianghui
d3e050bd21 Merge branch 'feature/夹具型号同步优化' into feature/夹具型号基本参数同步 2024-03-18 17:17:10 +08:00
yuxianghui
c470935cc5 1、删除夹具型号同步接口中的夹具型号基本参数的数据；2、新增夹具型号基本参数模型同步接口，完成夹具型号基本参数的同步；3、修改刀具管理菜单下子菜单名称；4、关闭刀具物料搜索模型form视图的注册接口 2024-03-18 17:15:34 +08:00
jinling.yang
cfd2910ead Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop 2024-03-18 14:43:27 +08:00
jinling.yang
e444e27cad 1.选择规则，带出对应型号图片 
2.规格弹出的页面隐藏刀具类型
3.型号新建弹出的页面图片字段去掉option设置，编码改为强制保存
 2024-03-18 14:42:51 +08:00
yuxianghui
6062ebdf9c Merge branch 'feature/刀具注册' into feature/夹具型号同步优化 2024-03-18 10:29:22 +08:00
yuxianghui
698ea31d31 夹具型号同步优化 2024-03-18 10:28:08 +08:00
yuxianghui
3b7e120eb2 1、优化夹具型号静态数据同步 2024-03-15 17:38:43 +08:00
jinling.yang
d5a1a82c72 1.优化分配工厂时材料型号获取方式为采购和外协时未有供应商返回提示 
2.修复质量标准去掉审核按钮显示
 2024-03-15 16:59:51 +08:00
jinling.yang
4765e34c09 1.优化表面工艺可选参数 
2.修复质量警报质量总监没有制造订单访问权限
 2024-03-15 10:48:01 +08:00
jinling.yang
5743ba5fac Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化agv接口 2024-03-14 11:54:34 +08:00
jinling.yang
86ec97bad1 修复刀具产品模版 2024-03-14 11:54:10 +08:00
jinling.yang
5e0b4aa509 优化产品页面 2024-03-13 17:34:35 +08:00
jinling.yang
0c44bba5f2 优化刀具产品 2024-03-12 17:32:40 +08:00
龚启豪
26942afc27 Accept Merge Request #892: (feature/修改机床参数bug -> develop) 
Merge Request: 删除工序，加工工艺对象，新增表面工艺可选参数对象

Created By: @龚启豪
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/892
 2024-03-12 09:48:23 +08:00
jinling.yang
0289e2f9ff Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化agv接口 2024-03-11 17:30:46 +08:00
jinling.yang
b24355dd67 1.优化产品页面 
2.优化agv回调接口且新增agv参数配置
3.优化工件配送
 2024-03-11 17:30:32 +08:00
马广威
e3b8b0a43d Accept Merge Request #891: (feature/制造代码优化 -> develop) 
Merge Request: 修改工单显隐控制逻辑，优化代码

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/891?initial=true
 2024-03-11 11:26:19 +08:00
mgw
2044db4d3e 修复权限问题 2024-03-11 11:25:31 +08:00
qihao.gong@jikimo.com
b16d2c2864 删除工序，加工工艺，新增表面工艺可选参数相关视图 2024-03-08 17:32:21 +08:00
马广威
21ebbc877a Accept Merge Request #888: (feature/制造代码优化 -> develop) 
Merge Request: 修改按钮样式、优化权限

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/888?initial=true
 2024-03-07 11:54:52 +08:00
mgw
457035e464 修改按钮样式、优化权限 2024-03-07 11:53:57 +08:00
qihao.gong@jikimo.com
1a50a8220e 处理设备字段类型相关缺陷 2024-03-05 16:50:08 +08:00
jinling.yang
51c6b7ef9b 修复日计划工单接口 2024-02-29 17:16:27 +08:00
jinling.yang
c1da64fc36 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复权限 
# Conflicts:
#	sf_dlm_management/views/product_template_management_view.xml
 2024-02-29 15:32:54 +08:00
jinling.yang
c262110b9a 修复权限 2024-02-29 15:30:10 +08:00
yuxianghui
25e65b39bc Merge branch 'feature/刀具物料序列号优化' into feature/刀具添加归档功能 
# Conflicts:
#	sf_dlm_management/views/product_template_management_view.xml
 2024-02-29 14:52:47 +08:00
yuxianghui
3c569fd485 1、刀具组和刀具管理模块下的所以模型添加active字段，添加已归档搜索方式；2、解决俩个警告；3、产品模型的刀具物料、型号、规格字段添加当产品物料为刀具时必填及红星样式；4、关闭刀具物料查询模型和CAM用刀模型的创建按钮； 2024-02-29 14:48:21 +08:00
jinling.yang
6b8789a54b 修复产品页面涉及到其他模型的访问权限 2024-02-29 11:03:02 +08:00
jinling.yang
0538763059 1.修复及优化质检接口2.质量检查新增检测报告和检测结果2个字段 2024-02-28 15:53:46 +08:00
qihao.gong@jikimo.com
e70a91d1ec 修改定时同步接口，机床参数 2024-02-26 17:07:16 +08:00
yuxianghui
3c4a2b58b1 1、优化刀具接口 2024-02-22 18:12:51 +08:00
yuxianghui
ed8cbb1f81 1、优化刀具组接口 2024-02-22 14:23:19 +08:00
yuxianghui
ce01127664 中控对接接口优化 2024-02-22 10:15:07 +08:00
yuxianghui
51b7bcac8a 1、新增刀具组、机床刀具组接口，修改中控相关接口名称 2024-02-21 16:24:10 +08:00
yuxianghui
9c08021773 Merge branch 'feature/自动生成二维码' into feature/序列号添加二维码 2024-02-20 16:01:52 +08:00
杨金灵
de26109ccc Accept Merge Request #809: (feature/产品的加工参数的权限修复 -> develop) 
Merge Request: 产品的加工参数的权限修复

Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/809
 2024-02-20 14:35:03 +08:00
yuxianghui
53e5aa2017 优化刀具组接口 2024-02-20 14:32:13 +08:00
jinling.yang
cbd7b561de 产品的加工参数的权限修复 2024-02-19 17:07:42 +08:00
mgw
9c080e0cb4 权限控制增补 2024-02-19 15:26:36 +08:00
jinling.yang
c867b3c7bc 产品相关岗位权限的修复 2024-02-17 16:34:32 +08:00
jinling.yang
9bae3a4e5f Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复产品权限问题 2024-02-04 16:53:28 +08:00
jinling.yang
e48c5e39ac 修复产品页面部分一对多字段的访问权限 2024-02-04 16:52:57 +08:00
qihao.gong@jikimo.com
6cdc547da5 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug 2024-02-04 15:57:16 +08:00
qihao.gong@jikimo.com
c11dc4f9c4 修改权限相关缺陷 2024-02-04 15:56:53 +08:00
jinling.yang
0185a3bc2b 修复客户页面除销售员和采购员字段可编辑，其余不可编辑 2024-02-02 17:27:08 +08:00