 曹鹏飞
|
f8d5f29fbc
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-06-13 15:22:10 +08:00 |
大米
|
dfa6939f43
|
1、事务问题
|
2024-06-13 14:56:56 +08:00 |
|
大米
|
e76f8bd2e6
|
1、事务问题
|
2024-06-13 14:52:42 +08:00 |
|
大米
|
4ddd6d1505
|
1、事务问题
|
2024-06-13 14:50:52 +08:00 |
|
曹鹏飞
|
21f6ff70c5
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-06-07 15:31:55 +08:00 |
|
曹鹏飞
|
dd891fe137
|
fix(ebom): 修复数量计算问题
|
2024-06-07 15:31:32 +08:00 |
|
曹鹏飞
|
b577689855
|
fix(ebom): 转正式表时设置转换人姓名
|
2024-06-07 15:30:08 +08:00 |
|
曹鹏飞
|
9b64e55981
|
feat(ebom): 正式表去除仅查看自己的数据
|
2024-06-07 15:28:40 +08:00 |
|
曹鹏飞
|
511f8c2a3a
|
feat(pbom): 添加导入SAP失败的数量显示和列表
|
2024-06-07 15:26:48 +08:00 |
|
曹鹏飞
|
e1367525e5
|
feat(pbom): 添加导入SAP失败的数量显示和列表
|
2024-06-07 15:25:53 +08:00 |
|
曹鹏飞
|
b0bc503239
|
fix(ebom): 修改判断条件
|
2024-06-07 15:18:41 +08:00 |
|
曹鹏飞
|
e8f3da6694
|
feat(ebom): 导入SAP异常时，也将其加入到待处理列表中
|
2024-06-06 17:53:57 +08:00 |
|
曹鹏飞
|
343d76b71c
|
fix(pbom): 修复一个bug
|
2024-06-06 17:52:47 +08:00 |
|
曹鹏飞
|
111456e587
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-06-06 09:46:35 +08:00 |
|
曹鹏飞
|
aea94aa852
|
feat(pbom): 重写复制功能
|
2024-06-06 09:46:10 +08:00 |
|
大米
|
3b68e7c76f
|
1、合并数量问题
|
2024-06-06 09:41:05 +08:00 |
|
大米
|
839a2bd0d4
|
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-06-06 09:10:18 +08:00 |
|
大米
|
9a89d903cc
|
1、合并数量问题
|
2024-06-06 09:09:56 +08:00 |
|
曹鹏飞
|
aa3c3f5d37
|
feat(pbom): 添加筛选条件仅看自己
|
2024-06-06 08:34:48 +08:00 |
|
曹鹏飞
|
e823ed6e53
|
feat(pbom): 重写复制功能
|
2024-06-06 08:34:03 +08:00 |
|
曹鹏飞
|
dfbcad0649
|
fix(ebom): 修复根节点的判断问题
|
2024-06-05 16:31:38 +08:00 |
|
曹鹏飞
|
048ac55706
|
feat(pbom): 重写复制功能
|
2024-06-05 16:21:31 +08:00 |
|
曹鹏飞
|
997d81dc1b
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-06-05 11:06:37 +08:00 |
|
曹鹏飞
|
8e30de33c4
|
optimize: 缓存接口优化
|
2024-06-05 10:56:30 +08:00 |
|
曹鹏飞
|
dcb52e9779
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-06-05 10:37:24 +08:00 |
|
曹鹏飞
|
114753d40d
|
optimize: 缓存接口优化
|
2024-06-05 10:26:42 +08:00 |
|
曹鹏飞
|
0695f98d4c
|
optimize: 缓存接口优化
|
2024-06-05 09:59:22 +08:00 |
|
曹鹏飞
|
678c6c1fdd
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-06-05 08:51:06 +08:00 |
|
曹鹏飞
|
16ddc6855b
|
optimize(ebom): 转pbom时设置编辑状态为已处理，同时设置下级节点的child编辑状态为已处理
|
2024-06-05 08:50:25 +08:00 |
|
曹鹏飞
|
8719140089
|
fix(ebom): 工作表搜索时只搜索草稿数据
|
2024-06-04 17:33:29 +08:00 |
|
曹鹏飞
|
ec5ef37346
|
feat(dqbom): 同步到pbom时设置source
|
2024-06-04 17:09:54 +08:00 |
|
曹鹏飞
|
3d7e49d19e
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-06-04 17:09:04 +08:00 |
|
曹鹏飞
|
5cfc095c29
|
feat(pbom): 增加source字段
|
2024-06-04 17:03:33 +08:00 |
|
曹鹏飞
|
855eddfc1c
|
fix(pbom): 优化根节点判断
|
2024-06-04 15:50:16 +08:00 |
|
曹鹏飞
|
ae1d544aa1
|
fix: 导入sap优化
|
2024-06-04 10:01:37 +08:00 |
|
曹鹏飞
|
5e85f73b2b
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-06-04 09:18:23 +08:00 |
|
曹鹏飞
|
5a51f0957d
|
feat(ebom): 添加物料名称非空判断
|
2024-06-04 09:17:37 +08:00 |
|
大米
|
8f57416217
|
1、pbom发布时状态改未已发布
|
2024-06-04 08:41:21 +08:00 |
|
曹鹏飞
|
30abb6a9cb
|
feat(ebom): 移除不需要的代码
|
2024-06-04 08:17:53 +08:00 |
|
曹鹏飞
|
bebc7843fa
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-06-04 07:58:25 +08:00 |
|
曹鹏飞
|
2163f7ad82
|
feat(ebom): 解决导入sap的物料总数与实际不符的问题
|
2024-06-04 07:58:06 +08:00 |
|
大米
|
908b57bb30
|
1、pom工作表发货包在顶级问题修复
|
2024-06-03 17:49:28 +08:00 |
|
曹鹏飞
|
66b63234e7
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-06-03 17:40:44 +08:00 |
|
大米
|
75c3b99eff
|
Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom
|
2024-06-03 16:45:58 +08:00 |
|
大米
|
123345a0f3
|
1、修复eBOM 升级后2次转PBOM问题
|
2024-06-03 16:45:50 +08:00 |
|
曹鹏飞
|
5d0142fee1
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-06-03 16:42:21 +08:00 |
|
曹鹏飞
|
d09db40c8c
|
feat(ebom): sap排序字符串优化
|
2024-06-03 16:41:27 +08:00 |
|
曹鹏飞
|
a7c53b06b5
|
feat(ebom): 编辑接口优化
|
2024-06-03 16:30:30 +08:00 |
|
曹鹏飞
|
e99aa8e17f
|
Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom
|
2024-06-03 15:49:16 +08:00 |
|
大米
|
57957fff26
|
Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom
|
2024-06-03 15:42:30 +08:00 |
|
大米
|
827f9fd4c2
|
1、合并时数量问题处理
|
2024-06-03 15:42:19 +08:00 |
|
曹鹏飞
|
1011bda857
|
fix(ebom): 修复精确搜索的bug
|
2024-06-03 15:34:35 +08:00 |
|
曹鹏飞
|
e47968dbc3
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-06-03 15:12:41 +08:00 |
|
曹鹏飞
|
76b549fdeb
|
Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom
|
2024-06-03 15:12:05 +08:00 |
|
大米
|
44eab7ad84
|
1、转PBOM
|
2024-06-03 15:01:48 +08:00 |
|
曹鹏飞
|
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 |
|
曹鹏飞
|
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 |