Commit Graph

1755 Commits

Author SHA1 Message Date
10001392 fc68fc6da3 Merge remote-tracking branch 'origin/master-hlq-20240905' into test 2024-09-05 09:33:33 +08:00
10001392 9e930b2aaa 【物料变更】提示语
【标准部件】非标导出加字段:选型说明,备注
2024-09-05 09:31:08 +08:00
10001392 c9a570f706 Merge remote-tracking branch 'origin/master-order-20240830' 2024-09-04 16:44:57 +08:00
10001392 73e41dfd77 Merge remote-tracking branch 'origin/master-order-20240830' into test 2024-09-04 16:44:05 +08:00
10001392 8447cf9ad9 【生产订单管理】 2024-09-04 16:42:44 +08:00
10001392 f1ac6f9c23 Merge remote-tracking branch 'origin/feature/DM/nflg-bom-transition' into test 2024-09-04 13:31:46 +08:00
jing's 86be029466 暂存 提交 子数据检查是否在主数据 2024-09-04 11:43:07 +08:00
10001392 e3a8343f1a Merge remote-tracking branch 'origin/master-hlq-20240903' into test 2024-09-03 18:04:25 +08:00
10001392 976e61abfb 【物料申请】制作大类201001电控柜及器件包英文描述选填 2024-09-03 18:01:43 +08:00
10001392 e56c44bd7c Merge remote-tracking branch 'origin/feature/DM/nflg-bom-transition' into test 2024-09-03 11:38:37 +08:00
10001392 1b4ce3963a Merge remote-tracking branch 'origin/feature/DM/nflg-bom-transition' 2024-09-03 11:33:40 +08:00
曹鹏飞 82af5dc6f5 Merge branch 'feature/DM/nflg-bom-transition' of http://192.168.0.40:3000/root/nflg_project into feature/DM/nflg-bom-transition 2024-09-03 10:56:40 +08:00
曹鹏飞 57e0e2a336 feat(pbom): 导入到SAP移除跳过用户根节点物料的限制 2024-09-03 10:56:17 +08:00
10002327 f1f01243d8 Merge pull request '虚拟包按发货-直发-制作的顺序排序' (#14) from master-xiantao-lhj0830 into test
Reviewed-on: http://192.168.0.40:3000/root/nflg_project/pulls/14
2024-09-03 09:56:32 +08:00
10002327 6f14256fb5 虚拟包按发货-直发-制作的顺序排序 2024-09-03 09:17:01 +08:00
10001392 ae4a691f68 Merge remote-tracking branch 'origin/master-order-20240830' into test 2024-09-02 17:59:37 +08:00
10001392 6e9466004b 【生产订单】 2024-09-02 17:58:05 +08:00
10001392 542ceb23c1 物料主数据【物料申请】制作物料英文描述 2024-09-02 17:57:41 +08:00
10001392 a616106b70 Merge remote-tracking branch 'origin/master-order-20240830' into test 2024-09-02 14:12:34 +08:00
10001392 848087523c 【生产订单管理】 2024-09-02 14:10:11 +08:00
10001392 fa3dfc210e 【生产订单管理】 2024-09-02 11:19:49 +08:00
10001392 91be7b8de1 物料主数据
1、【物料申请】制作物料英文描述
2024-09-02 11:19:37 +08:00
10002327 3cf0bfbb44 Merge pull request 'master-xiantao-lhj0830' (#13) from master-xiantao-lhj0830 into test
Reviewed-on: http://192.168.0.40:3000/root/nflg_project/pulls/13
2024-09-02 11:03:03 +08:00
10002327 2ab79e68bc 去掉修改排序号的值 2024-09-02 10:46:06 +08:00
10002327 ef5e9e23ae PBOM库存地点、ebom排序问题 2024-08-30 18:05:41 +08:00
10002327 5fdbceff47 PBOM库存地点、ebom排序问题 2024-08-30 18:02:35 +08:00
大米 7e6aafd545 Merge branch 'feature/DM/nflg-bom-transition_转pbom新逻辑' into feature/DM/nflg-bom-transition 2024-08-29 11:33:32 +08:00
大米 24dc6f7be0 EBOM草稿发布时-ebom升级处理 2024-08-29 08:53:08 +08:00
luoliming 2009537e0a 1-eBOM草稿-转Pbom 2024-08-29 08:53:03 +08:00
luoliming 8ea3d18d96 1-eBOM-正式转Pbom 2024-08-29 08:52:59 +08:00
10001392 7fe4cbacde Merge remote-tracking branch 'origin/feature/DM/nflg-bom-transition-sit' into feature/DM/nflg-bom-transition 2024-08-29 08:38:52 +08:00
大米 897e779f24 EBOM草稿发布时-ebom升级处理 2024-08-29 08:36:15 +08:00
10001392 2ec207ff97 Merge remote-tracking branch 'origin/feature/DM/nflg-bom-transition-sit' into feature/DM/nflg-bom-transition 2024-08-29 07:59:18 +08:00
luoliming 72941481fa 1-eBOM草稿-转Pbom 2024-08-28 23:47:18 +08:00
10001392 4b873c151d Merge remote-tracking branch 'origin/feature/DM/nflg-bom-transition-sit' into feature/DM/nflg-bom-transition 2024-08-28 22:01:06 +08:00
10001392 df4b9ceaa2 Merge remote-tracking branch 'origin/master-pbom-lhj0827' into feature/DM/nflg-bom-transition 2024-08-28 22:00:33 +08:00
luoliming 6e79ebe3ff Merge remote-tracking branch 'origin/feature/DM/nflg-bom-transition-sit' into feature/DM/nflg-bom-transition-sit 2024-08-28 21:58:47 +08:00
luoliming 647b7c2674 1-eBOM-正式转Pbom 2024-08-28 21:58:11 +08:00
10002327 c6451c8189 PBOM子表字段【source_parent_material_no】赋值 2024-08-28 18:59:43 +08:00
10001392 4fb3dfa2b2 Merge remote-tracking branch 'origin/feature/DM/nflg-bom-transition-sit' into feature/DM/nflg-bom-transition 2024-08-28 16:21:51 +08:00
大米 2d844076a7 pbom发布报错物料处理 2024-08-28 16:20:10 +08:00
大米 a908b2d6f3 pbom发布报错物料处理 2024-08-28 16:19:23 +08:00
大米 c250e91514 EBOM-getChild方法优化 2024-08-28 14:46:09 +08:00
大米 3abb688004 EBOM-getChild方法优化 2024-08-28 14:45:02 +08:00
大米 7170993496 转EBOM时- PBOM发布报错修复4 2024-08-28 14:29:24 +08:00
大米 4e0f149ac9 转EBOM时- PBOM发布报错修复3 2024-08-28 14:29:20 +08:00
10001392 22fc635e7c Merge remote-tracking branch 'origin/feature/DM/nflg-bom-transition-sit' into feature/DM/nflg-bom-transition 2024-08-28 14:25:07 +08:00
大米 b8ff69b50c 转EBOM时- PBOM发布报错修复4 2024-08-28 14:24:58 +08:00
大米 ca7bbdc353 转EBOM时- PBOM发布报错修复3 2024-08-28 14:23:04 +08:00
10001392 bc87bd8a99 Merge remote-tracking branch 'origin/master-pbom-lhj0827' into feature/DM/nflg-bom-transition 2024-08-28 11:34:12 +08:00