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

Commit Graph

  • ba93adfb7b 修复同步bug（刀片类型字段无值） mgw 2023-06-15 15:40:23 +08:00
  • a219a17165 Accept Merge Request #198: (feature/sf刀具基础信息管理 -> develop) Merge Request: 型号对象增加搜索视图 马广威 2023-06-15 12:21:00 +08:00
  • b1da7a8fda 型号对象增加搜索视图 mgw 2023-06-15 12:20:26 +08:00
  • 8b549a19a8 Accept Merge Request #197: (feature/sf刀具功能分支 -> develop) Merge Request: 关联了功能刀具和功能刀具管理俩个对象 禹翔辉 2023-06-15 10:00:20 +08:00
  • fc6b756aaf 关联了功能刀具和功能刀具管理俩个对象 yuxianghui 2023-06-15 09:57:14 +08:00
  • 1eeafeddb9 Accept Merge Request #196: (feature/sf刀具功能分支 -> develop) Merge Request: 增加了功能刀具实时分布和出入库记录功能模型 禹翔辉 2023-06-15 09:08:56 +08:00
  • 34cc5bf125 新增刀具及刀具型号联动展示相关字段并显示对应信息，不同刀具的页面布局 jinling.yang 2023-06-14 19:22:52 +08:00
  • a205220acd Accept Merge Request #195: (feature/sf刀具基础信息管理 -> develop) Merge Request: 删除测试模型及其界面 马广威 2023-06-14 17:38:14 +08:00
  • f6651ffffb 删除测试模型 mgw 2023-06-14 17:36:39 +08:00
  • b8dc06a7c7 sf功能刀具管理页面 qihao.gong@jikimo.com 2023-06-14 17:18:03 +08:00
  • 08f8d7f03a Accept Merge Request #194: (feature/sf刀具基础信息管理 -> develop) Merge Request: 增加物料刀具同步功能，修复一些问题 马广威 2023-06-14 16:35:54 +08:00
  • 93c5bcebe1 增加刀具物料同步功能 mgw 2023-06-14 16:33:53 +08:00
  • 24fd92fa3b 对功能刀具预警、实时分布和出入库记录的代码进行了合并优化 yuxianghui 2023-06-14 16:27:16 +08:00
  • c919dac8cb 刀具管理 qihao.gong@jikimo.com 2023-06-13 17:33:38 +08:00
  • 414f485c17 0613修改侧边栏 WEB许何哲\xuhez 2023-06-13 17:32:21 +08:00
  • 6068a55b79 新增sf的刀具模板的相关刀具物料字段 jinling.yang 2023-06-13 17:30:35 +08:00
  • 3236d477c0 sf的功能刀具实时分布和功能刀具出入库记录视图界面已建立 yuxianghui 2023-06-13 17:13:15 +08:00
  • 3d1d5e6ef3 智能工厂刀具物料模型、关联关系及其界面已建立 mgw 2023-06-13 14:13:15 +08:00
  • 6886354fc5 Accept Merge Request #191: (feature/sf刀具功能分支 -> develop) Merge Request: 夹具基础数据模块和redis夹具数据同步到sf夹具基础数据 禹翔辉 2023-06-13 11:22:02 +08:00
  • 3a8c65c8d1 解决sf代码冲突问题 yuxianghui 2023-06-13 11:19:06 +08:00
  • 2eadcbe31a 新建刀具管理模块 及菜单 qihao.gong@jikimo.com 2023-06-13 10:40:58 +08:00
  • c76c01d78f Accept Merge Request #189: (feature/sf机床同步 -> develop) Merge Request: 同步接口新增每日定时器 龚启豪 2023-06-12 16:19:42 +08:00
  • 3baa438c2b 每日同步刀具定时器 qihao.gong@jikimo.com 2023-06-12 16:17:42 +08:00
  • f457890b73 Accept Merge Request #188: (feature/sf刀具基础信息管理 -> develop) Merge Request: 修正图片同步bug 马广威 2023-06-12 15:10:22 +08:00
  • 06f907ba00 更正图片无法同步的bug mgw 2023-06-12 15:09:30 +08:00
  • 56580fa22a 同步方法已完成，合并 mgw 2023-06-12 14:48:06 +08:00
  • 3d04200ca7 解决冲突 mgw 2023-06-12 14:35:14 +08:00
  • e9ccdd958d Accept Merge Request #187: (feature/sf刀具基础信息管理 -> develop) Merge Request: sf刀具基础信息同步基本完成 马广威 2023-06-12 14:24:41 +08:00
  • e0983d0530 解决权限冲突 mgw 2023-06-12 14:12:16 +08:00
  • a1678f76c2 同步方法基本完成，优化图片展示 mgw 2023-06-12 13:17:52 +08:00
  • b53a115489 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2023-06-12 10:41:26 +08:00
  • 41cc8f1d73 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2023-06-12 10:39:34 +08:00
  • f95e04afc9 刀具同步方法（cloud >>> sf）基本完成，待测试 mgw 2023-06-12 09:24:33 +08:00
  • ac66e15d7a 部分cloud>sf同步接口已完成并测试 mgw 2023-06-09 18:15:12 +08:00
  • 8a4320c031 前端修改样式 WEB许何哲\xuhez 2023-06-09 17:28:36 +08:00
  • 8c23acceaf Accept Merge Request #184: (feature/sf机床同步 -> develop) Merge Request: 修改机床类型，机床型号对象，并从redis同步到工厂 龚启豪 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刀具基础信息初步建立 马广威 2023-06-08 15:00:26 +08:00
  • bf3c7e2b4d sf刀具基础信息已初步建立 mgw 2023-06-08 14:58:40 +08:00
  • 99b89f2e15 修改同步所有数据的按钮 qihao.gong@jikimo.com 2023-06-08 09:36:42 +08:00
  • 9d1597089b 修改机床型号同步接口以及基础数据 qihao.gong@jikimo.com 2023-06-07 15:26:44 +08:00
  • 46c57162d7 同步机床类型对象 qihao.gong@jikimo.com 2023-06-07 10:49:55 +08:00
  • 7dfab63a89 Accept Merge Request #183: (feature/企业微信审批接入 -> develop) Merge Request: 同步模板功能接入 马广威 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
  • f973bb031d 同步模板功能基本完成 mgw 2023-06-02 17:03:03 +08:00
  • 657293bf06 Merge branch 'feature/新增审批功能' into develop jinling.yang 2023-06-02 16:38:40 +08:00
  • f462aec08a Accept Merge Request #182: (feature/新增审批功能 -> develop) Merge Request: 新增sf与企业微信对接的审批模块 杨金灵 2023-06-02 16:38:25 +08:00
  • bb9c4d1c27 审批历史记录模型新增字段 jinling.yang 2023-06-01 17:27:33 +08:00
  • 8b19e0be38 优化create记录的字典 mgw 2023-06-01 16:31:11 +08:00
  • 1c5d135e48 修改模板模型结构 mgw 2023-06-01 15:45:00 +08:00
  • 48e0809bd7 同步企业微信审批模板~除”控件配置“外基本完成 mgw 2023-05-31 18:13:12 +08:00
  • 29acd4d879 新增审批模型及相关页面 jinling.yang 2023-05-31 17:44:27 +08:00
  • ce532a6b63 增加审批模板配置对象，当企业微信模板有更新时，从此配置对象读取模板id列表，即可更新odoo中的审批模板 mgw 2023-05-30 14:50:18 +08:00
  • fd943df012 Accept Merge Request #181: (feature/新增企业微信模块 -> develop) Merge Request: 新增企业微信模块 杨金灵 2023-05-30 11:27:56 +08:00
  • 9ae2ff1a2b 新增企业微信模块 jinling.yang 2023-05-30 11:26:03 +08:00
  • c913973936 Accept Merge Request #180: (feature/优化代码结构 -> develop) Merge Request: 修复进度反馈问题与时区问题，优化界面问题（下发记录等只显示在cnc加工工单处）与opcua超时时长 马广威 2023-05-23 10:46:37 +08:00
  • 92cbdfd4f5 修复进度不更新到bfm的问题，在sf的设置处增加bfm环境选择（正式、测试、开发） mgw 2023-05-23 10:41:10 +08:00
  • 0a2454507b Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2023-05-17 14:22:52 +08:00
  • 6ea98623fb Accept Merge Request #179: (feature/表面工艺外协优化项 -> develop) Merge Request: 出入库单新增验证及单个外协表面工艺Bug修复 杨金灵 2023-05-17 14:21:02 +08:00
  • f2218f7afb 出入库单新增验证及单个外协表面工艺Bug修复 jinling.yang 2023-05-17 14:18:23 +08:00
  • d04e98a5fd Accept Merge Request #178: (feature/表面工艺外协优化项 -> develop) Merge Request: 出入库单状态修复 杨金灵 2023-05-16 17:35:16 +08:00
  • 4e81243adc 出入库单状态修复 jinling.yang 2023-05-16 17:32:23 +08:00
  • 774d688929 Accept Merge Request #176: (feature/销售订单行新增模型展示 -> develop) Merge Request: 销售订单行新增模型展示 杨金灵 2023-05-15 17:08:25 +08:00
  • 9415599b53 Merge branch 'feature/销售订单行新增模型展示' into develop jinling.yang 2023-05-15 17:08:14 +08:00
  • e1a8f68eea Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/销售订单行新增模型展示 jinling.yang 2023-05-15 17:02:01 +08:00
  • 7ec8feec2c Accept Merge Request #175: (feature/表面工艺外协优化项 -> develop) Merge Request: 表面工艺外协优化 杨金灵 2023-05-12 17:41:23 +08:00
  • cdb5493461 新增出库单验证前置和后置条件，外协工单点击完成时生成询价单 jinling.yang 2023-05-12 17:36:59 +08:00
  • 0077d97cfa master-sf1.0 qihao.gong@jikimo.com 2023-05-06 16:03:00 +08:00
  • 8c53292f09 sf1.0推送到master feature/sf-master1.0 qihao.gong@jikimo.com 2023-05-06 15:57:06 +08:00
  • 19531bba04 修复下发时的时区问题 mgw 2023-05-06 10:48:26 +08:00
  • af5b319d0c 优化界面展示，优化opcua超时时长 mgw 2023-05-05 21:08:06 +08:00
  • 2601c28b4e Accept Merge Request #169: (feature/devops测试部署 -> develop) Merge Request: devops测试部署 龚启豪 2023-04-27 15:20:21 +08:00
  • f7e234e1b9 devops测试部署 qihao.gong@jikimo.com 2023-04-27 15:19:03 +08:00
  • c5bf185534 Accept Merge Request #167: (feature/devops流程部署测试 -> develop) Merge Request: 测试dev 龚启豪 2023-04-27 14:48:00 +08:00
  • ca8b4c6086 测试dev qihao.gong@jikimo.com 2023-04-27 14:46:57 +08:00
  • 7a0d4a0dfd Accept Merge Request #166: (feature/优化代码结构 -> develop) Merge Request: 优化平板扫码绑定托盘的渲染方式以及按钮位置 马广威 2023-04-26 17:38:46 +08:00
  • 69aa731990 优化平板扫码绑定托盘的渲染形式以及按钮位置 mgw 2023-04-26 17:35:03 +08:00
  • 453dd71bf4 Accept Merge Request #165: (feature/devops流程部署测试 -> develop) Merge Request: 测试devops流程部署 龚启豪 2023-04-26 10:41:13 +08:00
  • f85c9166f1 devops流程部署测试 qihao.gong@jikimo.com 2023-04-26 10:33:03 +08:00
  • 9ab0d590f3 Accept Merge Request #164: (feature/测试dev流程 -> develop) Merge Request: 测试dev 龚启豪 2023-04-26 10:12:25 +08:00
  • ad8651aa11 测试dev qihao.gong@jikimo.com 2023-04-26 10:10:06 +08:00
  • 4c75417f2a 优化代码结构 mgw 2023-04-25 22:22:26 +08:00
  • e0fb2a44f8 Accept Merge Request #163: (feature/解决coding代码警告问题 -> develop) Merge Request: 新增cpca 龚启豪 2023-04-25 16:23:11 +08:00
  • 1be003e000 新增cpca模块 qihao.gong@jikimo.com 2023-04-25 16:22:09 +08:00
  • 9a53f49d62 Accept Merge Request #162: (feature/解决coding代码警告问题 -> develop) Merge Request: 解决coding扫描代码报错 龚启豪 2023-04-25 15:07:58 +08:00
  • 438628ce46 解决coding扫描代码报错问题 qihao.gong@jikimo.com 2023-04-25 14:42:34 +08:00
  • b942696c69 1.销售模块的销售页面的订单行展示模型 2.表面工艺及类别菜单的排序 jinling.yang 2023-04-24 17:09:16 +08:00
  • 070f13a1c4 Accept Merge Request #161: (feature/增加平板扫码功能 -> develop) Merge Request: 增加平板扫码功能 马广威 2023-04-24 16:04:40 +08:00
  • 21f7f55ae8 增加平板扫码功能 mgw 2023-04-24 16:00:08 +08:00
  • 9300073be4 Accept Merge Request #160: (feature/增加一键合并下发功能，修正合并下发逻辑 -> develop) Merge Request: 一键下发代码请求合并 马广威 2023-04-24 14:34:08 +08:00
  • 307fc6c928 Merge branch develop into feature/增加一键合并下发功能，修正合并下发逻辑 马广威 2023-04-24 14:33:44 +08:00
  • 54b534d792 优化代码 mgw 2023-04-24 14:27:33 +08:00
  • 55129666c3 测试 qihao.gong@jikimo.com 2023-04-24 11:02:49 +08:00
  • 38b383ec29 解决bug qihao.gong@jikimo.com 2023-04-24 10:57:44 +08:00
  • b999e9f065 解决报错 qihao.gong@jikimo.com 2023-04-24 10:42:29 +08:00
  • 8fd18e0f55 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop qihao.gong@jikimo.com 2023-04-23 10:15:46 +08:00
  • d74a5ef835 去除多余企业版模块 qihao.gong@jikimo.com 2023-04-23 10:15:20 +08:00
  • e05db5f583 增加jd_eclp模块异常捕获功能 mgw 2023-04-21 18:02:25 +08:00
  • 843e44b441 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2023-04-21 17:43:29 +08:00
  • 9b05b87cb4 更换数据库 qihao.gong@jikimo.com 2023-04-21 15:53:46 +08:00