 曹鹏飞
|
310dfd3496
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-06-03 14:11:52 +08:00 |
|
曹鹏飞
|
f496771201
|
Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom
|
2024-06-03 14:09:53 +08:00 |
大米
|
da5fcd54cf
|
1、转PBOM
|
2024-06-03 14:04:10 +08:00 |
|
曹鹏飞
|
232979ac02
|
fix(pbom): 优化复制功能，设置创建人为当前登录用户，部门为当前登录用户所属部门，时间为当前时间
|
2024-06-03 11:06:43 +08:00 |
|
曹鹏飞
|
e8c01a2729
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-06-03 10:01:26 +08:00 |
|
曹鹏飞
|
c5cd02bcc7
|
optimize: 优化异常说明
|
2024-06-03 10:01:14 +08:00 |
|
曹鹏飞
|
62b6b2964f
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-06-03 09:02:03 +08:00 |
|
曹鹏飞
|
39f9cdae60
|
feat(pbom): 添加deptRowId
|
2024-06-03 08:50:33 +08:00 |
|
曹鹏飞
|
96a7e92898
|
feat(dqbom): 同步到pbom时，如果是31码，则状态为已分配工厂，如果是21码，则状态为已发布；设置dept_row_id
|
2024-06-03 08:49:26 +08:00 |
|
曹鹏飞
|
75443db826
|
Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into feature/DM/nflg-bom-transition
|
2024-06-02 20:09:17 +08:00 |
|
曹鹏飞
|
f5aa9863cf
|
feat(ebom): 列表页面的查询条件设计人员支持模糊搜索；增加通知单号模糊搜索
|
2024-06-02 20:08:17 +08:00 |
|
曹鹏飞
|
920d515fb9
|
optimize(dqbom): 一些优化
|
2024-05-31 17:44:02 +08:00 |
|
曹鹏飞
|
da4f625170
|
fix(ebom): 删除bom条件判断
|
2024-05-31 16:39:32 +08:00 |
|
曹鹏飞
|
f84d4416a4
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-05-31 16:13:42 +08:00 |
|
大米
|
d10e070038
|
1、变更记录暂时先取消
|
2024-05-31 16:13:03 +08:00 |
|
曹鹏飞
|
4749cb6b37
|
Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into feature/DM/nflg-bom-transition
|
2024-05-31 14:45:32 +08:00 |
|
曹鹏飞
|
03036ad4c3
|
optimize: 导入SAP优化
|
2024-05-31 14:45:08 +08:00 |
|
曹鹏飞
|
a809862b54
|
optimize: 导入SAP优化
|
2024-05-31 14:33:46 +08:00 |
|
曹鹏飞
|
0a2901f0c0
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-05-31 13:35:19 +08:00 |
|
曹鹏飞
|
c58185771a
|
optimize: 导入SAP优化
|
2024-05-31 12:17:28 +08:00 |
|
曹鹏飞
|
0f40fa7618
|
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-31 08:37:27 +08:00 |
|
大米
|
6069836320
|
1、不要改功能
|
2024-05-30 18:32:42 +08:00 |
|
大米
|
9ff66011b7
|
Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom
|
2024-05-30 18:26:06 +08:00 |
|
大米
|
c27d4ce725
|
1、不要改功能
|
2024-05-30 18:26:02 +08:00 |
|
曹鹏飞
|
6c3ffb6741
|
feat: ebom去除sap排序字符串；pbom添加sap排序字符串
|
2024-05-30 17:03:42 +08:00 |
|
曹鹏飞
|
51ef53e7aa
|
feat(ebom): 优化导入到sap逻辑
|
2024-05-30 16:52:13 +08:00 |
|
曹鹏飞
|
8f53c2c1a7
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-05-30 11:45:00 +08:00 |
|
曹鹏飞
|
04d33ab25c
|
feat(pbom): pbom工作表，只能查看本部门的数据
|
2024-05-30 11:44:47 +08:00 |
|
曹鹏飞
|
7a07b36e33
|
feat(ebom): ebom工作表，只能查看本部门的数据
|
2024-05-30 11:18:01 +08:00 |
|
曹鹏飞
|
feffa939c5
|
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/pojo/entity/BomNewEbomParentEntity.java
|
2024-05-30 11:16:48 +08:00 |
|
曹鹏飞
|
152c5c3ecf
|
feat(ebom): ebom工作表，只能查看本部门的数据
|
2024-05-30 11:15:55 +08:00 |
|
曹鹏飞
|
50e09fc198
|
feat(pbom): 修复sap状态
|
2024-05-30 10:42:35 +08:00 |
|
曹鹏飞
|
2844382d1d
|
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/mapper/master/BomNewEbomParentMapper.java
|
2024-05-30 10:22:38 +08:00 |
|
曹鹏飞
|
f83fdd9770
|
feat(ebom): 调整sap导入状态的枚举项；ebom正式工作表，如果有sap导入失败的，则显示失败的记录
|
2024-05-30 10:21:47 +08:00 |
|
曹鹏飞
|
e3636fb902
|
feat: 获取人员角色固定返回双角色
|
2024-05-30 09:16:15 +08:00 |
|
曹鹏飞
|
d5394ee6d3
|
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/TestApi.java
|
2024-05-30 08:49:27 +08:00 |
|
曹鹏飞
|
45f91d128f
|
feat: 添加测试接口
|
2024-05-30 08:47:35 +08:00 |
|
曹鹏飞
|
3125800c3f
|
fix(pbom): 修复导入到sap时，只导入了第一层的问题
|
2024-05-30 08:42:33 +08:00 |
|
曹鹏飞
|
23f3147edc
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-05-29 15:48:16 +08:00 |
|
曹鹏飞
|
207b1a6d44
|
fix(pbom): 修复导入到sap时，只导入了第一层的问题
|
2024-05-29 15:38:10 +08:00 |
|
曹鹏飞
|
5643eab9ec
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-05-29 11:43:01 +08:00 |
|
曹鹏飞
|
1cb3869052
|
fix(ebom): 修复导入到sap的错误信息保存问题
|
2024-05-29 11:42:38 +08:00 |
|
曹鹏飞
|
ee5a5d1c23
|
optimize(ebom): 固定返回双角色
|
2024-05-29 11:24:16 +08:00 |
|
曹鹏飞
|
70faa04f00
|
optimize(ebom): 删除时更新last_version_is
|
2024-05-29 10:17:40 +08:00 |
|
曹鹏飞
|
fd3c119ac5
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-05-29 08:31:38 +08:00 |
|
曹鹏飞
|
cacbdc0fc8
|
feat(pbom): 修复复制到功能状态判断错误
|
2024-05-29 08:30:56 +08:00 |
|
曹鹏飞
|
a83bf6942d
|
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/constant/VirtualPackageTypeEnum.java
|
2024-05-29 08:01:38 +08:00 |
|
大米
|
29d9bcb6fc
|
1、转PBOM不显示问题
|
2024-05-28 23:22:18 +08:00 |
|
大米
|
e90c7c2818
|
1、发货文案匹配问题
|
2024-05-28 20:45:53 +08:00 |
|
曹鹏飞
|
788397fdc0
|
Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into feature/DM/nflg-bom-transition
|
2024-05-28 17:59:16 +08:00 |