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
曹鹏飞 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
曹鹏飞 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