20240218

src/main/java/com/gaotao/modules/label/service/impl/PrintLabelRecordServiceImpl.java

@@ -151,8 +151,10 @@ public class PrintLabelRecordServiceImpl extends ServiceImpl<PrintLabelRecordMap
                     .eq(ManufacturerInformationData::getSite, printLabelRecord.getSite())
                     .eq(ManufacturerInformationData::getManufacturerNo, printLabelRecord.getManufacturerNo())
                     .one();
+            if (Objects.nonNull(manufacturer)){
                 str = Optional.ofNullable(manufacturer.getManufacturerCode()).orElse(str);
             }
+        }
 
         // 打印张数
         for (int i = 1; i <= printSize; i++) {

src/main/java/com/gaotao/modules/label/service/impl/PrintRollLabelRecordServiceImpl.java

@@ -90,7 +90,9 @@ public class PrintRollLabelRecordServiceImpl extends ServiceImpl<PrintRollLabelR
                     .eq(ManufacturerInformationData::getSite, printRollLabelRecord.getSite())
                     .eq(ManufacturerInformationData::getManufacturerNo, printRollLabelRecord.getManufacturerNo())
                     .one();
-            str = Optional.ofNullable(manufacturer.getManufacturerCode()).orElse("00");
+            if (Objects.nonNull(manufacturer)){
+                str = Optional.ofNullable(manufacturer.getManufacturerCode()).orElse(str);
+            }
         }
 
         List<PrintRollLabelRecord> printRollLabelRecords = new ArrayList<>();