Commit Graph

746 Commits

Author SHA1 Message Date
jing's 0bb6ecfa72 Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2024-03-11 17:23:18 +08:00
jing's 73b5df914d 调整比对 2024-03-11 17:23:13 +08:00
曹鹏飞 3176249b7d 如果没有子节点则跳过 2024-03-11 13:36:32 +08:00
jing's 8c87b8f058 原始bom描述 2024-03-10 20:58:09 +08:00
jing's 3bb1fe3eef +比对报表 2024-03-10 20:20:21 +08:00
jing's 75562248e1 Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2024-03-10 16:33:13 +08:00
jing's ae7de19498 比较导出excel 2024-03-10 16:33:01 +08:00
luoliming 94e43e62bc 主数据动态表头多语言 2024-03-10 16:30:29 +08:00
jing's dd0cda516e Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2024-03-09 14:14:57 +08:00
jing's 37bcabe40b 比对 2024-03-09 14:14:46 +08:00
jing's bafa5b2478 比对 2024-03-09 14:14:11 +08:00
曹鹏飞 ef5d53a66e 修复因row_id=null导致批量填写项目类别报404错误的问题 2024-03-08 11:30:57 +08:00
大米 9f8f216a43 1、多语言 2024-03-08 08:51:45 +08:00
大米 e3be1c5218 1、批量分工厂 2024-03-08 08:40:54 +08:00
大米 2fc231e1a0 1、主数据表头多语言 2024-03-07 18:20:13 +08:00
大米 4c8f653b13 1、ebom-工作列表通过物料编码可以查询到已发布的BOM
2、ebom-发起变更问题解决
2024-03-07 17:28:06 +08:00
曹鹏飞 ddc67786f9 修正一个单词拼写错误 2024-03-07 08:51:36 +08:00
大米 a8d70e3784 1、Pbom问题处理 2024-03-06 16:37:50 +08:00
大米 b0e36ecb7d 1、BOOL 判断 2024-03-06 14:56:03 +08:00
大米 f1b63faffc Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2024-03-06 14:54:58 +08:00
大米 c5cebc7108 1、BOOL 判断 2024-03-06 14:54:51 +08:00
曹鹏飞 cf44ce33a3 Merge branch 'feature/DM/bug-277' into feature/DM/nflg-bom 2024-03-06 11:37:07 +08:00
曹鹏飞 35f79b96b6 【修复bug】277(虚拟包名称生成规则调整) 2024-03-06 11:36:29 +08:00
大米 4f599c67ce 1、PBOM工作表通过物料号能查到已发布的 2024-03-06 10:09:00 +08:00
大米 9248214549 1、日志
2、批量修改工厂
3、转MBOM时,旧的迁移到历史且版本号以B开头
2024-03-06 09:58:38 +08:00
jing's 465d760d69 查子级 2024-03-05 22:11:19 +08:00
jing's 13371a7f20 Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2024-03-05 21:50:53 +08:00
jing's ee730207f5 +materialCategoryCode 2024-03-05 21:50:49 +08:00
luoliming 0b65236f4b Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2024-03-05 21:39:38 +08:00
luoliming 384a7aeaae 日志 2024-03-05 21:39:23 +08:00
jing's 863505362b Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom
# Conflicts:
#	nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewMbomParentService.java
2024-03-05 20:51:59 +08:00
jing's 20b66b6d4c Mbom正查 2024-03-05 20:47:40 +08:00
曹鹏飞 991b398030 Merge branch 'feature/DM/nflg-bom-rakor' into feature/DM/nflg-bom
# Conflicts:
#	nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/UpdateImpact.java
#	nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/ReverseReport/OriginalBomQuery.java
2024-03-05 10:00:01 +08:00
曹鹏飞 a80905ecb4 【修复bug】172(搜索结果未包含结束日期当天的数据) 2024-03-05 09:28:34 +08:00
luoliming 548ecba0a4 日志 2024-03-04 21:25:18 +08:00
大米 0a756abf84 更新异常 2024-03-04 19:16:11 +08:00
大米 f2bd86937d 更新异常 2024-03-04 18:40:29 +08:00
大米 5f5ffcd78a Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2024-03-04 11:25:14 +08:00
大米 6b1446b82f 日志 2024-03-04 11:25:04 +08:00
曹鹏飞 2c7ab5cfa5 移除未使用到的包导入配置,解决编译报错的问题 2024-03-04 11:21:25 +08:00
jing's 0c55aa1734 发布拷贝数据 2024-03-03 18:16:44 +08:00
jing's f858d21f6f mbom日志 2024-03-03 17:46:57 +08:00
jing's d74aa83311 移动破日志 2024-03-03 17:46:45 +08:00
jing's 26a9144da0 Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2024-03-03 15:07:33 +08:00
jing's e32c469cad copy正式发布数据 2024-03-03 15:07:26 +08:00
luoliming 17bcbb10fe 日志 2024-03-02 21:26:12 +08:00
luoliming 73382dd305 日志 2024-03-02 20:44:45 +08:00
大米 4f06c88888 日志 2024-03-01 18:47:39 +08:00
大米 389c85c803 ebom-可重复转PBOM 2024-03-01 16:46:38 +08:00
大米 ae3478521c ebom-可重复转PBOM 2024-03-01 16:32:00 +08:00