yuxianghui
|
c57daa2c52
|
1、处理销售订单确认接单后，确认接单、取消按钮没有隐藏问题
|
2024-08-20 16:13:30 +08:00 |
|
yuxianghui
|
03cfc00be5
|
Merge branch 'feature/销售单优化' into feature/销售、刀具模块优化
|
2024-08-16 16:02:19 +08:00 |
|
yuxianghui
|
cc05e8423e
|
1、注释重写的销售单交货按钮代码
|
2024-08-16 16:01:24 +08:00 |
|
yuxianghui
|
366e816268
|
1、优化货位变更接口、优化同步库存信息接口；2、隐藏已取消状态的销售订单的【确认接单】和【取消】按钮；3、处理功能刀具从线边刀库到刀具房没有生成移动历史问题；
|
2024-08-15 16:45:39 +08:00 |
|
yuxianghui
|
36fd17b6c7
|
1、处理 智能工厂，销售角色与采购角色权限更新 需求
|
2024-08-08 17:03:36 +08:00 |
|
杨金灵
|
d333621c7a
|
Accept Merge Request #1216: (feature/优化表面工艺 -> develop)
Merge Request: 优化表面工艺
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1216
|
2024-08-08 15:07:37 +08:00 |
|
jinling.yang
|
aaa19b96fd
|
还原注释代码
|
2024-08-08 14:57:55 +08:00 |
|
jinling.yang
|
1547a6064f
|
优化表面工艺
|
2024-08-07 17:30:29 +08:00 |
|
yuxianghui
|
d469c09f15
|
Merge branch 'feature/制造订单优化' into feature/销售单优化
|
2024-08-07 17:11:57 +08:00 |
|
yuxianghui
|
a03cb31b29
|
1、处理 SF销售单需求优化 需求
|
2024-08-07 17:11:12 +08:00 |
|
jinling.yang
|
5393ef686a
|
优化表面工艺
|
2024-08-05 17:28:48 +08:00 |
|
jinling.yang
|
ed0d57c364
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化表面工艺
# Conflicts:
# sf_manufacturing/models/mrp_production.py
# sf_manufacturing/models/mrp_workorder.py
|
2024-08-02 14:41:42 +08:00 |
|
liaodanlong
|
115a3e0712
|
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/tax_sync
|
2024-07-31 14:41:02 +08:00 |
|
mgw
|
754047bf02
|
同步修改引用位置
|
2024-07-30 11:08:27 +08:00 |
|
liaodanlong
|
81dbbf980c
|
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/tax_sync
|
2024-07-29 15:09:37 +08:00 |
|
jinling.yang
|
a5d8e88f1d
|
注释OCC代码
|
2024-07-24 16:33:47 +08:00 |
|
jinling.yang
|
da8e543819
|
修复返工向导
|
2024-07-23 17:18:31 +08:00 |
|
jinling.yang
|
28843b0733
|
修复返工bug
|
2024-07-22 10:57:43 +08:00 |
|
jinling.yang
|
8a0c968b10
|
修复返工bug
|
2024-07-19 17:25:51 +08:00 |
|
liaodanlong
|
a0d3b40548
|
添加工厂订单和产品创建时的错误日志
|
2024-07-19 16:46:31 +08:00 |
|
liaodanlong
|
dfba055019
|
添加bfm同步时产品创建填充税值
|
2024-07-19 16:45:46 +08:00 |
|
jinling.yang
|
8b75658787
|
添加注释代码
|
2024-07-18 16:55:59 +08:00 |
|
yuxianghui
|
bd642812a9
|
创建销售订单接口添加销售明细信息‘备注’字段
|
2024-07-16 10:45:00 +08:00 |
|
yuxianghui
|
3094379e86
|
1、在销售订单内产品列表内增加备注字段
|
2024-07-11 16:38:41 +08:00 |
|
yuxianghui
|
1672a3982e
|
1、完成 SF材料材料型号缺陷优化 bug
|
2024-07-05 17:09:32 +08:00 |
|
yuxianghui
|
05f2cb553d
|
1、完成 采购/采购总监岗位权限增加 需求；2、完成 刀具出入库列表缺少单据跳转 需求；3、完成 设备详情的机内装刀时间比当前时间还晚 bug；
|
2024-06-27 17:21:37 +08:00 |
|
yuxianghui
|
c0b673bfd0
|
添加注释
|
2024-06-19 11:23:25 +08:00 |
|
yuxianghui
|
6dae144d76
|
1、功能刀具拆解单优化；2、完成 需求坯料序列号生成规则优化2；
|
2024-06-19 11:19:47 +08:00 |
|
jinling.yang
|
2862c5a888
|
去掉客户部分字段必填校验和返工报废代码
|
2024-06-17 09:52:18 +08:00 |
|
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
|
f9cca591bb
|
修复表面工艺工单完成时对应库存(stock.move)的状态为完成并跳过标记完成方法的检查
|
2024-05-18 19:52:58 +08:00 |
|
jinling.yang
|
d7bcb0e4f3
|
修复销售确认按钮
|
2024-05-18 17:22:02 +08:00 |
|
jinling.yang
|
debd788864
|
修复快速订单
|
2024-05-18 16:46:59 +08:00 |
|
jinling.yang
|
0f5b94e8ca
|
1.修复销售订单确认按钮确认后不可见2.修复表面工艺工单完成3.下发编程单工件配送优化
|
2024-05-18 15:26:32 +08:00 |
|
jinling.yang
|
e5164454f2
|
修复销售确认按钮
|
2024-05-17 11:31:07 +08:00 |
|
jinling.yang
|
cda0b6d345
|
还原OCC代码
|
2024-05-17 11:04:35 +08:00 |
|
jinling.yang
|
7e31869d1f
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/表面工艺外协修复
# Conflicts:
# sf_sale/views/sale_order_view.xml
|
2024-05-17 11:00:58 +08:00 |
|
jinling.yang
|
ea1ed43c92
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/表面工艺外协修复
|
2024-05-17 11:00:00 +08:00 |
|
yuxianghui
|
2194374aa2
|
Merge branch 'feature/解决bug、优化权限' into feature/优化产品
|
2024-05-14 14:11:39 +08:00 |
|
yuxianghui
|
eff6ce9f1b
|
1、关闭产品、采购单中关联字段的创建功能；2、优化采购入库验证条件；
|
2024-05-14 14:09:42 +08:00 |
|
jinling.yang
|
90aae4dad9
|
销售订单按创建时间倒序
|
2024-05-14 10:59:35 +08:00 |
|
jinling.yang
|
934b59d213
|
坯料新增路线
|
2024-05-14 10:51:38 +08:00 |
|
yuxianghui
|
48782cb62b
|
Merge branch 'feature/解决主流程bug' into feature/解决bug、优化权限
|
2024-05-13 11:55:55 +08:00 |
|
yuxianghui
|
0f47f7c3b8
|
1、添加权限；2、设备的设备检修标准字段关闭创建功能；3、解决 销售经理创建报价单选择产品后没有把模型和价格带过去 的bug；4、关闭仓库创建按钮
|
2024-05-13 11:54:03 +08:00 |
|
mgw
|
1afc48a20e
|
去掉销售订单加工状态
|
2024-05-11 23:36:18 +08:00 |
|
jinling.yang
|
999959b6a1
|
1.修复工件配送向导制造订单号能显示5个
2工件配送向导页面优化
3.生成制造订单同时工件配送默认路线
|
2024-05-11 13:38:57 +08:00 |
|
jinling.yang
|
388b0b4e4c
|
优化制造
|
2024-05-09 10:37:41 +08:00 |
|
jinling.yang
|
d964a9feb1
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化模型上色路径
|
2024-05-08 11:20:07 +08:00 |
|
jinling.yang
|
fda43deeea
|
1.优化根据同一个产品，生成的制造订单绑定同一个编程单需求
|
2024-05-07 17:33:23 +08:00 |
|