jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,308 Commits 134 Branches 31 Tags
2a964bc30ebe93e60faa8c99032cab6cc3d007c7
Commit Graph

57 Commits

Author SHA1 Message Date
qihao.gong@jikimo.com
e3e253fab8 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug 2023-11-09 09:44:41 +08:00
jinling.yang
01f0902937 去掉注释，及修改转换3d模型文件的位置 2023-11-08 17:41:18 +08:00
jinling.yang
3a1acb0f5a 整合所有模块依赖 2023-11-08 17:13:18 +08:00
qihao.gong@jikimo.com
a45ee59a76 修改 2023-11-02 14:34:17 +08:00
qihao.gong@jikimo.com
d2782446b0 修改 2023-11-02 14:24:27 +08:00
jinling.yang
65dd8372dd Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具产品调取Cloud刀具标准库（10.11） 2023-10-25 15:07:52 +08:00
jinling.yang
7b471be4cf 洗澡基本参数回显 2023-10-24 17:47:05 +08:00
jinling.yang
076c4a2bcb 修复销售方法的传参 2023-10-24 14:55:45 +08:00
jinling.yang
575c856f27 修复创建销售 2023-10-24 14:43:11 +08:00
jinling.yang
103b00a635 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具产品调取Cloud刀具标准库（10.11） 
# Conflicts:
#	sf_sale/models/quick_easy_order.py
 2023-10-24 14:39:45 +08:00
jinling.yang
acff814e9b 添加注释 2023-10-24 11:23:29 +08:00
jinling.yang
4ef82ee7cf 代码还原 2023-10-24 10:29:10 +08:00
jinling.yang
4bed65d1df Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具产品调取Cloud刀具标准库（10.11） 
# Conflicts:
#	sf_sale/models/quick_easy_order.py
 2023-10-24 09:59:11 +08:00
jinling.yang
f4a878ced9 注释自动报价 2023-10-24 09:51:31 +08:00
jinling.yang
093724a277 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具产品调取Cloud刀具标准库（10.11） 
# Conflicts:
#	sf_sale/models/quick_easy_order.py
 2023-10-24 09:45:35 +08:00
jinling.yang
919a200750 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop 2023-10-23 17:36:15 +08:00
jinling.yang
13555d91e2 注释上色代码 2023-10-23 14:30:46 +08:00
jinling.yang
27259fb8f7 注释自动报价方法 2023-10-23 11:34:56 +08:00
jinling.yang
1e243e4500 代码释放 2023-10-23 09:59:25 +08:00
jinling.yang
296efcc395 新增调取cloud的刀具标准库接口 2023-10-11 17:39:46 +08:00
jinling.yang
7551bf38ef 销售模块新增依赖引用 2023-10-08 17:19:02 +08:00
jinling.yang
a96c7a34c1 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/bug修复 2023-09-18 17:40:30 +08:00
jinling.yang
5fa9d1e16e 1.优化生成销售订单和产品的接口：bfm分配工厂时将“结算方式”和“支付方式”传到该接口内的生成报价订单方法里 
2.优化销售和报价查询及详情页面：新增“结算方式”和“支付方式”两个字段;销售的tree列表的“号码”显示改为“订单号”；报价的tree列表的“号码”显示改为“订单号”，创建时间改为“下单时间”
3.优化快速订单：tree列表去掉“表面工艺参数”字段，新增“创建人”和“创建时间”2个字段；详情页面新增“加工时长”字段
 2023-09-14 18:04:04 +08:00
jinling.yang
eb0d83aa3a Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/页面优化 
# Conflicts:
#	sf_manufacturing/models/stock.py
 2023-09-14 09:46:28 +08:00
jinling.yang
ad0603f921 报价和销售订单页面优化 2023-09-14 09:29:03 +08:00
jinling.yang
c1be9a90fe 采购刀具产品反注册接口新增图片字段，3d模型代码放开 2023-09-08 17:14:57 +08:00
jinling.yang
41641f69fe Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀柄和夹头反注册到Cloud生成动态刀具物料 
# Conflicts:
#	sf_manufacturing/models/product_template.py
 2023-09-08 14:08:08 +08:00
jinling.yang
2fdcd3a009 快速订单页面优化 2023-08-30 16:19:38 +08:00
jinling.yang
908e8b3ff2 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/获取cnc工单Bug修复 2023-08-29 17:41:23 +08:00
jinling.yang
e9afce298d SF点击后获取cnc程序按钮，cloud生成的编程单的编号未显示Bug修复 2023-08-29 17:40:16 +08:00
yuxianghui
be0f62ffe0 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/自建模块日志警告信息处理 
# Conflicts:
#	sf_base/models/fixture.py
#	sf_manufacturing/models/model_type.py
#	sf_manufacturing/models/product_template.py
#	sf_sale/models/quick_easy_order.py
 2023-08-29 11:21:13 +08:00
jinling.yang
6e6b0b66d3 去掉警告 2023-08-29 10:22:12 +08:00
jinling.yang
fb717c22ad 1.模型为上色Bug修复（cloud代码注释引起） 
2.创建产品和订单未成功Bug修复
 2023-08-28 17:40:19 +08:00
yuxianghui
39feda07e5 自建模块日志警告信息处理 2023-08-28 17:31:41 +08:00
jinling.yang
7174de3de6 产品模板的型号手动输入时型号对象的编码，联装类型，夹具物料字段的值显示 2023-08-25 15:46:41 +08:00
jinling.yang
5de04449e4 对模型进行上色和特征识别及自动报价 2023-08-25 10:39:31 +08:00
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
f9e4b73fb0 新增上传模型功能 2023-08-23 17:34:06 +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
jinling.yang
b942696c69 1.销售模块的销售页面的订单行展示模型 
2.表面工艺及类别菜单的排序
 2023-04-24 17:09:16 +08:00
jinling.yang
bf010e2cca 去掉警告及开发表面工艺相关需求 2023-03-27 21:04:33 +08:00
jinling.yang
2df811d4ce 产品新增3d模型展示 2023-03-06 17:02:21 +08:00
gqh
cbe45d3d7b 修改参数说明 2023-02-02 17:21:51 +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
8e51654f17 合并sf代码 2023-01-11 14:51:59 +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
jinling.yang
a3e39d4fac 产品和制造订单新增模型和occ查看模型模块 2022-12-30 10:00:17 +08:00
jinling.yang
5fcb17d048 胚料bug修复，销售订单明细行路线修复，编程单下发优化 2022-12-27 17:28:47 +08:00