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

Commit Graph

  • cba007b374 Accept Merge Request #131: (feature/优化工单 -> develop) Merge Request: 优化工单 龚启豪 2023-02-03 17:16:46 +08:00
  • 19d742d20f 优化工单 gqh 2023-02-03 17:14:17 +08:00
  • f7cca137c6 Accept Merge Request #130: (feature/优化进度反馈 -> develop) Merge Request: 优化工单界面展示 马广威 2023-02-03 17:11:54 +08:00
  • a4bee8bb6b 优化工单界面显示 mgw 2023-02-03 17:10:31 +08:00
  • 4d4b0098ce 更新模块信息 mgw 2023-02-03 10:32:53 +08:00
  • eee02d2ff1 Accept Merge Request #129: (feature/对接业务平台返回状态 -> develop) Merge Request: 对接业务平台返回进度已完成主体部分 马广威 2023-02-03 09:53:25 +08:00
  • 2a713b6cc4 去掉测试按钮 mgw 2023-02-03 09:48:31 +08:00
  • 973bb748c2 优化模块分类 mgw 2023-02-03 09:47:09 +08:00
  • 4975835cf3 对接业务平台，返回加工中状态 mgw 2023-02-03 01:18:02 +08:00
  • 0f062dad96 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2023-02-02 18:12:59 +08:00
  • 79ee28e0dd Accept Merge Request #127: (feature/sf优化界面 -> develop) Merge Request: 修改参数说明 龚启豪 2023-02-02 17:24:53 +08:00
  • cbe45d3d7b 修改参数说明 gqh 2023-02-02 17:21:51 +08:00
  • 91de63a6a4 Accept Merge Request #126: (feature/sf优化界面 -> develop) Merge Request: 优化工单展示 龚启豪 2023-02-02 15:09:53 +08:00
  • 59cb6e5def 优化工单界面，新增物料page，修复工单按钮bug，隐藏权限字段 gqh 2023-02-02 14:59:39 +08:00
  • 904aad74ce Accept Merge Request #119: (feature/优化代码结构 -> develop) Merge Request: 扫码字段更新完成 马广威 2023-02-02 10:06:46 +08:00
  • b323abddac Merge branch 'feature/bom组件数量修复' into develop jinling.yang 2023-02-02 10:01:20 +08:00
  • 71f2c187dc Accept Merge Request #118: (feature/bom组件数量修复 -> develop) Merge Request: bom组件数量修复 杨金灵 2023-02-02 10:01:00 +08:00
  • a06e7cdb83 去掉不要的代码 jinling.yang 2023-02-02 09:58:47 +08:00
  • d3e30a4c87 去掉权限代码 jinling.yang 2023-02-02 09:57:01 +08:00
  • e8d923df03 bfm分配工厂: 1.销售页面：客户的值为业务平台， 2.没有原材料，事务回滚 3.去掉注释和没用到的代码 jinling.yang 2023-02-01 18:27:29 +08:00
  • a796795d05 Accept Merge Request #114: (feature/sf优化界面 -> develop) Merge Request: 优化工单form视图，增加制造翻译模块 龚启豪 2023-02-01 17:55:06 +08:00
  • d032f89272 sf优化绑定托盘，工单form显示开始按钮 加工时间 gqh 2023-02-01 17:53:32 +08:00
  • 6a51b8cc4c 更新字段名称至中文 mgw 2023-02-01 14:42:23 +08:00
  • e2561bee34 Accept Merge Request #113: (feature/sf优化界面 -> develop) Merge Request: sf合并工单优化项 龚启豪 2023-02-01 14:09:52 +08:00
  • 5495f2436a 优化工单，英文改为中文展示，解除托盘展示托盘 gqh 2023-02-01 14:07:33 +08:00
  • 643ce6ac7a 增加外层group标签 mgw 2023-01-31 21:02:48 +08:00
  • 5f45416d80 Accept Merge Request #110: (feature/整理代码，更新下发代码 -> develop) Merge Request: 整理代码，更新下发代码 马广威 2023-01-31 17:25:44 +08:00
  • 946bf32c4e 整理代码，更新下发代码 mgw 2023-01-31 17:21:37 +08:00
  • afcea7f715 Accept Merge Request #109: (feature/工单的cnc工单加工面显示bug修复 -> develop) Merge Request: 工单的cnc工单加工面显示bug修复 杨金灵 2023-01-31 12:03:20 +08:00
  • 7b78e2451a 工单的cnc工单加工面显示bug修复 jinling.yang 2023-01-31 12:02:56 +08:00
  • 8957fec332 修复密码错误bug gqh 2023-01-31 11:30:13 +08:00
  • e0193b81c9 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2023-01-31 11:09:13 +08:00
  • 8312b5fc6b Accept Merge Request #108: (feature/sf优化界面 -> develop) Merge Request: 修改登录背景，工作中心显示bug 龚启豪 2023-01-31 11:08:04 +08:00
  • 169bf4a59a 修改登录背景 gqh 2023-01-31 11:02:53 +08:00
  • f763da5947 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2023-01-31 10:53:30 +08:00
  • af91aca75f Accept Merge Request #106: (feature/优化代码：工单显示机床信息等 -> develop) Merge Request: 数采节点字段配置完毕 马广威 2023-01-31 10:42:56 +08:00
  • 8c424f5aa6 Merge branch develop into feature/优化代码：工单显示机床信息等 马广威 2023-01-31 10:42:32 +08:00
  • 07709af26a Merge branch 'feature/修复sf的bug' into develop jinling.yang 2023-01-31 10:38:37 +08:00
  • 210ee9d38d Accept Merge Request #107: (feature/修复sf的bug -> develop) Merge Request: 页面优化及部分bug修复 杨金灵 2023-01-31 10:37:58 +08:00
  • e2ae08c33f 制造和销售里的产品的筛选器，胚料的生成新增是否为业务平台新建字段，匹配bom修改为只能匹配手动建的bom jinling.yang 2023-01-31 10:32:14 +08:00
  • 51c89f5c6b 修改字段名称，为一键下发增加异常捕获 mgw 2023-01-31 10:27:57 +08:00
  • 733e33adfd 新增胚料的模型类型 jinling.yang 2023-01-30 18:11:29 +08:00
  • fec18188fa 工作中心看板查看工单取消全屏 gqh 2023-01-30 17:56:41 +08:00
  • 4e57c76c63 机床对象上增加数据采集节点配置 mgw 2023-01-30 17:38:53 +08:00
  • f5c8623c72 sf优化 gqh 2023-01-30 17:33:38 +08:00
  • 60e044ec9b 新增机床ftp路径配置 mgw 2023-01-30 15:14:36 +08:00
  • 271a5d4224 1.模型类型增加跟修改各字段 2.智能工厂成品名称优化 3.智能工厂产品根据产品类型增加默认筛选条件的优化（在筛选器内根据产品类型增加筛选条件） 4.智能工厂胚料名称的优化 5.自加工产品的制造订单优化 jinling.yang 2023-01-29 17:48:45 +08:00
  • f6f782fe33 配置工单显示机床信息 mgw 2023-01-29 17:47:36 +08:00
  • e93906a5f0 工作中心看板默认展示列表 gqh 2023-01-29 17:04:50 +08:00
  • 16cffc3ba5 单个制造显示问题 gqh 2023-01-29 16:33:56 +08:00
  • a7edb142c8 恢复代码 gqh 2023-01-29 16:05:00 +08:00
  • a26d1ca2ba 三元输入坐标变色 gqh 2023-01-29 15:55:46 +08:00
  • e0ce0fcfa3 回滚 gqh 2023-01-29 15:48:50 +08:00
  • 9125eedf5a 回滚 gqh 2023-01-29 15:48:12 +08:00
  • e6883a1f92 回滚 gqh 2023-01-29 15:47:46 +08:00
  • 16623b3292 回滚 gqh 2023-01-29 15:47:18 +08:00
  • 878e28791c 回滚 gqh 2023-01-29 15:46:58 +08:00
  • e319b282fc 回滚 gqh 2023-01-29 15:46:14 +08:00
  • bdae9d9f95 恢复代码 gqh 2023-01-29 15:42:33 +08:00
  • cfde389826 工单操作page默认在前面 gqh 2023-01-29 09:43:03 +08:00
  • 0a248d577a 优化代码-设置按钮权限等 mgw 2023-01-29 09:26:19 +08:00
  • 9c473e6f32 优化sf gqh 2023-01-23 20:21:00 +08:00
  • 270b8d3cc1 修复工作中心绑定机床和胚料外协供应商外包未勾选问题 jinling.yang 2023-01-13 16:47:12 +08:00
  • 5492d4f2fa 修复工作中心绑定机床和胚料外协供应商是否外包未勾选bug修复 jinling.yang 2023-01-13 16:43:30 +08:00
  • c212810d60 合并 gqh 2023-01-12 14:16:05 +08:00
  • f5cfd50d33 cnc按钮展示问题，加工进度字段去掉注释 jinling.yang 2023-01-11 16:32:48 +08:00
  • 6d48618253 优化接口 jinling.yang 2023-01-11 16:23:19 +08:00
  • 39136bb137 新增依赖 jinling.yang 2023-01-11 15:25:49 +08:00
  • 6374388d7b 附件新增字段 jinling.yang 2023-01-11 15:11:44 +08:00
  • 381d6ca9a5 更新mrs_connect gqh 2023-01-11 15:04:37 +08:00
  • 8e51654f17 合并sf代码 gqh 2023-01-11 14:51:59 +08:00
  • aba5a076b1 合并 gqh 2023-01-11 14:08:12 +08:00
  • eb162cb416 合并工单优化 gqh 2023-01-11 11:13:52 +08:00
  • 01cf30b03f 优化涉及到的接口 jinling.yang 2023-01-11 11:05:06 +08:00
  • d66687297d Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/工单文件优化 jinling.yang 2023-01-10 09:27:14 +08:00
  • 311c7c723a sf1.0 gqh 2023-01-09 23:04:53 +08:00
  • 0de2222009 cnc程序获取优化 jinling.yang 2023-01-09 21:20:51 +08:00
  • d0497aa043 工单优化 gqh 2023-01-09 20:40:27 +08:00
  • 1dcc15802a Merge branch 'feature/优化sf' into develop jinling.yang 2023-01-09 20:35:21 +08:00
  • c3e5610b17 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化sf jinling.yang 2023-01-09 20:33:53 +08:00
  • b7723f82d0 优化sf获取cnc程序和ftp jinling.yang 2023-01-09 19:54:02 +08:00
  • 3d882f5492 Accept Merge Request #76: (feature/轨迹跟踪 -> develop) Merge Request: 物流前轨迹跟踪代码合并 马广威 2023-01-09 14:42:37 +08:00
  • d088bc1c86 优化扫码部分 mgw 2023-01-08 16:51:24 +08:00
  • 7c4baa4d91 加工中代码测试完成 mgw 2023-01-07 01:12:25 +08:00
  • 0dbd941ed0 加工中轨迹跟踪代码 mgw 2023-01-06 16:47:40 +08:00
  • b53fddeec5 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop gqh 2023-01-04 10:35:38 +08:00
  • 08efe7813d sf工单优化及权限 gqh 2023-01-04 10:13:29 +08:00
  • fd0d65867e Accept Merge Request #63: (feature/三元补偿值写入下张工单 -> develop) Merge Request: 合并三元补偿值写入 马广威 2023-01-03 15:12:29 +08:00
  • be90cd933b 删除接口调用 mgw 2023-01-03 15:05:09 +08:00
  • a5f79ea97d 重写工单完成方法，添加接口调用 mgw 2023-01-03 11:08:39 +08:00
  • c023a13e3a Accept Merge Request #60: (feature/胚料问题修复 -> develop) Merge Request: 新增occ模块及部分bug修复 杨金灵 2022-12-30 11:15:25 +08:00
  • a3e39d4fac 产品和制造订单新增模型和occ查看模型模块 jinling.yang 2022-12-30 10:00:17 +08:00
  • ac383797e0 将三元补偿值写入CNC加工工单 mgw 2022-12-28 16:44:24 +08:00
  • 5fcb17d048 胚料bug修复，销售订单明细行路线修复，编程单下发优化 jinling.yang 2022-12-27 17:28:47 +08:00
  • c6b9953e40 Merge branch 'feature/odoo16的代码修改' into develop jinling.yang 2022-12-26 10:26:01 +08:00
  • a4be58098e 创建胚料的bug修复 jinling.yang 2022-12-26 10:25:16 +08:00
  • dd5c387585 解决代码冲突 jinling.yang 2022-12-12 16:59:42 +08:00
  • 0b0f5c82ed Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2022-12-12 16:56:04 +08:00
  • 70b7aa4c0f 工单修改 jinling.yang 2022-12-12 16:52:58 +08:00
  • 257ed593c9 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop gqh 2022-12-12 14:52:48 +08:00