Merge remote-tracking branch 'origin/master'

src/main/java/com/gaotao/modules/base/service/Impl/ReportLabelListServiceImpl.java

@@ -590,22 +590,10 @@ public class ReportLabelListServiceImpl extends ServiceImpl<ReportLabelListMappe
      */
     @Override
     public void printLabelCommon(PrintLabelRequest printRequest) {
-        // 校验必要参数
-        if (printRequest.getReportId() == null || printRequest.getReportId().trim().isEmpty()) {
-            throw new RuntimeException("标签编号不能为空");
-        }
-        if (printRequest.getUserId() == null || printRequest.getUserId().trim().isEmpty()) {
-            throw new RuntimeException("用户名不能为空");
-        }
-        if (printRequest.getUnitId() == null || printRequest.getUnitId().trim().isEmpty()) {
-            throw new RuntimeException("HU标签唯一码unitID不能为空");
-        }
-        if (printRequest.getSite() == null || printRequest.getSite().trim().isEmpty()) {
-            throw new RuntimeException("工厂编号不能为空");
-        }
         String rfidFlag;
         LabelSettingData labelSettingData = new LabelSettingData();
         labelSettingData.setLabelNo(printRequest.getReportId());
+        labelSettingData.setLabelType(printRequest.getLabelType());
         List<LabelSettingData> labelSettingDataList = baseService.getLabelSettingList(labelSettingData);
         LabelSettingData labelSetting;
         if (labelSettingDataList.isEmpty()) {