guanhuan
|
9db4ea745b
|
Merge branch 'refs/heads/develop' into feature/物料需求计划管理
|
2025-07-04 17:03:23 +08:00 |
|
胡尧
|
b23e50daa6
|
Accept Merge Request #2266: (feature/6711 -> develop)
Merge Request: 解决采购申请创建的采购单取消后导致后续单据无法就绪的问题
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2266?initial=true
|
2025-07-02 17:32:14 +08:00 |
|
胡尧
|
4615f1576f
|
解决采购申请创建的采购单取消后导致后续单据无法就绪的问题
|
2025-07-02 17:31:43 +08:00 |
|
guanhuan
|
0350f78710
|
Merge branch 'refs/heads/develop' into feature/物料需求计划管理
# Conflicts:
# sf_demand_plan/models/sf_production_demand_plan.py
# sf_demand_plan/views/demand_plan.xml
|
2025-07-02 08:57:20 +08:00 |
|
胡尧
|
c8f1676de9
|
解决采购申请创建的采购单取消后导致调拨单不能就绪的问题
|
2025-07-01 17:55:07 +08:00 |
|
yuxianghui
|
1fd9900e41
|
处理 由采购订单-委外加工类型生成的同一个补货组的坯料采购申请单据没有合并 问题
|
2025-06-27 09:39:11 +08:00 |
|
guanhuan
|
50a066c23a
|
物料需求计划管理
|
2025-06-26 17:52:40 +08:00 |
|
yuxianghui
|
e3494ce8b7
|
完成 委外加工采购订单增加BOM内物料的采购申请与采购订单 需求
|
2025-06-25 16:09:32 +08:00 |
|
胡尧
|
4f000a6be4
|
修改采购申请相关欠单创建报错的问题
|
2025-06-18 10:56:22 +08:00 |
|
胡尧
|
376eb9e56f
|
采购申请按钮按照产品以及bom产品过滤
|
2025-06-18 10:34:34 +08:00 |
|
胡尧
|
d70b757487
|
客供料的制造订单，不显示采购申请的智能按钮
|
2025-06-16 14:51:07 +08:00 |
|
胡尧
|
1811dbf0fd
|
解决修改产品名称带来的影响
|
2025-06-16 09:33:52 +08:00 |
|
guanhuan
|
b8043b3ad2
|
修复多条采购申请跳转报错
|
2025-06-11 11:41:03 +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
|
4225a8fe1b
|
采购申请单完成操作提示调整
|
2025-06-10 10:45:06 +08:00 |
|
guanhuan
|
a828c823dd
|
采购申请单完成操作修改
|
2025-06-09 17:55:34 +08:00 |
|
胡尧
|
03ec94d223
|
修复点击智能按钮点击的问题
|
2025-06-06 09:33:23 +08:00 |
|
胡尧
|
2ea24f2049
|
修改制造订单的采购申请只能按钮判断规则
|
2025-06-06 09:16:41 +08:00 |
|
管欢
|
433d5d63b7
|
Accept Merge Request #2146: (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/2146
|
2025-05-23 15:19:30 +08:00 |
|
guanhuan
|
38109028d4
|
采购申请关闭修改
|
2025-05-23 15:13:01 +08:00 |
|
guanhuan
|
cf16a9dd59
|
采购申请关闭修改
|
2025-05-23 14:53:34 +08:00 |
|
胡尧
|
be8fbca9aa
|
解决冲突
|
2025-05-23 14:47:43 +08:00 |
|
管欢
|
6add565a98
|
Accept Merge Request #2144: (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/2144
|
2025-05-23 14:22:18 +08:00 |
|
guanhuan
|
1b0dd96b40
|
采购申请关闭修改
|
2025-05-23 14:20:48 +08:00 |
|
胡尧
|
89f8718fe1
|
当询价单确认为采购单时，根据采购申请明细行变为采购单数量来完成采购申请
|
2025-05-23 14:20:38 +08:00 |
|
胡尧
|
83229c9ab1
|
解决冲突
|
2025-05-23 09:42:52 +08:00 |
|
胡尧
|
1f8e118965
|
取消采购单时，如果该采购单关联的库存移动是由采购申请创建的，则不取消
|
2025-05-23 09:39:38 +08:00 |
|
胡尧
|
a2b2faaa95
|
Accept Merge Request #2138: (feature/6694 -> develop)
Merge Request: 修改欠单逻辑
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2138?initial=true
|
2025-05-22 11:10:28 +08:00 |
|
胡尧
|
6bf666ac18
|
修改欠单逻辑
|
2025-05-22 11:04:12 +08:00 |
|
胡尧
|
a323acf7fc
|
Accept Merge Request #2135: (feature/6694 -> develop)
Merge Request: 取消采购申请部分确认生成的反向单据
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2135?initial=true
|
2025-05-20 16:09:06 +08:00 |
|
胡尧
|
c23715a1ef
|
取消采购申请部分确认生成的反向单据
|
2025-05-20 16:08:03 +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 |
|
胡尧
|
9f94a4e06f
|
在调拨单确认生成欠单时，修改对应采购申请明细行的目标移动
|
2025-05-16 11:44:06 +08:00 |
|
胡尧
|
a29265f17d
|
修改正则匹配成品名字序号
|
2025-05-15 16:39:57 +08:00 |
|
胡尧
|
ac4883db66
|
解决采购申请中零件图号不匹配的问题
|
2025-05-15 16:29:33 +08:00 |
|
胡尧
|
c2e4085b50
|
解决产品模板复制的问题
|
2025-05-15 12:14:33 +08:00 |
|
胡尧
|
c898e02860
|
解决制造申请字段未复制到成品中
|
2025-05-14 17:02:04 +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 |
|