大米
|
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 |
|
曹鹏飞
|
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 |
|
曹鹏飞
|
07c0575f0a
|
feat(ebom): 修复一个逻辑错误
|
2024-05-28 17:59:10 +08:00 |
|
曹鹏飞
|
14ae4b4129
|
feat(ebom): 31码生成虚拟包添加对油漆包的支持
|
2024-05-28 16:35:58 +08:00 |
|
曹鹏飞
|
ec18157276
|
feat: 如果物料单位为ST，则改为PC，因为导入SAP时不支持ST
|
2024-05-28 14:59:15 +08:00 |
|
曹鹏飞
|
0f25a80253
|
optimize(ebom): 优化查询物料信息接口
|
2024-05-28 13:38:10 +08:00 |
|
曹鹏飞
|
b71ca6e6a7
|
optimize(dqbom): 优化查询物料信息接口
|
2024-05-28 13:33:46 +08:00 |
|
大米
|
ec0ab3f202
|
1、31F项问题修复
|
2024-05-28 12:13:20 +08:00 |
|
大米
|
a990f4804e
|
Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom
|
2024-05-28 12:09:30 +08:00 |
|
大米
|
89897ad82a
|
1、31F项问题修复
|
2024-05-28 12:09:25 +08:00 |
|
曹鹏飞
|
d4b75545cd
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-05-28 11:13:27 +08:00 |
|
曹鹏飞
|
cf50f8752e
|
feat(pbom): 导入到sap时，如果是直发包，且没有下级，则不要提交到sap去
|
2024-05-28 11:11:42 +08:00 |
|
曹鹏飞
|
4aeb7db929
|
feat(ebom): 导入到sap时，如果是直发包，且没有下级，则不要提交到sap去
|
2024-05-28 11:11:21 +08:00 |
|
曹鹏飞
|
64b4adcb9f
|
feat(ebom): 删除bom逻辑重写
|
2024-05-28 10:37:39 +08:00 |
|
曹鹏飞
|
481491c950
|
feat(ebom): 31编码生成虚拟包时，直发包也生成parent
|
2024-05-28 09:44:53 +08:00 |
|
曹鹏飞
|
c6259258fc
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-05-28 09:38:19 +08:00 |
|
曹鹏飞
|
7717cecc5a
|
optimize(ebom): 优化查询物料信息接口
|
2024-05-28 09:38:02 +08:00 |
|
曹鹏飞
|
d08f0accfd
|
Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into feature/DM/nflg-bom
|
2024-05-28 09:30:41 +08:00 |
|
曹鹏飞
|
fd3524de70
|
optimize(dqbom): 优化查询物料信息接口
|
2024-05-28 09:27:16 +08:00 |
|
曹鹏飞
|
490ca88792
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-05-27 18:46:12 +08:00 |
|
曹鹏飞
|
6c875ac078
|
Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom
|
2024-05-27 18:45:36 +08:00 |
|
大米
|
cf5a77f583
|
Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom
|
2024-05-27 18:43:41 +08:00 |
|
大米
|
69bf939bd9
|
1、31F项问题修复
|
2024-05-27 18:43:36 +08:00 |
|
曹鹏飞
|
28af314810
|
Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into feature/DM/nflg-bom
|
2024-05-27 18:13:46 +08:00 |
|
曹鹏飞
|
08ffa20dc3
|
Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into feature/DM/nflg-bom-transition
|
2024-05-27 18:09:01 +08:00 |
|
曹鹏飞
|
13723d3442
|
optimize(ebom): 优化查询物料信息接口
|
2024-05-27 18:08:30 +08:00 |
|
曹鹏飞
|
1be98febb9
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-05-27 17:12:55 +08:00 |
|
曹鹏飞
|
e3cb052c89
|
optimize(ebom): 优化查询物料信息接口
|
2024-05-27 17:12:39 +08:00 |
|
曹鹏飞
|
94a00cbd2d
|
Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into feature/DM/nflg-bom
|
2024-05-27 17:10:33 +08:00 |
|
曹鹏飞
|
a1dfac009d
|
optimize(dqbom): 优化查询物料信息接口
|
2024-05-27 17:10:01 +08:00 |
|
曹鹏飞
|
16e462492c
|
Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into feature/DM/nflg-bom-transition
|
2024-05-27 17:00:18 +08:00 |
|
曹鹏飞
|
4b80bda416
|
optimize(dqbom): 优化查询物料信息接口
|
2024-05-27 16:59:53 +08:00 |
|
曹鹏飞
|
540d82b620
|
feat(移动破): 不需要了
|
2024-05-27 16:04:34 +08:00 |
|
曹鹏飞
|
91a12a291c
|
fix: 调整资源释放位置
|
2024-05-27 15:53:09 +08:00 |
|
曹鹏飞
|
8632cc3dbe
|
Merge branch 'refs/heads/feature/mobilebroken/update-material' into feature/DM/nflg-bom-transition
|
2024-05-27 15:38:19 +08:00 |
|
曹鹏飞
|
c5a99e48dc
|
feat(移动破): 从主物料表同步信息
|
2024-05-27 15:37:50 +08:00 |
|
曹鹏飞
|
043143306f
|
feat(ebom): sap排序字符串优化
|
2024-05-27 15:32:39 +08:00 |
|
曹鹏飞
|
b5bd4c40db
|
Merge branch 'refs/heads/feature/mobilebroken/update-material' into feature/DM/nflg-bom-transition
# Conflicts:
# nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OptionalEbomApi.java
|
2024-05-27 15:07:54 +08:00 |
|
曹鹏飞
|
6143575a5e
|
feat(移动破): 从主物料表同步信息
|
2024-05-27 15:02:56 +08:00 |
|
曹鹏飞
|
cd137991e8
|
Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into feature/mobilebroken/update-material
|
2024-05-27 14:48:12 +08:00 |
|
曹鹏飞
|
e13b5662a5
|
feat(移动破ebom): 物料名称如果有且仅有一个“无”字时才运允许导入
|
2024-05-27 14:47:21 +08:00 |
|
曹鹏飞
|
59386a517c
|
feat(ebom): 31编码生成虚拟包时，直发包也生成parent
|
2024-05-27 14:18:22 +08:00 |
|
曹鹏飞
|
e17e901470
|
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
# nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomToEBomV2Convert.java
|
2024-05-27 11:03:46 +08:00 |
|
曹鹏飞
|
760ae24a8e
|
feat(ebom): 新增sap排序字符串
|
2024-05-27 11:02:13 +08:00 |
|
曹鹏飞
|
71749f0a2b
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-05-27 10:51:52 +08:00 |
|
曹鹏飞
|
c0ebb43349
|
feat(ebom): 新增sap排序字符串
|
2024-05-27 10:51:39 +08:00 |
|
曹鹏飞
|
a637fc834c
|
feat(ebom): 添加对T项的支持
|
2024-05-27 10:41:53 +08:00 |
|
大米
|
e7f8d4665e
|
Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom
|
2024-05-27 10:26:16 +08:00 |
|
大米
|
3f5abedd81
|
1、31F项问题修复
|
2024-05-27 10:26:09 +08:00 |
|
曹鹏飞
|
cb47c0e938
|
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/BomNewEbomChildEntity.java
# nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewEbomParentEntity.java
# nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomToEBomV2Convert.java
|
2024-05-27 10:10:28 +08:00 |
|
曹鹏飞
|
9b401469a0
|
feat(ebom): 新增sap排序字符串
|
2024-05-27 10:07:18 +08:00 |
|
曹鹏飞
|
8e91288d0e
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-05-27 09:21:03 +08:00 |
|
大米
|
7804d59e40
|
1、31F项问题修复
|
2024-05-27 09:19:29 +08:00 |
|
曹鹏飞
|
63dbc1b8b5
|
Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition
|
2024-05-27 09:07:27 +08:00 |
|
大米
|
a9111be8ab
|
Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom
|
2024-05-27 09:03:42 +08:00 |
|
大米
|
ea28a267cd
|
1、21虚拟包问题
|
2024-05-27 09:03:39 +08:00 |
|
曹鹏飞
|
10e07ad2f3
|
Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into feature/DM/nflg-bom-transition
|
2024-05-27 08:40:13 +08:00 |
|
曹鹏飞
|
e3488681d1
|
feat(dqbom): 新增查询单个物料信息接口
|
2024-05-27 08:39:55 +08:00 |
|
曹鹏飞
|
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 |