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

377 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mgw
a1678f76c2 同步方法基本完成，优化图片展示 2023-06-12 13:17:52 +08:00
mgw
f95e04afc9 刀具同步方法（cloud >>> sf）基本完成，待测试 2023-06-12 09:24:33 +08:00
mgw
ac66e15d7a 部分cloud>sf同步接口已完成并测试 2023-06-09 18:15:12 +08:00
mgw
bf3c7e2b4d sf刀具基础信息已初步建立 2023-06-08 14:58:40 +08:00
马广威
7dfab63a89 Accept Merge Request #183: (feature/企业微信审批接入 -> develop) 
Merge Request: 同步模板功能接入

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/183
 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
mgw
f973bb031d 同步模板功能基本完成 2023-06-02 17:03:03 +08:00
杨金灵
f462aec08a Accept Merge Request #182: (feature/新增审批功能 -> develop) 
Merge Request: 新增sf与企业微信对接的审批模块

Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/182?initial=true
 2023-06-02 16:38:25 +08:00
jinling.yang
bb9c4d1c27 审批历史记录模型新增字段 2023-06-01 17:27:33 +08:00
mgw
8b19e0be38 优化create记录的字典 2023-06-01 16:31:11 +08:00
mgw
1c5d135e48 修改模板模型结构 2023-06-01 15:45:00 +08:00
mgw
48e0809bd7 同步企业微信审批模板~除”控件配置“外基本完成 2023-05-31 18:13:12 +08:00
jinling.yang
29acd4d879 新增审批模型及相关页面 2023-05-31 17:44:27 +08:00
mgw
ce532a6b63 增加审批模板配置对象，当企业微信模板有更新时，从此配置对象读取模板id列表，即可更新odoo中的审批模板 2023-05-30 14:50:18 +08:00
杨金灵
fd943df012 Accept Merge Request #181: (feature/新增企业微信模块 -> develop) 
Merge Request: 新增企业微信模块

Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/181?initial=true
 2023-05-30 11:27:56 +08:00
jinling.yang
9ae2ff1a2b 新增企业微信模块 2023-05-30 11:26:03 +08:00
马广威
c913973936 Accept Merge Request #180: (feature/优化代码结构 -> develop) 
Merge Request: 修复进度反馈问题与时区问题，优化界面问题（下发记录等只显示在cnc加工工单处）与opcua超时时长

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/180?initial=true
 2023-05-23 10:46:37 +08:00
mgw
92cbdfd4f5 修复进度不更新到bfm的问题，在sf的设置处增加bfm环境选择（正式、测试、开发） 2023-05-23 10:41:10 +08:00
jinling.yang
0a2454507b Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop 2023-05-17 14:22:52 +08:00
杨金灵
6ea98623fb Accept Merge Request #179: (feature/表面工艺外协优化项 -> develop) 
Merge Request: 出入库单新增验证及单个外协表面工艺Bug修复

Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/179?initial=true
 2023-05-17 14:21:02 +08:00
jinling.yang
f2218f7afb 出入库单新增验证及单个外协表面工艺Bug修复 2023-05-17 14:18:23 +08:00
杨金灵
d04e98a5fd Accept Merge Request #178: (feature/表面工艺外协优化项 -> develop) 
Merge Request: 出入库单状态修复

Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/178?initial=true
 2023-05-16 17:35:16 +08:00
jinling.yang
4e81243adc 出入库单状态修复 2023-05-16 17:32:23 +08:00
杨金灵
774d688929 Accept Merge Request #176: (feature/销售订单行新增模型展示 -> develop) 
Merge Request: 销售订单行新增模型展示

Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/176?initial=true
 2023-05-15 17:08:25 +08:00
jinling.yang
9415599b53 Merge branch 'feature/销售订单行新增模型展示' into develop 2023-05-15 17:08:14 +08:00
jinling.yang
e1a8f68eea Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/销售订单行新增模型展示 2023-05-15 17:02:01 +08:00
杨金灵
7ec8feec2c Accept Merge Request #175: (feature/表面工艺外协优化项 -> develop) 
Merge Request: 表面工艺外协优化

Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/175?initial=true
 2023-05-12 17:41:23 +08:00
jinling.yang
cdb5493461 新增出库单验证前置和后置条件，外协工单点击完成时生成询价单 2023-05-12 17:36:59 +08:00
mgw
19531bba04 修复下发时的时区问题 2023-05-06 10:48:26 +08:00
mgw
af5b319d0c 优化界面展示，优化opcua超时时长 2023-05-05 21:08:06 +08:00
龚启豪
2601c28b4e Accept Merge Request #169: (feature/devops测试部署 -> develop) 
Merge Request: devops测试部署

Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/169
 2023-04-27 15:20:21 +08:00
qihao.gong@jikimo.com
f7e234e1b9 devops测试部署 2023-04-27 15:19:03 +08:00
龚启豪
c5bf185534 Accept Merge Request #167: (feature/devops流程部署测试 -> develop) 
Merge Request: 测试dev

Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/167?initial=true
 2023-04-27 14:48:00 +08:00
qihao.gong@jikimo.com
ca8b4c6086 测试dev 2023-04-27 14:46:57 +08:00
马广威
7a0d4a0dfd Accept Merge Request #166: (feature/优化代码结构 -> develop) 
Merge Request: 优化平板扫码绑定托盘的渲染方式以及按钮位置

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/166?initial=true
 2023-04-26 17:38:46 +08:00
mgw
69aa731990 优化平板扫码绑定托盘的渲染形式以及按钮位置 2023-04-26 17:35:03 +08:00
龚启豪
453dd71bf4 Accept Merge Request #165: (feature/devops流程部署测试 -> develop) 
Merge Request: 测试devops流程部署

Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/165
 2023-04-26 10:41:13 +08:00
qihao.gong@jikimo.com
f85c9166f1 devops流程部署测试 2023-04-26 10:33:03 +08:00
龚启豪
9ab0d590f3 Accept Merge Request #164: (feature/测试dev流程 -> develop) 
Merge Request: 测试dev

Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/164?initial=true
 2023-04-26 10:12:25 +08:00
qihao.gong@jikimo.com
ad8651aa11 测试dev 2023-04-26 10:10:06 +08:00
mgw
4c75417f2a 优化代码结构 2023-04-25 22:22:26 +08:00
龚启豪
e0fb2a44f8 Accept Merge Request #163: (feature/解决coding代码警告问题 -> develop) 
Merge Request: 新增cpca

Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/163?initial=true
 2023-04-25 16:23:11 +08:00
qihao.gong@jikimo.com
1be003e000 新增cpca模块 2023-04-25 16:22:09 +08:00
龚启豪
9a53f49d62 Accept Merge Request #162: (feature/解决coding代码警告问题 -> develop) 
Merge Request: 解决coding扫描代码报错

Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/162?initial=true
 2023-04-25 15:07:58 +08:00
qihao.gong@jikimo.com
438628ce46 解决coding扫描代码报错问题 2023-04-25 14:42:34 +08:00
jinling.yang
b942696c69 1.销售模块的销售页面的订单行展示模型 
2.表面工艺及类别菜单的排序
 2023-04-24 17:09:16 +08:00
马广威
070f13a1c4 Accept Merge Request #161: (feature/增加平板扫码功能 -> develop) 
Merge Request: 增加平板扫码功能

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/161?initial=true
 2023-04-24 16:04:40 +08:00
mgw
21f7f55ae8 增加平板扫码功能 2023-04-24 16:00:08 +08:00
马广威
9300073be4 Accept Merge Request #160: (feature/增加一键合并下发功能，修正合并下发逻辑 -> develop) 
Merge Request: 一键下发代码请求合并

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/160
 2023-04-24 14:34:08 +08:00
马广威
307fc6c928 Merge branch develop into feature/增加一键合并下发功能，修正合并下发逻辑 2023-04-24 14:33:44 +08:00