nflg-qms-admin/src/main/resources/application.yml

@@ -13,8 +13,6 @@ 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
@@ -23,8 +21,6 @@ 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

nflg-wms-admin/src/main/resources/application-prod.yml

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

nflg-wms-admin/src/main/resources/application.yml

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

nflg-wms-auth/src/main/resources/application.yml

@@ -9,14 +9,12 @@ spring:
     import: nacos:shared.properties?group=${spring.profiles.active}&refreshEnabled=true
   cloud:
     nacos:
-      username: ${nacos.username:}
+      username: wms
-      password: ${nacos.password:}
+      password: wms
       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

nflg-wms-gateway/src/main/resources/application.yml

@@ -9,14 +9,12 @@ spring:
     import: nacos:shared.properties?group=${spring.profiles.active}&refreshEnabled=true
   cloud:
     nacos:
-      username: ${nacos.username:}
+      username: wms
-      password: ${nacos.password:}
+      password: wms
       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

nflg-wms-scheduled/src/main/resources/application.yml

@@ -9,14 +9,12 @@ spring:
     import: nacos:shared.properties?group=${spring.profiles.active}&refreshEnabled=true
   cloud:
     nacos:
-      username: ${nacos.username:}
+      username: wms
-      password: ${nacos.password:}
+      password: wms
       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

nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/controller/MaterialCodeController.java

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

nflg-wms-shipment/src/main/resources/application.yml

@@ -13,14 +13,12 @@ spring:
     import: nacos:shared.properties?group=${spring.profiles.active}&refreshEnabled=true
   cloud:
     nacos:
-      username: ${nacos.username:}
+      username: wms
-      password: ${nacos.password:}
+      password: wms
       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

nflg-wms-srm-receive/src/main/resources/application.yml

@@ -13,14 +13,12 @@ spring:
     import: nacos:shared.properties?group=${spring.profiles.active}&refreshEnabled=true
   cloud:
     nacos:
-      username: ${nacos.username:}
+      username: wms
-      password: ${nacos.password:}
+      password: wms
       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