 曹鹏飞
|
24276a95d7
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-05-26 20:09:19 +08:00 |
|
曹鹏飞
|
ebe8c35165
|
fix(ebom): 修复工作表搜索问题
|
2024-05-26 20:08:53 +08:00 |
|
曹鹏飞
|
d182fe1c61
|
Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into feature/DM/nflg-bom
|
2024-05-26 19:50:12 +08:00 |
|
曹鹏飞
|
6b3610be9f
|
optimize: 调整批量查询物料信息接口
|
2024-05-26 19:49:31 +08:00 |
|
曹鹏飞
|
376c3459b5
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-05-26 17:24:12 +08:00 |
|
曹鹏飞
|
02c7ec9ac3
|
fix(ebom): 调整删除规则，导入的数据可以删除；但是31码下的虚拟包不能删除
|
2024-05-26 17:23:49 +08:00 |
|
曹鹏飞
|
30ca4cb0b4
|
Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into feature/DM/nflg-bom
|
2024-05-26 16:53:36 +08:00 |
|
曹鹏飞
|
737c8dd0f8
|
fix(dqbom): 调整批量查询物料信息接口
|
2024-05-26 16:53:23 +08:00 |
|
曹鹏飞
|
6083c0cd41
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-05-26 16:30:33 +08:00 |
大米
|
f0a2bd2bde
|
1、转Pbom问题
|
2024-05-26 16:29:15 +08:00 |
|
曹鹏飞
|
5ed970336d
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-05-26 15:56:41 +08:00 |
|
大米
|
bc7181fb86
|
Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom
|
2024-05-26 15:54:40 +08:00 |
|
大米
|
cc299350a2
|
1、转Pbom问题
|
2024-05-26 15:54:36 +08:00 |
|
曹鹏飞
|
88b4252bed
|
fix(ebom): 优化updateEBomMaterialUse性能
|
2024-05-26 15:44:20 +08:00 |
|
曹鹏飞
|
0a6d022229
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
# Conflicts:
# nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/EbomV2Api.java
# nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomChildService.java
|
2024-05-26 15:01:33 +08:00 |
|
曹鹏飞
|
afc21614cd
|
fix(ebom): 优化updateEBomMaterialUse性能
|
2024-05-26 14:58:49 +08:00 |
|
曹鹏飞
|
31ca386f05
|
fix(ebom): 一些优化
|
2024-05-26 14:42:53 +08:00 |
|
曹鹏飞
|
b939212953
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
# Conflicts:
# nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java
|
2024-05-26 11:41:25 +08:00 |
|
曹鹏飞
|
e59652fb45
|
Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom
|
2024-05-26 11:36:42 +08:00 |
|
大米
|
f7f631796d
|
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-05-26 11:32:52 +08:00 |
|
大米
|
fd8ea9c75b
|
1、EBOM,PBOM 正式版只保留一个版本
|
2024-05-26 11:32:10 +08:00 |
|
曹鹏飞
|
a68ec65b09
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-05-26 11:31:58 +08:00 |
|
曹鹏飞
|
56b7b9a8e6
|
fix(ebom): 修复引用件为未正确显示的问题
|
2024-05-26 11:31:41 +08:00 |
|
曹鹏飞
|
bed6402a50
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
# Conflicts:
# nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java
|
2024-05-26 11:19:28 +08:00 |
|
曹鹏飞
|
ecea3c988d
|
feat(ebom): 转pbom时执行导入sap操作；导入sap存储错误信息到数据库
|
2024-05-26 11:17:12 +08:00 |
|
大米
|
02160fac19
|
Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom
|
2024-05-26 08:57:47 +08:00 |
|
大米
|
b3cd279b2b
|
1、获取岗位修改为工艺人员-默认全部为工艺人员
|
2024-05-26 08:57:25 +08:00 |
|
曹鹏飞
|
ac7a5e454e
|
feat(ebom): 导入目标的必填字段添加“*”符号
|
2024-05-25 17:50:20 +08:00 |
|
曹鹏飞
|
546a75a3f9
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-05-25 17:41:34 +08:00 |
|
曹鹏飞
|
bf1e3349e3
|
Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom
|
2024-05-25 17:40:42 +08:00 |
|
曹鹏飞
|
e5bf19a2ac
|
Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into feature/DM/nflg-bom
|
2024-05-25 17:40:32 +08:00 |
|
曹鹏飞
|
70696f4ea4
|
feat(dqbom): 调整批量查询物料信息接口
|
2024-05-25 17:40:03 +08:00 |
|
曹鹏飞
|
a724c8f2f4
|
feat(ebom): 调整批量查询物料信息接口
|
2024-05-25 17:39:38 +08:00 |
luoliming
|
4229d7b4b4
|
Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom
|
2024-05-25 17:38:15 +08:00 |
|
luoliming
|
c339a978b1
|
转31码问题
|
2024-05-25 17:36:49 +08:00 |
|
曹鹏飞
|
4cf4c95c83
|
fix(ebom): 修复引用件为未正确显示的问题
|
2024-05-25 17:28:12 +08:00 |
|
曹鹏飞
|
af6c30c89d
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-05-25 17:15:24 +08:00 |
|
曹鹏飞
|
c08ed0d539
|
feat(ebom): 修复引用件为未正确显示的问题
|
2024-05-25 17:15:08 +08:00 |
|
曹鹏飞
|
c3c3204819
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-05-25 16:30:45 +08:00 |
|
曹鹏飞
|
ab1449e3f0
|
feat(ebom): 删除ebom时支持删除他人创建的虚拟包
|
2024-05-25 15:01:07 +08:00 |
|
luoliming
|
cc20530e0d
|
Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom
|
2024-05-25 14:55:12 +08:00 |
|
luoliming
|
4643194820
|
修复问题1
|
2024-05-25 14:54:59 +08:00 |
|
曹鹏飞
|
bbc2e3331a
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
# Conflicts:
# nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java
|
2024-05-25 14:40:40 +08:00 |
|
曹鹏飞
|
f8775f4720
|
Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into feature/DM/nflg-bom
|
2024-05-25 14:38:37 +08:00 |
|
曹鹏飞
|
7ec0952f6d
|
feat(dqbom): 添加批量查询物料信息的接口
|
2024-05-25 14:38:25 +08:00 |
|
曹鹏飞
|
84ea802dff
|
feat(ebom): 添加批量查询物料信息的接口
|
2024-05-25 14:38:07 +08:00 |
|
luoliming
|
4f74c84fd7
|
31转PBOM报错问题
|
2024-05-25 14:23:09 +08:00 |
|
曹鹏飞
|
119b147665
|
optimize: 调整超时时间
|
2024-05-25 12:09:03 +08:00 |
|
曹鹏飞
|
63ed4ef299
|
feat: 小调整
|
2024-05-25 12:07:11 +08:00 |
|
曹鹏飞
|
30b2073999
|
other: 添加sap所需要的so文件
|
2024-05-25 12:06:51 +08:00 |
|
曹鹏飞
|
b4693fa64a
|
feat(ebom): 修复31码生成虚拟包的问题
|
2024-05-25 12:05:18 +08:00 |
|
曹鹏飞
|
638af508b4
|
Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into feature/DM/nflg-bom
|
2024-05-23 18:51:44 +08:00 |
|
曹鹏飞
|
1c1a3d8880
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-05-23 18:51:28 +08:00 |
|
曹鹏飞
|
ee2a36e55a
|
feat(移动破ebom): 物料名称如果有且仅有一个“无”字时才运允许导入
|
2024-05-23 18:40:11 +08:00 |
|
曹鹏飞
|
03f141fde2
|
Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into sit_bak
|
2024-05-23 18:20:30 +08:00 |
|
曹鹏飞
|
8e75f9536f
|
Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into feature/DM/nflg-bom-transition
|
2024-05-23 15:15:17 +08:00 |
|
曹鹏飞
|
04516d4d2f
|
fix(dqbom): 修复一些问题
|
2024-05-23 15:14:53 +08:00 |
|
曹鹏飞
|
b9d58cbf24
|
Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into feature/DM/nflg-bom-transition
|
2024-05-23 13:49:10 +08:00 |
|
曹鹏飞
|
f6f9084ccf
|
Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into sit_bak
|
2024-05-23 13:48:48 +08:00 |
|
曹鹏飞
|
c99cbcf852
|
fix(dqbom): 修复删除子级的sql在测试环境正常，但是正式环境报错的问题
|
2024-05-23 13:48:21 +08:00 |
|
曹鹏飞
|
383dda49f3
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-05-23 11:50:40 +08:00 |
|
曹鹏飞
|
a672698303
|
feat(ebom): 从cad获取数据并转到ebom时，如果是31编码的，设置下级的关联编号以供后续生成虚拟包使用
|
2024-05-23 11:44:06 +08:00 |
|
曹鹏飞
|
d8e8e60a9f
|
fix(ebom): 修复双角色人员无法查看到自己创建的待复核数据的问题
|
2024-05-23 11:29:16 +08:00 |
|
曹鹏飞
|
430fbd127d
|
fix: 修复定时任务获取用户信息报错的问题
|
2024-05-23 11:13:18 +08:00 |
|
曹鹏飞
|
fb62f92f05
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
# Conflicts:
# nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/EbomV2Api.java
|
2024-05-22 17:05:30 +08:00 |
|
大米
|
71563c1e55
|
Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom
|
2024-05-22 16:54:29 +08:00 |
|
大米
|
5e9b6b14cf
|
1.清CAD数据
|
2024-05-22 16:54:20 +08:00 |
|
曹鹏飞
|
0ec51d1ec6
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-05-22 16:35:28 +08:00 |
|
曹鹏飞
|
3d92f0f87b
|
fix: 修复定时任务获取用户信息报错的问题
|
2024-05-22 16:35:01 +08:00 |
|
曹鹏飞
|
8a653c533a
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-05-22 15:55:11 +08:00 |
|
曹鹏飞
|
22b33f6701
|
fix(pbom): 修复pbom正式表查询报错
|
2024-05-22 15:54:56 +08:00 |
|
曹鹏飞
|
c798fc647d
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-05-22 11:51:58 +08:00 |
|
大米
|
3e62befdeb
|
1.清CAD数据
|
2024-05-22 11:45:25 +08:00 |
|
大米
|
764747b495
|
1.导CAD物料编码检测
|
2024-05-22 11:27:29 +08:00 |
|
曹鹏飞
|
581e59e473
|
Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into sit_bak
|
2024-05-22 09:33:44 +08:00 |
|
曹鹏飞
|
794721e1a0
|
fix(ebom): 修复从excel导入时T项图号为空的问题
|
2024-05-22 09:33:09 +08:00 |
|
曹鹏飞
|
34fe4b7540
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-05-21 17:11:01 +08:00 |
|
大米
|
8a3a1d3bf2
|
1.31转PBOM
|
2024-05-21 17:04:47 +08:00 |
|
大米
|
30aa342ff7
|
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-05-21 17:02:15 +08:00 |
|
大米
|
3ea43051af
|
1.31转PBOM
|
2024-05-21 17:02:02 +08:00 |
|
曹鹏飞
|
a4d4b2cffc
|
Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into feature/DM/nflg-bom-transition
|
2024-05-21 16:18:41 +08:00 |
|
曹鹏飞
|
5e6c611477
|
fix(dqbom): 修复编辑页面新增bom暂存后再提交报错的问题
|
2024-05-21 16:18:23 +08:00 |
|
曹鹏飞
|
50f69b47a4
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-05-20 17:05:54 +08:00 |
|
曹鹏飞
|
3400d2d35a
|
fix(pbom): 修复pbom正式表子级数据无法展示的问题
|
2024-05-20 17:05:43 +08:00 |
|
曹鹏飞
|
ae22596eaf
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-05-20 14:30:11 +08:00 |
|
曹鹏飞
|
53760502e8
|
fix(ebom):
1、31码下的所有物料都生成虚拟包后才能转pbom
2、31码只能生成1010的pbom
|
2024-05-20 10:45:48 +08:00 |
|
曹鹏飞
|
cee46eb0e3
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
# Conflicts:
# nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java
|
2024-05-20 10:06:21 +08:00 |
|
曹鹏飞
|
1055d24aba
|
fix(ebom): 优化编辑功能
|
2024-05-20 10:04:08 +08:00 |
|
曹鹏飞
|
bb56ba1b0c
|
fix(ebom): 优化从excel导入
|
2024-05-20 09:58:47 +08:00 |
|
曹鹏飞
|
2a982f0c45
|
fix(ebom): 优化从excel导入
|
2024-05-19 10:13:25 +08:00 |
|
曹鹏飞
|
c78f0fc151
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-05-18 17:15:27 +08:00 |
|
曹鹏飞
|
8bf4612a31
|
fix: 修复2个bug
|
2024-05-18 17:15:03 +08:00 |
|
曹鹏飞
|
2fe03c4e80
|
fix(ebom): 优化31码生成虚拟包
|
2024-05-18 16:24:15 +08:00 |
|
曹鹏飞
|
e1f093023d
|
fix(pbom): 31编码的才一定需要生成虚拟包
|
2024-05-17 18:27:58 +08:00 |
|
曹鹏飞
|
b34c3523e8
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-05-17 18:12:01 +08:00 |
|
曹鹏飞
|
4d39400144
|
fix(ebom): 数量需要用户确认的判断条件添加：来源为原始bom
|
2024-05-17 18:11:47 +08:00 |
|
曹鹏飞
|
16ff524b45
|
fix(ebom): T类型物料的描述为空时，异常状态改为4
|
2024-05-17 18:02:15 +08:00 |
|
曹鹏飞
|
b40728514f
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-05-17 17:29:48 +08:00 |
|
曹鹏飞
|
e9ed71800c
|
fix(ebom): 编辑页面添加T类型物料的设置优化
|
2024-05-17 17:29:33 +08:00 |
|
曹鹏飞
|
33fd163cbd
|
fix(ebom): 一些优化
|
2024-05-17 17:17:29 +08:00 |