胡尧
|
61baa49d85
|
Merge branch 'feature/6694' into feature/merge-6694
|
2025-05-15 09:22:44 +08:00 |
|
胡尧
|
b783af6ef3
|
修复误回退的代码
|
2025-05-15 09:15:27 +08:00 |
|
胡尧
|
22cbe1bd9d
|
回退代码
|
2025-05-15 09:13:51 +08:00 |
|
胡尧
|
961754428b
|
退回至未合并工艺外协代码
|
2025-05-15 09:02:31 +08:00 |
|
胡尧
|
c898e02860
|
解决制造申请字段未复制到成品中
|
2025-05-14 17:02:04 +08:00 |
|
liaodanlong
|
8afc8bb3a6
|
外协调拨单只有当制造订单状态变为已编程才能就绪
|
2025-05-14 10:03:26 +08:00 |
|
liaodanlong
|
9e6f3fa864
|
Merge branch 'refs/heads/develop' into feature/tool_standard_library_process
# Conflicts:
# sf_manufacturing/models/purchase_order.py
|
2025-05-12 15:03:25 +08:00 |
|
liaodanlong
|
1040844b0a
|
采购申请跳转处理
|
2025-05-12 11:01:51 +08:00 |
|
管欢
|
8249d1427f
|
Accept Merge Request #2105: (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/2105
|
2025-05-09 18:28:56 +08:00 |
|
guanhuan
|
94bcfc0543
|
采购申请数量修改过滤取消
|
2025-05-09 18:15:40 +08:00 |
|
guanhuan
|
b4d31c7c4b
|
采购申请数量修改
|
2025-05-09 17:50:43 +08:00 |
|
胡尧
|
7575424760
|
委外加工的入库单增加采购申请按钮
|
2025-05-08 20:12:12 +08:00 |
|
胡尧
|
f10f595fa4
|
解决制造订单不显示采购申请按钮的问题
|
2025-05-08 17:47:40 +08:00 |
|
胡尧
|
5dc16c039c
|
修复收料入库单明细不对的问题
|
2025-05-08 17:29:41 +08:00 |
|
胡尧
|
18c7b22319
|
取消采购申请合并明细行的代码，会导致其他后续单据的问题
|
2025-05-08 16:47:01 +08:00 |
|
胡尧
|
c24bba3137
|
增加采购申请对于单件制造非首个制造订单的显示，修改采购申请对于同一个补货组同一个产品的合并
|
2025-05-07 16:34:45 +08:00 |
|
guanhuan
|
21d052e222
|
采购申请明细优化
|
2025-04-29 10:40:19 +08:00 |
|
胡尧
|
644ff967e5
|
解决pdf上数字乱码的问题
|
2025-04-27 14:10:29 +08:00 |
|
liaodanlong
|
9cf70cc54c
|
工艺外协代码回退
|
2025-04-26 14:42:38 +08:00 |
|
胡尧
|
6767b693f5
|
取消线上解决bug的改动
|
2025-04-23 14:22:50 +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 |
|
胡尧
|
05b5e9cfd9
|
解决创建采购申请报错
|
2025-04-23 10:32:39 +08:00 |
|
liaodanlong
|
dc6fb4ddda
|
采购申请单查询条件同一
|
2025-04-23 09:34:02 +08:00 |
|
liaodanlong
|
9f9c08b1f0
|
制造订单采购申请查询问题
|
2025-04-21 14:35:57 +08:00 |
|
胡尧
|
4ca655ad51
|
采购申请跳转到采购单，不默认筛选询价单
|
2025-03-25 17:09:22 +08:00 |
|
yuxianghui
|
2275f7a384
|
制造订单详情页添加对应采购申请跳转链接
|
2025-03-25 13:28:31 +08:00 |
|
yuxianghui
|
f51f8bebb2
|
新增按规格生成的采购申请订单跳过审核环节自动更新为已批准状态
|
2025-03-24 13:16:02 +08:00 |
|
yuxianghui
|
d202e7ee93
|
零件名称字段计算方法修改
|
2025-03-21 15:37:10 +08:00 |
|
yuxianghui
|
80e9085e29
|
采购申请字段调整
|
2025-03-21 15:05:42 +08:00 |
|
yuxianghui
|
86d2fb1ac2
|
efms-purchase_request模块新增修改代码搬迁到sf-jikimo_purchase_request模块
|
2025-03-21 11:20:24 +08:00 |
|
yuxianghui
|
6c879e4af3
|
1、新增由销售单生成的采购申请自动确认；2、销售单新增【采购申请】跳转按钮
|
2025-03-20 15:20:05 +08:00 |
|
mgw
|
a8d8bcbcee
|
state字段添加ondelete策略
|
2025-03-19 11:07:49 +08:00 |
|
mgw
|
5b979ffc34
|
取消列表增加采购申请明细
|
2025-03-19 11:00:48 +08:00 |
|
胡尧
|
674af1d11d
|
成品，坯料复制模板中的采购申请字段模板
|
2025-03-06 16:02:19 +08:00 |
|