gqh
|
84ef243b9f
|
sf新增表面工艺参数同步接口和基础对象，新增dockerfile和requirements.txt文件
|
2023-03-14 14:56:18 +08:00 |
|
mgw
|
7074911b6e
|
修正合并下发bug
|
2023-03-10 18:18:12 +08:00 |
|
杨金灵
|
8b6a3c10f8
|
Accept Merge Request #148: (feature/3D模型展示 -> develop)
Merge Request: 3d模型展示
Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/148?initial=true
|
2023-03-10 10:56:10 +08:00 |
|
jinling.yang
|
8e41e772ff
|
产品创建时上传3D模型
|
2023-03-10 10:53:05 +08:00 |
|
jinling.yang
|
dfeeed7b59
|
制造订单，产品，工单上进行3d模型展示
|
2023-03-09 17:34:44 +08:00 |
|
gqh
|
fddc8100d6
|
工单返工优化待排序（工单就绪状态还没完成）
|
2023-03-08 17:15:06 +08:00 |
|
mgw
|
e576a8f98d
|
增加“机床主轴转速”字段
|
2023-03-08 16:20:03 +08:00 |
|
马广威
|
52913d31be
|
Accept Merge Request #147: (feature/优化京东物流对接 -> develop)
Merge Request: 优化收货人公司字段
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/147?initial=true
|
2023-03-08 15:26:34 +08:00 |
|
mgw
|
a4ee163aa7
|
优化收货人公司字段
|
2023-03-08 15:24:55 +08:00 |
|
jinling.yang
|
2df811d4ce
|
产品新增3d模型展示
|
2023-03-06 17:02:21 +08:00 |
|
gqh
|
06efa1b777
|
3d模型
|
2023-03-03 18:17:48 +08:00 |
|
mgw
|
bebbaa2a5e
|
更改python地址解析包成功
|
2023-02-28 18:02:21 +08:00 |
|
gqh
|
adaecd6e09
|
一键打印功能
|
2023-02-28 17:32:24 +08:00 |
|
马广威
|
84a674e4e2
|
Accept Merge Request #146: (feature/增加一键下发时的补偿功能，改显示bug -> develop)
Merge Request: 增加一键下发时的补偿功能，改显示bug
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/146?initial=true
|
2023-02-27 15:38:29 +08:00 |
|
mgw
|
cbf51065b7
|
增加一键下发补偿值，优化显示bug
|
2023-02-27 15:29:12 +08:00 |
|
马广威
|
dcdb3534dd
|
Accept Merge Request #145: (feature/优化NC下发 -> develop)
Merge Request: NC下发测试成功，请求合并
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/145?initial=true
|
2023-02-27 14:57:30 +08:00 |
|
mgw
|
659651b930
|
增加sf.cnc.processing缺省视图
|
2023-02-27 14:52:20 +08:00 |
|
mgw
|
dd9d20ea2a
|
更改python地址解析库
|
2023-02-27 11:11:23 +08:00 |
|
mgw
|
57d403d754
|
下发完成后，关闭ftp连接
|
2023-02-27 09:52:17 +08:00 |
|
龚启豪
|
ad44c7c6a3
|
Accept Merge Request #143: (feature/sf胚料序号码验证 -> develop)
Merge Request: 坯料认证判断
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/143?initial=true
|
2023-02-27 09:44:51 +08:00 |
|
mgw
|
8247acb79a
|
优化代码，恢复屏蔽代码，准备去测试新的NC下发
|
2023-02-27 09:43:24 +08:00 |
|
mgw
|
6ae0abac94
|
三种下发方式均可被记录，本地测试成功
|
2023-02-24 17:47:28 +08:00 |
|
gqh
|
4ec5f2c1de
|
验证坯料序列号
|
2023-02-24 17:23:00 +08:00 |
|
mgw
|
5fbe834528
|
合并下发已完成，正在增加下发记录对象
|
2023-02-23 22:11:32 +08:00 |
|
mgw
|
444e99b4cf
|
合并下发功能已完成，待测试
|
2023-02-23 11:04:58 +08:00 |
|
mgw
|
52b045b658
|
合并下发本地测试已成功
|
2023-02-23 10:57:42 +08:00 |
|
mgw
|
28659bfc95
|
增加合并下发向导，增加cnc模型的缺省tree视图
|
2023-02-23 08:52:56 +08:00 |
|
gqh
|
7ddaace1ad
|
序列号去除中文（打印条形码不能带中文否则会报错）
|
2023-02-22 17:14:42 +08:00 |
|
马广威
|
d81cf77bbe
|
Accept Merge Request #142: (feature/优化进度反馈 -> develop)
Merge Request: 京东物流对接sf端基本完成
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/142?initial=true
|
2023-02-17 15:30:08 +08:00 |
|
mgw
|
f67c1fb719
|
增加物流面单打印报告
|
2023-02-17 15:17:22 +08:00 |
|
杨金灵
|
97c64ff290
|
Accept Merge Request #141: (feature/页面优化 -> develop)
Merge Request: 页面优化及排产（根据胚料的长宽高比对一下机床的最大加工尺寸）
Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/141?initial=true
|
2023-02-17 15:03:05 +08:00 |
|
jinling.yang
|
d978f9d9b2
|
排产的时候, 根据胚料的长宽高比对一下机床的最大加工尺寸.不符合就不要分配给这个加工中心(机床).
|
2023-02-17 15:01:43 +08:00 |
|
龚启豪
|
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 |
|