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

760 Commits

Author SHA1 Message Date
jing's be1ef7ad69 ebom退回设计忽略工艺人员 2024-03-21 09:39:52 +08:00
曹鹏飞 dc84e52cdb 一点优化 2024-03-21 08:38:42 +08:00
曹鹏飞 fc8409134e 修复因parentResult和childResult未初始化导致的空指针异常 2024-03-21 08:37:44 +08:00
jing's ddd8f8aceb 恢复 2024-03-20 23:10:06 +08:00
jing's f06d087665 图号匹配规则调整 2024-03-20 20:34:35 +08:00
jing's 2c1d43a201 移动破导入 出现异常详细提示 2024-03-20 13:58:58 +08:00
jing's f179268e14 ebom 工艺创建bom不能退回 2024-03-20 11:45:10 +08:00
jing's b455c47b3e +注释 2024-03-20 09:39:21 +08:00
jing's 83aaed97f6 暂存/提交验证调整 2024-03-20 09:37:32 +08:00
jing's d055077b3f 调整报表 2024-03-19 21:39:43 +08:00
jing's adeb6bccff mbom版本赋值 2024-03-18 23:10:20 +08:00
jing's 8d0fc3ad1c 报表调整 2024-03-18 23:02:01 +08:00
曹鹏飞 d2720d1844 发货前装配包才需要加FHQ关键字 2024-03-18 16:54:52 +08:00
曹鹏飞 da42182ecc 提示信息优化 2024-03-18 15:27:29 +08:00
曹鹏飞 af3268756f 原始bom暂存、提交、转ebom时添加权限校验，只允许操作自己创建的数据 2024-03-18 15:24:10 +08:00
曹鹏飞 ccd879665a 优化删除语句 2024-03-18 15:22:08 +08:00
大米 3a8b33eb32 Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2024-03-18 11:04:17 +08:00
大米 ecbbe43059 1、查询 2024-03-18 11:04:12 +08:00
曹鹏飞 7e60d7a606 添加null判断 2024-03-18 08:40:46 +08:00
大米 046a0b4854 1、BOM反查 2024-03-16 18:05:49 +08:00
大米 f50aeb496c 1、315问题修复 2024-03-15 18:53:56 +08:00
大米 72eb9aa439 1、315问题修复 2024-03-15 18:51:38 +08:00
大米 6a5062cede Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2024-03-15 18:28:33 +08:00
大米 2962454b46 1、315问题修复 2024-03-15 18:28:27 +08:00
jing's eba677e7a4 Mbom搜索查询调整 2024-03-15 18:18:58 +08:00
大米 c89e9f34cd Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2024-03-15 17:10:24 +08:00
大米 b61a4b8863 1、ebom-转pbom加转换时间 2024-03-15 17:10:18 +08:00
曹鹏飞 67bc739c1b Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2024-03-15 16:01:06 +08:00
jing's 0a4e5d4d39 +版本描述 2024-03-15 14:44:36 +08:00
曹鹏飞 a2fe921a5e 查询子节点时只未转换的 2024-03-15 14:34:59 +08:00
jing's 1aee8b9797 Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2024-03-15 14:33:38 +08:00
jing's cc110419e7 查询类型判断改正 2024-03-15 14:33:30 +08:00
曹鹏飞 d769eb7de3 优化判断 2024-03-15 14:01:58 +08:00
曹鹏飞 eeb2e3fc3c 优化提示信息 2024-03-15 11:31:19 +08:00
曹鹏飞 5284a4b753 优化提示信息 2024-03-15 11:18:24 +08:00
曹鹏飞 534aab8468 添加提示 2024-03-15 09:55:12 +08:00
曹鹏飞 a60683704a 添加提示 2024-03-15 09:54:57 +08:00
大米 304db5e16c Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2024-03-15 09:38:34 +08:00
大米 da8d2b91e7 1、EBOM-编辑问题 2024-03-15 09:38:29 +08:00
jing's e4791b20bf ebom添加bom 接口 2024-03-14 17:21:58 +08:00
jing's 9b7f3b2a1d 判断参数 2024-03-14 16:15:40 +08:00
jing's 9627157746 Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2024-03-14 16:11:22 +08:00
jing's 5175f8a606 ebom编辑重构 2024-03-14 16:11:17 +08:00
曹鹏飞 662a7fa977 从cad导入原始bom时，如果父级物料编号是”无“则从主数据同步编号 2024-03-14 14:29:33 +08:00
曹鹏飞 a4c4facf31 从excel导入原始bom时，如果物料编号是”无“则改为”“ 2024-03-14 14:28:17 +08:00
曹鹏飞 f859141de8 修复系统异常时返回的响应是404的问题 2024-03-14 11:23:57 +08:00
曹鹏飞 f92ac3be80 修复系统异常时返回的响应是404的问题 2024-03-14 09:37:45 +08:00
曹鹏飞 fa7435e95b 去除不需要的包引用 2024-03-14 09:36:00 +08:00
jing's 49f606a9ae Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2024-03-13 17:47:06 +08:00
jing's 08fc06ee98 11 2024-03-13 17:47:01 +08:00
大米 d6a2b2e5d3 Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2024-03-13 17:28:11 +08:00
大米 820aff2be0 1、EBOM-编辑问题 2024-03-13 17:28:04 +08:00
曹鹏飞 3ae8fa4316 工艺人员可以看到自己创建的待复核数据（极端情况，在设计人员身份创建了数据，而后又被赋予了工艺人员身份） 2024-03-13 16:44:29 +08:00
jing's f814d447d7 Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2024-03-13 14:52:25 +08:00
jing's 9b1d387bec mbom sap 2024-03-13 14:52:18 +08:00
曹鹏飞 12f6e1c227 优化错误提示信息 2024-03-13 13:46:56 +08:00
大米 5995b101a5 1、解决转PBOM-404问题 2024-03-13 11:39:49 +08:00
曹鹏飞 0fafee339d 没有子级时，bomRowId设置为0，原来是null 2024-03-13 09:33:02 +08:00
曹鹏飞 716dbc6eae Merge branch 'feature/DM/bug-232' into feature/DM/nflg-bom 2024-03-13 08:16:16 +08:00
曹鹏飞 2ddb2bd29c 优化日志 2024-03-13 08:14:59 +08:00
曹鹏飞 ffed3f5779 【修复】232（数据创建时修改日期应该为空，待进行修改日期改为当前日期） 2024-03-13 08:13:57 +08:00
jing's ca6c4ab940 ebom编辑删除调整 2024-03-12 22:55:30 +08:00
jing's db934e1f4a Mbom报表调整 2024-03-12 17:46:52 +08:00
jing's 70d65268d7 mbom sap导入 2024-03-12 14:15:43 +08:00
jing's 3ad6f0c785 报表调整 2024-03-11 23:14:13 +08:00
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
大米 df02cbf112 Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2024-03-01 15:03:12 +08:00
大米 bd7f96b177 转PBOM-重复问题 2024-03-01 15:03:08 +08:00
jing's 5ee6c4bf45 发布时间 以降序排列或做成由用户自选升降 2024-02-29 21:39:10 +08:00
大米 607ed9d581 bom-生成多个版本问题 2024-02-29 19:30:45 +08:00
大米 07b4f1bc17 Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2024-02-28 16:33:05 +08:00
大米 4999312fbc EBOM生成虚拟包 2024-02-28 16:33:01 +08:00
jing's d369a0daae Ebom超级物料标签 2024-02-27 13:55:02 +08:00
大米 9efab16980 EBOM生成虚拟包 2024-02-26 16:41:23 +08:00
大米 91b1c92a3c eBOM-反查 2024-02-26 16:26:02 +08:00
大米 4e4cd647ba eBOM-反查 2024-02-26 11:10:01 +08:00
大米 7ed3b87555 eBOM-反查 2024-02-25 18:50:40 +08:00
大米 820d7496e7 原始BOM-反查 2024-02-25 17:48:21 +08:00
大米 7baf801d81 原始BOM-反查 2024-02-25 17:36:29 +08:00
大米 97c0b32dc3 反查 2024-02-24 14:35:02 +08:00
大米 860e5e9aa4 规则分组 2024-02-24 13:58:15 +08:00
大米 4ded5800f8 Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2024-02-24 10:30:01 +08:00
大米 0ad889cc8b 反查 2024-02-24 10:29:54 +08:00
jing's e859fdefb5 Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2024-02-22 22:45:56 +08:00
jing's 1e8a716f67 导出excel 2024-02-22 22:45:46 +08:00
大米 b091706e98 反查 2024-02-22 18:15:48 +08:00
大米 1fb18011fa 反查 2024-02-22 17:59:47 +08:00
jing's 49c3380406 obom 2024-02-21 18:29:51 +08:00
jing's 304e73479d 条件 2024-02-21 14:02:02 +08:00
jing's c282f9aebe 调整命名 2024-02-21 13:36:00 +08:00
jing's 214c515136 转换结构 tree 和list 2024-02-21 13:30:42 +08:00
jing's 7f8363978d pbom 2024-02-20 21:47:08 +08:00
jing's 43ddc86057 单层bom下级 2024-02-20 17:33:58 +08:00
大米 17bcd18396 Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2024-02-20 15:54:03 +08:00
大米 f0a32b44ce 查询 2024-02-20 15:53:56 +08:00
jing's 1029cffc09 报表树形查询 2024-02-19 22:53:26 +08:00
大米 96702f5e35 物料编码搜索-死循环问题 2024-02-19 10:17:12 +08:00
jing's 90a2847d03 查询版本列表 2024-02-18 18:30:16 +08:00
大米 7bca375eb1 Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2024-02-18 15:24:42 +08:00
大米 e3632534b5 BUG修复 2024-02-18 15:24:37 +08:00
jing's 903c218c08 ebom 2024-02-17 21:54:48 +08:00
jing's b860ed2de6 bom 选择 2024-02-17 16:38:47 +08:00
jing's b280a73b4d 配置 2024-02-16 23:01:47 +08:00
jing's 3355b29dad init2 2024-02-16 22:23:49 +08:00
jing's 4dfef33691 init 2024-02-16 22:22:26 +08:00
jing's 637ea32f92 Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2024-02-16 18:13:00 +08:00
jing's a4b72c6819 重复删除 2024-02-16 18:12:55 +08:00
luoliming 91e7cda738 4 2024-02-16 17:54:10 +08:00
luoliming ce05126a7e 4 2024-02-16 17:47:12 +08:00
luoliming 881e3d61a6 4 2024-02-16 12:06:54 +08:00
luoliming 43868984ad 4 2024-02-15 23:18:12 +08:00
luoliming c4a58ca5ce 4 2024-02-15 22:59:28 +08:00
luoliming 500fb94ba1 4 2024-02-15 22:58:00 +08:00
luoliming 603421b8f1 4 2024-02-15 22:55:02 +08:00
luoliming f8d30f9208 4 2024-02-15 22:53:35 +08:00
luoliming 27fc46f294 4 2024-02-15 22:11:58 +08:00
luoliming c2e615e949 4 2024-02-15 21:02:50 +08:00
luoliming 3726ebbe16 记录子表Bom版本行ID 2024-02-13 17:42:31 +08:00
luoliming ca9dee8eea 记录子表Bom版本行ID 2024-02-13 17:38:01 +08:00
luoliming fa26973ce9 子表加BOM版本rowId 2024-02-13 16:39:09 +08:00
luoliming 05ba87c822 原材料规则 2024-02-13 16:31:18 +08:00
luoliming 435589379a 原材料规则 2024-02-07 15:23:33 +08:00
luoliming d5615be227 Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2024-02-02 15:47:30 +08:00
luoliming 2bcc599016 复制 2024-02-02 15:46:40 +08:00
luoliming 66e1a2c0f3 原材料规则 2024-01-29 22:16:46 +08:00
大米 4dad05c287 BUG修复 2024-01-29 17:03:38 +08:00
luoliming c12036ffa1 Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2024-01-28 22:37:20 +08:00
luoliming f73e7bbeb9 物料，工厂规则匹配接口迁移 2024-01-28 22:36:40 +08:00
jing's b45e374683 废弃 2024-01-28 22:15:49 +08:00
jing's e0a098f218 Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2024-01-28 22:12:07 +08:00
jing's b81bd49eeb 默认修改日期 2024-01-28 22:12:03 +08:00
luoliming c156fc5ca8 物料，工厂规则匹配接口迁移 2024-01-27 23:14:41 +08:00
luoliming 58bdfecebb 物料，工厂规则匹配接口迁移 2024-01-27 20:46:16 +08:00
jing's a4aa03958d 选项删除软删除 2024-01-27 17:59:03 +08:00
jing's 4383367efb 已发布选项不能删除提示 2024-01-27 17:19:44 +08:00
jing's e0531ca0e9 Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2024-01-26 22:13:15 +08:00
jing's 31227e8094 导出设备顺序 2024-01-26 22:13:11 +08:00
大米 b1fd8eaca4 BUG修复 2024-01-26 18:44:34 +08:00
大米 e5e24cdf6b Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2024-01-26 18:02:11 +08:00
大米 11fba444c3 BUG修复 2024-01-26 18:02:04 +08:00
jing's 2530f56254 Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2024-01-26 15:50:47 +08:00
jing's fd604e40b8 移动破调整 2024-01-26 15:50:43 +08:00
大米 8ad11de234 BUG修复 2024-01-26 14:38:25 +08:00
大米 87c322a4c7 BUG修复 2024-01-26 14:35:47 +08:00
luoliming daabfa09ac 注释获取订单号 2024-01-25 23:38:20 +08:00
luoliming 4ad663fe6f Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2024-01-25 23:08:42 +08:00
luoliming 3b83c06d31 注释获取订单号 2024-01-25 23:08:28 +08:00
jing's be45b8e310 Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2024-01-25 22:57:19 +08:00
jing's 758158d262 调整 2024-01-25 22:57:15 +08:00
luoliming fb13d33228 Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2024-01-25 22:18:41 +08:00
luoliming 6da9e80a76 注释获取订单号 2024-01-25 22:18:24 +08:00