guanhuan
|
2febc369bb
|
确认工艺路线新增表面工艺参数需要同步到产品的加工参数中
|
2025-06-16 13:44:55 +08:00 |
|
guanhuan
|
fa03b562a2
|
确认工艺路线新增表面工艺参数需要同步到产品的加工参数中
|
2025-06-16 11:52:22 +08:00 |
|
guanhuan
|
5f55c954d1
|
确认工艺路线新增表面工艺参数需要同步到产品的加工参数中
|
2025-06-16 11:42:21 +08:00 |
|
管欢
|
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 |
|
yuxianghui
|
2b3a2dd21c
|
1、处理返工报错，2、保存的合同文档添加对应销售订单号
|
2025-06-05 09:16:02 +08:00 |
|
yuxianghui
|
573b50da68
|
销售订单添加合同字段，销售订单form页面新增合同page页，优化/api/bfm_process_order/list接口添加合同信息处理。
|
2025-06-04 11:31:28 +08:00 |
|
guanhuan
|
9b01254b3c
|
下达生产
|
2025-05-28 10:47:03 +08:00 |
|
胡尧
|
30a6e5bf2e
|
制造订单的编程记录修改
|
2025-05-26 09:31:47 +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 |
|
管欢
|
1856a1a4ef
|
Accept Merge Request #2134: (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/2134
|
2025-05-19 11:04:44 +08:00 |
|
guanhuan
|
52579673de
|
采购申请单完成操作优化
|
2025-05-19 08:54:02 +08:00 |
|
胡尧
|
4b443e65f6
|
解决库存单据零件图号零件名称不对的问题
|
2025-05-16 09:14:37 +08:00 |
|
胡尧
|
a3c0fd3ccf
|
解决工艺外协采购单不显示的问题
|
2025-05-15 16:48:34 +08:00 |
|
胡尧
|
a29265f17d
|
修改正则匹配成品名字序号
|
2025-05-15 16:39:57 +08:00 |
|
胡尧
|
c2e4085b50
|
解决产品模板复制的问题
|
2025-05-15 12:14:33 +08:00 |
|
胡尧
|
c80e12d731
|
回退工艺外协代码
|
2025-05-15 11:07:22 +08:00 |
|
胡尧
|
9c4d545915
|
Merge branch 'develop' into feature/6694
|
2025-05-15 10:33:42 +08:00 |
|
胡尧
|
c898e02860
|
解决制造申请字段未复制到成品中
|
2025-05-14 17:02:04 +08:00 |
|
胡尧
|
5477582a69
|
修改中控日志接口授权为none
|
2025-05-14 16:09:06 +08:00 |
|
胡尧
|
ceb38aa483
|
Accept Merge Request #2106: (feature/tool_standard_library_process -> develop)
Merge Request: 工艺外协代码
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2106
|
2025-05-12 08:41:26 +08:00 |
|
胡尧
|
11ecad5ef2
|
解决冲突
|
2025-05-12 08:41:12 +08:00 |
|
胡尧
|
61bcd72a41
|
表面工艺外协调拨单数量问题
|
2025-05-09 17:24:24 +08:00 |
|
胡尧
|
ee87e1dacf
|
处理特殊表面工艺采购单确认报错的问题
|
2025-05-09 15:26:12 +08:00 |
|
胡尧
|
bfff4ac440
|
确认接收时，将不追溯的产品的完成数量自动填上
|
2025-05-09 13:43:10 +08:00 |
|
liaodanlong
|
b5339046b9
|
工艺外协代码
|
2025-05-08 16:42:18 +08:00 |
|
liaodanlong
|
51c517145b
|
工艺外协代码
|
2025-05-07 17:17:41 +08:00 |
|
胡尧
|
fffbfc21c2
|
表面工艺外协工单流程数量按照制造订单的product_uom_qty设置
|
2025-05-07 13:02:13 +08:00 |
|
胡尧
|
5aa848de53
|
修改判断坯料序列号的逻辑
|
2025-05-07 11:01:01 +08:00 |
|
liaodanlong
|
efc4ae31c9
|
工艺外协代码
|
2025-05-07 11:00:32 +08:00 |
|
liaodanlong
|
0863238819
|
Merge branch 'refs/heads/develop' into feature/tool_standard_library_process
|
2025-05-07 11:00:24 +08:00 |
|
胡尧
|
2bf43ae9a1
|
将成品的追溯复制到product上，将坯料的追溯同成品的追组
|
2025-05-07 08:47:33 +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 |
|
胡尧
|
5a61b3b459
|
调整机台二维码使用A4打印机
|
2025-04-24 09:58:27 +08:00 |
|
胡尧
|
7b77d846c3
|
Accept Merge Request #2040: (hotfix/解决采购申请bug -> develop)
Merge Request: 解决创建采购申请报错
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2040?initial=true
|
2025-04-23 14:21:27 +08:00 |
|
廖丹龙
|
5e3bce1931
|
Accept Merge Request #2038: (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/2038
|
2025-04-23 11:25:04 +08:00 |
|
yuxianghui
|
7c7876e96f
|
工单添加默认按工序排序
|
2025-04-23 11:19:08 +08:00 |
|
liaodanlong
|
5438ff6df1
|
排程产能限制问题
|
2025-04-23 11:06:03 +08:00 |
|
廖丹龙
|
a84f8636a4
|
Accept Merge Request #2035: (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/2035
|
2025-04-23 09:12:59 +08:00 |
|
liaodanlong
|
7c26045377
|
工艺确认报错问题处理
|
2025-04-23 09:12:20 +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 |
|