zhangke
|
7b0734bb32
|
Merge branch 'develop' into dev_zhangke
|
2025-10-11 22:57:58 +08:00 |
|
zhangke
|
b606368669
|
1、零部件装车单和零部件出库单添加了冲销的功能
|
2025-10-11 22:57:41 +08:00 |
曹鹏飞
|
dee8259e81
|
feat: 一些优化
|
2025-10-11 17:36:42 +08:00 |
|
曹鹏飞
|
0b9d3923b0
|
Merge branch 'feature/bug-815' into develop
|
2025-10-11 14:58:18 +08:00 |
|
曹鹏飞
|
f45a3f4ba1
|
feat: bug-815 厂内调拨单和工厂间调拨单功能调整
|
2025-10-11 14:58:04 +08:00 |
|
曹鹏飞
|
6789b81523
|
Merge branch 'feature/bug-813' into develop
|
2025-10-11 11:46:05 +08:00 |
|
曹鹏飞
|
99176cdca2
|
feat: bug-813 零部件打包详情查询接口返回工厂编号
|
2025-10-11 11:45:48 +08:00 |
|
曹鹏飞
|
0035ae3f6a
|
feat: bug-814 调整排序字段
|
2025-10-11 11:37:23 +08:00 |
|
曹鹏飞
|
6226770de9
|
Merge branch 'feature/bug-788' into develop
|
2025-10-10 10:14:27 +08:00 |
|
曹鹏飞
|
3fa3afdbd4
|
Merge branch 'feature/bug-784' into develop
|
2025-10-10 10:14:16 +08:00 |
|
曹鹏飞
|
40d8de59b6
|
feat: bug-784 钢构包订单添加缺件交货的功能
|
2025-10-10 10:14:04 +08:00 |
|
曹鹏飞
|
314a5303a5
|
feat: bug-788 库存物料条码打印问题修改
|
2025-10-10 10:13:15 +08:00 |
|
曹鹏飞
|
0a623b70e4
|
feat: 仓库搜索条件添加工厂编号
|
2025-10-09 15:08:13 +08:00 |
|
曹鹏飞
|
303cd1164e
|
fix: 修复零部件出库单查询出错的问题
|
2025-10-09 15:07:28 +08:00 |
|
曹鹏飞
|
0db65a862e
|
feat: 仓库搜索条件添加工厂编号
|
2025-10-09 14:07:15 +08:00 |
|
曹鹏飞
|
dda2f7e8ff
|
fix: 修复零部件出库单查询出错的问题
|
2025-10-09 14:03:18 +08:00 |
|
曹鹏飞
|
c3159f91fa
|
Merge remote-tracking branch '惠信/dev_zhangke' into develop
|
2025-10-08 11:16:03 +08:00 |
|
曹鹏飞
|
6a02cb9270
|
feat: bug-784 钢构包订单添加缺件交货的功能
|
2025-10-08 11:13:20 +08:00 |
|
zhangke
|
fc3e06863a
|
1、添加库存物料打印的功能；
2、修改生成订单PDA确认商家的时候，仓储为null 时报错的问题
|
2025-09-30 17:00:12 +08:00 |
|
曹鹏飞
|
924bf4c5ff
|
采购退库优化：
1、PDA提交数据校验优化；
2、PC页面搜索列表添加供应商名称字段
|
2025-09-29 10:27:49 +08:00 |
|
曹鹏飞
|
429a9ed448
|
feat: bug-760 钢构包管理列表默认按创建时间排序
|
2025-09-28 09:55:43 +08:00 |
|
曹鹏飞
|
c8722c267a
|
一些优化
|
2025-09-26 18:04:00 +08:00 |
|
曹鹏飞
|
5d8f839272
|
Merge remote-tracking branch '惠信/dev_zhangke' into rakor
|
2025-09-26 12:01:19 +08:00 |
|
zhangke
|
e2b5bb6778
|
pda 搜索上架任务的条件搜索添加采购单
|
2025-09-26 11:51:04 +08:00 |
|
曹鹏飞
|
4c1d36e6ba
|
Merge remote-tracking branch '惠信/dev_zhangke' into rakor
|
2025-09-26 09:57:24 +08:00 |
|
曹鹏飞
|
a363a5b610
|
feat: bug-755 生成送货单时选了所有托盘仍然提示数据未齐套
|
2025-09-26 09:56:21 +08:00 |
|
zhangke
|
59948a87da
|
Merge remote-tracking branch 'origin/rakor' into dev_zhangke
|
2025-09-26 08:05:43 +08:00 |
|
曹鹏飞
|
f1345a3249
|
feat: 优化钢构包查询
|
2025-09-25 17:52:50 +08:00 |
|
zhangke
|
8cf7298135
|
Merge remote-tracking branch 'origin/rakor' into dev_zhangke
|
2025-09-25 11:29:28 +08:00 |
|
曹鹏飞
|
c3799fe052
|
feat: bug-739 钢构件搜索的机台号改为通过机台编号模糊搜索
|
2025-09-25 11:25:15 +08:00 |
|
zhangke
|
c1e82f45ed
|
1、修改供应商导出和导入功能
2、修改无码收货查询的接口，添加一个根据单据编号搜索的字段
|
2025-09-25 11:21:29 +08:00 |
|
曹鹏飞
|
a033aa2b5e
|
feat: bug-739 钢构件搜索的机台号改为通过机台编号模糊搜索
|
2025-09-25 10:57:30 +08:00 |
|
曹鹏飞
|
11b4dd11b4
|
feat: bug-721 钢构件版本号支持字母+数字
|
2025-09-25 10:21:02 +08:00 |
|
zhangke
|
e2a516abae
|
1、修改授权的方式
|
2025-09-25 09:29:35 +08:00 |
|
zhangke
|
7d1a3750ef
|
1、修改供應商沒有開通權限的時候，刪除報錯的問題
2、修改刪除用戶的 接口方式
|
2025-09-25 09:20:36 +08:00 |
|
曹鹏飞
|
d210cd94c5
|
一些优化
|
2025-09-24 16:56:47 +08:00 |
 zhangke
|
f4b2ef7608
|
Merge branch 'refs/heads/rakor' into dev_zhangke
|
2025-09-24 16:39:19 +08:00 |
|
zhangke
|
51e56cdf0c
|
source type
|
2025-09-24 16:38:58 +08:00 |
|
曹鹏飞
|
7cc07aac8b
|
登录名不区分大小写
|
2025-09-24 09:50:44 +08:00 |
|
曹鹏飞
|
f999fae1e5
|
一些优化
|
2025-09-24 09:04:54 +08:00 |
|
曹鹏飞
|
9f8b4890a5
|
一些优化
|
2025-09-24 08:56:59 +08:00 |
|
曹鹏飞
|
1dac30c1d5
|
一些优化
|
2025-09-23 15:50:24 +08:00 |
|
曹鹏飞
|
20684c7acd
|
Merge remote-tracking branch 'refs/remotes/惠信/dev_zhangke' into rakor
|
2025-09-23 12:05:29 +08:00 |
|
zhangke
|
799ac02088
|
修改了钢构包和普通物料打印条码时查询和存储的供应商编号为Id
|
2025-09-23 11:27:40 +08:00 |
|
曹鹏飞
|
93a8819d8d
|
一些优化
|
2025-09-22 17:47:51 +08:00 |
|
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 |