曹鹏飞
|
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 |
|
曹鹏飞
|
8ac577a1f2
|
添加功能
|
2025-08-21 18:08:11 +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 |
|
曹鹏飞
|
2e0df1c816
|
添加功能
|
2025-08-17 15:35:37 +08:00 |
|
曹鹏飞
|
1ee072e15f
|
Merge remote-tracking branch '惠信/dev_zhangke' into develop
|
2025-08-17 15:12:44 +08:00 |
|
曹鹏飞
|
3b6673789e
|
添加功能
|
2025-08-17 15:11:56 +08:00 |
|
zhangke
|
ea1ba6bd5b
|
添加SAP接口ZWM3A21【获取物料的属性信息（仓库、库位、批次管理、序号管理，是否质检）】
添加 SAP接口 ZWM00_MB113（厂内调库过账的接口）
|
2025-08-16 18:37:25 +08:00 |
|
zhangke
|
7c2734ff19
|
Merge branch 'develop' into dev_zhangke
|
2025-08-15 13:54:25 +08:00 |
|
曹鹏飞
|
a3a59ecb2f
|
Merge remote-tracking branch '惠信/dev_zhangke' into develop
|
2025-08-15 09:58:15 +08:00 |
|
zhangke
|
3bf0bbeee3
|
feat(wms): 新增多个 SAP 业务接口及数据传输对象- 新增转储单、部门领料单、部门退料单、委外订单等业务的 DTO 和 QO 类
- 在 SapService 中实现相关业务的 SAP接口调用方法
- 更新单元测试用例，覆盖新接口的测试
|
2025-08-14 20:30:52 +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 |
|
曹鹏飞
|
96dce21051
|
Merge remote-tracking branch '惠信/dev_zhangke' into develop
# Conflicts:
# nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/SapService.java
|
2025-08-11 10:43:21 +08:00 |
|
zhangke
|
90e4490a07
|
feat(wms): 新增多个SAP接口及相关数据结构
- 新增了多个SAP接口方法，包括生产领料单查询、生成领料出库、补料单查询等
- 新增了多个相关的请求和响应对象，如Zwm3a03QO、Zwm3a07VO等
- 优化了部分现有接口的实现
|
2025-08-10 23:02:40 +08:00 |
|
曹鹏飞
|
36bb7c0c30
|
添加功能
|
2025-08-08 18:38:18 +08:00 |
|
曹鹏飞
|
a975aa9cda
|
添加功能
|
2025-08-08 14:20:15 +08:00 |
|
曹鹏飞
|
374ec166a2
|
添加功能
|
2025-08-08 14:04:10 +08:00 |
|
曹鹏飞
|
5f74d354ba
|
添加生产入库单功能
|
2025-08-07 11:55:19 +08:00 |
|
zhangke
|
1b081162c8
|
成本领料、退料的SAP接口对接
|
2025-08-06 11:37:17 +08:00 |
|
曹鹏飞
|
3d5c33eb40
|
添加生产入库单功能
|
2025-08-05 18:07:14 +08:00 |
 zhangke
|
1207038de8
|
Merge branch 'develop' into dev_zhangke
|
2025-08-05 14:46:00 +08:00 |
|
曹鹏飞
|
85c653e9dc
|
一些优化
|
2025-08-05 14:44:56 +08:00 |
|
zhangke
|
39a8bbac58
|
feat(wms): 实现中心领料功能
- 新增中心领料单确认出库功能
- 实现根据预留号获取订单项信息
- 添加物料出库推荐批次功能
- 优化库存查询和推荐逻辑
- 完善中心领料相关的数据结构和接口
|
2025-08-05 13:43:32 +08:00 |
|
曹鹏飞
|
b2c2495938
|
feat: 添加功能：采购单退库
|
2025-08-04 18:45:38 +08:00 |
|
zhangke
|
3671ba2232
|
Merge branch 'develop' into dev_zhangke
|
2025-08-04 15:57:13 +08:00 |
|
zhangke
|
9cd3aae9a6
|
更新
|
2025-08-04 15:56:48 +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 |
|
zhangke
|
ba1b80819c
|
合并了develop分支的代码
|
2025-08-02 13:16:37 +08:00 |
|
曹鹏飞
|
dbe48a46a2
|
Merge remote-tracking branch '惠信/dev_zhangke' into develop
|
2025-08-01 18:29:18 +08:00 |
|
zhangke
|
985d43e346
|
添加了SAP的MB017的接口
|
2025-08-01 18:26:08 +08:00 |
|
曹鹏飞
|
dacbe67cc8
|
feat: 添加功能
|
2025-08-01 18:25:09 +08:00 |
|
曹鹏飞
|
cb741c328f
|
feat: 添加功能
|
2025-07-31 18:03:22 +08:00 |
|
曹鹏飞
|
7fa767e83a
|
feat: 添加功能
|
2025-07-30 18:23:29 +08:00 |
|
曹鹏飞
|
2d963c0ffd
|
feat: 添加功能
|
2025-07-29 18:14:15 +08:00 |
|
曹鹏飞
|
e404326626
|
Merge remote-tracking branch 'refs/remotes/惠信/dev_zhangke' into develop
# Conflicts:
# nflg-wms-repository/src/test/java/com/nflg/wms/repository/CodeGeneratorTest.java
|
2025-07-29 18:05:50 +08:00 |