 曹鹏飞
|
c96e25c487
|
Merge branch 'technology/rakor-w3' into technology-init-lhj1119
|
2025-01-06 19:41:48 +08:00 |
|
曹鹏飞
|
1278f3f13e
|
feat(成本分析): 修改计算材料成本时的物料价格获取字段
|
2025-01-06 19:41:38 +08:00 |
|
曹鹏飞
|
c2437dac70
|
Merge branch 'technology/rakor-w3' into technology-init-lhj1119
|
2025-01-06 18:31:10 +08:00 |
|
曹鹏飞
|
66f0f84eaf
|
fix(成本分析): 修复了几个问题
|
2025-01-06 18:30:52 +08:00 |
|
曹鹏飞
|
4a495d8fa9
|
Merge branch 'technology/rakor-w3' into technology-init-lhj1119
|
2025-01-06 12:42:11 +08:00 |
|
曹鹏飞
|
7f4f2b4ea5
|
fix(成本分析): 修复钢材价格计算损耗获取错误的问题
|
2025-01-06 12:41:57 +08:00 |
|
曹鹏飞
|
cf293ab289
|
Merge branch 'technology/rakor-w3' into technology-init-lhj1119
|
2025-01-06 11:30:48 +08:00 |
|
曹鹏飞
|
cf4ec31dbd
|
feat(成本分析): 成本维护优化
|
2025-01-06 11:29:43 +08:00 |
|
曹鹏飞
|
7981bf02eb
|
Merge branch 'technology/rakor-w3' into technology-init-lhj1119
# Conflicts:
# nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/mapper/master/ProcessRouteTaskProcessesMapper.java
# nflg_project_dev/nflg-technology/src/main/resources/mapper/master/ProcessRouteTaskProcessesMapper.xml
|
2025-01-05 21:56:37 +08:00 |
|
曹鹏飞
|
475b124cc3
|
fix(成本分析): 修复价格计算和单层成本排序问题
|
2025-01-05 21:53:28 +08:00 |
10001392
|
33853a1098
|
【定时任务】HANA获取物料的采购属性信息
|
2025-01-03 09:44:26 +08:00 |
|
曹鹏飞
|
c47d47d62e
|
fix(成本分析): 计算高价值外购件添加null判断，因为如果是T项的话是没有缓存数据的
|
2024-12-31 11:14:15 +08:00 |
|
曹鹏飞
|
83d886d1e1
|
perf(core模块): 不使用lettuce，使用jedis，原来就引入了jedis，但是没有把lettuce排除
|
2024-12-31 11:12:30 +08:00 |
|
曹鹏飞
|
41303ff3b8
|
fix(成本分析): 修复计算成本时获取物料工时报错的问题
|
2024-12-31 09:25:46 +08:00 |
|
曹鹏飞
|
20d0367ffb
|
Merge branch 'technology/rakor-w3' into technology-init-lhj1119
# Conflicts:
# nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/mapper/master/MaterialCategoryMapper.java
# nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/mapper/master/ProcessRouteTaskProcessesMapper.java
# nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/service/MaterialCategoryService.java
# nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/service/MaterialMainService.java
# nflg_project_dev/nflg-technology/src/main/resources/mapper/master/ProcessRouteTaskProcessesMapper.xml
|
2024-12-26 10:40:33 +08:00 |
|
曹鹏飞
|
b529f93800
|
feat(成本分析): 添加功能
|
2024-12-26 10:34:30 +08:00 |
|
10001392
|
e13ec1cbda
|
【工作中心】虚拟工作中心对应关系
|
2024-12-25 11:45:10 +08:00 |
|
10001392
|
b4adf9bc45
|
【物料主数据】同步HANA物料采购属性
|
2024-12-25 09:56:18 +08:00 |
|
10001392
|
717c10f5bd
|
【物料主数据】同步HANA物料价格字段
|
2024-12-24 16:37:41 +08:00 |
|
10001392
|
5ffbb9c45d
|
【物料主数据】从HANA获取物料采购属性信息
|
2024-12-24 14:36:55 +08:00 |
|
曹鹏飞
|
35abaf305a
|
feat: 修改交期的数据类型为datetime
|
2024-12-23 09:34:09 +08:00 |
|
10001392
|
62ca1a1641
|
【工艺路线】删除和恢复接口
|
2024-12-23 08:47:18 +08:00 |
|
10001392
|
fed6e94a54
|
【工艺路线】删除场景的保存
|
2024-12-18 16:55:25 +08:00 |
|
10001392
|
e7d9cc18d4
|
【工艺路线】删除场景的保存
|
2024-12-18 16:10:39 +08:00 |
|
10001392
|
428b63558a
|
【工艺路线】获取PBOM列表
|
2024-12-13 14:40:32 +08:00 |
|
曹鹏飞
|
bc00758d84
|
fix(设计成本维护): 修复一个bug
|
2024-12-12 16:23:19 +08:00 |
|
10001392
|
7a9dd2c4c9
|
【工艺路线】获取PBOM列表，父级物料号和父级描述字段
|
2024-12-10 13:52:48 +08:00 |
|
10001392
|
82bcf6a421
|
【工艺路线】字段类型；详情分类全路径；保存重复判断修正
|
2024-12-09 16:57:52 +08:00 |
|
10001392
|
4a18917359
|
【工艺路线】获取PBOM列表，序号
|
2024-12-09 14:01:29 +08:00 |
|
10001392
|
5f9fdf4cff
|
【工艺路线】获取PBOM列表，SAP排序字符串和项目类别
|
2024-12-09 10:52:32 +08:00 |
|
曹鹏飞
|
1d6e8b9296
|
feat(产品成本分析): BOM组件成本分析
|
2024-12-06 16:05:13 +08:00 |
|
10001392
|
d56a6257d6
|
【工艺路线】导出
|
2024-12-06 09:25:42 +08:00 |
|
曹鹏飞
|
8665c1a793
|
feat(产品成本分析): BOM组件成本分析
|
2024-12-05 18:18:28 +08:00 |
|
10001392
|
ff4d34744f
|
【工艺路线】编号生成规则
|
2024-12-05 16:02:27 +08:00 |
|
10001392
|
f6c5072ee4
|
【工作中心】同步SAP逻辑优化
|
2024-12-05 14:48:18 +08:00 |
|
10001392
|
9d99f8bf60
|
【工艺路线】详情接口字段
|
2024-12-05 14:43:54 +08:00 |
|
10001392
|
abbdd26a1f
|
【工艺路线】列表查询
|
2024-12-05 14:24:57 +08:00 |
|
10001392
|
c8eb77a4b1
|
【工艺路线】有效起始日格式
|
2024-12-05 11:41:30 +08:00 |
|
10001392
|
e1e97c9135
|
【工作中心】去重
|
2024-12-05 10:33:22 +08:00 |
|
10001392
|
7b48a69a76
|
【工艺路线】保存字段
|
2024-12-05 09:32:49 +08:00 |
|
10001392
|
b8e470621d
|
【工艺路线】字段修改
|
2024-12-05 08:54:04 +08:00 |
|
10001392
|
65db1a15d4
|
【工作中心】虚拟工作中心
|
2024-12-05 08:27:40 +08:00 |
|
曹鹏飞
|
d31e00cec2
|
Merge branch 'refs/heads/technology-init-lhj1119' into technology/rakor-w2
# Conflicts:
# nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/mapper/master/MaterialMainMapper.java
# nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/entity/MaterialMainEntity.java
# nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/service/MaterialMainService.java
# nflg_project_dev/nflg-technology/src/main/resources/mapper/master/MaterialMainMapper.xml
|
2024-12-04 18:27:53 +08:00 |
|
10001392
|
9b7df5beca
|
【工作中心】虚拟工作中心
|
2024-12-04 18:04:58 +08:00 |
|
曹鹏飞
|
52ae3c4bba
|
Merge branch 'refs/heads/technology/rakor-w1' into technology/rakor-w2
|
2024-12-04 16:39:24 +08:00 |
|
曹鹏飞
|
65dcfb0671
|
Merge branch 'technology/rakor-w1' into technology-init-lhj1119
|
2024-12-04 11:04:30 +08:00 |
|
曹鹏飞
|
edc78f9e1b
|
fix(设计成本维护): 修复问题
|
2024-12-04 10:48:34 +08:00 |
|
曹鹏飞
|
3de455507f
|
Merge branch 'technology/rakor-w1' into technology-init-lhj1119
|
2024-12-04 09:54:46 +08:00 |
|
10001392
|
fcd1efb605
|
【工艺路线】查看详情
|
2024-12-04 09:16:12 +08:00 |
10002327
|
7f4274fbdb
|
BOM物料查询接口增加物料分类字段
|
2024-12-03 17:46:31 +08:00 |