rakor
/
nflg_project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,472 Commits 16 Branches 1 Tag 12 MiB
Commit Graph

1417 Commits

Author SHA1 Message Date
曹鹏飞 3762a37841 optimize(ebom): 优化性能 2024-06-20 15:33:30 +08:00
曹鹏飞 5a78ef449a optimize(ebom): 优化从excel导入 2024-06-20 15:31:37 +08:00
jing's 0fb12afba0 同步主 2024-06-20 14:14:34 +08:00
jing's 0494e98972 Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2024-06-20 13:46:05 +08:00
jing's 991c4d287d ebom pbom 版本显示调整 2024-06-20 13:45:59 +08:00
曹鹏飞 d05db2d869 feat(pbom): 导入SAP增加SORT（排序字符串） 2024-06-19 17:39:03 +08:00
曹鹏飞 f030e56db5 fix(pbom): 修复pbom正式表搜索时间范围不生效的问题 2024-06-19 16:31:32 +08:00
曹鹏飞 2e3e1221a5 Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition 2024-06-19 16:30:50 +08:00
大米 2e0fbe491d Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2024-06-19 16:15:56 +08:00
大米 47d2f01e50 1、昨天问题修复 2024-06-19 16:15:47 +08:00
曹鹏飞 dde0fe373f Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition 2024-06-19 15:13:19 +08:00
曹鹏飞 e06704fe6c fix(ebom): 添加部门id 2024-06-19 13:43:18 +08:00
曹鹏飞 4efbf98253 optimize: 优化数据验证 2024-06-19 13:42:56 +08:00
曹鹏飞 d5f948916b optimize: 优化http请求和响应输出 2024-06-19 13:35:58 +08:00
曹鹏飞 1d50b4686d fix(ebom): 增加为空判断 2024-06-19 08:22:12 +08:00
曹鹏飞 9ae5eaaed6 Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition 2024-06-18 16:19:59 +08:00
大米 313ffc9532 Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 
# Conflicts:
#	nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml
 2024-06-18 16:16:34 +08:00
大米 13d88007ec 1、转pbom报错问题 2024-06-18 16:14:42 +08:00
曹鹏飞 42d4c1c47d Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition 2024-06-18 15:35:31 +08:00
曹鹏飞 0dc234ff71 feat(ebom): 修复异常检查，如果不是检查根节点时，会出现项目类型为空的异常 2024-06-18 15:35:06 +08:00
曹鹏飞 4a2e64a657 fix(ebom): 添加dept_row_id 2024-06-18 15:33:28 +08:00
jing's ea95483620 移动 ebom 同步主数据 2024-06-18 15:10:19 +08:00
jing's e70fb3135a Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2024-06-18 13:15:25 +08:00
jing's ddb1db41ea 机台号[A-Za-z0-9]{1,5} 2024-06-18 13:15:05 +08:00
jing's 92c254a515 同步主物料 2024-06-18 13:14:28 +08:00
曹鹏飞 2997383147 Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition 2024-06-18 11:11:05 +08:00
曹鹏飞 34bfde31c8 fix(ebom): 添加dept_row_id 2024-06-18 11:10:20 +08:00
曹鹏飞 76a4a90ea7 fix(ebom): 恢复被错误移除的代码 2024-06-18 11:07:22 +08:00
曹鹏飞 c3a7c09707 Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition 
# Conflicts:
#	nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml
 2024-06-18 11:05:56 +08:00
大米 5d74b9e8d0 Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2024-06-18 10:37:33 +08:00
大米 7c4da752c0 1、昨天问题修复 2024-06-18 10:37:28 +08:00
曹鹏飞 44c714816a 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/domain/EBom/EBomEdit.java
 2024-06-18 09:59:40 +08:00
曹鹏飞 17e3523b83 optimize: 添加http日志记录 
将请求内容和响应内容记录到日志文件，可根据配置开启或关闭该功能
 2024-06-18 09:54:30 +08:00
曹鹏飞 39a8f28b20 fix(ebom): 工作表编辑页面暂存时，没有下级也需要可以保存 2024-06-18 09:53:13 +08:00
曹鹏飞 8b9bbb1ce8 Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition 2024-06-17 17:29:58 +08:00
曹鹏飞 925b883916 optimize(ebom): 异常检查移除废弃的代码 2024-06-17 16:54:25 +08:00
曹鹏飞 7db789d7ac Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition 2024-06-17 15:55:53 +08:00
曹鹏飞 1d59e425e9 fix(ebom): 如果没有历史版本则将本次转正式的数据复制到formal表 2024-06-17 15:05:27 +08:00
曹鹏飞 65d71b8e69 optimize(ebom): 导入到SAP时F项不需要提层，只需要把空的直发包丢弃 2024-06-17 11:36:04 +08:00
曹鹏飞 b9f37aea55 optimize: 添加物料时，去掉同步到OA，由主物料服务来同步 2024-06-17 10:43:02 +08:00
曹鹏飞 1ec4e16bd7 fix(ebom): 添加dept_row_id 2024-06-17 10:41:50 +08:00
曹鹏飞 e1c03a2b55 Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition 2024-06-16 18:33:52 +08:00
jing's 9a44353c8d Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2024-06-16 17:24:50 +08:00
jing's 84df8d7394 ebom正式表使用ebom表字段 2024-06-16 17:24:44 +08:00
曹鹏飞 aaa3545f3a Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition 2024-06-16 16:14:58 +08:00
大米 5b3509dccd 1、ebom 转 pbom 2024-06-16 12:46:32 +08:00
曹鹏飞 d91db60c95 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/EbomApi.java
#	nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewEbomChildMapper.java
#	nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPbomBase.java
#	nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomChildMapper.xml
 2024-06-15 19:51:02 +08:00
大米 1a459a6057 1、ebom,pbom 正式表保存所有正式版数据 2024-06-15 17:44:23 +08:00
大米 ac9901a0a1 1、EBOM正式版转PBOM逻辑调整 2024-06-15 14:21:49 +08:00
大米 bc423b6cd6 1、EBOM转PBOM逻辑调整 2024-06-15 11:07:34 +08:00
曹鹏飞 4ce8b7c41a Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition 2024-06-14 15:12:35 +08:00
曹鹏飞 171854351e fix(ebom): 导入SAP的F项提层优化 2024-06-14 15:10:14 +08:00
大米 faf0071638 1、CAD转EBOM新逻辑调整 2024-06-14 14:43:26 +08:00
大米 0dd9dd5943 1、CAD转EBOM新逻辑调整 2024-06-14 14:40:58 +08:00
曹鹏飞 a54b186845 feat(ebom): 从excel导入逻辑调整（旧版本是正式表则升级小版本；旧版本是工作表且是其他人创建则提示，旧版本是工作表且是自己创建则覆盖） 2024-06-14 14:12:31 +08:00
曹鹏飞 acc2e770fd feat(ebom): 工作表借用件支持展开显示 2024-06-14 13:34:13 +08:00
曹鹏飞 7806d18874 fix(ebom): 修复精确搜索不能跨部门的问题 2024-06-14 13:33:12 +08:00
曹鹏飞 7ff168fd1a optimize(移动破mbom): 导入SAP状态值调整 2024-06-14 09:01:15 +08:00
曹鹏飞 d4788a1d4a fix(ebom): 调整事务位置 2024-06-14 08:10:43 +08:00
曹鹏飞 be2a133e2b fix(ebom): 修复暂存和提交报错的问题 2024-06-13 17:54:34 +08:00
曹鹏飞 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
大米 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
大米 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
大米 da5fcd54cf 1、转PBOM 2024-06-03 14:04:10 +08:00
曹鹏飞 232979ac02 fix(pbom): 优化复制功能，设置创建人为当前登录用户，部门为当前登录用户所属部门，时间为当前时间 2024-06-03 11:06:43 +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
曹鹏飞 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