曹鹏飞
|
f008989a1c
|
Merge branch 'feature/bug-784' into develop
|
2025-10-08 11:15:38 +08:00 |
|
曹鹏飞
|
6a02cb9270
|
feat: bug-784 钢构包订单添加缺件交货的功能
|
2025-10-08 11:13:20 +08:00 |
|
曹鹏飞
|
be2af35025
|
feat: bug-783 采购单退库功能调整
|
2025-10-08 09:12:33 +08:00 |
 zhangke
|
270b2d110b
|
Merge branch 'rakor' into dev_zhangke
|
2025-10-05 13:06:29 +08:00 |
|
曹鹏飞
|
04b68647b3
|
feat: bug-779 生产订单入库需要可多个生产订单合并打印
|
2025-10-01 08:49:10 +08:00 |
zhangke
|
fc3e06863a
|
1、添加库存物料打印的功能；
2、修改生成订单PDA确认商家的时候，仓储为null 时报错的问题
|
2025-09-30 17:00:12 +08:00 |
|
zhangke
|
e326e5ac14
|
Merge remote-tracking branch 'refs/remotes/origin/rakor' into dev_zhangke
|
2025-09-30 11:07:28 +08:00 |
|
zhangke
|
afb0b214a9
|
修改了零部件出口的 二维码不验证唯一性的问题
修改批量无码上架的问题
|
2025-09-30 09:36:49 +08:00 |
|
曹鹏飞
|
19674ba135
|
feat: bug-776 所有的出库操作扫码后流程需要调整
|
2025-09-29 18:02:12 +08:00 |
|
曹鹏飞
|
924bf4c5ff
|
采购退库优化：
1、PDA提交数据校验优化；
2、PC页面搜索列表添加供应商名称字段
|
2025-09-29 10:27:49 +08:00 |
|
曹鹏飞
|
a42df50cd8
|
一些优化
|
2025-09-28 16:47:40 +08:00 |
|
曹鹏飞
|
508576debb
|
feat: bug-765 整单打印的二维码没有号码后的流水码
|
2025-09-28 13:51:52 +08:00 |
|
曹鹏飞
|
13889b2703
|
feat: bug-774 打印模板中的公司名称全部更改为【福建南方路面机械股份有限公司】
|
2025-09-28 13:50:55 +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 |
|
曹鹏飞
|
44d06ad46d
|
feat: bug-751 老鼠图-PDF导出样式的问题
|
2025-09-26 10:42:55 +08:00 |
|
zhangke
|
c5ecfd8409
|
1、更改图纸上传图片的版本逻辑
|
2025-09-26 10:23:17 +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 |
|
曹鹏飞
|
05b9005120
|
feat: 将pdf使用的字体外挂，减少打包的jar体积
|
2025-09-25 17:55:33 +08:00 |
|
zhangke
|
ce8e6a3494
|
1、无码收货的查询添加批次号的判断
|
2025-09-25 16:18:25 +08:00 |
|
zhangke
|
038b61449b
|
1、条码添加一个入库单的ID号
2、测试普通物料非质检的无码收货、上架流程
|
2025-09-25 16:05:44 +08:00 |
|
zhangke
|
9eeb24819c
|
无码收货搜索条件
|
2025-09-25 11:52:15 +08:00 |
|
曹鹏飞
|
67623100b0
|
feat: 添加actuator支持
|
2025-09-25 11:49:59 +08:00 |
|
zhangke
|
c1e82f45ed
|
1、修改供应商导出和导入功能
2、修改无码收货查询的接口，添加一个根据单据编号搜索的字段
|
2025-09-25 11:21:29 +08:00 |
|
曹鹏飞
|
d989bbc299
|
feat: bug-200 整张打印添加行：批次号
|
2025-09-25 10:48:28 +08:00 |
|
曹鹏飞
|
11b4dd11b4
|
feat: bug-721 钢构件版本号支持字母+数字
|
2025-09-25 10:21:02 +08:00 |
|
zhangke
|
7d1a3750ef
|
1、修改供應商沒有開通權限的時候，刪除報錯的問題
2、修改刪除用戶的 接口方式
|
2025-09-25 09:20:36 +08:00 |
|
曹鹏飞
|
d210cd94c5
|
一些优化
|
2025-09-24 16:56:47 +08:00 |
|
zhangke
|
03e2d272d8
|
Merge branch 'rakor' into dev_zhangke
|
2025-09-23 21:32:01 +08:00 |
|
曹鹏飞
|
d4cb53d482
|
feat(material): 新增批量获取物料信息接口
|
2025-09-23 19:58:54 +08:00 |
|
zhangke
|
45d678f980
|
修改了钢构包和普通物料打印条码时查询和存储的供应商编号为Id
|
2025-09-23 16:37:07 +08:00 |
|
zhangke
|
a37736494a
|
Merge branch 'rakor' into dev_zhangke
|
2025-09-23 15:57:06 +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 |
|
曹鹏飞
|
c5d2811c97
|
Merge remote-tracking branch 'refs/remotes/惠信/dev_zhangke' into rakor
|
2025-09-23 08:01:52 +08:00 |
|
zhangke
|
5f0f40404c
|
1、修改了供应商的代码
|
2025-09-22 20:16:44 +08:00 |
|
曹鹏飞
|
93a8819d8d
|
一些优化
|
2025-09-22 17:47:51 +08:00 |
|
zhangke
|
397c3b4581
|
1、修改了供应商的代码
|
2025-09-22 16:15:40 +08:00 |
|
zhangke
|
9d327f9ed1
|
新增无码收货和无码上架的功能
|
2025-09-21 23:06:27 +08:00 |
|
zhangke
|
fc54a528e8
|
1、添加无码收货的，功改了一半
|
2025-09-21 18:13:39 +08:00 |
|
zhangke
|
d8f4368d20
|
1、添加无码收货的，功改了一半
|
2025-09-19 21:25:14 +08:00 |
|
zhangke
|
8eb712741f
|
1、添加无码收货的，功改了一半
|
2025-09-19 21:23:19 +08:00 |
|
曹鹏飞
|
c4dab5bf7f
|
一些优化
|
2025-09-19 17:01:06 +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 |
|
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 |
|
曹鹏飞
|
2983c19b95
|
一些优化
|
2025-09-11 18:19:07 +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 |
|
曹鹏飞
|
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 |
|
曹鹏飞
|
e7c1d61009
|
一些优化
|
2025-09-04 20:09:52 +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 |
|
曹鹏飞
|
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
|
018ecd60a2
|
修改普通送货单的接口的描述和配置文件
|
2025-08-26 11:23:57 +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
|
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
|
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 |
|
曹鹏飞
|
a975aa9cda
|
添加功能
|
2025-08-08 14:20:15 +08:00 |
|
曹鹏飞
|
374ec166a2
|
添加功能
|
2025-08-08 14:04:10 +08:00 |
|
曹鹏飞
|
32d51fdd61
|
优化测试
|
2025-08-08 14:03:48 +08:00 |
|
曹鹏飞
|
cc4a8a628e
|
优化测试
|
2025-08-07 12:12:26 +08:00 |
|
曹鹏飞
|
62602b7270
|
优化测试
|
2025-08-07 12:06:47 +08:00 |
|
曹鹏飞
|
b5969c279c
|
优化测试
|
2025-08-07 12:04:03 +08:00 |
|
曹鹏飞
|
b2fe07fd4b
|
优化测试
|
2025-08-07 11:55:32 +08:00 |
|
曹鹏飞
|
5f74d354ba
|
添加生产入库单功能
|
2025-08-07 11:55:19 +08:00 |
|
zhangke
|
39c77df87d
|
成本领料、退料的SAP接口对接 异常修复
|
2025-08-06 17:31:45 +08:00 |
|
zhangke
|
1b081162c8
|
成本领料、退料的SAP接口对接
|
2025-08-06 11:37:17 +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 |
|
曹鹏飞
|
85c653e9dc
|
一些优化
|
2025-08-05 14:44:56 +08:00 |
|
zhangke
|
39a8bbac58
|
feat(wms): 实现中心领料功能
- 新增中心领料单确认出库功能
- 实现根据预留号获取订单项信息
- 添加物料出库推荐批次功能
- 优化库存查询和推荐逻辑
- 完善中心领料相关的数据结构和接口
|
2025-08-05 13:43:32 +08:00 |
|
曹鹏飞
|
4a0b165b91
|
一些优化
|
2025-08-05 11:54:52 +08:00 |
|
曹鹏飞
|
b2c2495938
|
feat: 添加功能：采购单退库
|
2025-08-04 18:45:38 +08:00 |