jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,037 Commits 134 Branches 31 Tags
94f57629e5e9e46b47c0574cddd90bec0d475b80
Commit Graph

4037 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
龚启豪
3b3f8f57db Accept Merge Request #135: (feature/sf接口前后置检查以及注释 -> develop) 
Merge Request: sf获取cnc程序工单自动开始获取

Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/135?initial=true
 2023-02-16 17:50:58 +08:00
gqh
9d59917af9 CNC获取程序工单自动开始 并获取cnc程序到mrs编程单 2023-02-16 17:48:26 +08:00
jinling.yang
d5c2c8de86 新增排产的时候, 根据胚料的长宽高比对一下机床的最大加工尺寸.不符合就不要分配给这个加工中心(机床). 2023-02-16 17:35:08 +08:00
mgw
3423622a77 物流面单可作为附件存在odoo中 2023-02-15 12:07:05 +08:00
mgw
e05459b842 获取面单接口已跑通 2023-02-14 22:48:38 +08:00
mgw
d7d468a8b5 下单接口已跑通 2023-02-14 12:39:02 +08:00
mgw
c1c39396f9 增加bfm回调接口 2023-02-13 21:51:06 +08:00
gqh
a3f350b69c 代码注释，前后置检查 2023-02-13 17:28:20 +08:00
mgw
c07803d3cf 增加京东物流的配置项目 2023-02-13 08:50:37 +08:00
jinling.yang
fc98ebb8c5 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/页面优化 2023-02-09 15:27:03 +08:00
jinling.yang
a812c603ea 代码规范整理，产品页面模型和胚料的模型类型字段做显示 2023-02-09 15:26:08 +08:00
gqh
f007542c35 合并dev 2023-02-09 14:34:43 +08:00
mgw
38f67d98f8 增加状态返回接口，增加调用京东接口 2023-02-09 08:50:48 +08:00
jinling.yang
11065139d3 bom组件的公斤数量修复，产品页面的模型根据类型隐藏 2023-02-06 18:11:03 +08:00
龚启豪
2c753b93ca Accept Merge Request #134: (feature/优化工单 -> develop) 
Merge Request: 优化修改网站标题

Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/134
 2023-02-06 16:13:18 +08:00
gqh
2a3b334f73 sf新增修改网站标签功能 2023-02-06 16:10:03 +08:00
gqh
b3bfe48c67 优化工单 2023-02-03 17:53:46 +08:00
龚启豪
cba007b374 Accept Merge Request #131: (feature/优化工单 -> develop) 
Merge Request: 优化工单

Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/131
 2023-02-03 17:16:46 +08:00
gqh
19d742d20f 优化工单 2023-02-03 17:14:17 +08:00
马广威
f7cca137c6 Accept Merge Request #130: (feature/优化进度反馈 -> develop) 
Merge Request: 优化工单界面展示

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/130
 2023-02-03 17:11:54 +08:00
mgw
a4bee8bb6b 优化工单界面显示 2023-02-03 17:10:31 +08:00
mgw
4d4b0098ce 更新模块信息 2023-02-03 10:32:53 +08:00
马广威
eee02d2ff1 Accept Merge Request #129: (feature/对接业务平台返回状态 -> develop) 
Merge Request: 对接业务平台返回进度已完成主体部分

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/129
 2023-02-03 09:53:25 +08:00
mgw
2a713b6cc4 去掉测试按钮 2023-02-03 09:48:31 +08:00
mgw
973bb748c2 优化模块分类 2023-02-03 09:47:09 +08:00
mgw
4975835cf3 对接业务平台，返回加工中状态 2023-02-03 01:18:02 +08:00
jinling.yang
0f062dad96 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop 2023-02-02 18:12:59 +08:00
龚启豪
79ee28e0dd Accept Merge Request #127: (feature/sf优化界面 -> develop) 
Merge Request: 修改参数说明

Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/127
 2023-02-02 17:24:53 +08:00
gqh
cbe45d3d7b 修改参数说明 2023-02-02 17:21:51 +08:00
龚启豪
91de63a6a4 Accept Merge Request #126: (feature/sf优化界面 -> develop) 
Merge Request: 优化工单展示

Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/126
 2023-02-02 15:09:53 +08:00
gqh
59cb6e5def 优化工单界面，新增物料page，修复工单按钮bug，隐藏权限字段 2023-02-02 14:59:39 +08:00
马广威
904aad74ce Accept Merge Request #119: (feature/优化代码结构 -> develop) 
Merge Request: 扫码字段更新完成

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/119
 2023-02-02 10:06:46 +08:00
jinling.yang
b323abddac Merge branch 'feature/bom组件数量修复' into develop 2023-02-02 10:01:20 +08:00
杨金灵
71f2c187dc Accept Merge Request #118: (feature/bom组件数量修复 -> develop) 
Merge Request: bom组件数量修复

Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/118
 2023-02-02 10:01:00 +08:00
jinling.yang
a06e7cdb83 去掉不要的代码 2023-02-02 09:58:47 +08:00
jinling.yang
d3e30a4c87 去掉权限代码 2023-02-02 09:57:01 +08:00
jinling.yang
e8d923df03 bfm分配工厂: 
1.销售页面：客户的值为业务平台，
2.没有原材料，事务回滚
3.去掉注释和没用到的代码
 2023-02-01 18:27:29 +08:00
龚启豪
a796795d05 Accept Merge Request #114: (feature/sf优化界面 -> develop) 
Merge Request: 优化工单form视图，增加制造翻译模块

Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/114
 2023-02-01 17:55:06 +08:00
gqh
d032f89272 sf优化绑定托盘，工单form显示开始按钮 加工时间 2023-02-01 17:53:32 +08:00
mgw
6a51b8cc4c 更新字段名称至中文 2023-02-01 14:42:23 +08:00
龚启豪
e2561bee34 Accept Merge Request #113: (feature/sf优化界面 -> develop) 
Merge Request: sf合并工单优化项

Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/113
 2023-02-01 14:09:52 +08:00
gqh
5495f2436a 优化工单，英文改为中文展示，解除托盘展示托盘 2023-02-01 14:07:33 +08:00
mgw
643ce6ac7a 增加外层group标签 2023-01-31 21:02:48 +08:00
马广威
5f45416d80 Accept Merge Request #110: (feature/整理代码，更新下发代码 -> develop) 
Merge Request: 整理代码，更新下发代码

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/110
 2023-01-31 17:25:44 +08:00
mgw
946bf32c4e 整理代码，更新下发代码 2023-01-31 17:21:37 +08:00
杨金灵
afcea7f715 Accept Merge Request #109: (feature/工单的cnc工单加工面显示bug修复 -> develop) 
Merge Request: 工单的cnc工单加工面显示bug修复

Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/109
 2023-01-31 12:03:20 +08:00
jinling.yang
7b78e2451a 工单的cnc工单加工面显示bug修复 2023-01-31 12:02:56 +08:00
gqh
8957fec332 修复密码错误bug 2023-01-31 11:30:13 +08:00
jinling.yang
e0193b81c9 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop 2023-01-31 11:09:13 +08:00
龚启豪
8312b5fc6b Accept Merge Request #108: (feature/sf优化界面 -> develop) 
Merge Request: 修改登录背景，工作中心显示bug

Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/108
 2023-01-31 11:08:04 +08:00