jinling.yang
|
adafce85bd
|
1.工单,工件配送新增sns及给部分字段添加tracking(跟踪)及优化页面
2.优化agv：部分字段不可编辑
|
2024-06-11 16:56:20 +08:00 |
|
jinling.yang
|
7be5b53767
|
工件配送添加sns
|
2024-06-07 17:29:49 +08:00 |
|
jinling.yang
|
b8196cc4a9
|
1.修复销售岗位创建快速订单没有生成销售订单问题2.工件配送Tree视图默认上产线
|
2024-05-07 14:44:58 +08:00 |
|
jinling.yang
|
307e052740
|
优化agv及站点位置和对应接口
|
2024-04-23 14:05:10 +08:00 |
|
jinling.yang
|
9a157125ba
|
优化agv相关页面及对应接口
|
2024-04-22 22:30:05 +08:00 |
|
jinling.yang
|
5f2600c96f
|
释放注释代码
|
2024-04-19 08:34:41 +08:00 |
|
jinling.yang
|
8d1e4a89c2
|
1、没绑定工单不能完工，绑定后才可以完工
2、工单绑定后没完工可以换绑
3、工单点完工按钮要有确认弹窗
|
2024-03-29 17:38:35 +08:00 |
|
qihao.gong@jikimo.com
|
3fe9c9e532
|
修改接口方法
|
2024-02-22 14:30:51 +08:00 |
|
jinling.yang
|
1e006b0bd7
|
1.工单新增rfid字段
2.修改中控对接的工单接口
3.快速订单材料，型号，客户修改为可选择
|
2024-02-21 14:52:14 +08:00 |
|
jinling.yang
|
5646cc492e
|
1.快速订单新增特征识别路径字段
2.修复销售经理和销售总监看不到快速订单菜单
3.优化系统设置页面，新增特征识别路径展示，去掉重复的业务平台参数配置展示
4.快速订单去掉老版本的特征识别的代码及包，新增最新的特征识别方法
|
2024-02-20 17:33:06 +08:00 |
|
jinling.yang
|
04e63dcc59
|
修复代码规范
|
2023-11-20 15:10:01 +08:00 |
|
jinling.yang
|
7ceaadb9c4
|
修复引入库
|
2023-11-20 15:04:39 +08:00 |
|
jinling.yang
|
01f0902937
|
去掉注释，及修改转换3d模型文件的位置
|
2023-11-08 17:41:18 +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
|
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
|
296efcc395
|
新增调取cloud的刀具标准库接口
|
2023-10-11 17:39:46 +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
|
ad0603f921
|
报价和销售订单页面优化
|
2023-09-14 09:29:03 +08:00 |
|
yuxianghui
|
b12880da50
|
放开OCC相关的代码
|
2023-09-08 10:39:47 +08:00 |
|
yuxianghui
|
35afdd3b2a
|
刀具物料功能模型从sf_base模块迁移到sf_manufacturing模块；新增每齿走刀量模型；整体式刀具物料新增关联每齿走刀量对象字段；
|
2023-09-08 10:20:52 +08:00 |
|
jinling.yang
|
2fdcd3a009
|
快速订单页面优化
|
2023-08-30 16:19:38 +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
|
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 |
|