 曹鹏飞
|
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 |
|
曹鹏飞
|
925dc231cf
|
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-06-04 09:20:45 +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 |
|
曹鹏飞
|
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 |