曹鹏飞
|
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 |
|
zhangke
|
82119dfc43
|
Merge branch 'develop' into dev_zhangke
|
2025-09-16 16:22:14 +08:00 |
|
zhangke
|
ee93e1b92a
|
1、零部件出库单搜索SAP结果
|
2025-09-16 16:21:48 +08:00 |
|
曹鹏飞
|
ac075c26b3
|
一些优化
|
2025-09-12 18:03:23 +08:00 |
|
曹鹏飞
|
ffaf1efa36
|
Merge remote-tracking branch 'refs/remotes/惠信/dev_zhangke' into develop
|
2025-09-12 09:08:47 +08:00 |
|
zhangke
|
dbb5342855
|
Merge branch 'develop' into dev_zhangke
|
2025-09-12 08:18:31 +08:00 |
|
曹鹏飞
|
2983c19b95
|
一些优化
|
2025-09-11 18:19:07 +08:00 |
|
zhangke
|
65b8972b1a
|
1、零部件出库单搜索调试
|
2025-09-11 16:24:12 +08:00 |
|
zhangke
|
4bec1232a9
|
1、零部件出库单搜索调试
|
2025-09-11 12:14:23 +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 |
|
曹鹏飞
|
3e02bd0895
|
Merge remote-tracking branch 'refs/remotes/惠信/dev_zhangke' into develop
|
2025-09-08 11:55:30 +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 |
|
曹鹏飞
|
99aa608eff
|
Merge remote-tracking branch 'refs/remotes/惠信/dev_zhangke' into develop
|
2025-09-08 09:14:27 +08:00 |
|
曹鹏飞
|
f3bc54aa94
|
一些优化
|
2025-09-07 16:43:17 +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
|
382cee9ca1
|
采购物料入库的调试
|
2025-09-05 14:41:31 +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
|
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 |