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

1873 Commits

Author SHA1 Message Date
曹鹏飞 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 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 7253022f9d 首页》个人工作台 2024-07-31 16:31:52 +08:00
jing's f7818bd6fa 增加版本数量 2024-07-30 18:02:05 +08:00
10001392 bdce2a4421 1、EBOM 生成PBOM 生成变更通知单 
2、PBOM发布 生成变更通知单
 2024-07-30 16:11:50 +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
曹鹏飞 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
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
BF-202309241046\Administrator 02ed618269 Pbom调整 2024-07-05 16:24:34 +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
曹鹏飞 711c104a91 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/domain/EBom/EBomForwardReport.java
#	nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/PBomForwardReport.java
 2024-06-27 17:05:15 +08:00
曹鹏飞 3942fb2a70 optimize: bom查看 
添加非null判断
 2024-06-27 16:52:44 +08:00
jing's 910f7d637a 空数据不抛异常 2024-06-27 16:40:25 +08:00
曹鹏飞 9a92cb535d optimize(pbom查看): 查不到物料信息时不在提示错误信息 2024-06-27 15:53:51 +08:00
曹鹏飞 0d587b3ea9 fix(pbom): 添加筛选条件-工厂 2024-06-27 15:52:55 +08:00
曹鹏飞 65acfcf94a fix(pbom): 发起变更时，将原物料设置为last_version_is=0 2024-06-27 15:50:40 +08:00
曹鹏飞 6ebeb26432 feat: 根据直发包编号导入上级物料到SAP 2024-06-27 15:48:20 +08:00
曹鹏飞 452e50a550 optimize: 优化批量查询物料信息接口 2024-06-27 15:46:42 +08:00
曹鹏飞 33d36c2db1 optimize: 按时间倒序 2024-06-27 15:41:53 +08:00
曹鹏飞 1943b3107f Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition 2024-06-27 14:06:55 +08:00
大米 80bf577fb6 1、解决提层项问题 2024-06-27 12:00:18 +08:00
大米 102ee0bda6 1、解决提层项问题 2024-06-27 11:54:48 +08:00
大米 250702f310 1、解决提层项问题 2024-06-27 11:43:25 +08:00
曹鹏飞 fb797c106b Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition 2024-06-27 07:58:28 +08:00
大米 aba0507bf9 1、解决变更影响重复问题 2024-06-26 23:18:14 +08:00
曹鹏飞 e991ea46b9 Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition 2024-06-26 18:19:01 +08:00
大米 327f6b1a3b 1、解决变更影响重复问题 2024-06-26 18:06:27 +08:00
曹鹏飞 7e3cf23eb1 optimize: 大量修改 2024-06-26 18:02:37 +08:00
曹鹏飞 424095c5c5 Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition 2024-06-26 17:58:28 +08:00
大米 1f0f944804 1、pbom-提层问题 2024-06-26 17:50:51 +08:00
曹鹏飞 3721be0f80 Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition 2024-06-26 15:39:39 +08:00
大米 6a2c3d1fa0 1、pbom升级 2024-06-26 15:38:22 +08:00
大米 ccee79d329 1、pbom升级 2024-06-26 15:02:03 +08:00
曹鹏飞 8caad8d307 Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition 2024-06-26 11:51:33 +08:00
大米 12bedbf9a2 1、转PBOM问题修复222 2024-06-26 11:47:31 +08:00
曹鹏飞 80d321c4b2 optimize(ebom反查): 修复一些问题；数量限制为1000条 2024-06-26 10:06:17 +08:00
曹鹏飞 e64860e506 Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition 2024-06-26 08:00:56 +08:00
luoliming f7bbd9ac7f 一般零部件-bomExists 问题 2024-06-25 23:41:02 +08:00
大米 bf8a28cd55 1、转PBOM问题修复 2024-06-25 20:47:14 +08:00
曹鹏飞 3bd8bd538a fix: 大量改动 2024-06-25 19:06:43 +08:00
曹鹏飞 07fc435bd2 Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition 2024-06-25 16:09:59 +08:00
大米 50ef317ab4 1、EBOM发起变更-技术通知单异常问题 2024-06-25 14:05:54 +08:00
曹鹏飞 2d13908107 Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition 2024-06-25 11:39:38 +08:00
大米 4f928b6839 1、F项问题 
2、图号问题
 2024-06-25 11:04:47 +08:00
曹鹏飞 25fb67f91a Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition 2024-06-24 22:06:23 +08:00
luoliming 45381290e9 一般零部件-bomExists 问题 2024-06-24 22:04:22 +08:00
曹鹏飞 a414797234 Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition 2024-06-24 19:14:41 +08:00
大米 64b81b88b3 1、3个问题处理 2024-06-24 19:07:37 +08:00
曹鹏飞 3ff75130f6 optimize(ebom): 从cad导入，如果编号为“无”，则修改为“” 2024-06-24 18:41:16 +08:00
曹鹏飞 e907fb4f02 Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition 2024-06-24 18:02:31 +08:00
大米 c564a5fb92 Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2024-06-24 17:53:39 +08:00
大米 776ba1d494 1、existBom标记问题-2 2024-06-24 17:53:30 +08:00
曹鹏飞 3b3e98bfd9 optimize(pbom): 一点小调整 2024-06-24 14:53:00 +08:00
曹鹏飞 1674c43ae2 Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition 2024-06-24 14:35:05 +08:00
jing's 795ff6f6ab queryMaterial 单位kg，数量=单重=总重 2024-06-24 14:16:23 +08:00
jing's 51abcc54d7 查询变更物料编码 单位kg 单重=数量=总重 2024-06-24 14:13:04 +08:00
曹鹏飞 bfc126fe80 Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition 2024-06-24 13:32:51 +08:00
大米 fb104e9d53 1、existBom标记问题 2024-06-24 12:18:38 +08:00
曹鹏飞 a22d26e739 Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition 2024-06-24 11:30:28 +08:00
曹鹏飞 86d0f26791 fix(ebom): 修复显示缺bom但是无法添加下级的问题 2024-06-24 11:25:18 +08:00
大米 96adcae0a0 1、 转PBOM 问题 2024-06-24 08:47:18 +08:00
jing's b5dca83082 Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2024-06-23 22:51:30 +08:00
jing's 3151af0fe0 fix查看多层子级无数据异常 2024-06-23 22:51:24 +08:00
曹鹏飞 560adb6b92 Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition 2024-06-23 21:26:21 +08:00
luoliming 5c574b98c5 EBOM正式转PBOM问题 2024-06-23 21:11:58 +08:00
曹鹏飞 a58a3a44a8 fix(ebom): 虚拟包编号逻辑优化 2024-06-23 19:46:11 +08:00
曹鹏飞 e2bf276d25 feat(ebom): 修复last_version_is的设置问题 2024-06-23 19:45:18 +08:00
曹鹏飞 c6e1c64104 optimize(ebom): 导入SAP优化 2024-06-23 19:44:36 +08:00
曹鹏飞 c702a95282 feat(ebom): 修复last_version_is的设置问题 2024-06-23 19:44:07 +08:00
曹鹏飞 0e80f4e4f7 Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition 2024-06-23 19:16:24 +08:00
luoliming 8a69a37635 EBOM正式转PBOM问题 2024-06-23 19:01:21 +08:00
大米 5a16d05a0d 1、 单层反查 2024-06-23 18:50:32 +08:00
luoliming 320dd02854 PBOM 发布问题 2024-06-23 16:54:15 +08:00
曹鹏飞 390a790640 Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition 2024-06-23 16:48:34 +08:00
luoliming 1bf8983127 PBOM 发布问题 2024-06-23 16:46:45 +08:00
曹鹏飞 2dd82046fe Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition 2024-06-23 16:06:23 +08:00
luoliming 437e0c10e2 PBOM 发布问题 2024-06-23 16:05:47 +08:00
曹鹏飞 baaffc9571 Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition 2024-06-23 15:55:00 +08:00
luoliming cff4a2dbd2 PBOM 发布问题 2024-06-23 15:54:34 +08:00
luoliming 3ada559a6e 转31码问题 2024-06-23 15:53:28 +08:00
曹鹏飞 9968e8eb6a Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition 2024-06-23 15:30:19 +08:00
luoliming 7ab3f931cd Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2024-06-23 15:29:42 +08:00
luoliming 9a73a53a08 转31码问题 2024-06-23 15:29:24 +08:00
曹鹏飞 6ae29687f5 Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition 2024-06-23 09:50:44 +08:00
大米 d64fecddbe 1、 单层反查 2024-06-22 17:55:54 +08:00
大米 bf5797669d Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2024-06-21 18:59:43 +08:00
大米 f266389ea0 1、修复转Pbom错误 2024-06-21 18:59:39 +08:00
曹鹏飞 dbd6e650c7 fix: 启用物料信息发起OA请求功能，后续OA请求的状态同步由主物料服务负责 2024-06-21 15:59:19 +08:00
曹鹏飞 abd0a2d6c2 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/MaterialService.java
 2024-06-21 15:56:00 +08:00
曹鹏飞 3905ac75bd feat: 中类、小类、细分类（若有），分类代码和名称都传给OA 2024-06-21 15:43:18 +08:00
曹鹏飞 e1b6caa2d8 Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition 2024-06-21 15:26:24 +08:00
jing's c04fa487d8 Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2024-06-21 15:17:30 +08:00
jing's 818564eaa3 设备导出异常 2024-06-21 15:17:24 +08:00
曹鹏飞 443153bacd fix: 启用物料信息发起OA请求功能，后续OA请求的状态同步由主物料服务负责 2024-06-21 14:17:11 +08:00
曹鹏飞 354c566383 Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition 2024-06-21 14:10:10 +08:00
曹鹏飞 bc596f3e1a feat: 中类、小类、细分类（若有），分类代码和名称都传给OA 2024-06-21 14:09:15 +08:00
曹鹏飞 d597bed3b6 optimize(ebom): 从cad和excel导入时，物料编号和图号去除前后空格，以免从主物料查询时查不到数据 2024-06-21 09:40:36 +08:00
曹鹏飞 8dd5c58d8b optimize(ebom): 去掉重复的deptRowId 2024-06-21 07:58:17 +08:00
曹鹏飞 63bc0d775a Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition 2024-06-21 07:56:00 +08:00
大米 8c54292602 Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2024-06-20 18:31:30 +08:00
大米 7bb369b112 1、变更影响 2024-06-20 18:31:16 +08:00
jing's 4f86a44420 添加模型dept_row_id 2024-06-20 15:43:48 +08:00
曹鹏飞 44dd7ae71f Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition 2024-06-20 15:36:04 +08:00
曹鹏飞 b55aec2016 fix(ebom): 添加条件限制 2024-06-20 15:35:19 +08:00
曹鹏飞 b77c327c6f fix(ebom): 修复编辑页面保存数据时部门编号缺失导致报错的问题 2024-06-20 15:35:02 +08:00
曹鹏飞 3762a37841 optimize(ebom): 优化性能 2024-06-20 15:33:30 +08:00
曹鹏飞 5a78ef449a optimize(ebom): 优化从excel导入 2024-06-20 15:31:37 +08:00
jing's 0fb12afba0 同步主 2024-06-20 14:14:34 +08:00
jing's 0494e98972 Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2024-06-20 13:46:05 +08:00
jing's 991c4d287d ebom pbom 版本显示调整 2024-06-20 13:45:59 +08:00
曹鹏飞 d05db2d869 feat(pbom): 导入SAP增加SORT（排序字符串） 2024-06-19 17:39:03 +08:00
曹鹏飞 f030e56db5 fix(pbom): 修复pbom正式表搜索时间范围不生效的问题 2024-06-19 16:31:32 +08:00
曹鹏飞 2e3e1221a5 Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition 2024-06-19 16:30:50 +08:00
大米 2e0fbe491d Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2024-06-19 16:15:56 +08:00
大米 47d2f01e50 1、昨天问题修复 2024-06-19 16:15:47 +08:00
曹鹏飞 dde0fe373f Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition 2024-06-19 15:13:19 +08:00
曹鹏飞 e06704fe6c fix(ebom): 添加部门id 2024-06-19 13:43:18 +08:00
曹鹏飞 4efbf98253 optimize: 优化数据验证 2024-06-19 13:42:56 +08:00
曹鹏飞 d5f948916b optimize: 优化http请求和响应输出 2024-06-19 13:35:58 +08:00
曹鹏飞 1d50b4686d fix(ebom): 增加为空判断 2024-06-19 08:22:12 +08:00
曹鹏飞 9ae5eaaed6 Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition 2024-06-18 16:19:59 +08:00
大米 313ffc9532 Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 
# Conflicts:
#	nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml
 2024-06-18 16:16:34 +08:00
大米 13d88007ec 1、转pbom报错问题 2024-06-18 16:14:42 +08:00
曹鹏飞 42d4c1c47d Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition 2024-06-18 15:35:31 +08:00
曹鹏飞 0dc234ff71 feat(ebom): 修复异常检查，如果不是检查根节点时，会出现项目类型为空的异常 2024-06-18 15:35:06 +08:00
曹鹏飞 4a2e64a657 fix(ebom): 添加dept_row_id 2024-06-18 15:33:28 +08:00
jing's ea95483620 移动 ebom 同步主数据 2024-06-18 15:10:19 +08:00
jing's e70fb3135a Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2024-06-18 13:15:25 +08:00
jing's ddb1db41ea 机台号[A-Za-z0-9]{1,5} 2024-06-18 13:15:05 +08:00
jing's 92c254a515 同步主物料 2024-06-18 13:14:28 +08:00
曹鹏飞 2997383147 Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition 2024-06-18 11:11:05 +08:00
曹鹏飞 34bfde31c8 fix(ebom): 添加dept_row_id 2024-06-18 11:10:20 +08:00
曹鹏飞 76a4a90ea7 fix(ebom): 恢复被错误移除的代码 2024-06-18 11:07:22 +08:00
曹鹏飞 c3a7c09707 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-18 11:05:56 +08:00
大米 5d74b9e8d0 Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 2024-06-18 10:37:33 +08:00
大米 7c4da752c0 1、昨天问题修复 2024-06-18 10:37:28 +08:00
曹鹏飞 44c714816a 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/domain/EBom/EBomEdit.java
 2024-06-18 09:59:40 +08:00
曹鹏飞 17e3523b83 optimize: 添加http日志记录 
将请求内容和响应内容记录到日志文件，可根据配置开启或关闭该功能
 2024-06-18 09:54:30 +08:00
曹鹏飞 39a8f28b20 fix(ebom): 工作表编辑页面暂存时，没有下级也需要可以保存 2024-06-18 09:53:13 +08:00
曹鹏飞 8b9bbb1ce8 Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition 2024-06-17 17:29:58 +08:00
曹鹏飞 925b883916 optimize(ebom): 异常检查移除废弃的代码 2024-06-17 16:54:25 +08:00
曹鹏飞 7db789d7ac Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition 2024-06-17 15:55:53 +08:00
曹鹏飞 1d59e425e9 fix(ebom): 如果没有历史版本则将本次转正式的数据复制到formal表 2024-06-17 15:05:27 +08:00
曹鹏飞 65d71b8e69 optimize(ebom): 导入到SAP时F项不需要提层，只需要把空的直发包丢弃 2024-06-17 11:36:04 +08:00
曹鹏飞 b9f37aea55 optimize: 添加物料时，去掉同步到OA，由主物料服务来同步 2024-06-17 10:43:02 +08:00
曹鹏飞 1ec4e16bd7 fix(ebom): 添加dept_row_id 2024-06-17 10:41:50 +08:00
曹鹏飞 e1c03a2b55 Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition 2024-06-16 18:33:52 +08:00
jing's 9a44353c8d Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom 2024-06-16 17:24:50 +08:00
jing's 84df8d7394 ebom正式表使用ebom表字段 2024-06-16 17:24:44 +08:00
曹鹏飞 aaa3545f3a Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition 2024-06-16 16:14:58 +08:00
大米 5b3509dccd 1、ebom 转 pbom 2024-06-16 12:46:32 +08:00
曹鹏飞 d91db60c95 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/api/user/EbomApi.java
#	nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewEbomChildMapper.java
#	nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPbomBase.java
#	nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomChildMapper.xml
 2024-06-15 19:51:02 +08:00
大米 1a459a6057 1、ebom,pbom 正式表保存所有正式版数据 2024-06-15 17:44:23 +08:00