解决冲突

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java

@@ -129,6 +129,15 @@ public class MesProduceSn extends BaseBean {
     @ApiParam("返回信息")
     private String resultMsg;
 
+    @Transient
+    @ApiParam("下线时间开始")
+    private String outWorkCenterTimeStart;
+
+    @Transient
+    @ApiParam("下线时间截止")
+    private String outWorkCenterTimeEnd;
+
+
     public double getQtyVal() {
         return this.qty == null ? 0.0d : this.qty;
     }
@@ -178,6 +187,8 @@ public class MesProduceSn extends BaseBean {
                 ", snType='" + snType + '\'' +
                 ", tray='" + tray + '\'' +
                 ", resultMsg='" + resultMsg + '\'' +
+                ", outWorkCenterTimeStart='" + outWorkCenterTimeStart + '\'' +
+                ", outWorkCenterTimeEnd='" + outWorkCenterTimeEnd + '\'' +
                 '}';
     }
 }

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

@@ -0,0 +1,27 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import cn.estsh.i3plus.pojo.mes.bean.MesLabelTemplate;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Description: 打印信息封装模板
+ * @Reference:
+ * @Author: wangjie
+ * @CreateDate:2019-08-27-13:24
+ * @Modify:
+ **/
+@Data
+@Api("打印信息封装模板")
+public class SnPrintDataModel {
+
+    @ApiParam("打印数据")
+    private List<SnPrintValueModel> snPrintValueModel;
+
+    @ApiParam("打印模板及参数")
+    private MesLabelTemplate labelTemplate;
+
+}

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

@@ -0,0 +1,27 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description: 条码补打印
+ * @Reference:
+ * @Author: wangjie
+ * @CreateDate:2019-08-27-13:24
+ * @Modify:
+ **/
+@Data
+@Api("打印信息模板")
+public class SnPrintModel extends SnPrintValueModel {
+
+    @ApiParam("过程条码")
+    private SnPrintDataModel snPrintModel;
+
+    @ApiParam("产品条码")
+    private SnPrintDataModel prodPrintModel;
+
+    @ApiParam("包装条码")
+    private SnPrintDataModel packagePrintModel;
+
+}

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

@@ -1,26 +0,0 @@
-package cn.estsh.i3plus.pojo.mes.model;
-
-import cn.estsh.i3plus.pojo.mes.bean.MesLabelTemplate;
-import io.swagger.annotations.ApiParam;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * @Description : 产品/包装打印模板model
- * @Reference :
- * @Author : wangjie
- * @CreateDate : 2019-08-18 11:00
- * @Modify:
- **/
-@Data
-public class SnPrintTemplateModel implements Serializable {
-
-    @ApiParam("产品条码模板")
-    private MesLabelTemplate prodSnPrintTemplate;
-
-    @ApiParam("包装条码模板集合")
-    private List<MesLabelTemplate> packageSnPrintTemplateList;
-
-}

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

@@ -0,0 +1,72 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import cn.estsh.i3plus.pojo.mes.bean.MesProduceSn;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description: 条码补打印
+ * @Reference:
+ * @Author: wangjie
+ * @CreateDate:2019-08-27-13:24
+ * @Modify:
+ **/
+@Data
+@Api("打印信息模板")
+public class SnPrintValueModel extends MesProduceSn {
+    @ApiParam("打印描述")
+    private String printDesc;
+
+    @ApiParam("条码")
+    private String barCode;
+
+    @ApiParam("物料号")
+    private String partNo;
+
+    @ApiParam("批次号")
+    private String batchNo;
+
+    @ApiParam("箱数量")
+    private String boxQty;
+
+    @ApiParam("订单号")
+    private String orderNo;
+
+    @ApiParam("生产日期")
+    private String productionTime;
+
+    @ApiParam("包装编码")
+    private String packageNo;
+
+    @ApiParam("包装规格")
+    private String packageSpec;
+
+    @ApiParam("供应商")
+    private String supplier;
+
+    @ApiParam("客户名称")
+    private String customerName;
+
+    @ApiParam("客户零件号")
+    private String customerPartNo;
+
+    @ApiParam("客户物料名称")
+    private String customerPartName;
+
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @ApiParam("单位")
+    private String unit;
+
+    @ApiParam("特殊批号")
+    private String fixLotNo;
+
+    @ApiParam("生产工单号")
+    private String workOrderNo;
+
+    @ApiParam("生产线代码")
+    private String workCenterCode;
+
+}

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

@@ -1860,10 +1860,6 @@ public class MesHqlPack {
         if (mesProduceSn.getQcStatus() != null) {
             DdlPreparedPack.getNumEqualPack(mesProduceSn.getQcStatus(), "qcStatus", packBean);
         }
-        DdlPreparedPack.timeBuilder(
-                mesProduceSn.getCreateDateTimeStart(),
-                mesProduceSn.getCreateDateTimeEnd(),
-                "createDatetime", packBean, true);
         return packBean;
     }
 
@@ -1927,4 +1923,73 @@ public class MesHqlPack {
         return packBean;
     }
 
+    /**
+     * 按条件分页查询产品条码补打印数据
+     * @param mesProduceSn
+     * @return
+     */
+    public static DdlPackBean getProdSnPrint(MesProduceSn mesProduceSn) {
+        DdlPackBean packBean = getMesAllData(mesProduceSn.getOrganizeCode());
+        if (!StringUtils.isEmpty(mesProduceSn.getSerialNumber())) {
+            DdlPreparedPack.getStringLikerPack(mesProduceSn.getSerialNumber(), "serialNumber", packBean);
+        }
+
+        if (!StringUtils.isEmpty(mesProduceSn.getProductSn())) {
+            DdlPreparedPack.getStringLikerPack(mesProduceSn.getProductSn(), "productSn", packBean);
+        }
+
+        if (!StringUtils.isEmpty(mesProduceSn.getPartNo())) {
+            DdlPreparedPack.getStringLikerPack(mesProduceSn.getPartNo(), "partNo", packBean);
+        }
+
+        if (!StringUtils.isEmpty(mesProduceSn.getSnStatus())) {
+            DdlPreparedPack.getNumEqualPack(mesProduceSn.getSnStatus(), "snStatus", packBean);
+        }
+
+        // 时间段查询
+        DdlPreparedPack.timeBuilder(
+                mesProduceSn.getCreateDateTimeStart(),
+                mesProduceSn.getCreateDateTimeEnd(),
+                "createDatetime", packBean, true);
+        DdlPreparedPack.timeBuilder(
+                mesProduceSn.getOutWorkCenterTimeStart(),
+                mesProduceSn.getOutWorkCenterTimeEnd(),
+                "outWorkCenterTime", packBean, true);
+
+        return packBean;
+    }
+
+    /**
+     * 按条件分页查询包装条码补打印数据
+     * @param mesPackage
+     * @return
+     */
+    public static DdlPackBean getPackageSnPrint(MesPackage mesPackage) {
+
+        DdlPackBean packBean = getMesAllData(mesPackage.getOrganizeCode());
+        if (!StringUtils.isEmpty(mesPackage.getPartNo())) {
+            DdlPreparedPack.getStringLikerPack(mesPackage.getPartNo(), "partNo", packBean);
+        }
+
+        if (!StringUtils.isEmpty(mesPackage.getPackLevel())) {
+            DdlPreparedPack.getNumEqualPack(mesPackage.getPackLevel(), "packLevel", packBean);
+        }
+
+        if (!StringUtils.isEmpty(mesPackage.getPackageNo())) {
+            DdlPreparedPack.getStringLikerPack(mesPackage.getPackageNo(), "packageNo", packBean);
+        }
+
+        if (!StringUtils.isEmpty(mesPackage.getWorkCenterCode())) {
+            DdlPreparedPack.getStringLikerPack(mesPackage.getWorkCenterCode(), "workCenterCode", packBean);
+        }
+
+        // 时间段查询
+        DdlPreparedPack.timeBuilder(
+                mesPackage.getCreateDateTimeStart(),
+                mesPackage.getCreateDateTimeEnd(),
+                "createDatetime", packBean, true);
+
+        return packBean;
+    }
+
 }