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
|
1080638f20
|
修改质检物料收货的条码逻辑，更改了user的vo
|
2025-09-03 17:01:54 +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 |
|
zhangke
|
70a1d57c55
|
修改了pda查找任务不需要ordeNo 必填
|
2025-09-01 09:32:14 +08:00 |
|
曹鹏飞
|
133d42deb0
|
一些优化
|
2025-08-31 21:03:30 +08:00 |
|
曹鹏飞
|
93e1885898
|
Merge remote-tracking branch 'refs/remotes/惠信/dev_zhangke' into develop
|
2025-08-29 09:41:29 +08:00 |
|
zhangke
|
3e987656d4
|
修改 long为Long
|
2025-08-29 09:39:27 +08:00 |
|
曹鹏飞
|
f41ecedea5
|
Merge remote-tracking branch 'refs/remotes/惠信/dev_zhangke' into develop
|
2025-08-29 09:34:53 +08:00 |
 zhangke
|
2aa1c723c3
|
修改参数的备注信息
|
2025-08-28 18:24:57 +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
|
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 |