guanhuan
|
ba955ca658
|
快速订单上传模型文件检查文件后缀
|
2024-09-14 08:46:32 +08:00 |
|
guanhuan
|
0c2d6dd582
|
SF快速订单优化
|
2024-09-11 08:52:28 +08:00 |
|
jinling.yang
|
804bdb60e8
|
修复外协采购单
|
2024-08-29 14:21:18 +08:00 |
|
jinling.yang
|
821a7a63be
|
优化工单
|
2024-08-28 17:30:46 +08:00 |
|
jinling.yang
|
b40a87df88
|
修复报废
|
2024-08-27 11:24:04 +08:00 |
|
jinling.yang
|
f1780181fa
|
修复报废向导
|
2024-08-25 17:36:07 +08:00 |
|
jinling.yang
|
7fee98cdee
|
修复报废
|
2024-08-23 16:13:03 +08:00 |
|
yuxianghui
|
03cfc00be5
|
Merge branch 'feature/销售单优化' into feature/销售、刀具模块优化
|
2024-08-16 16:02:19 +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 |
|
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
|
debd788864
|
修复快速订单
|
2024-05-18 16:46:59 +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 |
|
jinling.yang
|
b8196cc4a9
|
1.修复销售岗位创建快速订单没有生成销售订单问题2.工件配送Tree视图默认上产线
|
2024-05-07 14:44:58 +08:00 |
|
jinling.yang
|
ed41667477
|
1.采购去掉审核2.装夹预调工单验证优化
|
2024-05-06 16:29:54 +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
|
690a66b6a1
|
修复快递订单模型路径字段问题
|
2024-04-22 15:46:43 +08:00 |
|
jinling.yang
|
4b2e58a66d
|
修复快速订单订单号和人工报价及注释掉识别长宽高代码
|
2024-04-22 14:14:59 +08:00 |
|
jinling.yang
|
5cb1e3c838
|
修复快速订单
|
2024-04-19 17:24:51 +08:00 |
|
jinling.yang
|
a30c620823
|
优化快读订单
|
2024-04-19 16:50:38 +08:00 |
|
jinling.yang
|
5f2600c96f
|
释放注释代码
|
2024-04-19 08:34:41 +08:00 |
|