管欢
|
9cbd311fec
|
Accept Merge Request #2183: (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/2183
|
2025-06-11 09:22:25 +08:00 |
|
管欢
|
39a25bb6c8
|
Accept Merge Request #2180: (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/2180
|
2025-06-10 16:33:37 +08:00 |
|
guanhuan
|
9cf2bac9c6
|
修复返工问题
|
2025-06-09 17:39:55 +08:00 |
|
yuxianghui
|
5d0f094da7
|
1
|
2025-06-05 17:03:06 +08:00 |
|
yuxianghui
|
95cb5251dc
|
1、销售订单添加合同编号字段，bfm下单接口添加合同编号同步；2、优化解除装夹工单完工时解绑rfid逻辑，优化工单返工时新工单绑定rfid逻辑
|
2025-06-05 16:59:33 +08:00 |
|
guanhuan
|
9b01254b3c
|
下达生产
|
2025-05-28 10:47:03 +08:00 |
|
yuxianghui
|
981569170c
|
Merge branch 'feature/销售委外加工按钮优化_1' into feature/中控接口优化
|
2025-05-22 11:04:48 +08:00 |
|
yuxianghui
|
3a9cd3f39d
|
1、获取日计划接口优化；2、货位信息接口优化；
|
2025-05-22 11:04:06 +08:00 |
|
guanhuan
|
52579673de
|
采购申请单完成操作优化
|
2025-05-19 08:54:02 +08:00 |
|
胡尧
|
a3c0fd3ccf
|
解决工艺外协采购单不显示的问题
|
2025-05-15 16:48:34 +08:00 |
|
胡尧
|
c80e12d731
|
回退工艺外协代码
|
2025-05-15 11:07:22 +08:00 |
|
liaodanlong
|
b5339046b9
|
工艺外协代码
|
2025-05-08 16:42:18 +08:00 |
|
liaodanlong
|
51c517145b
|
工艺外协代码
|
2025-05-07 17:17:41 +08:00 |
|
胡尧
|
5aa848de53
|
修改判断坯料序列号的逻辑
|
2025-05-07 11:01:01 +08:00 |
|
liaodanlong
|
efc4ae31c9
|
工艺外协代码
|
2025-05-07 11:00:32 +08:00 |
|
liaodanlong
|
95c25ac7b8
|
工艺外协代码
|
2025-04-29 13:39:36 +08:00 |
|
liaodanlong
|
5f79d2038c
|
工艺外协采购单展示问题
|
2025-04-27 11:49:56 +08:00 |
|
liaodanlong
|
9f1beb4013
|
Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
# sf_manufacturing/models/mrp_production.py
# sf_manufacturing/models/purchase_order.py
# sf_sale/models/sale_order.py
|
2025-04-27 08:50:45 +08:00 |
|
liaodanlong
|
9cf70cc54c
|
工艺外协代码回退
|
2025-04-26 14:42:38 +08:00 |
|
liaodanlong
|
443a21a0cc
|
工序外协需求
|
2025-04-25 11:46:05 +08:00 |
|
胡尧
|
4b29def105
|
修改模型id为模型ID，增加机台判断
|
2025-04-24 14:58:50 +08:00 |
|
yuxianghui
|
7c7876e96f
|
工单添加默认按工序排序
|
2025-04-23 11:19:08 +08:00 |
|
廖丹龙
|
c6f625fe44
|
Accept Merge Request #2027: (feature/tool_standard_library_process -> 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/2027
|
2025-04-22 13:49:59 +08:00 |
|
liaodanlong
|
41e4d2656a
|
采购申请单
|
2025-04-22 13:39:57 +08:00 |
|
廖丹龙
|
73dce5e75e
|
Accept Merge Request #2025: (feature/tool_standard_library_process -> 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/2025
|
2025-04-21 15:00:30 +08:00 |
|
liaodanlong
|
9b009ec5a3
|
外协工单采购申请查询问题
|
2025-04-21 14:55:52 +08:00 |
|
liaodanlong
|
7d70184a5d
|
外协工单采购申请查询问题
|
2025-04-21 14:55:20 +08:00 |
|
胡尧
|
7849ce6342
|
工单列表增加模型ID搜索
|
2025-04-21 11:25:37 +08:00 |
|
管欢
|
be639d7631
|
Accept Merge Request #2013: (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/2013
|
2025-04-18 14:08:29 +08:00 |
|
guanhuan
|
66c745af3c
|
排序优化
|
2025-04-18 13:22:25 +08:00 |
|
管欢
|
f92b844c16
|
Accept Merge Request #2012: (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/2012
|
2025-04-18 09:50:58 +08:00 |
|
liaodanlong
|
a4f8183654
|
更新工艺外协流程的采购单查询逻辑
|
2025-04-17 17:02:43 +08:00 |
|
liaodanlong
|
962931bc9d
|
外协流程更改
|
2025-04-17 14:29:06 +08:00 |
|
guanhuan
|
9cfc8418ec
|
优化库存排序
|
2025-04-17 13:44:25 +08:00 |
|
胡尧
|
1d857be16a
|
修改获取编程文件根目录
|
2025-03-31 09:28:30 +08:00 |
|
胡尧
|
b55c6c1fe7
|
修改前置三元检测文件根目录
|
2025-03-30 11:16:40 +08:00 |
|
胡尧
|
f34c01d1b0
|
解决表面工艺外协调拨单验证报错的问题
|
2025-03-28 13:37:29 +08:00 |
|
胡尧
|
a11329eaf8
|
Merge branch 'develop' into feature/commercially_launched
|
2025-03-13 14:51:21 +08:00 |
|
yuxianghui
|
7ddcfc6226
|
1、处理 制造订单内外协调拨单质量检查不通过，点击跳转质量检查页面报错 ；2、处理 工单Rfid绑定解绑是数据不正确问题
|
2025-03-13 14:39:04 +08:00 |
|
胡尧
|
a1a94867f0
|
Merge branch 'develop' into feature/commercially_launched
|
2025-03-13 11:34:17 +08:00 |
|
廖丹龙
|
b2b8762138
|
Accept Merge Request #1898: (feature/tool_standard_library_process -> 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/1898
|
2025-03-13 10:12:56 +08:00 |
|
胡尧
|
3cc3c48ab3
|
Merge branch 'develop' into feature/commercially_launched
|
2025-03-13 08:47:59 +08:00 |
|
yuxianghui
|
0d8445e444
|
处理工单的Rfid扫码绑定解绑问题
|
2025-03-13 08:36:10 +08:00 |
|
胡尧
|
29337bfceb
|
调整模型显示
|
2025-03-12 17:05:29 +08:00 |
|
liaodanlong
|
5b084624df
|
不送检的质量检查单状态更新：等待、待处理
|
2025-03-12 13:46:07 +08:00 |
|
yuxianghui
|
826d5b1d58
|
1、优化工单子页签可全量配置处理方法；
|
2025-03-06 13:37:52 +08:00 |
|
yuxianghui
|
7d4314abc7
|
完成 工单子页签可全量配置
|
2025-03-05 11:24:48 +08:00 |
|
廖丹龙
|
ec1da84da0
|
Accept Merge Request #1888: (feature/tool_standard_library_process -> 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/1888
|
2025-02-28 16:38:23 +08:00 |
|
liaodanlong
|
4c8cf5caf8
|
制造订单状态为返工时限制表面工艺工单状态
|
2025-02-28 16:36:16 +08:00 |
|
mgw
|
c24f539197
|
取消销售订单时的下游单据清单【大类、单据名称、作业类型】显示错误
|
2025-02-28 16:04:49 +08:00 |
|