Compare commits

..

2 Commits

Author SHA1 Message Date
曹鹏飞 7aa04aa2ee chore(config): 新增和调整各微服务配置文件
- 新增 nflg-qms-admin、nflg-wms-admin、nflg-wms-auth、nflg-wms-gateway、nflg-wms-scheduled、nflg-wms-shipment、nflg-wms-srm-receive 应用配置
- 配置服务端端口及Tomcat最大表单提交大小
- 各服务配置Nacos注册中心及配置管理,支持配置文件自动刷新
- 设置Spring Boot应用名、激活开发环境配置
- 配置文件上传大小限制及多部分请求大小限制
- 全局开启管理端点,配置健康检查和日志级别
- sa-token 配置JWT及SSO参数于认证服务中
- 调整wms-admin生产环境nacos日志级别为info,降低trace日志输出
2026-04-17 14:38:11 +08:00
曹鹏飞 0d2ccc6e62 修正对象lambda更新中的条件传参,确保删除逻辑正确执行 2026-04-17 09:56:48 +08:00
9 changed files with 73 additions and 65 deletions

View File

@ -13,6 +13,8 @@ spring:
import: nacos:shared.properties?group=${spring.profiles.active}&refreshEnabled=true
cloud:
nacos:
username: wms
password: wms
config:
server-addr: ${nacos.server-addr:192.168.163.83:8848}
namespace: wms
@ -21,6 +23,8 @@ spring:
server-addr: ${nacos.server-addr:192.168.163.83:8848}
namespace: wms
group: ${spring.profiles.active}
username: wms
password: wms
servlet:
multipart:
max-file-size: 200MB

View File

@ -7,7 +7,7 @@ logging:
nflg: debug
alibaba:
cloud:
nacos: trace
nacos: info
org:
springframework: info
# sa-token配置

View File

@ -13,8 +13,8 @@ spring:
import: nacos:shared.properties?group=${spring.profiles.active}&refreshEnabled=true
cloud:
nacos:
username: wms
password: wms
username: ${nacos.username:}
password: ${nacos.password:}
config:
server-addr: ${nacos.server-addr:192.168.163.83:8848}
namespace: wms

View File

@ -9,12 +9,14 @@ spring:
import: nacos:shared.properties?group=${spring.profiles.active}&refreshEnabled=true
cloud:
nacos:
username: wms
password: wms
username: ${nacos.username:}
password: ${nacos.password:}
config:
server-addr: ${nacos.server-addr:192.168.163.83:8848}
namespace: wms
group: ${spring.profiles.active}
file-extension: properties
refresh-enabled: true
discovery:
server-addr: ${nacos.server-addr:192.168.163.83:8848}
namespace: wms

View File

@ -9,12 +9,14 @@ spring:
import: nacos:shared.properties?group=${spring.profiles.active}&refreshEnabled=true
cloud:
nacos:
username: wms
password: wms
username: ${nacos.username:}
password: ${nacos.password:}
config:
server-addr: ${nacos.server-addr:112.74.186.154:8848}
namespace: wms
group: ${spring.profiles.active}
file-extension: properties
refresh-enabled: true
discovery:
server-addr: ${nacos.server-addr:112.74.186.154:8848}
namespace: wms

View File

@ -9,12 +9,14 @@ spring:
import: nacos:shared.properties?group=${spring.profiles.active}&refreshEnabled=true
cloud:
nacos:
username: wms
password: wms
username: ${nacos.username:}
password: ${nacos.password:}
config:
server-addr: ${nacos.server-addr:192.168.163.83:8848}
namespace: wms
group: ${spring.profiles.active}
file-extension: properties
refresh-enabled: true
discovery:
server-addr: ${nacos.server-addr:192.168.163.83:8848}
namespace: wms

View File

@ -9,10 +9,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.nflg.wms.common.pojo.ApiResult;
import com.nflg.wms.common.pojo.PageData;
import com.nflg.wms.common.pojo.dto.MaterialCodePrintDTO;
import com.nflg.wms.common.pojo.dto.MaterialPdfDTO;
import com.nflg.wms.common.pojo.qo.*;
import com.nflg.wms.common.pojo.vo.*;
import com.nflg.wms.common.pojo.vo.MaterialPdfVO;
import com.nflg.wms.common.pojo.vo.ShipmentMaterialCodeItemVO;
import com.nflg.wms.common.pojo.vo.ShipmentMaterialCodeQRVO;
import com.nflg.wms.common.util.EecExcelUtil;
import com.nflg.wms.common.util.NumberUtil;
import com.nflg.wms.common.util.UserUtil;
@ -49,8 +50,8 @@ import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.math.BigDecimal;
import java.net.URLEncoder;
import java.net.URL;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
@ -136,7 +137,7 @@ public class MaterialCodeController extends BaseController {
if (CollectionUtil.isNotEmpty(idsForDelete)) {
materialCodeService.removeByIds(idsForDelete);
materialCodeForwardService.lambdaUpdate()
.in(WmsShipmentMaterialCodeForward::getMaterialCodeId)
.in(WmsShipmentMaterialCodeForward::getMaterialCodeId, idsForDelete)
.remove();
idsForDelete = materialCodeItemService.lambdaQuery()
.in(WmsShipmentMaterialCodeItem::getMaterialCodeId, idsForDelete)
@ -399,7 +400,6 @@ public class MaterialCodeController extends BaseController {
/**
* 清单明细-导入
*
* @param materialCodeId 清单ID
* @param cover 导入模式true:覆盖false:新增
* @param file 文件
@ -558,7 +558,6 @@ public class MaterialCodeController extends BaseController {
/**
* 清单明细-根据二维码唯一号获取物料信息PDA使用
*
* @param code 二维码唯一号
*/
@GetMapping("getInfoByQRCode")
@ -588,7 +587,6 @@ public class MaterialCodeController extends BaseController {
/**
* 根据清单导出标签图片ZIP用于直连打印机打印
*
* @param ids 清单id列表
*/
@PostMapping("exportItemImageZip1")
@ -600,7 +598,6 @@ public class MaterialCodeController extends BaseController {
/**
* 根据清单项导出标签图片ZIP用于直连打印机打印
*
* @param ids 清单明细id列表
*/
@PostMapping("exportItemImageZip")
@ -643,7 +640,6 @@ public class MaterialCodeController extends BaseController {
/**
* 代发物料-导入
*
* @param id 清单ID
*/
@PostMapping("importForward")
@ -870,7 +866,6 @@ public class MaterialCodeController extends BaseController {
/**
* 导出标签图片PDF打印预览
*
* @param response HTTP响应
* @param list 物料码主表列表
*/
@ -942,7 +937,6 @@ public class MaterialCodeController extends BaseController {
/**
* 根据明细ID导出物料明细PDF打印预览
*
* @param response HTTP响应
* @param list 物料明细列表包含qrCodes二维码数组
*/

View File

@ -13,12 +13,14 @@ spring:
import: nacos:shared.properties?group=${spring.profiles.active}&refreshEnabled=true
cloud:
nacos:
username: wms
password: wms
username: ${nacos.username:}
password: ${nacos.password:}
config:
server-addr: ${nacos.server-addr:192.168.163.83:8848}
namespace: wms
group: ${spring.profiles.active}
file-extension: properties
refresh-enabled: true
discovery:
server-addr: ${nacos.server-addr:192.168.163.83:8848}
namespace: wms

View File

@ -13,12 +13,14 @@ spring:
import: nacos:shared.properties?group=${spring.profiles.active}&refreshEnabled=true
cloud:
nacos:
username: wms
password: wms
username: ${nacos.username:}
password: ${nacos.password:}
config:
server-addr: ${nacos.server-addr:192.168.163.83:8848}
namespace: wms
group: ${spring.profiles.active}
file-extension: properties
refresh-enabled: true
discovery:
server-addr: ${nacos.server-addr:192.168.163.83:8848}
namespace: wms