Commit Graph

46 Commits

Author SHA1 Message Date
陈烨
ff5925eb06 Merge branch refs/heads/develop into refs/heads/feature/7249 2025-07-11 10:10:56 +08:00
chenye
2a7e07b4c0 提交7249和7246需求 2025-07-10 17:44:10 +08:00
李晓斌
2f21c510bd Accept Merge Request #2274: (feature/7231 -> develop)
Merge Request: 7231_lxb_commit--控制物料需求计划在客户位置的计划量不允许超过需求量

Created By: @李晓斌
Reviewed By: @胡尧
Approved By: @胡尧 
Accepted By: @李晓斌
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2274
2025-07-10 17:01:05 +08:00
lixiaobin@jikimo.com
559c6bfb1d 7231_lxb_commit 2025-07-10 14:29:06 +08:00
guanhuan
1f93ba3b42 修复未保存需求计划删除明细行问题,打印列表显示 2025-07-10 14:11:31 +08:00
guanhuan
df4995fa24 需求计划下达计划 2025-07-04 10:18:28 +08:00
guanhuan
6e877d0449 需求计划下达计划 2025-07-03 17:32:11 +08:00
guanhuan
3822d78f35 需求计划供货方式修改 2025-07-03 14:33:19 +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
胡尧
20069d5336 Merge branch refs/heads/develop into refs/heads/release/release_2.15 2025-07-01 17:57:06 +08:00
guanhuan
b267f2351d 需求计划开发 2025-07-01 14:34:27 +08:00
guanhuan
fe8df494f9 需求计划列表字段位置变动 2025-06-30 17:13:46 +08:00
guanhuan
c31cc868a9 物料需求计划管理 2025-06-30 17:10:25 +08:00
guanhuan
32cd68e15f 调拨动作中屏蔽验证 2025-06-30 13:36:04 +08:00
guanhuan
048f07aba4 新增坯料类型 2025-06-27 17:44:32 +08:00
guanhuan
f0e47371ed 新增坯料类型 2025-06-27 15:29:02 +08:00
guanhuan
c03cda8250 物料需求计划管理 2025-06-27 15:23:05 +08:00
guanhuan
fe4659987f 物料需求计划管理 2025-06-26 17:18:03 +08:00
guanhuan
c14e2c19bf 物料需求计划管理 2025-06-26 11:13:56 +08:00
guanhuan
deda36a0f9 物料需求计划管理 2025-06-25 15:01:02 +08:00
guanhuan
8a953a1417 Merge branch 'refs/heads/feature/库存路线' into feature/物料需求计划管理
# Conflicts:
#	sf_demand_plan/__manifest__.py
#	sf_demand_plan/models/sf_production_demand_plan.py
#	sf_demand_plan/security/ir.model.access.csv
2025-06-25 14:32:18 +08:00
guanhuan
d046fd5298 移除销售订单供货方式确认 2025-06-25 14:22:27 +08:00
hyyy
4b026535f8 修改固定列tree的传参方式 2025-06-25 14:01:34 +08:00
yuxianghui
28ade4ac72 完成 物料需求计划主数据准备:库存路线 需求 2025-06-25 13:57:56 +08:00
hyyy
99ac89f995 需求-字段命名调整 2025-06-25 09:54:37 +08:00
guanhuan
f41d3558d2 物料需求计划管理 2025-06-24 17:46:55 +08:00
guanhuan
7d1f7b11eb 坯料尺寸显示修改 2025-06-24 11:39:47 +08:00
guanhuan
fe3492ceb5 坯料尺寸显示修改 2025-06-24 11:32:41 +08:00
guanhuan
02b4f76326 物料需求计划 2025-06-24 11:17:41 +08:00
guanhuan
566bc0e1e2 物料需求计划增加字段显示 2025-06-19 09:40:29 +08:00
guanhuan
b426d5d505 需求计划排序修改 2025-06-17 14:58:27 +08:00
guanhuan
5a071188cc 需求计划对应产品的调拨单显示不正确 2025-06-12 10:53:46 +08:00
guanhuan
154a17657c 需求计划材料销售订单行取值问题 2025-06-12 09:35:39 +08:00
guanhuan
37c5c9d498 需求计划列表拖动 2025-06-11 10:40:26 +08:00
guanhuan
796e9b0cef 需求计划新增合同日期等字段 2025-06-10 15:49:22 +08:00
guanhuan
b11b6ef283 合同编号显示 2025-06-06 09:11:03 +08:00
guanhuan
865d2216af 未齐套提示按钮修改 2025-06-05 17:02:39 +08:00
guanhuan
b0f2fe6a8e 未齐套提示 2025-06-04 13:38:40 +08:00
guanhuan
de951b1b45 未齐套提示 2025-06-03 16:16:11 +08:00
guanhuan
b8cebe07fe 未齐套提示 2025-05-30 15:06:41 +08:00
guanhuan
1bdb81f5f7 待下达生产状态修改 2025-05-29 17:05:19 +08:00
guanhuan
9b01254b3c 下达生产 2025-05-28 10:47:03 +08:00
guanhuan
f4babfcd24 下达生产 2025-05-23 17:26:21 +08:00
guanhuan
a5243970d5 需求计划 2025-05-23 14:14:50 +08:00
guanhuan
e46e6dfc2a 需求计划 2025-05-22 17:40:56 +08:00
guanhuan
50f8bf5ab1 需求计划 2025-05-22 11:37:41 +08:00