余料标签修改

dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SurplusReturnServiceImpl.java

@@ -205,17 +205,16 @@ public class SurplusReturnServiceImpl extends ServiceImpl<SurplusReturnMapper, S
         inventoryAssyData.setInventoryBo(inventoryBo);
         inventoryAssyData.setDataField("VENDOR_NAME");
         List<InventoryAssyData> inventoryAssyDataList = inventoryAssyDataService.selectList(inventoryAssyData);
-        if (inventoryAssyDataList.size() != 1){
-            throw BusinessException.build("未正确找到当前批次的供应商！");
-        }
-        String dataAttr = inventoryAssyDataList.get(0).getDataAttr();
 
         // 记录打印参数：物料、物料编码、供应商、批次号
         LabelPrintDto labelPrintDto = new LabelPrintDto();
         labelPrintDto.setItem(inventoryModel.getItemBo().split(",")[1]);
         labelPrintDto.setItemDescription(inventoryModel.getDescription());
-        labelPrintDto.setSupplier(dataAttr);
-        labelPrintDto.setBatch(surplusInventory);
+        if (inventoryAssyDataList.size() == 1){
+            labelPrintDto.setSupplier(inventoryAssyDataList.get(0).getDataAttr());
+            labelPrintDto.setBatch(inventoryAssyDataList.get(0).getDataField());
+            //throw BusinessException.build("未正确找到当前批次的供应商！");
+        }
         labelPrintDto.setLabel(surplusInventory);
 
         printLog.setPrintParam(JSON.toJSONString(labelPrintDto));