zhangke
|
9e01b73fca
|
质检物料入库
|
2025-09-05 15:53:13 +08:00 |
|
zhangke
|
e6334ee3a9
|
Merge branch 'develop' into dev_zhangke
|
2025-09-05 14:37:02 +08:00 |
|
zhangke
|
be24ba7bc8
|
采购物料入库的调试
|
2025-09-05 14:36:34 +08:00 |
曹鹏飞
|
78b5698129
|
Merge remote-tracking branch 'refs/remotes/惠信/dev_zhangke' into develop
|
2025-09-04 20:10:39 +08:00 |
|
曹鹏飞
|
e7c1d61009
|
一些优化
|
2025-09-04 20:09:52 +08:00 |
|
zhangke
|
a357ecb57b
|
修改库存表的sql语句
|
2025-09-04 14:45:58 +08:00 |
|
曹鹏飞
|
893717bfe2
|
Merge remote-tracking branch 'refs/remotes/惠信/dev_zhangke' into develop
|
2025-09-04 08:52:16 +08:00 |
|
曹鹏飞
|
d50e0738cf
|
一些优化
|
2025-09-03 18:44:23 +08:00 |
|
zhangke
|
df144e410c
|
Merge branch 'develop' into dev_zhangke
|
2025-09-03 14:32:38 +08:00 |
|
曹鹏飞
|
c7d2e64583
|
一些优化
|
2025-09-03 14:31:52 +08:00 |
|
zhangke
|
ecfe26d708
|
优化了获取角色权限的方法
|
2025-09-03 12:33:36 +08:00 |
|
zhangke
|
9eb7ffbe02
|
测试了系统和平台模块，修改了bug
|
2025-09-03 10:16:53 +08:00 |
|
曹鹏飞
|
7e9dc3e702
|
一些优化
|
2025-09-02 18:25:14 +08:00 |
|
曹鹏飞
|
d350079342
|
一些优化
|
2025-09-02 09:24:11 +08:00 |
|
曹鹏飞
|
133d42deb0
|
一些优化
|
2025-08-31 21:03:30 +08:00 |
 zhangke
|
cb53b606bb
|
一个临时的版本，用于前后端联调，屏蔽SAP部分功能
|
2025-08-27 22:38:10 +08:00 |
|
zhangke
|
56e5db2c3b
|
Merge branch 'develop' into dev_zhangke
|
2025-08-27 21:35:42 +08:00 |
|
曹鹏飞
|
55bdb3c95a
|
一些优化
|
2025-08-27 18:35:18 +08:00 |
|
曹鹏飞
|
95c7809730
|
一些优化
|
2025-08-26 18:14:19 +08:00 |
|
zhangke
|
21fb7417f6
|
Merge branch 'develop' into dev_zhangke
|
2025-08-26 11:15:14 +08:00 |
|
zhangke
|
8c9ebde6d3
|
修改了质检物料的相关接口
|
2025-08-26 09:03:32 +08:00 |
|
曹鹏飞
|
722bd067fc
|
Merge remote-tracking branch 'refs/remotes/惠信/dev_zhangke' into develop
|
2025-08-25 18:02:17 +08:00 |
|
zhangke
|
265fd6c54f
|
接口调试
|
2025-08-25 17:56:31 +08:00 |
|
曹鹏飞
|
69adc3fb18
|
Merge remote-tracking branch 'refs/remotes/惠信/dev_zhangke' into develop
|
2025-08-25 17:54:39 +08:00 |
|
曹鹏飞
|
f52f34eb66
|
添加功能
|
2025-08-25 17:47:54 +08:00 |
|
zhangke
|
e40cbf20e3
|
Merge branch 'develop' into dev_zhangke
|
2025-08-25 09:02:13 +08:00 |
|
zhangke
|
08177a1f1f
|
提交质检物料的上架确认和质检物料采购入库单、普通物料采购入库单
|
2025-08-24 11:18:30 +08:00 |
|
曹鹏飞
|
07c1d0ec8c
|
添加功能
|
2025-08-22 18:52:00 +08:00 |
|
zhangke
|
94fb0d216d
|
Merge branch 'develop' into dev_zhangke
# Conflicts:
# nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalPGIController.java
# nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/NormalPGIControllerService.java
# nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/SapService.java
# nflg-wms-repository/src/test/java/com/nflg/wms/repository/CodeGeneratorTest.java
# nflg-wms-srm-receive/src/main/java/com/nflg/wms/srm/receive/controller/SRMController.java
|
2025-08-22 18:46:34 +08:00 |
|
zhangke
|
e64b2deeb0
|
完成采购单入库（普通物料）管理
|
2025-08-22 18:24:08 +08:00 |
|
曹鹏飞
|
6765075cbb
|
添加功能
|
2025-08-20 18:16:59 +08:00 |
|
曹鹏飞
|
00b9e7426d
|
添加功能
|
2025-08-19 18:22:15 +08:00 |
|
zhangke
|
d77c8669a1
|
暂存版本
|
2025-08-18 18:15:20 +08:00 |
|
曹鹏飞
|
3b6673789e
|
添加功能
|
2025-08-17 15:11:56 +08:00 |
|
曹鹏飞
|
82372168e9
|
添加功能
|
2025-08-14 18:34:54 +08:00 |
|
曹鹏飞
|
cf98664152
|
添加功能
|
2025-08-13 18:18:47 +08:00 |
|
曹鹏飞
|
0fea75d799
|
添加功能
|
2025-08-12 15:57:33 +08:00 |
|
曹鹏飞
|
a975aa9cda
|
添加功能
|
2025-08-08 14:20:15 +08:00 |
|
曹鹏飞
|
374ec166a2
|
添加功能
|
2025-08-08 14:04:10 +08:00 |
|
曹鹏飞
|
3d5c33eb40
|
添加生产入库单功能
|
2025-08-05 18:07:14 +08:00 |
|
曹鹏飞
|
93e92eda9e
|
Merge remote-tracking branch '惠信/dev_zhangke' into develop
# Conflicts:
# nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TestController.java
# nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/SapService.java
# nflg-wms-repository/src/test/java/com/nflg/wms/repository/CodeGeneratorTest.java
|
2025-08-04 15:12:29 +08:00 |
|
曹鹏飞
|
89b997364f
|
feat: 添加功能：采购单退库
|
2025-08-04 15:06:59 +08:00 |
|
zhangke
|
57377c33c5
|
feat(wms): 添加成本中心退货单功能
- 新增 BasdeSerialNumber 实体类和相关 Mapper
- 实现退货单号生成逻辑
- 添加退货单保存功能
- 优化 SAP 退货信息查询接口
|
2025-08-03 22:09:48 +08:00 |
|
zhangke
|
1afd869099
|
Merge branch 'refs/heads/develop' into dev_zhangke
# Conflicts:
# nflg-wms-repository/src/test/java/com/nflg/wms/repository/CodeGeneratorTest.java
|
2025-08-03 16:14:52 +08:00 |
|
zhangke
|
590fe80e24
|
feat(wms): 新增中心领料和退料功能
- 添加了中心领料和退料相关的数据传输对象(DTO)和查询对象(QO)
- 新增了中心领料和退料的控制器、服务接口和实现类
- 创建了中心领料和退料的数据库表结构及对应的实体类
- 实现了中心领料和退料的基本业务逻辑，包括查询、详情获取等功能
|
2025-08-02 16:12:00 +08:00 |
|
曹鹏飞
|
dacbe67cc8
|
feat: 添加功能
|
2025-08-01 18:25:09 +08:00 |
|
曹鹏飞
|
7fa767e83a
|
feat: 添加功能
|
2025-07-30 18:23:29 +08:00 |
|
曹鹏飞
|
e2bbb7c430
|
Merge remote-tracking branch '惠信/dev_zhangke' into develop
|
2025-07-29 18:16:00 +08:00 |
|
曹鹏飞
|
2d963c0ffd
|
feat: 添加功能
|
2025-07-29 18:14:15 +08:00 |
|
zhangke
|
e04287b0c6
|
feat(admin): 实现收货单推送SRM系统功能
- 新增收货单推送SRM系统的接口和相关逻辑
- 添加一键收货功能，自动处理收货单中的所有物料
- 优化收货单处理流程，支持质检物料和非质检物料的分别处理
- 新增SRM系统Token获取和缓存机制
-调整数据库表结构，增加供应商编码等字段
|
2025-07-29 18:07:29 +08:00 |