优化天津麦格纳报表

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnPaintPolishingReportModel.java

@@ -0,0 +1,42 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+@Data
+public class MgnPaintPolishingReportModel {
+
+    @ApiParam("物料号")
+    private String partNo;
+
+    @ApiParam("物料描述")
+    private String partDesc;
+
+    @ApiParam("工单号")
+    private String workOrderNo;
+
+    @ApiParam("日期")
+    private String modifyDate;
+
+    @ApiParam("开始日期")
+    private String modifyStartDate;
+
+    @ApiParam("结束日期")
+    private String modifyEndDate;
+
+    @ApiParam("抛光数量")
+    private Double polishingQty;
+
+    @ApiParam("返喷标识")
+    private String reverseSprayMark;
+
+    @ApiParam("打磨件物料号")
+    private String polishPartNo;
+
+    @ApiParam("打磨件物料描述")
+    private String polishPartDesc;
+
+    @ApiParam("组织代码")
+    private String organizeCode;
+
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java

@@ -11,6 +11,7 @@ import cn.estsh.i3plus.pojo.mes.bean.template.BasImportTemplate;
 import cn.estsh.i3plus.pojo.mes.bean.template.BasImportTemplateDetails;
 import cn.estsh.i3plus.pojo.mes.bean.MesWorkCellDefect;
 import cn.estsh.i3plus.pojo.mes.dbinterface.MesInterfaceDataMapper;
+import cn.estsh.i3plus.pojo.mes.model.MgnPaintPolishingReportModel;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
@@ -3415,4 +3416,16 @@ public class MesHqlPack {
         }
         return packBean;
     }
+
+    public static DdlPackBean getMesPaintPolishing(MgnPaintPolishingReportModel paintPolishingReportModel, String organizeCode) {
+        DdlPackBean packBean = DdlPackBean.getDdlPackBean(paintPolishingReportModel.getOrganizeCode());
+        if (!StringUtils.isEmpty(paintPolishingReportModel.getPartNo())) {
+            DdlPreparedPack.getStringEqualPack(paintPolishingReportModel.getPartNo(), "partNo", packBean);
+        }
+        if (!StringUtils.isEmpty(paintPolishingReportModel.getModifyStartDate()) || !StringUtils.isEmpty(paintPolishingReportModel.getModifyEndDate())) {
+            DdlPreparedPack.timeBuilder(paintPolishingReportModel.getModifyStartDate(), paintPolishingReportModel.getModifyEndDate(),
+                    "modifyDatetime", packBean, true);
+        }
+        return packBean;
+    }
 }