jinling.yang
|
55504c2725
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增上传模型功能
|
2023-08-24 17:32:25 +08:00 |
|
jinling.yang
|
f68dce9ee2
|
修复产品模板中产品类别为刀具和夹具时，根据产品类别为刀具和夹具时，新增的page页面里的字段显示及回显Bug
|
2023-07-17 16:46:01 +08:00 |
|
jinling.yang
|
1a0fa3fdb0
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增工件装夹
|
2023-07-06 17:33:47 +08:00 |
|
jinling.yang
|
eab6f0ceee
|
刀具产品页面刀具物料及型号字段修改
|
2023-06-28 18:32:45 +08:00 |
|
mgw
|
92cbdfd4f5
|
修复进度不更新到bfm的问题，在sf的设置处增加bfm环境选择（正式、测试、开发）
|
2023-05-23 10:41:10 +08:00 |
|
马广威
|
307fc6c928
|
Merge branch develop into feature/增加一键合并下发功能，修正合并下发逻辑
|
2023-04-24 14:33:44 +08:00 |
|
mgw
|
e05db5f583
|
增加jd_eclp模块异常捕获功能
|
2023-04-21 18:02:25 +08:00 |
|
jinling.yang
|
82dcfb5018
|
优化及调试表面工艺外协出入库单，‘胚料’修改为‘坯料’
|
2023-04-20 19:39:12 +08:00 |
|
jinling.yang
|
4e2947c107
|
sf的销售订单生成制造订单的方法,该方法内，需让制造订单和工单的数据入数据库，以便生成表面外协工艺相关的外协出入库单及关联的库存（stock.move）记录的代码可转移至生成工单的该行代码production.workorder_ids = workorders_values前后左右
|
2023-04-19 18:05:41 +08:00 |
|
jinling.yang
|
5a639d6f55
|
重写sf的销售订单生成制造订单的方法,该方法内，需让制造订单和工单的数据入数据库，以便生成表面外协工艺相关的外协出入库单及关联的库存（stock.move）记录
|
2023-04-18 17:28:18 +08:00 |
|
jinling.yang
|
bf010e2cca
|
去掉警告及开发表面工艺相关需求
|
2023-03-27 21:04:33 +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 |
|
mgw
|
a4ee163aa7
|
优化收货人公司字段
|
2023-03-08 15:24:55 +08:00 |
|
jinling.yang
|
2df811d4ce
|
产品新增3d模型展示
|
2023-03-06 17:02:21 +08:00 |
|
mgw
|
bebbaa2a5e
|
更改python地址解析包成功
|
2023-02-28 18:02:21 +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
|
dd9d20ea2a
|
更改python地址解析库
|
2023-02-27 11:11:23 +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 |
|
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 |
|
mgw
|
c07803d3cf
|
增加京东物流的配置项目
|
2023-02-13 08:50:37 +08:00 |
|
jinling.yang
|
a812c603ea
|
代码规范整理，产品页面模型和胚料的模型类型字段做显示
|
2023-02-09 15:26:08 +08:00 |
|
mgw
|
38f67d98f8
|
增加状态返回接口，增加调用京东接口
|
2023-02-09 08:50:48 +08:00 |
|
mgw
|
4975835cf3
|
对接业务平台，返回加工中状态
|
2023-02-03 01:18:02 +08:00 |
|
jinling.yang
|
e8d923df03
|
bfm分配工厂:
1.销售页面：客户的值为业务平台，
2.没有原材料，事务回滚
3.去掉注释和没用到的代码
|
2023-02-01 18:27:29 +08:00 |
|
jinling.yang
|
271a5d4224
|
1.模型类型增加跟修改各字段
2.智能工厂成品名称优化
3.智能工厂产品根据产品类型增加默认筛选条件的优化（在筛选器内根据产品类型增加筛选条件）
4.智能工厂胚料名称的优化
5.自加工产品的制造订单优化
|
2023-01-29 17:48:45 +08:00 |
|
gqh
|
bdae9d9f95
|
恢复代码
|
2023-01-29 15:42:33 +08:00 |
|
gqh
|
9c473e6f32
|
优化sf
|
2023-01-23 20:21:00 +08:00 |
|
jinling.yang
|
5492d4f2fa
|
修复工作中心绑定机床和胚料外协供应商是否外包未勾选bug修复
|
2023-01-13 16:43:30 +08:00 |
|
jinling.yang
|
6d48618253
|
优化接口
|
2023-01-11 16:23:19 +08:00 |
|
gqh
|
eb162cb416
|
合并工单优化
|
2023-01-11 11:13:52 +08:00 |
|
jinling.yang
|
d66687297d
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/工单文件优化
# Conflicts:
# sf_manufacturing/models/mrp_workorder.py
|
2023-01-10 09:27:14 +08:00 |
|
gqh
|
d0497aa043
|
工单优化
|
2023-01-09 20:40:27 +08:00 |
|
jinling.yang
|
c3e5610b17
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化sf
# Conflicts:
# sf_manufacturing/models/__init__.py
# sf_manufacturing/models/mrp_workcenter.py
# sf_manufacturing/models/mrp_workorder.py
# sf_manufacturing/views/mrp_workorder_view.xml
|
2023-01-09 20:33:53 +08:00 |
|
jinling.yang
|
b7723f82d0
|
优化sf获取cnc程序和ftp
|
2023-01-09 19:54:02 +08:00 |
|
mgw
|
7c4baa4d91
|
加工中代码测试完成
|
2023-01-07 01:12:25 +08:00 |
|
mgw
|
0dbd941ed0
|
加工中轨迹跟踪代码
|
2023-01-06 16:47:40 +08:00 |
|
jinling.yang
|
a3e39d4fac
|
产品和制造订单新增模型和occ查看模型模块
|
2022-12-30 10:00:17 +08:00 |
|
jinling.yang
|
5fcb17d048
|
胚料bug修复，销售订单明细行路线修复，编程单下发优化
|
2022-12-27 17:28:47 +08:00 |
|
jinling.yang
|
c6b9953e40
|
Merge branch 'feature/odoo16的代码修改' into develop
|
2022-12-26 10:26:01 +08:00 |
|
jinling.yang
|
a4be58098e
|
创建胚料的bug修复
|
2022-12-26 10:25:16 +08:00 |
|
jinling.yang
|
331f230974
|
stock.production.lot对象修改为stock.lot，http新增验证返回
|
2022-12-12 10:04:16 +08:00 |
|
jinling.yang
|
5e2d75b23e
|
修改胚料部分
|
2022-12-09 17:23:07 +08:00 |
|
jinling.yang
|
a18d55850a
|
优化文件内容
|
2022-12-01 17:18:49 +08:00 |
|
jinling.yang
|
8fce929022
|
从ftp获取cnc程序文件
|
2022-11-30 11:25:37 +08:00 |
|