rakor
/
nflg_project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
500 Commits 16 Branches 1 Tag 12 MiB
Commit Graph

499 Commits

Author SHA1 Message Date
大米 621a2287f5 加1|自制;2|外协;3|采购 2024-01-24 17:08:16 +08:00
jing's 3ca4ee7606 Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2024-01-24 17:02:27 +08:00
jing's 404fef34e3 暂存取消异常检查 2024-01-24 17:02:23 +08:00
大米 bc17c0cd3a 加1|自制;2|外协;3|采购 2024-01-24 11:06:57 +08:00
大米 4a9d9b5385 加1|自制;2|外协;3|采购 2024-01-24 10:06:29 +08:00
luoliming 5821052b77 Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2024-01-23 23:38:01 +08:00
luoliming b1ee64a574 注释获取订单号 2024-01-23 23:37:49 +08:00
jing's eff37916b8 Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2024-01-23 23:04:17 +08:00
jing's cffc7b8777 sap 导入 2024-01-23 23:04:07 +08:00
luoliming e6afa2ef26 注释获取订单号 2024-01-23 22:58:26 +08:00
jing's b65c7d3953 Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 
# Conflicts:
#	nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewPbomParentVO.java
 2024-01-23 21:56:41 +08:00
jing's bec67d75d5 sap 2024-01-23 21:56:02 +08:00
大米 71e5c2aec4 加1|自制;2|外协;3|采购 2024-01-23 18:51:52 +08:00
大米 e728f1d2af Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2024-01-23 18:06:56 +08:00
大米 38e9ed6d93 加1|自制;2|外协;3|采购 2024-01-23 18:06:51 +08:00
jing's 4edad1ba33 Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2024-01-23 15:26:18 +08:00
jing's 9ab8a44e06 调整工厂 2024-01-23 15:25:54 +08:00
大米 c1f21f8723 加1|自制;2|外协;3|采购 2024-01-23 15:08:23 +08:00
大米 a32e3591d8 pbom 加relCategoryCode 2024-01-23 14:20:37 +08:00
大米 c20932ff1f 原始BOM搜索+虚拟包加单位 2024-01-23 12:57:50 +08:00
大米 b81a9e6cf2 Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2024-01-22 12:29:38 +08:00
大米 52ce04273c 同步sap 2024-01-22 12:29:31 +08:00
jing's 0f7031bea7 调整判断 2024-01-22 10:04:19 +08:00
jing's 79637ce6f3 Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2024-01-22 09:33:09 +08:00
jing's c8f4b6e697 移动破 2024-01-22 09:32:58 +08:00
大米 e8f7ef564d 同步sap 2024-01-22 08:50:38 +08:00
luoliming f7a261dbab Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2024-01-21 22:23:40 +08:00
jing's b297276412 调整 2024-01-21 22:19:32 +08:00
luoliming e81c155ca4 Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 
# Conflicts:
#	nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java
 2024-01-21 22:18:22 +08:00
luoliming 0bf8ed6c1f 注释获取订单号 2024-01-21 22:16:51 +08:00
jing's eb2c62de30 Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2024-01-21 22:16:41 +08:00
jing's f05ae31a57 调整 2024-01-21 22:16:37 +08:00
luoliming 67bfc6686a 同步sap 2024-01-21 22:13:28 +08:00
jing's 5014614de7 Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2024-01-21 21:13:30 +08:00
jing's 26831d55d3 移动破调整 2024-01-21 21:13:25 +08:00
luoliming eb70a94864 31码需有虚拟包 2024-01-21 15:01:28 +08:00
大米 9bcea20836 Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2024-01-20 11:49:33 +08:00
大米 9893678ea2 同步sap 2024-01-20 11:49:23 +08:00
jing's 82e0749c57 异常检查 2024-01-19 20:37:41 +08:00
jing's ce9596a61f 退回 2024-01-19 17:56:03 +08:00
jing's 05cc8db7db Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2024-01-19 11:42:37 +08:00
jing's 3cd755b283 退回 2024-01-19 11:42:33 +08:00
大米 5fc1a33109 Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2024-01-19 10:46:49 +08:00
大米 8d560d9b4a 非Q 的规则 2024-01-19 10:46:44 +08:00
luoliming da13cbe9f0 Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 
# Conflicts:
#	nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java
 2024-01-18 21:34:33 +08:00
luoliming fd4969cb99 ebom 工作表 2024-01-18 21:32:14 +08:00
大米 648c2166d6 非Q 的规则 2024-01-18 11:51:38 +08:00
大米 ba97872897 1020分工厂 2024-01-18 11:39:30 +08:00
大米 b3b9a85b5f 1020分工厂 2024-01-18 11:15:57 +08:00
大米 36d810252f BUG修复 2024-01-18 10:53:22 +08:00
大米 67824540e3 同步sap 2024-01-17 12:24:11 +08:00
大米 277a658ae9 同步sap 2024-01-17 11:13:09 +08:00
大米 d6fa200648 Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2024-01-17 09:35:09 +08:00
大米 789e9f1be2 同步sap 2024-01-17 09:35:03 +08:00
jing's 39ccfb251b Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2024-01-16 21:51:02 +08:00
jing's 6770c183c4 移动破调整 2024-01-16 21:50:56 +08:00
大米 f7fc1a9d41 变更原因 2024-01-16 19:00:45 +08:00
大米 df856477cb 虚拟包图号+转Ebom 2024-01-16 18:39:54 +08:00
大米 b1a3a82515 同步sap+发布PBOM 2024-01-16 15:27:49 +08:00
大米 c1265b656b 同步sap+发布PBOM 2024-01-16 14:55:29 +08:00
大米 716ff8fe32 Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2024-01-16 09:09:34 +08:00
大米 1cda5d400d 异常检查 2024-01-16 09:09:28 +08:00
jing's 8799ac54c2 调整 2024-01-16 08:13:16 +08:00
jing's 9879005e2c Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2024-01-15 23:34:25 +08:00
jing's 91a2e06147 调整 2024-01-15 23:34:21 +08:00
大米 fed8158567 Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2024-01-15 16:22:50 +08:00
大米 1887be724f 变更影响 2024-01-15 16:22:42 +08:00
jing's b70a795723 判断调整 2024-01-15 15:34:36 +08:00
大米 0332756cea Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2024-01-15 08:50:19 +08:00
jing's a13dc576db 注释 2024-01-14 21:38:13 +08:00
jing's 7ef7eec235 Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2024-01-14 21:25:01 +08:00
jing's 334174a757 移动破编辑 2024-01-14 21:24:55 +08:00
luoliming b197d757c4 ebom 工作表 2024-01-14 16:54:54 +08:00
luoliming 3a5c231d40 bug修复 2024-01-14 09:38:18 +08:00
大米 268d94b392 变更影响 2024-01-12 16:51:12 +08:00
jing's c5d312ee85 Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2024-01-12 14:38:28 +08:00
jing's 5aef3c1fe5 移动破调整 2024-01-12 14:38:16 +08:00
大米 46a870b3a1 PBOM-导出 2024-01-12 10:06:20 +08:00
大米 7f8f9dcd27 Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2024-01-12 09:17:52 +08:00
大米 de4b8a70e5 黄色异常处理 2024-01-12 09:17:45 +08:00
luoliming 7b05c2a126 bug修复 2024-01-11 22:30:50 +08:00
luoliming 2bdeba22bc bug修复 2024-01-11 22:21:39 +08:00
大米 591ed8b390 BUG修复 2024-01-11 18:54:39 +08:00
jing's 9cebd0f021 移动破调整 2024-01-10 23:29:10 +08:00
jing's fa71e7024d 排序 2024-01-10 23:22:52 +08:00
jing's eeb58516de Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2024-01-10 23:03:30 +08:00
jing's 413115a082 选项排序升序 2024-01-10 23:03:26 +08:00
luoliming 15fadbdd3a bug修复 2024-01-10 22:48:41 +08:00
jing's 3b15f04be5 Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2024-01-10 22:24:26 +08:00
jing's 2625956e09 调整 2024-01-10 22:24:21 +08:00
大米 0a08f2f208 PBOM-正式列表搜索 2024-01-10 18:47:40 +08:00
大米 b502414d32 PBOM-正式列表搜索 2024-01-10 14:47:26 +08:00
大米 e8d970d593 PBOM-正式列表搜索 2024-01-10 12:05:32 +08:00
jing's 71098f6fb5 检查异常问题 2024-01-09 23:34:56 +08:00
jing's fa77887c0a Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2024-01-09 21:10:39 +08:00
jing's 888e861a6e 调整 2024-01-09 21:10:35 +08:00
大米 e533b3309f PBOM-正式列表搜索 2024-01-09 18:09:22 +08:00
大米 fc72eebcf0 PBOM-列表搜索 2024-01-09 17:21:29 +08:00
大米 12fd066d0c Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2024-01-09 12:19:31 +08:00
大米 f6cb5cf326 EBOM修复 2024-01-09 12:19:24 +08:00
jing's a0409d15e5 Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2024-01-08 22:37:39 +08:00
jing's be8b809c6f 退回 2024-01-08 22:37:34 +08:00
大米 55da2e01c0 Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2024-01-08 18:43:19 +08:00
大米 b158c48de9 EBOM修复 2024-01-08 18:43:14 +08:00
jing's 76028e0c64 Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2024-01-08 16:12:53 +08:00
jing's 5e4e0acc7c 查询bug修改 2024-01-08 16:12:34 +08:00
大米 b98fe9b4b2 EBOM修复 2024-01-08 12:30:27 +08:00
大米 41c0b4346e EBOM修复 2024-01-08 11:37:06 +08:00
jing's 72151cb3eb 查询调整 2024-01-07 22:53:01 +08:00
luoliming 1aa13ece77 bug修复 2024-01-07 20:57:40 +08:00
luoliming c17a135723 Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2024-01-07 19:38:37 +08:00
luoliming 48d69751d8 bug修复 2024-01-07 19:38:16 +08:00
jing's be4d901595 bug修改 2024-01-07 18:13:26 +08:00
jing's e62e5e4cf8 Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2024-01-07 17:00:15 +08:00
jing's 4a9d799535 更改状态 2024-01-07 17:00:12 +08:00
luoliming 506cf0adea Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2024-01-07 16:32:07 +08:00
luoliming c54bb944d9 bug修复 2024-01-07 16:31:42 +08:00
jing's 669150193c Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2024-01-07 15:40:48 +08:00
jing's d8eee928e5 bug修复 2024-01-07 15:40:44 +08:00
luoliming a434819d73 bug修复 2024-01-07 15:16:23 +08:00
jing's 42c8f7a1fa get方式 2024-01-07 13:10:27 +08:00
jing's 16620d0d77 调整查询字段 2024-01-07 11:44:16 +08:00
jing's bdb726400f 退回状态显示 2024-01-06 21:46:21 +08:00
jing's d8542fee07 Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2024-01-06 21:25:21 +08:00
jing's 5119f698b6 退回等调整 2024-01-06 21:25:17 +08:00
大米 460ca0b864 PBOM已发布列表 2024-01-06 18:37:04 +08:00
大米 52afb0fd1c EBOM-物料和图号搜索 2024-01-06 17:36:27 +08:00
大米 c8155b648b EBOM-物料和图号搜索 2024-01-06 17:11:38 +08:00
大米 2112e9f648 EBOM-物料和图号搜索 2024-01-06 17:05:18 +08:00
大米 16f53a4fdb 转EBOM合并相同行 2024-01-06 16:08:11 +08:00
大米 849f02d16a Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2024-01-06 13:42:09 +08:00
大米 94cfdfb291 发布Mbom 2024-01-06 13:42:02 +08:00
jing's b29fdd0baf 调整 2024-01-06 12:02:15 +08:00
luoliming 9f20578fef 处理异常 2024-01-05 22:46:19 +08:00
大米 9df337434d Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2024-01-05 18:14:18 +08:00
大米 66990bd395 发布Mbom 2024-01-05 18:14:11 +08:00
jing's 269864b22e 判断 2024-01-05 15:13:55 +08:00
jing's 52ab6d5c81 Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 
# Conflicts:
#	nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java
 2024-01-04 23:28:46 +08:00
jing's 4893ccaba7 异常调整 2024-01-04 23:25:08 +08:00
大米 07db8a3e1d 1.Pbom 2024-01-04 19:09:41 +08:00
大米 7b338c3879 Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2024-01-04 19:00:20 +08:00
大米 d8406ee9c4 1.Pbom 2024-01-04 19:00:11 +08:00
jing's 9757db017d 支持格式 2024-01-03 23:00:10 +08:00
jing's bd8ed13aca Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2024-01-03 22:36:30 +08:00
jing's 5ef293e69c 问题调整 2024-01-03 22:36:25 +08:00
luoliming 1c067a510a 处理异常 2024-01-03 22:35:11 +08:00
大米 be9db5d36f Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2024-01-03 19:32:10 +08:00
大米 00a19a8851 1.分工厂 2024-01-03 19:32:02 +08:00
jing's 5bed408ca7 Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2024-01-03 17:48:30 +08:00
jing's 6ddbda06fc mbom 工作列表 明细 2024-01-03 17:48:26 +08:00