 zhangke
|
9d327f9ed1
|
新增无码收货和无码上架的功能
|
2025-09-21 23:06:27 +08:00 |
zhangke
|
8eb712741f
|
1、添加无码收货的，功改了一半
|
2025-09-19 21:23:19 +08:00 |
曹鹏飞
|
8500640600
|
Merge remote-tracking branch '惠信/dev_zhangke' into develop
# Conflicts:
# nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/UserControllerService.java
|
2025-09-19 09:11:19 +08:00 |
|
曹鹏飞
|
ef07d3160b
|
一些优化
|
2025-09-19 09:05:02 +08:00 |
|
zhangke
|
1df1506c4c
|
1、供应商相关逻辑优化修改
|
2025-09-19 08:55:38 +08:00 |
|
曹鹏飞
|
ac075c26b3
|
一些优化
|
2025-09-12 18:03:23 +08:00 |
|
zhangke
|
65b8972b1a
|
1、零部件出库单搜索调试
|
2025-09-11 16:24:12 +08:00 |
|
zhangke
|
7a8f07ef76
|
1、零部件出库单测试完毕
|
2025-09-11 11:43:56 +08:00 |
|
zhangke
|
afa1e756d4
|
1、零部件出库单测试完毕
|
2025-09-11 08:54:42 +08:00 |
|
zhangke
|
c6f40c86a9
|
Merge branch 'develop' into dev_zhangke
|
2025-09-10 21:43:04 +08:00 |
|
zhangke
|
354677520f
|
1、零部件出库单测试完毕
|
2025-09-10 21:37:58 +08:00 |
|
曹鹏飞
|
272555b84c
|
一些优化
|
2025-09-10 18:09:31 +08:00 |
|
zhangke
|
b2babc691d
|
1、零部件出库的装车单开发测试完毕，出库单待测
|
2025-09-10 12:10:24 +08:00 |
|
zhangke
|
8e0458d944
|
Merge branch 'develop' into dev_zhangke
# Conflicts:
# nflg-wms-repository/src/test/java/com/nflg/wms/repository/CodeGeneratorTest.java
|
2025-09-09 22:41:24 +08:00 |
|
zhangke
|
90abcd3054
|
完成零部件出库单的接口，zwm3a19的接口存在问题需要重新处理，少了一个删除装箱单的接口
|
2025-09-09 22:40:38 +08:00 |
|
曹鹏飞
|
331970b9b9
|
一些优化
|
2025-09-09 18:09:21 +08:00 |
|
zhangke
|
bc341d2fba
|
1、零部件出库的临时版本，无合并
|
2025-09-09 17:19:06 +08:00 |
|
zhangke
|
73dc55cc4a
|
Merge branch 'develop' into dev_zhangke
|
2025-09-08 21:42:21 +08:00 |
|
zhangke
|
7eb12b08fa
|
1、添加零部件出库单的表单信息和SAP的接口信息
|
2025-09-08 21:41:56 +08:00 |
|
曹鹏飞
|
5751392131
|
一些优化
|
2025-09-08 18:32:45 +08:00 |
|
zhangke
|
d40773b593
|
接收质检物料的接口调整
|
2025-09-08 11:51:34 +08:00 |
|
zhangke
|
98640065fe
|
Merge remote-tracking branch 'origin/develop' into dev_zhangke
|
2025-09-08 10:32:33 +08:00 |
|
zhangke
|
e97a81a2df
|
接收质检物料的接口调整
|
2025-09-05 21:42:52 +08:00 |
|
曹鹏飞
|
43454304dd
|
一些优化
|
2025-09-05 18:57:17 +08:00 |
|
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 |
|
曹鹏飞
|
f41ecedea5
|
Merge remote-tracking branch 'refs/remotes/惠信/dev_zhangke' into develop
|
2025-08-29 09:34:53 +08:00 |
|
曹鹏飞
|
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
|
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 |
|
曹鹏飞
|
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 |
|
曹鹏飞
|
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 |
|
曹鹏飞
|
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 |
|
曹鹏飞
|
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 |
|
曹鹏飞
|
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 |
|
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 |
|
曹鹏飞
|
b1765b65a0
|
一些优化
|
2025-08-04 15:54:18 +08:00 |
|
曹鹏飞
|
75af7a687b
|
一些优化
|
2025-08-04 15:26:17 +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
|
bd804a13f5
|
成本中心退库列表和详情信息
|
2025-08-03 14:39:12 +08:00 |
|
zhangke
|
590fe80e24
|
feat(wms): 新增中心领料和退料功能
- 添加了中心领料和退料相关的数据传输对象(DTO)和查询对象(QO)
- 新增了中心领料和退料的控制器、服务接口和实现类
- 创建了中心领料和退料的数据库表结构及对应的实体类
- 实现了中心领料和退料的基本业务逻辑，包括查询、详情获取等功能
|
2025-08-02 16:12:00 +08:00 |
|
曹鹏飞
|
dbe48a46a2
|
Merge remote-tracking branch '惠信/dev_zhangke' into develop
|
2025-08-01 18:29:18 +08:00 |
|
曹鹏飞
|
2c232359a3
|
Merge remote-tracking branch '惠信/dev_zhangke' into develop
|
2025-08-01 18:27:35 +08:00 |
|
zhangke
|
985d43e346
|
添加了SAP的MB017的接口
|
2025-08-01 18:26:08 +08:00 |
|
曹鹏飞
|
dacbe67cc8
|
feat: 添加功能
|
2025-08-01 18:25:09 +08:00 |
|
zhangke
|
e46c1bc472
|
Merge branch 'refs/heads/develop' into dev_zhangke
|
2025-08-01 14:26:17 +08:00 |
|
zhangke
|
1ea7db9ae3
|
feat(admin): 实现收货单推送SRM系统功能
优化了普通物料收货流程
|
2025-08-01 10:31:12 +08:00 |
|
曹鹏飞
|
cb741c328f
|
feat: 添加功能
|
2025-07-31 18:03:22 +08:00 |
|
曹鹏飞
|
7fa767e83a
|
feat: 添加功能
|
2025-07-30 18:23:29 +08:00 |
|
曹鹏飞
|
6bae50dab8
|
feat: 添加功能
|
2025-07-29 18:23:13 +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 |
|
曹鹏飞
|
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 |
|
曹鹏飞
|
c0e2cf6e3d
|
Merge remote-tracking branch 'refs/remotes/惠信/dev_zhangke' into develop
# Conflicts:
# nflg-wms-admin/src/main/java/com/nflg/wms/admin/pojo/dto/SAPMaterialInfoInOrderDTO.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-07-29 18:02:35 +08:00 |
|
zhangke
|
f89a31a5e1
|
feat(admin): 实现收货单推送SRM系统功能
- 新增收货单推送SRM系统的接口和相关逻辑
- 添加一键收货功能，自动处理收货单中的所有物料
- 优化收货单处理流程，支持质检物料和非质检物料的分别处理
- 新增SRM系统Token获取和缓存机制
-调整数据库表结构，增加供应商编码等字段
|
2025-07-29 17:59:24 +08:00 |
|
曹鹏飞
|
03dc0985de
|
feat: 添加功能
|
2025-07-28 18:37:45 +08:00 |
|
zhangke
|
8352b38351
|
feat(wms): 新增普通物料收货功能
- 新增 NormalPGIController 和 NormalPGIControllerService 类实现普通物料收货相关功能
- 添加 PDAOrderVO、PDAOrderItemVO等数据传输对象
- 实现送货单列表、送货单详情、PDA 扫码收货等功能接口
- 新增 SAPCommonService 类处理与 SAP 系统的交互
- 修改 WmsSrmOrder 和 WmsSrmOrderItem 实体类，增加相关字段- 更新 WmsSrmOrderItemMapper 和 XML 文件，添加获取送货单详情的 SQL 查询
|
2025-07-28 18:22:40 +08:00 |