Commit Graph

695 Commits

Author SHA1 Message Date
jing's 02b08c008d 查询条件变更 2024-04-01 13:10:10 +08:00
jing's 60c7f489e2 最新查询条件变更 2024-04-01 13:06:02 +08:00
大米 9ef37d9c1d 1、获取子级逻辑调整 2024-04-01 13:00:03 +08:00
曹鹏飞 a76f872d15 other: pbom导出强制设置页码和页数避免前端传错误参数导致报错 2024-03-31 19:47:50 +08:00
曹鹏飞 c593a6341e Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2024-03-31 19:45:36 +08:00
jing's 774f830fa9 退回设计 提示错误的物料编号 2024-03-31 16:07:54 +08:00
jing's c193718b2a +异常确认标记字段 2024-03-31 15:46:08 +08:00
jing's 178ed71853 ebom编辑部分导出异常 2024-03-31 15:14:05 +08:00
jing's e7154dc542 Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2024-03-31 14:39:30 +08:00
jing's e490c10037 待复核不能退回 2024-03-31 14:39:26 +08:00
曹鹏飞 474671154d fix: 原始bom转ebom忽略非本人创建的,但是打印到日志 2024-03-31 13:55:43 +08:00
大米 7ecfa7d53d 1、发货前装配包 2024-03-31 13:42:07 +08:00
jing's d10962d79c 暂存、提交 非定版相同Bom变更状态 2024-03-31 10:43:48 +08:00
jing's f21f7585b4 Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2024-03-30 18:56:54 +08:00
jing's 9ae1b14842 +ebom编辑 验证码删除与编辑行互斥 2024-03-30 18:56:49 +08:00
luoliming 37c720c3fc 问题修复 2024-03-30 18:54:55 +08:00
luoliming d4803fdfb4 问题修复 2024-03-30 17:53:52 +08:00
jing's 22c09cf185 88# ebom工作明细张科001账号删除3100005886报错 2024-03-30 17:44:23 +08:00
jing's 483029dc39 Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2024-03-30 16:41:33 +08:00
jing's f3b4f6baf2 退回原因 2024-03-30 16:38:18 +08:00
luoliming 4ec5856c52 问题修复 2024-03-30 16:37:42 +08:00
luoliming 24926cc757 Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2024-03-30 16:33:56 +08:00
luoliming 53dd3add1b 问题修复 2024-03-30 16:33:43 +08:00
jing's 67477ec634 Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2024-03-30 16:31:06 +08:00
jing's 2315a80f10 退回工厂判断 2024-03-30 16:31:02 +08:00
luoliming 689bdaba18 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-03-30 13:53:50 +08:00
luoliming af9f32fd8a 问题修复 2024-03-30 13:51:39 +08:00
曹鹏飞 7c3ccd698c fix: 记录操作日志时截取指定长度 2024-03-30 11:33:08 +08:00
曹鹏飞 c5dacdbec8 feat: ebom异常状态下不允许生成虚拟包 2024-03-30 10:43:22 +08:00
曹鹏飞 6e3e65e453 feat: 从cad导入原始bom时将物料编号为“无”的项置空 2024-03-30 10:16:18 +08:00
曹鹏飞 3bec84e14e Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2024-03-30 09:15:52 +08:00
大米 41dcf17772 1、最子级搜索 2024-03-29 19:06:35 +08:00
大米 ecca276e77 1、虚拟包排序号 2024-03-29 18:26:44 +08:00
曹鹏飞 4815b5d1c4 refactor: 一点点修改 2024-03-29 16:42:08 +08:00
曹鹏飞 01e40439c7 fix: 保存操作日志报错(数据超出长度等)时,记录到运行日志中 2024-03-29 16:39:43 +08:00
曹鹏飞 55db281e14 fix: 原始bom列表支持查询最后一级数据 2024-03-29 16:07:15 +08:00
曹鹏飞 0b0368993d feat: 添加筛选条件 2024-03-29 16:05:35 +08:00
jing's af4900141d 提示 2024-03-29 13:28:21 +08:00
jing's 92a0b6679c 删除 2024-03-29 13:26:28 +08:00
jing's 7abecbd672 删除bom 工艺角色调整 2024-03-29 13:22:29 +08:00
jing's 63f125918a Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2024-03-29 10:19:37 +08:00
jing's 8b822bd503 空指针 2024-03-29 10:19:26 +08:00
曹鹏飞 461692daf0 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-03-29 08:14:51 +08:00
jing's 2ad0c12acf Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2024-03-28 23:45:55 +08:00
jing's e59cc27d2a 退回设计 设计复核调整 2024-03-28 23:45:51 +08:00
大米 29c4969235 1、虚拟包排序号 2024-03-28 20:25:06 +08:00
大米 5505efa335 Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2024-03-28 19:26:24 +08:00
大米 b17a146c93 1、虚拟包名称问题 2024-03-28 19:26:02 +08:00
曹鹏飞 fde0dc1130 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-03-28 17:04:45 +08:00
jing's 17293e495d 调整新加bom 最新版调整 2024-03-28 17:03:10 +08:00