Commit Graph

615 Commits

Author SHA1 Message Date
曹鹏飞 f5fc5c2368 一些优化 2025-08-28 18:07:31 +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 9ee983b81c Merge remote-tracking branch 'origin/dev_zhangke' into dev_zhangke 2025-08-26 11:24:37 +08:00
zhangke 018ecd60a2 修改普通送货单的接口的描述和配置文件 2025-08-26 11:23:57 +08:00
zhangke b6d28d7f30 Merge remote-tracking branch 'origin/dev_zhangke' into dev_zhangke 2025-08-26 11:17:06 +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
zhangke 3c1d0ba75f Merge branch 'develop' into dev_zhangke 2025-08-22 18:53:37 +08:00
zhangke 1506c4119e Merge remote-tracking branch 'origin/dev_zhangke' into dev_zhangke
# Conflicts:
#	nflg-wms-repository/src/test/java/com/nflg/wms/repository/CodeGeneratorTest.java
2025-08-22 18:53:06 +08:00
zhangke 63958f910b 代码合并并修改 3a17 的函数接口 2025-08-22 18:52:02 +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
曹鹏飞 1f702bbd9d 优化测试 2025-08-19 08:49:21 +08:00
zhangke a13539d6b0 Merge branch 'develop' into dev_zhangke
# Conflicts:
#	nflg-wms-repository/src/test/java/com/nflg/wms/repository/CodeGeneratorTest.java
2025-08-18 18:18:38 +08:00
zhangke d77c8669a1 暂存版本 2025-08-18 18:15:20 +08:00
曹鹏飞 2e0df1c816 添加功能 2025-08-17 15:35:37 +08:00
曹鹏飞 c9ed597c86 Merge remote-tracking branch '惠信/dev_zhangke' into develop 2025-08-17 15:21:35 +08:00
zhangke 0430e35af3 修改SAP接口 ZWM00_MB113(厂内调库过账的接口)的函数名称 2025-08-17 15:19:24 +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
曹鹏飞 81da4c6331 添加功能 2025-08-15 09:44:57 +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
曹鹏飞 5dfdd61cf7 优化监控配置 2025-08-11 14:22:07 +08:00
曹鹏飞 ee3557370f 优化测试 2025-08-11 14:18:55 +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
曹鹏飞 4a9aad9eb4 优化测试 2025-08-08 14:47:25 +08:00
曹鹏飞 e918caa8b8 SAP接口ZIM_001_QUERY调整为ZWM3A05,ZIM_001调整为ZWM3A06 2025-08-08 14:47:19 +08:00
曹鹏飞 2e172a4451 添加功能 2025-08-08 14:29:27 +08:00
曹鹏飞 a8c911dcad 添加功能 2025-08-08 14:22:47 +08:00