 曹鹏飞
|
a8b5c0aba7
|
Merge branch 'test' into dev
# Conflicts:
# nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/PBomApi.java
|
2024-09-27 15:18:49 +08:00 |
10001392
|
8fddd3d864
|
Merge remote-tracking branch 'origin/master-hlq-20240927sapMsg' into test
|
2024-09-27 13:39:01 +08:00 |
|
10001392
|
bd74999ef6
|
临时处理EBOM导入SAP报错情况：SAP信息含有“在工厂1010中未被维护”，不算报错
|
2024-09-27 13:38:01 +08:00 |
大米
|
894978dc68
|
pbom-异常检查,变更记录
|
2024-09-27 08:33:45 +08:00 |
|
大米
|
5f11a53c81
|
Merge branch 'DM/10月需求' into test
# Conflicts:
# nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/constant/BomConstant.java
# nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewPbomParentEntity.java
# nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewPbomParentVO.java
# nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/UpdateLogVO.java
# nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/ForwardReportService.java
# nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewPbomParentMapper.xml
|
2024-09-27 08:31:20 +08:00 |
|
10001392
|
ec91721d33
|
Merge remote-tracking branch 'origin/master-virtualPackageOrderNumber-lhj0925'
|
2024-09-26 17:49:02 +08:00 |
|
大米
|
ad7afba8f0
|
pbom-异常检查,变更记录
|
2024-09-26 17:19:28 +08:00 |
|
大米
|
0e47cbc96e
|
pbom-异常检查
|
2024-09-26 16:32:13 +08:00 |
|
10001392
|
75f2b9ff7a
|
Merge remote-tracking branch 'origin/master-hlq-20240925material' into test
|
2024-09-26 15:43:43 +08:00 |
|
10001392
|
e05f89af05
|
Merge remote-tracking branch 'origin/master-virtualPackageOrderNumber-lhj0925' into test
|
2024-09-26 15:42:12 +08:00 |
10002327
|
c422139480
|
BOM查看查询空指针处理
|
2024-09-26 15:37:47 +08:00 |
|
10001392
|
1854dafebf
|
Merge remote-tracking branch 'origin/master-virtualPackageOrderNumber-lhj0925' into test
|
2024-09-26 14:50:44 +08:00 |
|
10001392
|
f1b0f1a9da
|
物料申请，增加选填字段 通用程度
|
2024-09-26 14:49:12 +08:00 |
|
10002327
|
f96b5701f4
|
4、电气BOM列表查询优化
5、BOM查看查询列表优化物料描述
|
2024-09-26 14:37:45 +08:00 |
|
10001392
|
483c8bbfe6
|
Merge remote-tracking branch 'origin/master-virtualPackageOrderNumber-lhj0925' into test
|
2024-09-26 11:32:38 +08:00 |
|
10002327
|
8d31889ccf
|
生成PBOM时，bom没有子项的话，仅生成EBOM正式表，不生成PBOM任务2
|
2024-09-26 11:23:33 +08:00 |
|
10001392
|
eecc877620
|
Merge remote-tracking branch 'origin/master-virtualPackageOrderNumber-lhj0925' into test
|
2024-09-26 10:49:05 +08:00 |
|
10002327
|
cdcf08e706
|
生成PBOM时，bom没有子项的话，仅生成EBOM正式表，不生成PBOM任务2
|
2024-09-26 10:44:01 +08:00 |
|
10002327
|
cb40340257
|
生成PBOM时，bom没有子项的话，仅生成EBOM正式表，不生成PBOM任务（优化）
|
2024-09-26 10:22:56 +08:00 |
|
10001392
|
38dd3e7035
|
Merge remote-tracking branch 'origin/DM/-bug修复-2' into test
|
2024-09-26 09:09:37 +08:00 |
|
大米
|
558f4feca6
|
合sit 无法打包问题
|
2024-09-26 09:08:19 +08:00 |
|
10001392
|
e20b0ab67e
|
Merge remote-tracking branch 'origin/DM/-bug修复-2' into test
|
2024-09-26 08:50:14 +08:00 |
|
10001392
|
4660334bc9
|
Merge remote-tracking branch 'origin/DM/发货前包问题修复' into test
|
2024-09-26 08:49:57 +08:00 |
|
10001392
|
582ccdc66a
|
√2、物料变更，弹窗匹配最新的英文描述
√3、物料变更，弹窗显示字段：变更人、变更部门、申请变更时间、变更生效时间
4、物料申请，增加选填字段 通用程度；取消项目类别字段必填
|
2024-09-26 08:48:26 +08:00 |
|
大米
|
7d22993707
|
发货前提层问题修复
|
2024-09-26 08:47:02 +08:00 |
|
曹鹏飞
|
c28fb465ef
|
Merge branch 'feature/DM/rakor' into dev
|
2024-09-25 18:34:03 +08:00 |
|
曹鹏飞
|
30f3ebe4e7
|
Merge branch 'test' into dev
|
2024-09-25 18:33:28 +08:00 |
|
曹鹏飞
|
99f49ac434
|
feat(pbom): 添加获取单个节点异常状态接口
|
2024-09-25 18:31:06 +08:00 |
|
曹鹏飞
|
8dc82a054e
|
feat(pbom): 添加物料查看的路径接口
|
2024-09-25 17:08:28 +08:00 |
|
曹鹏飞
|
22cee60742
|
feat: bom反查结果添加“子级物料数量”，“子级物料单位”
|
2024-09-25 17:07:33 +08:00 |
|
曹鹏飞
|
86ce3b30d3
|
feat: 导入到SAP时，如果没有需要导入的数据，仅记录日志，不返回错误提示
|
2024-09-25 17:01:17 +08:00 |
|
大米
|
f9829796c0
|
bom-查看变更记录
|
2024-09-25 16:14:45 +08:00 |
|
大米
|
7687006045
|
bom-查看变更记录
|
2024-09-25 15:06:22 +08:00 |
|
大米
|
5ba4960667
|
bom-查看变更记录
|
2024-09-25 15:04:21 +08:00 |
|
大米
|
4fe36d5b9c
|
BUG修复-3
|
2024-09-25 10:55:19 +08:00 |
|
10001392
|
6034fbf37d
|
Merge remote-tracking branch 'origin/DM/-bug修复-2' into test
|
2024-09-25 10:50:46 +08:00 |
|
大米
|
5eb21cd0a6
|
BUG修复-3
|
2024-09-25 10:49:03 +08:00 |
|
10001392
|
95941e1e32
|
Merge remote-tracking branch 'origin/DM/-bug修复-2' into test
|
2024-09-25 09:37:28 +08:00 |
|
大米
|
b55474a9f8
|
BUG修复
|
2024-09-25 09:35:34 +08:00 |
|
10001392
|
5f8e482a0b
|
Merge remote-tracking branch 'origin/master-checkVirtualPackage-lhj0920' into test
|
2024-09-24 21:26:05 +08:00 |
|
10002327
|
43356a7228
|
生成PBOM时，bom没有子项的话，仅生成EBOM正式表3
|
2024-09-24 21:24:31 +08:00 |
|
10001392
|
142201fa5e
|
Merge remote-tracking branch 'origin/master-checkVirtualPackage-lhj0920' into test
|
2024-09-24 21:08:27 +08:00 |
|
10002327
|
935f4f596e
|
生成PBOM时，bom没有子项的话，仅生成EBOM正式表2
|
2024-09-24 21:07:00 +08:00 |
|
10001392
|
dd79b21e34
|
Merge remote-tracking branch 'origin/master-checkVirtualPackage-lhj0920' into test
|
2024-09-24 20:57:38 +08:00 |
|
10002327
|
3f51dd3317
|
pbom正式表发布电控系统优化2
|
2024-09-24 20:55:38 +08:00 |
|
10002327
|
9f2af14cea
|
Merge remote-tracking branch 'origin/master' into master-checkVirtualPackage-lhj0920
|
2024-09-24 20:24:55 +08:00 |
|
10001392
|
071b3bee71
|
Merge remote-tracking branch 'origin/master-checkVirtualPackage-lhj0920' into test
|
2024-09-24 19:39:45 +08:00 |
|
10001392
|
b1c73c19e1
|
Merge remote-tracking branch 'origin/master-checkVirtualPackage-lhj0920' into test
|
2024-09-24 19:37:47 +08:00 |
|
10002327
|
b995a19db8
|
生成PBOM时，bom没有子项的话，仅生成EBOM正式表，不生成PBOM任务
|
2024-09-24 18:32:50 +08:00 |
|
10001392
|
e4a10e4b3c
|
Merge remote-tracking branch 'origin/feature/DM/rakor-change-sap'
|
2024-09-24 18:23:55 +08:00 |