jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Commit Graph

  • 00802f9fc0 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-04-08 16:39:52 +08:00
  • 07230703d8 1.优化agv配置及接口：新增站点集合对象，agv车辆编号及任务单类型编号字段 2.优化rfid和工单部分需求：点完工按钮，若为工件装夹工单，完工需校验工件坯料、RFID码、前置三元定位是否填写；若未填写，页面弹出对应提示，反之则需要二次确认弹窗 3.新增最初版的快速订单：为了工厂测试下单走流程 4.工单优化：新增检测结果和是否重新生成制造订单字段 jinling.yang 2024-04-08 16:39:26 +08:00
  • 4cd2cbe1a7 Accept Merge Request #935: (feature/工单扫描绑定Rfid优化 -> develop) 禹翔辉 2024-04-08 15:58:09 +08:00
  • 6bddc4c262 Merge branch 'feature/功能刀具组装功能优化' into feature/工单扫描绑定Rfid优化 yuxianghui 2024-04-08 14:45:05 +08:00
  • 4faeda11b8 1、优化工单扫托盘Rfid绑定Rfid码录入信息时，工单的开始等按键消失的问题 yuxianghui 2024-04-08 14:43:46 +08:00
  • 3a484682fa Accept Merge Request #934: (feature/功能刀具组装功能优化 -> develop) 禹翔辉 2024-04-07 16:46:26 +08:00
  • 556c3cb4bb Merge branch 'feature/工单扫Rfid绑定托盘' into feature/功能刀具组装功能优化 yuxianghui 2024-04-07 15:37:52 +08:00
  • 000280e53a no message yuxianghui 2024-04-07 15:36:05 +08:00
  • 4dd733c466 1、处理刀具物料注册时搜索不到的问题；2、功能刀具组装时，当没有选择物料的时候功能刀具编码不显示数据；添加最大寿命值、报警值、有效长、避空长的必填验证； yuxianghui 2024-04-07 15:35:47 +08:00
  • 92e522905c Accept Merge Request #933: (feature/工单扫Rfid绑定托盘 -> develop) 禹翔辉 2024-04-03 17:27:03 +08:00
  • 2ef832c17e 暂时关闭工单扫Rfid绑定托盘的Rfid重复验证 yuxianghui 2024-04-03 17:23:57 +08:00
  • 7fd92e44b3 Accept Merge Request #932: (feature/工单扫Rfid绑定托盘 -> develop) 禹翔辉 2024-04-03 16:59:55 +08:00
  • 392784041c Merge branch 'feature/刀具物料采购生成序列号优化' into feature/工单扫Rfid绑定托盘 yuxianghui 2024-04-03 16:54:10 +08:00
  • 02e5972272 1、新增装夹预调工单扫拖盘Rfid绑定托盘；2、删除工单的Rfid字段的customRFID样式；3、修改序列号模型的Rfid字段的隐藏条件；4、优化刀柄、托盘物料采购时绑定Rfid的判断条件 yuxianghui 2024-04-03 16:52:16 +08:00
  • eb3583222c Accept Merge Request #931: (feature/刀具物料采购生成序列号优化 -> develop) 禹翔辉 2024-04-02 16:43:21 +08:00
  • aac5195b4d 当产品的刀具物料不是刀柄时，隐藏对应序列号模型的Rfid字段 yuxianghui 2024-04-02 16:38:19 +08:00
  • 715119d250 Accept Merge Request #930: (feature/刀具物料采购生成序列号优化 -> develop) 禹翔辉 2024-04-02 16:16:25 +08:00
  • 9ed3930a1b Merge branch 'feature/刀柄入库录入Rfid' into feature/刀具物料采购生成序列号优化 yuxianghui 2024-04-02 16:03:35 +08:00
  • 2580e0c795 1、优化产品采购刀具物料生成的序列号出现不连续的问题；2、采购刀柄物料时，在入库验证环节增加Rfid是否全部录入检验。 yuxianghui 2024-04-02 15:36:28 +08:00
  • f4f1c9f839 1.新增表面工艺外协路线初始化数据 jinling.yang 2024-04-01 17:34:56 +08:00
  • 827e056dc8 Accept Merge Request #928: (feature/刀柄入库录入Rfid -> develop) 禹翔辉 2024-04-01 17:14:03 +08:00
  • 02e4987281 优化选取适用夹头方法 yuxianghui 2024-04-01 17:12:47 +08:00
  • e89b8ac65c Merge branch 'feature/功能刀具安全库存注册' into feature/刀柄入库录入Rfid yuxianghui 2024-04-01 16:56:56 +08:00
  • f0b972e705 1、优化刀柄物料产品适用夹头型号没有数据的问题，优化刀具标准库基本参数同步接口；2、优化功能刀具组装时，只需扫入刀柄的Rfid，将自动带出刀柄信息，并根据刀柄适用夹头型号和适配夹头尺寸随机带出一个可用夹头物料信息，同时将刀柄的Rfid码填入功能刀具的Rfid码。3、优化刀柄物料采购入库时的验证的判断条件； yuxianghui 2024-04-01 16:56:15 +08:00
  • 5c220af28c Accept Merge Request #927: (feature/制造代码优化 -> develop) 马广威 2024-04-01 14:56:34 +08:00
  • 82947a909e Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化 mgw 2024-04-01 14:55:31 +08:00
  • 18dcb79116 修复自定义角色打印无权限的问题 mgw 2024-04-01 14:55:10 +08:00
  • 8d1e4a89c2 1、没绑定工单不能完工，绑定后才可以完工 2、工单绑定后没完工可以换绑 3、工单点完工按钮要有确认弹窗 jinling.yang 2024-03-29 17:38:35 +08:00
  • 48809cd654 1、序列号模型对象添加rfid字段且rfid仅在产品为刀柄时展示，序列号模型添加规格字段，且添加自动根据对应产品类型不同计算出其值，产品为夹具时看板展示其规格的值；2、在采购入库流程，录入序列号的过程界面添加录入rfid字段，当产品是刀柄时需录入刀柄的rfid，并在验证通过后刀柄的序列号中带有rfid码； yuxianghui 2024-03-29 17:37:02 +08:00
  • 35fd1e329d Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-03-29 16:56:06 +08:00
  • af289b7030 Merge branch 'feature/优化下发编程单的同时拉取CMM程序' into develop jinling.yang 2024-03-29 16:55:52 +08:00
  • 5b3ee99bf3 Accept Merge Request #926: (feature/优化下发编程单的同时拉取CMM程序 -> develop) 杨金灵 2024-03-29 16:55:31 +08:00
  • be975ea901 文件匹配添加注释 jinling.yang 2024-03-29 16:52:05 +08:00
  • 1451539bb4 释放注释代码 jinling.yang 2024-03-29 16:48:44 +08:00
  • 154e7de8a4 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化下发编程单的同时拉取CMM程序 jinling.yang 2024-03-29 16:47:18 +08:00
  • d21b25467b Accept Merge Request #925: (feature/功能刀具安全库存注册 -> develop) 禹翔辉 2024-03-28 17:34:29 +08:00
  • 71b7b07949 Merge branch 'feature/表面工艺添加类别筛选' into feature/功能刀具安全库存注册 yuxianghui 2024-03-28 17:31:42 +08:00
  • 4115bbb05e 1、优化功能刀具安全库存信息更新时没有及时注册的问题 yuxianghui 2024-03-28 17:30:16 +08:00
  • c380d99a26 Accept Merge Request #924: (feature/表面工艺添加类别筛选 -> develop) 禹翔辉 2024-03-28 10:39:15 +08:00
  • a0d50edc84 Merge branch 'feature/夹具管理' into feature/表面工艺添加类别筛选 yuxianghui 2024-03-28 10:36:29 +08:00
  • 2aa29e5cbf 1、表面工艺添加按类型筛选功能；2、夹具产品的类型、规格添加必填 yuxianghui 2024-03-28 10:35:08 +08:00
  • 32907109ef Accept Merge Request #923: (feature/修复表面工艺外协 -> develop) 杨金灵 2024-03-27 17:30:24 +08:00
  • 303fcfaabd 查询源位置的条件=改为ilike jinling.yang 2024-03-27 17:28:48 +08:00
  • f767433a96 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-03-27 17:26:37 +08:00
  • 3eae506e48 注释occ代码 jinling.yang 2024-03-27 17:26:27 +08:00
  • 0ddefacda7 注释OCC代码 jinling.yang 2024-03-27 17:26:14 +08:00
  • 42a748e0f8 Accept Merge Request #922: (feature/夹具管理 -> develop) 禹翔辉 2024-03-27 11:52:45 +08:00
  • 63263e3509 修改刀具管理权限 yuxianghui 2024-03-27 11:49:42 +08:00
  • aaf782b4a1 Merge branch 'feature/刀具管理' into feature/夹具管理 yuxianghui 2024-03-27 11:47:28 +08:00
  • ce069e8b50 1、制造模块新增夹具管理菜单，将夹具物料查询菜单移到夹具管理菜单下，设置夹具管理菜单为工件装夹岗可见； yuxianghui 2024-03-27 11:39:07 +08:00
  • 609ea62d0d Accept Merge Request #921: (feature/制造代码优化 -> develop) 马广威 2024-03-27 10:35:29 +08:00
  • f7f9cf1e43 控制cnc只能看到cnc产线；增加必填标识 mgw 2024-03-27 10:26:46 +08:00
  • 75eb359c5a Accept Merge Request #920: (feature/制造代码优化 -> develop) 马广威 2024-03-26 20:40:07 +08:00
  • 7906ff2836 优化翻译、排序、权限问题 mgw 2024-03-26 18:09:23 +08:00
  • 5e97747ec1 Accept Merge Request #919: (feature/功能刀具安全库存优化 -> develop) 禹翔辉 2024-03-26 15:20:17 +08:00
  • ead758d34c Merge branch 'feature/零件特采接口优化' into feature/功能刀具安全库存优化 yuxianghui 2024-03-26 15:17:49 +08:00
  • decb6c7792 禁用功能刀具安全库存的刀具组字段创建新记录的功能 yuxianghui 2024-03-26 15:16:26 +08:00
  • b83e5575dc Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-03-26 14:19:40 +08:00
  • a003987111 Merge branch 'feature/优化agv配置和客户' into develop jinling.yang 2024-03-26 14:19:13 +08:00
  • db2052a019 Accept Merge Request #918: (feature/优化agv配置和客户 -> develop) 杨金灵 2024-03-26 14:18:56 +08:00
  • ca06d11d79 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-03-26 14:11:25 +08:00
  • e63eed3405 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化agv配置和客户 jinling.yang 2024-03-26 14:11:11 +08:00
  • d05c0951eb 1.agv配置参数新增地码 2.bpm分配工厂时的客户(业务平台)的必填信息（税，邮箱，号码）赋值 3.报价页面的客户改为不可新建 jinling.yang 2024-03-26 14:10:51 +08:00
  • 0500a2dd02 Accept Merge Request #917: (feature/零件特采接口优化 -> develop) 禹翔辉 2024-03-25 16:55:37 +08:00
  • 37ea48dbee Merge branch 'feature/夹具物料搜索' into feature/零件特采接口优化 yuxianghui 2024-03-25 16:51:04 +08:00
  • 48cd8399f4 1、优化中控零件特采接口，2、将刀具管理的功能刀具所有rfid改为Rfid yuxianghui 2024-03-25 16:49:49 +08:00
  • ee3c0d702d Accept Merge Request #916: (feature/制造代码优化 -> develop) 马广威 2024-03-25 16:19:22 +08:00
  • 1212ea0930 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化 mgw 2024-03-25 16:18:42 +08:00
  • ed8c39d005 修复员工模块js问题、能力特征哭js问题、设备处问题 mgw 2024-03-25 16:17:19 +08:00
  • fe4782eecf Accept Merge Request #915: (feature/前端样式修改 -> develop) 黄焱 2024-03-25 09:10:37 +08:00
  • 57bfec02eb 修改field错误问题 黄焱 2024-03-25 09:07:45 +08:00
  • 84140f77a0 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug qihao.gong@jikimo.com 2024-03-22 14:44:57 +08:00
  • c91cb525b0 修改权限相关 qihao.gong@jikimo.com 2024-03-22 14:44:40 +08:00
  • 53c4b01a74 Accept Merge Request #914: (feature/制造代码优化 -> develop) 马广威 2024-03-20 17:34:56 +08:00
  • 5b535fae18 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化 mgw 2024-03-20 17:33:58 +08:00
  • ba79b358a9 调整打印机模型结构 mgw 2024-03-20 17:32:17 +08:00
  • c788392b36 打印配置初步优化并测试成功，自测流程成功 mgw 2024-03-20 16:58:57 +08:00
  • d3819e818b Accept Merge Request #913: (feature/夹具物料搜索 -> develop) 禹翔辉 2024-03-20 16:38:43 +08:00
  • 0725b7a7ba Merge branch 'feature/功能刀具组装优化' into feature/夹具物料搜索 yuxianghui 2024-03-20 16:36:00 +08:00
  • a07563e166 1、新增夹具物料搜索模型，完成tree视图和form视图；2、新增夹具物料序列号、夹具物料搜索模型注册到cloud的接口，优化刀具物料序列号注册接口及流程；3、删除刀具物料搜索模型的无关字段； yuxianghui 2024-03-20 16:34:11 +08:00
  • 2407d2cfc7 移除系统中odoo相关标识、信息 mgw 2024-03-20 16:15:00 +08:00
  • f38c062804 打印相关抽象为公用类 mgw 2024-03-20 11:28:58 +08:00
  • 0363f8c8a3 odoo16中直连局域网zebra标签打印机打印二维码初版测试成功 mgw 2024-03-19 17:48:00 +08:00
  • 2e83fc2e44 Accept Merge Request #912: (feature/功能刀具组装优化 -> develop) 禹翔辉 2024-03-19 17:22:24 +08:00
  • 952e663b31 1、解决刀具物料采购时，自动生成序列号重复问题；2、优化刀具物料生成序列号时，自动更新刀具物料查询记录的方法 yuxianghui 2024-03-19 17:20:19 +08:00
  • bb78404772 Accept Merge Request #911: (feature/功能刀具组装优化 -> develop) 禹翔辉 2024-03-19 10:33:04 +08:00
  • e5b6f2dcdc Merge branch 'feature/夹具型号基本参数同步' into feature/功能刀具组装优化 yuxianghui 2024-03-19 10:28:07 +08:00
  • 3458deef09 1、解决功能刀具组装时，已使用刀具物料还能再选到的问题；2、解决功能刀具组装完成后的功能刀具注册到cloud没有编码的问题；3、刀具物料添加未入库状态； yuxianghui 2024-03-19 10:26:55 +08:00
  • f8d1bff5d3 Accept Merge Request #910: (feature/夹具型号基本参数同步 -> develop) 禹翔辉 2024-03-18 17:21:29 +08:00
  • d3e050bd21 Merge branch 'feature/夹具型号同步优化' into feature/夹具型号基本参数同步 yuxianghui 2024-03-18 17:17:10 +08:00
  • c470935cc5 1、删除夹具型号同步接口中的夹具型号基本参数的数据；2、新增夹具型号基本参数模型同步接口，完成夹具型号基本参数的同步；3、修改刀具管理菜单下子菜单名称；4、关闭刀具物料搜索模型form视图的注册接口 yuxianghui 2024-03-18 17:15:34 +08:00
  • b053edd655 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-03-18 15:02:07 +08:00
  • 0324acd4fd Merge branch 'feature/优化产品模版' into develop jinling.yang 2024-03-18 15:01:54 +08:00
  • 3eb274aa01 Accept Merge Request #909: (feature/优化产品模版 -> develop) 杨金灵 2024-03-18 15:01:20 +08:00
  • d4c786ff1e 1.选择规则，带出对应型号图片 jinling.yang 2024-03-18 14:46:49 +08:00
  • ab58f5b40c Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化产品模版 jinling.yang 2024-03-18 14:46:35 +08:00
  • 83327136eb Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-03-18 14:43:50 +08:00
  • cfd2910ead Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-03-18 14:43:27 +08:00
  • e444e27cad 1.选择规则，带出对应型号图片 2.规格弹出的页面隐藏刀具类型 3.型号新建弹出的页面图片字段去掉option设置，编码改为强制保存 jinling.yang 2024-03-18 14:42:51 +08:00
  • 64050ac461 Accept Merge Request #908: (feature/夹具型号同步优化 -> develop) 禹翔辉 2024-03-18 10:31:25 +08:00