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

2042 Commits

Author SHA1 Message Date
10001392 c065330bde Merge remote-tracking branch 'origin/feature/DM/bug-projecttype' 2024-09-11 11:38:54 +08:00
10001392 bc1a959489 【物料变更】大批量导入 2024-09-11 11:34:23 +08:00
曹鹏飞 99af9030d1 Merge branch 'feature/DM/bug-dqbomtopbom' into test 2024-09-11 10:27:44 +08:00
曹鹏飞 28de32c99e fix(dqbom): 修复转正式bom的一个错误 2024-09-11 10:26:49 +08:00
jing's a9d059ace0 Merge branch 'feature/DM/nflg-bom-transition' into test 2024-09-11 10:18:45 +08:00
曹鹏飞 678379a69e Merge branch 'feature/DM/bug-projecttype' into test 2024-09-11 10:11:51 +08:00
曹鹏飞 ffb2975ad6 fix(ebom): 从excel导入和编辑导入时，去掉项目类别前后的空格 2024-09-11 10:10:35 +08:00
jing's 842b9b48ff Merge branch 'feature/DM/nflg-bom-transition' 2024-09-11 09:48:34 +08:00
jing's defc69ab65 项目类型编辑去掉前后空格 2024-09-11 09:48:01 +08:00
10001392 fe244d93f8 Merge remote-tracking branch 'origin/feature/DM/nflg-bom-transition' into test 2024-09-11 08:19:13 +08:00
10001392 c309ee7b3f Merge remote-tracking branch 'origin/master-order-20240910' into test 2024-09-11 08:16:38 +08:00
10001392 0e3c3c3186 【生产订单】优化 2024-09-11 08:13:42 +08:00
jing's f243456805 Merge branch 'feature/DM/nflg-bom-transition' 2024-09-10 16:45:30 +08:00
jing's e2d4d5bbe4 忽略T项检查 2024-09-10 16:44:07 +08:00
大米 94e04540ac 转PBOM-虚拟包处理 2024-09-10 15:43:22 +08:00
大米 6d2abfa7a8 转PBOM-虚拟包处理 2024-09-10 15:36:06 +08:00
大米 2b4db51c18 1、pbom-编辑去掉验证 
2、转pbom-直发包跳过
 2024-09-10 11:22:41 +08:00
大米 77c84b12c6 1、pbom-编辑去掉验证 
2、转pbom-直发包跳过
 2024-09-10 11:15:44 +08:00
大米 c003903a61 生成虚拟包问题 2024-09-10 10:31:41 +08:00
大米 8b1974235e EBOM转PBOM-问题 2024-09-10 10:16:41 +08:00
10001392 40d6126e7c Merge remote-tracking branch 'origin/DM/异常检查' into test 2024-09-09 16:39:52 +08:00
大米 425dfa2678 EBOM-正式转PBOM-多任务问题 2024-09-09 16:38:57 +08:00
大米 ff6d7641bd 转pbom-pbom中有手工新增的时，兼容历史数据 2024-09-09 15:52:15 +08:00
10001392 f5245b9f6b Merge remote-tracking branch 'origin/DM/异常检查' into test 2024-09-09 15:20:06 +08:00
大米 afd82d5c15 EBOM-初始化项目类别：跳过已发布版BOM 2024-09-09 15:14:31 +08:00
10002327 29130e5d04 BOM完整性检查；仙桃发货包增加发货前装配包 2024-09-09 14:44:44 +08:00
大米 46252f8f4d 提层-F项缺BOM处理 2024-09-09 09:29:59 +08:00
luoliming fe657fc14f bug-修复 2024-09-08 15:43:58 +08:00
大米 96f7923e26 PBOM发布时，pbom在工作表时，当创建人为本人或版本大于当前版本则覆盖 2024-09-05 19:45:41 +08:00
大米 ed45236c00 pbom-发布只发布自己的 2024-09-05 19:37:13 +08:00
10001392 fc13cf3700 Merge remote-tracking branch 'origin/master-xiantao-lhj0830' 2024-09-05 10:49:18 +08:00
10002327 c02ecb336d 清除redis缓存 2024-09-05 10:12:46 +08:00
10001392 510d546378 Merge remote-tracking branch 'origin/feature/DM/nflg-bom-transition' 2024-09-05 09:34:47 +08:00
10001392 9e930b2aaa 【物料变更】提示语 
【标准部件】非标导出加字段：选型说明，备注
 2024-09-05 09:31:08 +08:00
10001392 c9a570f706 Merge remote-tracking branch 'origin/master-order-20240830' 2024-09-04 16:44:57 +08:00
10001392 8447cf9ad9 【生产订单管理】 2024-09-04 16:42:44 +08:00
大米 f888d1ef70 一般零部件单位不为KG时数量置空 2024-09-04 14:57:09 +08:00
jing's 86be029466 暂存 提交 子数据检查是否在主数据 2024-09-04 11:43:07 +08:00
大米 195fff751f pbom-发布，只变化T项时，直接更新T项 2024-09-04 11:08:52 +08:00
大米 6ec9c55415 pbom-升级使用新的版本规则 2024-09-04 09:23:25 +08:00
大米 1462232721 转pbom处理-2 2024-09-03 18:44:16 +08:00
10001392 976e61abfb 【物料申请】制作大类201001电控柜及器件包英文描述选填 2024-09-03 18:01:43 +08:00
大米 1e392b6a46 转pbom处理-2 2024-09-03 17:38:22 +08:00
10001392 1b4ce3963a Merge remote-tracking branch 'origin/feature/DM/nflg-bom-transition' 2024-09-03 11:33:40 +08:00
曹鹏飞 82af5dc6f5 Merge branch 'feature/DM/nflg-bom-transition' of http://192.168.0.40:3000/root/nflg_project into feature/DM/nflg-bom-transition 2024-09-03 10:56:40 +08:00
曹鹏飞 57e0e2a336 feat(pbom): 导入到SAP移除跳过用户根节点物料的限制 2024-09-03 10:56:17 +08:00
10002327 6f14256fb5 虚拟包按发货-直发-制作的顺序排序 2024-09-03 09:17:01 +08:00
大米 57aa6603ce 转pbom处理 2024-09-02 18:59:15 +08:00
10001392 6e9466004b 【生产订单】 2024-09-02 17:58:05 +08:00
10001392 542ceb23c1 物料主数据【物料申请】制作物料英文描述 2024-09-02 17:57:41 +08:00
大米 a0337e5a41 EBOM-编辑-更新物料行时更新物料单位 2024-09-02 14:34:15 +08:00
大米 79740360fa EBOM-编辑-更新物料行时更新物料单位 2024-09-02 14:28:46 +08:00
10001392 848087523c 【生产订单管理】 2024-09-02 14:10:11 +08:00
10001392 fa3dfc210e 【生产订单管理】 2024-09-02 11:19:49 +08:00
10001392 91be7b8de1 物料主数据 
1、【物料申请】制作物料英文描述
 2024-09-02 11:19:37 +08:00
10002327 2ab79e68bc 去掉修改排序号的值 2024-09-02 10:46:06 +08:00
10002327 ef5e9e23ae PBOM库存地点、ebom排序问题 2024-08-30 18:05:41 +08:00
10002327 5fdbceff47 PBOM库存地点、ebom排序问题 2024-08-30 18:02:35 +08:00
大米 4bc3d6c99b 版本号处理 2024-08-30 17:14:10 +08:00
大米 6f4e2a22ac 直发包，发货前装配包物料不合并 2024-08-30 16:54:37 +08:00
大米 48d3a83e89 仙桃不导入1010工厂 2024-08-30 11:00:48 +08:00
大米 3f6cde7e7a pbom-升级版本号获取 2024-08-30 09:36:09 +08:00
10001392 7fe4cbacde Merge remote-tracking branch 'origin/feature/DM/nflg-bom-transition-sit' into feature/DM/nflg-bom-transition 2024-08-29 08:38:52 +08:00
大米 897e779f24 EBOM草稿发布时-ebom升级处理 2024-08-29 08:36:15 +08:00
10001392 2ec207ff97 Merge remote-tracking branch 'origin/feature/DM/nflg-bom-transition-sit' into feature/DM/nflg-bom-transition 2024-08-29 07:59:18 +08:00
luoliming 72941481fa 1-eBOM草稿-转Pbom 2024-08-28 23:47:18 +08:00
10001392 4b873c151d Merge remote-tracking branch 'origin/feature/DM/nflg-bom-transition-sit' into feature/DM/nflg-bom-transition 2024-08-28 22:01:06 +08:00
10001392 df4b9ceaa2 Merge remote-tracking branch 'origin/master-pbom-lhj0827' into feature/DM/nflg-bom-transition 2024-08-28 22:00:33 +08:00
luoliming 6e79ebe3ff Merge remote-tracking branch 'origin/feature/DM/nflg-bom-transition-sit' into feature/DM/nflg-bom-transition-sit 2024-08-28 21:58:47 +08:00
luoliming 647b7c2674 1-eBOM-正式转Pbom 2024-08-28 21:58:11 +08:00
10002327 c6451c8189 PBOM子表字段【source_parent_material_no】赋值 2024-08-28 18:59:43 +08:00
10001392 4fb3dfa2b2 Merge remote-tracking branch 'origin/feature/DM/nflg-bom-transition-sit' into feature/DM/nflg-bom-transition 2024-08-28 16:21:51 +08:00
大米 a908b2d6f3 pbom发布报错物料处理 2024-08-28 16:19:23 +08:00
大米 c250e91514 EBOM-getChild方法优化 2024-08-28 14:46:09 +08:00
10001392 22fc635e7c Merge remote-tracking branch 'origin/feature/DM/nflg-bom-transition-sit' into feature/DM/nflg-bom-transition 2024-08-28 14:25:07 +08:00
大米 b8ff69b50c 转EBOM时- PBOM发布报错修复4 2024-08-28 14:24:58 +08:00
大米 ca7bbdc353 转EBOM时- PBOM发布报错修复3 2024-08-28 14:23:04 +08:00
10001392 bc87bd8a99 Merge remote-tracking branch 'origin/master-pbom-lhj0827' into feature/DM/nflg-bom-transition 2024-08-28 11:34:12 +08:00
10002327 e98b0f063a PBOM子表SourceParentMaterialNo赋值 2024-08-28 11:32:53 +08:00
10001392 fab3d4f66c Merge remote-tracking branch 'origin/feature/DM/nflg-bom-transition-sit' into feature/DM/nflg-bom-transition 2024-08-28 11:18:41 +08:00
大米 ef3287ba9c 转EBOM时- PBOM发布报错修复2 2024-08-28 11:17:50 +08:00
大米 ba1209700a 转EBOM时- PBOM发布报错修复2 2024-08-28 11:17:46 +08:00
10001392 78d87ae304 Merge remote-tracking branch 'origin/feature/DM/nflg-bom-transition-hlq' into feature/DM/nflg-bom-transition 2024-08-28 08:44:45 +08:00
大米 c4349f44a9 物料主数据 
1、【物料变更】申请部门是营销中心，11,21变更，由冻结改成其他状态，不允许改成激活
2、【物料申请】支持61大类物料申请
 2024-08-28 08:43:00 +08:00
曹鹏飞 05679a70fd feat(pbom): 取消从SAP导入进来的数据，不再导入到SAP去的限制 2024-08-27 21:51:36 +08:00
曹鹏飞 a6cb884797 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-27 19:00:31 +08:00
曹鹏飞 4e7fb24723 fix(dqbom): 优化导入时T项物料项目类别的设置逻辑 2024-08-27 19:00:08 +08:00
10001392 dcad5ecf4e Merge remote-tracking branch 'origin/feature/DM/nflg-bom-transition-sit' into feature/DM/nflg-bom-transition 2024-08-27 15:02:43 +08:00
大米 3a25f5d4bb 转EBOM时- PBOM发布报错修复 2024-08-27 15:01:42 +08:00
大米 38fcbdbf17 Merge remote-tracking branch 'origin/feature/DM/nflg-bom-transition' into feature/DM/nflg-bom-transition 2024-08-27 14:59:34 +08:00
大米 2990decaff 转EBOM时- PBOM发布报错修复 2024-08-27 14:59:20 +08:00
10001392 a31d2263e7 Merge remote-tracking branch 'origin/feature/DM/nflg-bom-transition-sit' into feature/DM/nflg-bom-transition 2024-08-27 14:28:17 +08:00
大米 2126d03ee0 转EBOM时-bug修复-PBOM发布报错 2024-08-27 14:26:23 +08:00
10001392 a06a883caa Merge remote-tracking branch 'origin/feature/DM/nflg-bom-transition-sit' into feature/DM/nflg-bom-transition 2024-08-27 14:03:29 +08:00
大米 3b7db353b0 转EBOM时-bug修复-PBOM发布报错 2024-08-27 14:00:32 +08:00
10001392 f6b8242d57 Merge remote-tracking branch 'origin/feature/DM/nflg-bom-transition-sit' into feature/DM/nflg-bom-transition 2024-08-27 13:42:28 +08:00
大米 460de25178 转EBOM时-parent表数量为1 2024-08-27 13:38:36 +08:00
10001392 80de53535a Merge remote-tracking branch 'origin/feature/DM/nflg-bom-transition-sit' into feature/DM/nflg-bom-transition 2024-08-27 11:05:25 +08:00
大米 a36e57f1dc PBOM-全新逻辑： 1、直发包为升级问题 
2、31生成了A00.1版本
 2024-08-27 11:02:09 +08:00
大米 9d18245de5 PBOM-全新逻辑： 1、直发包为升级问题 
2、31生成了A00.1版本
 2024-08-27 11:00:49 +08:00
10001392 e1ddef2101 Merge remote-tracking branch 'origin/feature/DM/nflg-bom-transition-sit' into feature/DM/nflg-bom-transition 2024-08-27 08:55:06 +08:00
10002327 58ac1426be pbom发布和导入SAP时项目类别为F项，则给POTX1 赋值来源EBOM的父级物料编码 2024-08-27 08:41:56 +08:00
大米 be3251253d PBOM-工作表新增行加工厂 2024-08-26 17:37:56 +08:00
大米 7b91469737 EBOM正式转PBOM全新逻辑-优化 2024-08-26 15:35:44 +08:00
大米 4882f91925 Merge branch 'feature/DM/nflg-bom-transition_转pbom新逻辑' into feature/DM/nflg-bom-transition-sit 2024-08-26 11:56:24 +08:00
大米 2067ddf802 EBOM正式转PBOM全新逻辑 2024-08-26 11:50:10 +08:00
曹鹏飞 a77936dc42 fix(dqbom): 优化查询条件 2024-08-26 10:12:14 +08:00
大米 14fa056416 解决仙桃会到1010 的问题（油漆包没parnent数据问题）-测试完再发生产 2024-08-23 18:18:00 +08:00
大米 ed23c74ccc pbom-子级更新人员和时间好排除问题 2024-08-23 15:48:11 +08:00
曹鹏飞 8c2c0b9f69 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-23 11:14:58 +08:00
曹鹏飞 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
曹鹏飞 16c877882c optimize: 反查返回参数添加bomVersion，用于区分是否为一个bom 2024-08-03 10:58:41 +08:00
大米 7b4e600680 Merge remote-tracking branch 'origin/feature/DM/nflg-bom-transition' into feature/DM/nflg-bom-transition 2024-08-03 10:35:18 +08:00
大米 f5aab939e0 转PBOM优化-3(生产错问题) 2024-08-03 10:35:08 +08:00
10002327 d82f3549ba Merge remote-tracking branch 'origin/feature/DM/nflg-bom-transition' into feature/DM/nflg-bom-transition 2024-08-02 22:50:34 +08:00
10001392 422a388d0e 变更通知单 2024-08-02 17:50:16 +08:00
10001392 fd94ef194b 变更通知单 2024-08-02 09:22:13 +08:00
10002327 9468168e85 Merge remote-tracking branch 'origin/feature/DM/nflg-bom-transition' into feature/DM/nflg-bom-transition 2024-08-02 08:34:29 +08:00
大米 ae38289524 转PBOM优化-3(制作转PBOM) 2024-08-02 08:17:45 +08:00
大米 768fd2c293 转PBOM优化-3(制作转PBOM) 2024-08-01 19:15:00 +08:00
10002327 ad59a0c28c Merge remote-tracking branch 'origin/feature/DM/nflg-bom-transition' into feature/DM/nflg-bom-transition 2024-08-01 17:48:53 +08:00
10002327 38ee9ac669 AD用户状态同步ehr员工状态 2024-08-01 17:35:45 +08:00
10002327 abc525c3da Merge remote-tracking branch 'origin/feature/DM/nflg-bom-transition' into feature/DM/nflg-bom-transition 2024-08-01 08:18:54 +08:00
10002327 36a2cec93e 角色管理》配置用户增加部门选择器 2024-07-31 17:39:45 +08:00
10002327 7253022f9d 首页》个人工作台 2024-07-31 16:31:52 +08:00
10002327 5853279a53 Merge remote-tracking branch 'origin/feature/DM/nflg-bom-transition' into feature/DM/nflg-bom-transition 2024-07-30 18:03:06 +08:00
jing's f7818bd6fa 增加版本数量 2024-07-30 18:02:05 +08:00
10002327 9d7d0367ad Merge remote-tracking branch 'origin/feature/DM/nflg-bom-transition' into feature/DM/nflg-bom-transition 2024-07-30 16:58:21 +08:00
10001392 bdce2a4421 1、EBOM 生成PBOM 生成变更通知单 
2、PBOM发布 生成变更通知单
 2024-07-30 16:11:50 +08:00
10002327 349ae5a1c3 首页》工作台 2024-07-26 18:05:39 +08:00
10001392 769c083cdd 【一期物料主数据】整机大类移动破碎申请 2024-07-26 10:03:11 +08:00
10001392 092d010cf0 【一期物料主数据】制作物料申请 2024-07-26 10:02:46 +08:00
大米 77e2cea585 转PBOM优化-2 2024-07-24 17:13:07 +08:00
大米 c9f4bd79d0 转PBOM优化 2024-07-24 16:48:17 +08:00
10001392 5e1ef72fa5 生产订单管理 2024-07-24 10:47:11 +08:00
10001392 c59157c3cb 【一期物料主数据】对外接口 查询物料图号 2024-07-23 16:14:01 +08:00
曹鹏飞 f52664df9f fix(pbom): 修复导入到SAP的顺序与页面显示顺序不一致的问题 2024-07-23 15:34:25 +08:00
曹鹏飞 7b16839f29 fix(ebom): 调整删除虚拟包校验逻辑的位置 2024-07-23 15:33:38 +08:00
jing's e97946f8fc 多余符号 2024-07-23 12:32:45 +08:00
jing's 63d25b1445 ebom pbom 无子级数据 2024-07-23 11:40:58 +08:00
jing's 4f02752c5b 单层bomversion 2024-07-23 09:49:05 +08:00
大米 bbc58e4aa6 转PBOM-油漆包问题(1010无需仙桃油漆包) 2024-07-23 09:09:52 +08:00
大米 a8e1ee5737 Merge remote-tracking branch 'origin/feature/DM/nflg-bom-transition' into feature/DM/nflg-bom-transition 2024-07-23 09:01:30 +08:00
大米 98a8405682 转PBOM-油漆包问题(1010无需仙桃油漆包) 2024-07-23 09:01:14 +08:00
jing's 33e44fb6d1 查询物料 || ->&& 2024-07-22 15:47:53 +08:00
jing's 76685daaee Merge branch 'feature/DM/nflg-bom-transition' of http://192.168.0.40:3000/root/nflg_project into feature/DM/nflg-bom-transition 2024-07-22 15:33:40 +08:00
jing's d3601f5f79 编辑查回来的物料信息未变 2024-07-22 15:33:36 +08:00
大米 f9778ea8c1 EBOM-最新版反查 2024-07-22 15:32:59 +08:00
大米 fd54b8aead Merge remote-tracking branch 'origin/feature/DM/nflg-bom-transition' into feature/DM/nflg-bom-transition 2024-07-22 12:32:13 +08:00
大米 a9cf538ba9 EBOM-最新版反查 2024-07-22 12:32:03 +08:00
曹鹏飞 55ee9fc8a7 fix(ebom): 修复ebom工作表根据通知单号查询无效的问题 2024-07-22 10:57:07 +08:00
曹鹏飞 32e9356862 Merge branch 'feature/DM/nflg-bom-transition' of http://192.168.0.40:3000/root/nflg_project into feature/DM/nflg-bom-transition 2024-07-22 10:30:49 +08:00
曹鹏飞 e54dde9610 Merge remote-tracking branch '惠信/feature/DM/nflg-bom-transition' into feature/DM/nflg-bom-transition 2024-07-22 10:18:55 +08:00
luoliming 6588752cde ebom-来源问题 2024-07-21 22:21:25 +08:00
jing's 24c9169033 取消数量空默认值 2024-07-21 12:57:01 +08:00
大米 56c9ed0a66 EBOM-正式表-通知单号查询 2024-07-19 08:24:50 +08:00
大米 e317bdec3d Merge remote-tracking branch 'origin/feature/DM/nflg-bom-transition' into feature/DM/nflg-bom-transition 2024-07-18 18:20:58 +08:00
大米 f61c426a13 bug修复 2024-07-18 18:20:49 +08:00
曹鹏飞 780dbb8216 feat: 导入SAP结果的错误信息统一格式 2024-07-18 14:58:24 +08:00
曹鹏飞 3fd368c135 Merge branch 'feature/DM/nflg-bom-transition' of http://192.168.0.40:3000/root/nflg_project into feature/DM/nflg-bom-transition 2024-07-18 10:45:20 +08:00
曹鹏飞 901a789da5 feat: 导入SAP结果，“修改失败计量单位”错误提示特殊处理 2024-07-18 10:31:18 +08:00
jing's 3b87848f60 正查汇总调整 2024-07-17 20:50:16 +08:00
BF-202309241046\Administrator bb6e4daec0 bom查询 根节点数量空引起异常 2024-07-15 17:09:53 +08:00
10001392 8122ebdd8a EBOM编辑，21物料生成发货包，发货前装配包命名规则和分类代码修改 2024-07-11 09:51:24 +08:00
10001392 8548f82c67 【一期物料主数据】1、制作物料批量导入，英文描述赋值 
2、定时任务，物料SAP近两年使用量（新）优化
 2024-07-11 09:15:58 +08:00
zhangke c420b2812c Merge branch 'feature/DM/nflg-bom-transition' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom-transition 2024-07-10 14:56:07 +08:00
jing's 3a2e6f883f * +电控发货 
*  -电控制作
 2024-07-09 09:59:13 +08:00
大米 b33bd0f766 1、阿里链接池异常 
2、从CAD获取到原始bom改为批量插入
 2024-07-08 16:32:52 +08:00
jing's 3f48c37801 叶子节点无bom带上设计人员信息 2024-07-08 09:20:59 +08:00
jing's 8a9afaf8da 取消查项目类型 2024-07-07 22:43:40 +08:00
jing's fe3536f13d 顶层同步主数据 2024-07-07 10:35:01 +08:00
jing's 24edba0da3 比较结果按层级升序 2024-07-06 22:56:28 +08:00
jing's 13fd8df3f4 比对根节点不比较 2024-07-06 22:30:23 +08:00
jing's bd41892bbc +正式版查询条件 2024-07-06 17:56:01 +08:00
jing's d502130f01 异常判断 2024-07-05 22:41:03 +08:00
jing's 7ec1387c85 注释无用 2024-07-05 21:18:59 +08:00
jing's 5ba378b684 ebom pbom 报表单层子级 2024-07-05 21:03:28 +08:00
10001392 3085b4fe1f SVN仓库的物料material项目代码，手动合并过来 2024-07-05 16:55:17 +08:00
BF-202309241046\Administrator 02ed618269 Pbom调整 2024-07-05 16:24:34 +08:00
10001392 5e136441af 测试提交 2024-07-05 15:08:18 +08:00
BF-202309241046\Administrator 22783b8506 判断 2024-07-05 11:43:59 +08:00
BF-202309241046\Administrator 52a26046d6 查询正式表查询逻辑(非 bom_version_row_id)调整 2024-07-05 11:25:44 +08:00
曹鹏飞 1cec213f66 feat: SAP排序字符串名称SORT改为ZSORT 2024-07-05 10:50:05 +08:00
曹鹏飞 8dd3101538 fix: bom查看优化 2024-07-05 10:07:50 +08:00
曹鹏飞 4fb0a338de feat: 生成虚拟包前进行异常检查，有异常时不能生成虚拟包 2024-07-05 10:07:08 +08:00
曹鹏飞 6423a67ebe optimize: 优化导入SAP 2024-07-05 10:05:40 +08:00
BF-202309241046\Administrator bbd13241ed Merge branch 'feature/DM/nflg-bom-transition' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom-transition 2024-07-05 09:10:27 +08:00
BF-202309241046\Administrator 0fc3b3562e 表属性获取工具 2024-07-05 09:10:12 +08:00
曹鹏飞 45df3ddcef Merge remote-tracking branch 'origin/feature/DM/nflg-bom-transition' into feature/DM/nflg-bom-transition 2024-07-05 08:27:54 +08:00
BF-202309241046\Administrator 51ef33cde6 ebom汇总筛选叶子 2024-07-04 22:45:53 +08:00
BF-202309241046\Administrator d1760bc1d7 Ebom报表调整 2024-07-04 22:26:34 +08:00
曹鹏飞 c9cdc0e957 other: 调整日志配置 2024-07-04 17:36:37 +08:00
BF-202309241046\Administrator b7a23a1caa Merge branch 'feature/DM/nflg-bom-transition' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom-transition 2024-07-04 13:07:07 +08:00
BF-202309241046\Administrator 1de556b5ad 增加查询 2024-07-04 13:07:01 +08:00
曹鹏飞 e54ea2c275 optimize: 调整日志输出 2024-07-02 18:02:24 +08:00
曹鹏飞 317c64019b optimize: 调整日志输出 2024-07-02 17:31:31 +08:00
大米 6c9098cf1a Merge remote-tracking branch 'origin/feature/DM/nflg-bom-transition' into feature/DM/nflg-bom-transition 2024-07-02 15:52:00 +08:00
大米 2c193a55bc 1、一般零部件-下挂问题修复 2024-07-02 15:51:55 +08:00
曹鹏飞 bb9c98c209 fix: 调整发起变更后的数据设置 2024-07-02 15:01:37 +08:00
大米 e6550b9cf0 Merge remote-tracking branch 'origin/feature/DM/nflg-bom-transition' into feature/DM/nflg-bom-transition 2024-07-02 14:45:31 +08:00
大米 71c4568661 1、一般零部件-下挂问题修复 2024-07-02 14:45:26 +08:00
曹鹏飞 f2ca749534 optimize(ebom): 优化逻辑 2024-07-02 11:19:35 +08:00
曹鹏飞 ab5a23afbd optimize(ebom): 异常检查优化 2024-07-02 10:47:55 +08:00
曹鹏飞 453d504219 fix: 添加直发包 2024-07-02 08:05:52 +08:00
luoliming bfdeca90f8 ebom-来源问题 2024-07-01 23:06:05 +08:00
luoliming 1e775815bd ebom-来源问题 2024-07-01 23:00:23 +08:00
曹鹏飞 1fbe82d335 optimize: 一些调整 2024-07-01 17:34:26 +08:00
曹鹏飞 1adb6dc3c6 optimize(ebom): 优化提示语 2024-07-01 09:47:24 +08:00
luoliming 87c5567376 变更影响升级-更新虚拟包组成 2024-06-30 22:17:39 +08:00
BF-202309241046\Administrator 77f20e616a 比较多层 2024-06-30 14:22:58 +08:00
luoliming 6bc26c638d ebom,pbom getBomTree 去重 2024-06-29 23:01:25 +08:00
曹鹏飞 7357e70ce7 optimize(ebom): 从excel导入时，将本人以前导入的草稿数据中的顶级设置为非顶级 2024-06-29 22:55:38 +08:00
BF-202309241046\Administrator 6eee207e29 fix 获取最大版本错误 2024-06-29 21:07:27 +08:00
BF-202309241046\Administrator 5d713f84dd 比较数量调整 2024-06-29 20:49:49 +08:00
曹鹏飞 79630893c6 optimize(ebom): 一个小调整 2024-06-29 18:43:35 +08:00
曹鹏飞 b923c70b20 fix(pbom): 修改判断条件 2024-06-29 18:14:36 +08:00
大米 6979d75388 1、PBOM发布判断状态 2024-06-29 18:11:05 +08:00
曹鹏飞 eeb0da8158 Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition 2024-06-29 17:41:14 +08:00
大米 18c0b7f8cb 1、PBOM发布判断状态 2024-06-29 17:38:07 +08:00
曹鹏飞 1e6bc020f2 optimize(pbom): 导入SAP不再判断是否根节点 2024-06-29 17:35:19 +08:00
曹鹏飞 079df935de 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-06-29 17:01:42 +08:00
大米 f600d1fe2e 1、修复t_bom_new_ebom_child_formal的bom_version_row_id字段没有赋值 2024-06-29 16:52:36 +08:00
曹鹏飞 a6284a7626 Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition 2024-06-29 16:45:19 +08:00
大米 f2f62ac4dd 1、转PBOM-ROWid问题 2024-06-29 16:42:12 +08:00
曹鹏飞 792eec20bb Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition 2024-06-29 14:53:45 +08:00
大米 45f0c9a3ae 1、转PBOM-ROWid问题 2024-06-29 14:51:46 +08:00
曹鹏飞 c534eaf33f fix(pbom): 修复编辑页面点击提交按钮时，如果当前物料无下级数据，则发生异常的问题 2024-06-29 14:33:45 +08:00
曹鹏飞 999e071e4b fix(pbom): 修复当工艺包物料在主物料已存在时，创建工艺包没有如预期创建节点的问题 2024-06-29 14:32:18 +08:00
曹鹏飞 4217fa8b83 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-29 14:28:02 +08:00
大米 4d8e76e25d 1、转PBOM-ROWid问题 2024-06-29 12:28:46 +08:00
大米 51febf0ef7 1、变更影响及同步formal表优化 2024-06-29 12:11:23 +08:00
曹鹏飞 f553ceff4d fix: 优化调整 2024-06-29 11:04:21 +08:00
曹鹏飞 b4606483d6 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-06-29 10:58:19 +08:00
大米 cce1aef1d7 1、变更影响及同步formal表优化 2024-06-29 09:57:48 +08:00
大米 f78c40a795 1、变更影响及同步formal表优化 2024-06-29 09:54:57 +08:00
曹鹏飞 31b9415de7 Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition 2024-06-28 14:52:10 +08:00
大米 b5a694ae5f 1、替换草稿态的虚拟包 2024-06-28 14:49:25 +08:00
曹鹏飞 ba0ab67053 Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition 2024-06-28 14:05:53 +08:00
大米 0a7a745c28 1、替换草稿态的虚拟包 2024-06-28 11:21:14 +08:00
大米 78b4b9ac38 1、替换草稿态的虚拟包 2024-06-28 11:20:43 +08:00
曹鹏飞 d25fbcd007 Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition 2024-06-28 09:33:01 +08:00
大米 6176f3b903 1、变更影响-升级 2024-06-28 09:30:42 +08:00
曹鹏飞 2eb5392a30 feat: ebom和pbom正式表查询逻辑调整 2024-06-28 09:01:11 +08:00
曹鹏飞 23b55e23dd feat(ebom): 导出到excel时添加选中的节点数据 2024-06-28 08:43:58 +08:00
曹鹏飞 a6869a8a9a optimize(ebom): 导入SAP优化 2024-06-27 22:57:34 +08:00
曹鹏飞 88aa53956b Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition 2024-06-27 20:17:21 +08:00
大米 1d85e0468a Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2024-06-27 18:11:48 +08:00
大米 a2cc8ee7ca 1、变更影响 2024-06-27 18:11:44 +08:00
曹鹏飞 c1eb489f7d Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition 2024-06-27 17:42:50 +08:00
jing's c1041084ff fix有bom 未查询到数据异常 2024-06-27 17:37:14 +08:00
曹鹏飞 963062bee5 optimize: bom比较 
添加非null判断
 2024-06-27 17:25:34 +08:00