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

1596 Commits

Author SHA1 Message Date
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