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

1682 Commits

Author SHA1 Message Date
曹鹏飞 3674ef3acb feat(ebom): 导入到SAP时，取消从SAP进来的数据不导入到SAP去的限制 2024-08-23 11:14:00 +08:00
大米 434fc809fa pbom-显示问题。 2024-08-23 09:35:52 +08:00
大米 3379c277cf EBOM -pbom 物料信息动态获取 2024-08-22 19:22:50 +08:00
BF-202309241046\Administrator 544e4ef13f EBOM -pbom 物料信息动态获取 2024-08-22 19:10:08 +08:00
大米 a21d25215c Merge remote-tracking branch 'origin/feature/DM/nflg-bom-transition' into feature/DM/nflg-bom-transition 2024-08-22 17:50:16 +08:00
大米 ee18b73cfb SET 单位不确认 2024-08-22 17:49:43 +08:00
10002327 da7f44afd7 Merge pull request 'pbom发起变更来源状态保持不变' (#8) from nflg-bom-transition-pbom-lhj0821 into feature/DM/nflg-bom-transition 
Reviewed-on: http://192.168.0.40:3000/root/nflg_project/pulls/8
 2024-08-22 16:50:01 +08:00
10002327 7061e032a9 pbom发起变更来源状态保持不变 2024-08-22 16:47:32 +08:00
曹鹏飞 982dc6821e fix: 修复导入SAP时添加直发包parent的一个bug 2024-08-22 16:27:10 +08:00
曹鹏飞 be8d4fab44 fix: 修复导入SAP时添加直发包parent的一个bug 2024-08-22 16:22:29 +08:00
曹鹏飞 5eea13aaa4 Merge branch 'feature/DM/nflg-bom-transition' of http://192.168.0.40:3000/root/nflg_project into feature/DM/nflg-bom-transition 2024-08-21 08:58:46 +08:00
曹鹏飞 f4aae74c93 fix: 修复导入SAP时的一个bug 2024-08-21 08:57:47 +08:00
大米 12fa508e49 EBOM正式-转PBOM-直发包不出现问题-转PBOM 新逻辑-起--大米 2024-08-21 08:37:09 +08:00
曹鹏飞 9140da0752 feat: SAP异常信息添加时间 2024-08-20 21:41:50 +08:00
曹鹏飞 b01cbd3cff optimize(pbom): 导入到SAP时，如果直发包缺少parent，则自动添加 2024-08-20 21:41:19 +08:00
大米 472a899bee Merge remote-tracking branch 'origin/feature/DM/nflg-bom-transition' into feature/DM/nflg-bom-transition 2024-08-19 17:28:52 +08:00
大米 0b7987d87d EBOM转PBOM新逻辑-不发生产-20240819 2024-08-19 17:28:44 +08:00
曹鹏飞 aa335e3fe1 optimize: 导入到SAP成功后，如果下级节点存在导入失败的状态，则修改为导入成功 2024-08-19 12:42:46 +08:00
曹鹏飞 89dab0d841 Merge branch 'feature/DM/nflg-bom-transition' of http://192.168.0.40:3000/root/nflg_project into feature/DM/nflg-bom-transition 2024-08-19 09:07:38 +08:00
曹鹏飞 c4dc0f7a13 fix(pbom): 移除获取导入SAP失败的列表记录中的根节点筛选条件，因为现在可以选择任意节点导入 2024-08-19 09:07:14 +08:00
10002327 ebb8f338c7 Merge remote-tracking branch 'origin/feature/DM/nflg-bom-transition' into nflg-bom-transition-home-msg-lhj0812 2024-08-19 08:08:30 +08:00
大米 9d8e471998 Merge remote-tracking branch 'origin/feature/DM/nflg-bom-transition' into feature/DM/nflg-bom-transition 2024-08-18 17:35:59 +08:00
大米 8640baa627 PBOM工作表，查询1020数据时取消只能查本人的限制 2024-08-18 17:35:53 +08:00
曹鹏飞 c6589d9bf1 fix(pbom): 修复导入SAP时使用的父级错误的问题 2024-08-18 15:55:00 +08:00
曹鹏飞 2c7db34d4a optimize: 导入SAP时，先获取所有bom，然后将来源是SAP的bom丢弃，其余的导入到SAP中 2024-08-16 17:24:45 +08:00
曹鹏飞 9e37fcd9ef Merge branch 'feature/DM/nflg-bom-transition' of http://192.168.0.40:3000/root/nflg_project into feature/DM/nflg-bom-transition 2024-08-16 16:48:38 +08:00
曹鹏飞 c6d9b3e031 optimize: 导入SAP时，先获取所有bom，然后将来源是SAP的bom丢弃，其余的导入到SAP中 2024-08-16 16:48:18 +08:00
大米 fc08e9f6b5 Merge remote-tracking branch 'origin/feature/DM/nflg-bom-transition' into feature/DM/nflg-bom-transition 2024-08-15 22:10:48 +08:00
大米 a5095fe55a F提层后造成的空包要递归往上检查删除2-先不发生产 2024-08-15 22:10:42 +08:00
jing's 26da8f93be 取消负数限制 2024-08-15 17:34:45 +08:00
jing's 3ed9941da1 excel 导入取消负数限制 2024-08-15 17:32:15 +08:00
曹鹏飞 553e9f699d Merge branch 'feature/DM/nflg-bom-transition' of http://192.168.0.40:3000/root/nflg_project into feature/DM/nflg-bom-transition 2024-08-15 10:12:38 +08:00
曹鹏飞 4315eddefd fix(dqbom): 修复转正式表时删除数据的查询错误 2024-08-15 10:12:14 +08:00
大米 ad91ce1a18 Merge remote-tracking branch 'origin/feature/DM/nflg-bom-transition' into feature/DM/nflg-bom-transition 2024-08-14 16:13:47 +08:00
大米 b23e22d9a8 F提层后造成的空包要递归往上检查删除-先不发生产 2024-08-14 16:13:41 +08:00
曹鹏飞 0a3aa2ba26 fix(dqbom): 导入时未读取到数据时返回错误提示 2024-08-14 15:00:12 +08:00
10002327 ea8f277d1c 首页bi链接增加排序字段 2024-08-14 14:15:59 +08:00
曹鹏飞 b5c91dfe0b Merge branch 'feature/DM/nflg-bom-transition' of http://192.168.0.40:3000/root/nflg_project into feature/DM/nflg-bom-transition 2024-08-14 11:01:27 +08:00
曹鹏飞 edb3f88e7f fix(ebom): 修复工作表搜索时，当物料图号为空时，搜索结果异常的问题 2024-08-14 11:00:48 +08:00
大米 c15239baff 转PBOM-直发包parent为null 时-null异常处理 2024-08-13 19:03:13 +08:00
10002327 d3651cf4dd 首页增加BI链接及SAP异常消息 2024-08-13 17:57:24 +08:00
大米 f199cc4c84 Merge remote-tracking branch 'origin/feature/DM/nflg-bom-transition' into feature/DM/nflg-bom-transition 2024-08-13 11:32:57 +08:00
大米 1d2b2e3681 转PBOM-解决缺parent时版本为空的情况 2024-08-13 11:32:46 +08:00
10001392 a88962fbd7 Merge remote-tracking branch 'origin/feature/DM/nflg-bom-transition' into feature/DM/nflg-bom-transition 2024-08-12 22:16:52 +08:00
10001392 44f3bf96e1 EBOM PBOM SAP报错信息，显示创建日期字段 2024-08-12 22:15:58 +08:00
jing's 74ff1fd5e3 bom 排序 2024-08-12 09:53:42 +08:00
luoliming 7db0f7555e 1-pbom-优化 2024-08-11 15:17:38 +08:00
jing's a0fdabd88f 移除库名 2024-08-10 22:47:10 +08:00
jing's ab3ede7306 移除库名 2024-08-10 22:41:15 +08:00
luoliming 19bb6ffa39 1-pbom-升级判断是否有工厂权限 2024-08-10 22:28:48 +08:00
luoliming 04a36e33cb 1-pbom-工作表查询问题-2 2024-08-10 17:27:17 +08:00
曹鹏飞 9886397891 Merge branch 'feature/DM/nflg-bom-transition' of http://192.168.0.40:3000/root/nflg_project into feature/DM/nflg-bom-transition 2024-08-10 15:45:18 +08:00
曹鹏飞 278df9410d fix: 修复导入SAP时数据排重的逻辑问题 2024-08-10 15:44:42 +08:00
luoliming df179207b9 Merge remote-tracking branch 'origin/feature/DM/nflg-bom-transition' into feature/DM/nflg-bom-transition 2024-08-10 14:27:38 +08:00
luoliming 4c6f47cf2c 1-pbom-工作表查询 
2-pbom工作表工厂权限问题
 2024-08-10 14:27:25 +08:00
曹鹏飞 8bd5026fe6 fix: 修复导入SAP时数据排重的逻辑问题 2024-08-10 13:09:06 +08:00
曹鹏飞 cddc01abc3 fix(dqbom): 添加查询条件 2024-08-10 09:08:38 +08:00
曹鹏飞 fa5be9761c fix(dqbom): 添加查询条件 2024-08-10 08:35:18 +08:00
曹鹏飞 4a079e4aeb Merge branch 'feature/DM/nflg-bom-transition' of http://192.168.0.40:3000/root/nflg_project into feature/DM/nflg-bom-transition 2024-08-09 20:27:01 +08:00
10001392 55900d714e 【EBOM、PBOM】SAP报错信息转义 2024-08-09 19:05:23 +08:00
曹鹏飞 611a5eeb53 optimize: 两条sql分开执行 2024-08-09 18:10:28 +08:00
大米 f2d556fb92 Merge remote-tracking branch 'origin/feature/DM/nflg-bom-transition' into feature/DM/nflg-bom-transition 2024-08-09 17:54:34 +08:00
大米 49bc8003d6 转PBOM-直发包缺parent数据问题修复 2024-08-09 17:54:22 +08:00
曹鹏飞 0663529f27 Merge branch 'feature/DM/nflg-bom-transition' of http://192.168.0.40:3000/root/nflg_project into feature/DM/nflg-bom-transition 2024-08-09 16:10:58 +08:00
曹鹏飞 37ae02f45c fix: 限制导入SAP出错时写入日志的错误内容的长度，以免数据库报错 2024-08-09 16:10:26 +08:00
10002327 f2459a8883 Merge pull request 'pbom增加字段来源状态' (#6) from nflg-bom-transition-pbom-lhj0809 into feature/DM/nflg-bom-transition 
Reviewed-on: http://192.168.0.40:3000/root/nflg_project/pulls/6
 2024-08-09 15:53:02 +08:00
10002327 eb4e33a749 pbom增加字段来源状态 2024-08-09 15:49:34 +08:00
大米 349df53fc6 转PBOM-覆盖时更新创建人，部门 2024-08-09 10:39:15 +08:00
luoliming 6d77ac079f Merge remote-tracking branch 'origin/feature/DM/nflg-bom-transition' into feature/DM/nflg-bom-transition 2024-08-08 22:34:40 +08:00
luoliming e3a07d0971 转PBOM-覆盖模式时，取消创建人是否同一人的判断 2024-08-08 22:30:15 +08:00
曹鹏飞 7a329674d1 feat(pbom): 从SAP导入过来的数据，再次执行导入时，不再导入到SAP中去 2024-08-08 15:18:19 +08:00
10002327 f386e7ad5b Merge remote-tracking branch 'origin/feature/DM/nflg-bom-transition' into nflg-bom-transition-home-lhj0807 2024-08-08 14:40:47 +08:00
10002327 c09b3ab368 首页跳转修改 2024-08-08 14:24:47 +08:00
曹鹏飞 e5d49b9e13 feat(ebom): 导入到SAP取消是否根节点验证 2024-08-08 09:38:16 +08:00
曹鹏飞 139beead0b Merge branch 'feature/DM/nflg-bom-transition' of http://192.168.0.40:3000/root/nflg_project into feature/DM/nflg-bom-transition 2024-08-07 21:56:23 +08:00
曹鹏飞 2c4fa6538a optimize: 查询子节点数据时，设置SapStatus为null 2024-08-07 21:55:40 +08:00
jing's 51a7f0c4a0 填负数系统报错，校验规则要优化 2024-08-07 18:07:12 +08:00
大米 a896dbd22e Merge remote-tracking branch 'origin/feature/DM/nflg-bom-transition' into feature/DM/nflg-bom-transition 2024-08-06 18:22:04 +08:00
大米 c7bcfb0752 转PBOM-顺序问题 2024-08-06 18:21:59 +08:00
曹鹏飞 9a7e17ea82 Merge branch 'feature/DM/nflg-bom-transition' of http://192.168.0.40:3000/root/nflg_project into feature/DM/nflg-bom-transition 2024-08-06 13:09:34 +08:00
曹鹏飞 9f74fa5b19 fix(ebom): 转pbom时设置source 2024-08-06 11:50:28 +08:00
曹鹏飞 b193c5917f feat(ebom): 导入到SAP时不再移除空的直发包 2024-08-06 11:47:46 +08:00
jing's f00e9eb02a pbom正查过期时间变更 2024-08-06 11:40:19 +08:00
jing's 33b8c2be8d Merge branch 'feature/DM/nflg-bom-transition' of http://192.168.0.40:3000/root/nflg_project into feature/DM/nflg-bom-transition 2024-08-06 11:11:47 +08:00
jing's cffe58bfec 正查子级版本号 2024-08-06 11:11:42 +08:00
10002327 3f2a33a25d 首页》标准部件列表 2024-08-06 09:59:37 +08:00
10002327 062275abd8 Merge remote-tracking branch 'origin/feature/DM/nflg-bom-transition' into feature/DM/nflg-bom-transition 2024-08-06 08:12:37 +08:00
曹鹏飞 09c2b1c8ee fix(pbom): 解决导入到SAP时发货包作为根节点时找不到直发包的问题 2024-08-05 23:10:34 +08:00
大米 37856ae888 生产报错问题-拆分sql 2024-08-05 08:24:44 +08:00
曹鹏飞 fb53f628d1 feat: 调整31生成的虚拟包名称规则，中间括号里的物料名称去除图号 2024-08-03 17:00:23 +08:00
大米 12f2cf24d2 Merge remote-tracking branch 'origin/feature/DM/nflg-bom-transition' into feature/DM/nflg-bom-transition 2024-08-03 16:21:49 +08:00
大米 170ad6fa2e 31码-生成虚拟包，名称中去除图号 2024-08-03 16:20:01 +08:00
曹鹏飞 488cbe2ab4 Merge branch 'feature/DM/nflg-bom-transition' of http://192.168.0.40:3000/root/nflg_project into feature/DM/nflg-bom-transition 2024-08-03 16:14:53 +08:00
曹鹏飞 fad5673c64 refactor: 优化虚拟包识别 2024-08-03 16:14:29 +08:00
大米 b12b86690d 转PBOM优化-3(生产错问题) 2024-08-03 16:03:43 +08:00
jing's c8b48f739d Merge branch 'feature/DM/nflg-bom-transition' of http://192.168.0.40:3000/root/nflg_project into feature/DM/nflg-bom-transition 2024-08-03 13:49:10 +08:00
jing's 72709df86d 编辑变更删除条件 2024-08-03 13:49:03 +08:00
大米 45e78cf5a3 Merge remote-tracking branch 'origin/feature/DM/nflg-bom-transition' into feature/DM/nflg-bom-transition 2024-08-03 12:33:12 +08:00
大米 d0268eeac9 转PBOM优化-3(生产错问题) 2024-08-03 12:33:02 +08:00
曹鹏飞 25082c28a2 Merge branch 'feature/DM/nflg-bom-transition' of http://192.168.0.40:3000/root/nflg_project into feature/DM/nflg-bom-transition 2024-08-03 10:59:17 +08:00