曹鹏飞
|
30c726d080
|
一些优化
|
2025-09-25 17:55:47 +08:00 |
|
曹鹏飞
|
05b9005120
|
feat: 将pdf使用的字体外挂，减少打包的jar体积
|
2025-09-25 17:55:33 +08:00 |
|
曹鹏飞
|
f1345a3249
|
feat: 优化钢构包查询
|
2025-09-25 17:52:50 +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 |
|
曹鹏飞
|
d679fd47bd
|
feat: 优化404错误返回
|
2025-09-25 11:54:21 +08:00 |
|
zhangke
|
9eeb24819c
|
无码收货搜索条件
|
2025-09-25 11:52:15 +08:00 |
|
曹鹏飞
|
67623100b0
|
feat: 添加actuator支持
|
2025-09-25 11:49:59 +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 |
|
曹鹏飞
|
d989bbc299
|
feat: bug-200 整张打印添加行：批次号
|
2025-09-25 10:48:28 +08:00 |
|
曹鹏飞
|
7fc87580d7
|
feat: bug-726 LDAP同步过来的用户不能重置密码，因为登录使用的是LDAP的密码
|
2025-09-25 10:26:44 +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 |
 zhangke
|
2ba1608ecf
|
Merge branch 'rakor' into dev_zhangke
|
2025-09-25 08:15:38 +08:00 |
|
曹鹏飞
|
cef7a91803
|
导入文件类型添加对.xls格式的支持
|
2025-09-24 21:27:33 +08:00 |
|
zhangke
|
b470c7f935
|
Merge branch 'rakor' into dev_zhangke
# Conflicts:
# nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageMapper.xml
|
2025-09-24 16:59:38 +08:00 |
|
曹鹏飞
|
d210cd94c5
|
一些优化
|
2025-09-24 16:56:47 +08:00 |
|
zhangke
|
318e12ea5f
|
source type
|
2025-09-24 16:45:48 +08:00 |
|
曹鹏飞
|
9c55faa3d7
|
Merge remote-tracking branch 'refs/remotes/惠信/dev_zhangke' into rakor
|
2025-09-24 16:42:27 +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 |
|
曹鹏飞
|
eaa57a56f4
|
Merge remote-tracking branch 'refs/remotes/惠信/dev_zhangke' into rakor
|
2025-09-24 16:38:05 +08:00 |
|
曹鹏飞
|
7cc07aac8b
|
登录名不区分大小写
|
2025-09-24 09:50:44 +08:00 |
|
曹鹏飞
|
f999fae1e5
|
一些优化
|
2025-09-24 09:04:54 +08:00 |
|
zhangke
|
e9de23c491
|
Merge branch 'rakor' into dev_zhangke
|
2025-09-24 09:02:27 +08:00 |
|
曹鹏飞
|
9f8b4890a5
|
一些优化
|
2025-09-24 08:56:59 +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 |