Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

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

@@ -30,6 +30,11 @@ import java.io.Serializable;
 @Api("工位投料信息")
 public class MesCellFeed extends BaseBean implements Serializable {
     private static final long serialVersionUID = 1947971369479107782L;
+
+    @Column(name = "ORDER_NO")
+    @ApiParam("工单号")
+    private String orderNo;
+
     @Column(name = "WORK_CENTER_CODE")
     @ApiParam("工作中心")
     private String workCenterCode;

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

@@ -118,6 +118,11 @@ public class MesPackage extends BaseBean implements Serializable {
     @ApiParam("客户发往地")
     private String custDeliveryLocation;
 
+    // 赋值模板代码
+    @Column(name = "PACKAGE_LABEL_TEMPLATE")
+    @ApiParam("包装标签模板")
+    private String packageLabelTemplate;
+
     public MesPackage() {
     }
 

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

@@ -140,6 +140,10 @@ public class MesProduceSn extends BaseBean implements Serializable {
     @ApiParam("产品标签模板")
     private String prodLabelTemplate;
 
+    @Column(name = "CUST_LABEL_TEMPLATE")
+    @ApiParam("客户标签模板")
+    private String custLabelTemplate;
+
 //    @Version
 //    @Column(name = "LOCK_VERSION")
 //    @ApiParam(value = "乐观锁", example = "1")

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

@@ -177,6 +177,10 @@ public class MesWorkOrder extends BaseBean implements Serializable {
     @ApiParam("预留字段4")
     private String reserved4;
 
+    @Column(name = "PARENT_PART_NO")
+    @ApiParam("父阶物料号")
+    private String parentPartNo;
+
     @Version
     @Column(name = "LOCK_VERSION")
     @ApiParam(value = "乐观锁", example = "1")

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

@@ -0,0 +1,45 @@
+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;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: siliter.yuan
+ * @CreateDate: 2020\06\22 15:58
+ * @Modify:
+ **/
+@Data
+public class MesPaintSnPrintModel implements Serializable {
+
+    @ApiParam("过程条码")
+    private String serialNumber;
+
+    @ApiParam("产品条码")
+    private String produceSn;
+
+    @ApiParam("包装编号")
+    private String packageNo;
+
+    @ApiParam("工单号")
+    private String workOrderNo;
+
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @ApiParam("工作单元代码")
+    private String workCellCode;
+
+    @ApiParam("物料号")
+    private String partNo;
+
+    @ApiParam("工厂代码")
+    private String organizeCode;
+
+    @ApiParam("打印模板")
+    private MesLabelTemplate labelTemplate;
+}

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

@@ -0,0 +1,30 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+@Data
+public class PackageSnLabelTemplateDataModel {
+
+    @ApiParam("物料号")
+    private String partNo;
+
+    @ApiParam("物料名称")
+    private String partName;
+
+    // 工单表.包装规格描述
+    @ApiParam("包装规格")
+    private Double packSpecQty;
+
+    @ApiParam("生产日期")
+    private String prodDate;
+
+    @ApiParam("工单班次")
+    private String workOrderShift;
+
+    @ApiParam("操作人员名称")
+    private String operatorName;
+
+    @ApiParam("工厂名称")
+    private String organizeName;
+}

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

@@ -0,0 +1,49 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Author: siliter.yuan
+ * @CreateDate: 2020/6/21 8:06 PM
+ * @Description:
+ **/
+@Data
+@Api("涂装上线MODEL")
+public class PaintOnLineModel {
+
+    @ApiParam("工作中心")
+    private String workCenterCode;
+
+    @ApiParam("工作单元")
+    private String workCellCode;
+
+    @ApiParam("工单号")
+    private String workOrderNo;
+
+    @ApiParam("物料号")
+    private String partNo;
+
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @ApiParam("颜色")
+    private String color;
+
+    @ApiParam("工单数量")
+    private Double orderNum;
+
+    @ApiParam("包装数量")
+    private Double packageNum;
+
+    @ApiParam("项目名称")
+    private String productName;
+
+    @ApiParam("创建时间")
+    private String createDateTime;
+
+    @ApiParam("圈数")
+    private Integer rounds;
+}

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

@@ -0,0 +1,64 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+/**
+ * @Description : 涂装工单条码-展示组件model
+ * @Reference :
+ * @Author : adair.song
+ * @CreateDate : 2020-06-21 11:02
+ * @Modify:
+ **/
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Api("涂装工单条码展示组件model")
+public class PaintWorkOrderSnModel extends BaseBean {
+
+    @ApiParam("工单号")
+    private String orderNo;
+
+    @ApiParam("物料号")
+    private String partNo;
+
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @ApiParam("颜色代码")
+    private String colorCode;
+
+    @ApiParam("颜色名称")
+    private String colorName;
+
+    @ApiParam("工单数量")
+    private Double workOrderQty;
+
+    @ApiParam("包装数量")
+    private Double packageQty;
+
+    @ApiParam("项目名称")
+    private String prodCfgTypeName;
+
+    @ApiParam("圈数")
+    private Integer groupNum;
+
+    @ApiParam("工单状态")
+    private Integer workOrderStatus;
+
+    // 父阶物料号  -- 涂装客户标签打印
+    @ApiParam("父阶物料号")
+    private String parentPartNo;
+
+    // 父阶物料名称  -- 涂装二次条码打印
+    @ApiParam("父阶物料名称")
+    private String parentPartName;
+
+    private List<ProdPackModel> prodPackageList;
+}

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

@@ -0,0 +1,60 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description : 涂装工单条码-展示组件(产品包装)model
+ * @Reference :
+ * @Author : adair.song
+ * @CreateDate : 2020-06-21 11:02
+ * @Modify:
+ **/
+@Data
+@Api("产品包装model")
+public class ProdPackModel {
+
+    // 产品条码表--产品条码
+    @ApiParam("产品条码")
+    private String productSn;
+
+    // 包装主表--包装编号
+    @ApiParam("一检箱条码")
+    private String packageNo;
+
+    // 包装明细表--创建时间
+    @ApiParam("一检校验时间")
+    private String createDatetime;
+
+    // 包装主表--打印状态(10：未打印 20：已打印)
+    @ApiParam("箱条码状态")
+    private Integer printStatus;
+
+    // 涂装客户标签打印
+    @ApiParam("客户标签")
+    private String custSn;
+
+    // 涂装客户标签打印
+    @ApiParam("当前工序")
+    private String processCode;
+
+    // 涂装客户标签打印
+    @ApiParam("更新时间")
+    private String modifyDateTime;
+
+    public ProdPackModel(String productSn, String packageNo, String createDatetime, Integer printStatus) {
+        this.productSn = productSn;
+        this.packageNo = packageNo;
+        this.createDatetime = createDatetime;
+        this.printStatus = printStatus;
+    }
+
+    public ProdPackModel(String productSn, String packageNo, String custSn, String processCode, String modifyDateTime) {
+        this.productSn = productSn;
+        this.packageNo = packageNo;
+        this.custSn = custSn;
+        this.processCode = processCode;
+        this.modifyDateTime = modifyDateTime;
+    }
+}

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

@@ -616,4 +616,47 @@ public class MesPcnHqlPack {
         return endIndex;
     }
 
+    /**
+     * 涂装一次箱条码打印获取工单 查询条件封装
+     *
+     * @param mesWorkOrder
+     * @return
+     */
+    public static DdlPackBean getWorkOrderList(MesWorkOrder mesWorkOrder, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(mesWorkOrder, organizeCode);
+        if (!StringUtils.isEmpty(mesWorkOrder.getOrderNo())) {
+            DdlPreparedPack.getStringLikerPack(mesWorkOrder.getOrderNo(), "orderNo", packBean);
+        }
+        if (!StringUtils.isEmpty(mesWorkOrder.getPartNo())) {
+            DdlPreparedPack.getStringLikerPack(mesWorkOrder.getPartNo(), "partNo", packBean);
+        }
+        if (!StringUtils.isEmpty(mesWorkOrder.getWorkCenterCode())) {
+            DdlPreparedPack.getStringEqualPack(mesWorkOrder.getWorkCenterCode(), "workCenterCode", packBean);
+        }
+        if (!StringUtils.isEmpty(mesWorkOrder.getWorkOrderStatus())) {
+            DdlPreparedPack.getNumEqualPack(mesWorkOrder.getWorkOrderStatus(), "workOrderStatus", packBean);
+        }
+        DdlPreparedPack.getNumEqualPack(mesWorkOrder.getWorkOrderType(), "workOrderType", packBean);
+        // 时间段查询
+        if (!StringUtils.isEmpty(mesWorkOrder.getStartTimeStart()) || !StringUtils.isEmpty(mesWorkOrder.getStartTimeEnd())) {
+            DdlPreparedPack.timeBuilder(
+                    mesWorkOrder.getStartTimeStart(),
+                    mesWorkOrder.getStartTimeEnd(),
+                    "startTime", packBean, true);
+        }
+        if (!StringUtils.isEmpty(mesWorkOrder.getEndTimeStart()) || !StringUtils.isEmpty(mesWorkOrder.getEndTimeEnd())) {
+            DdlPreparedPack.timeBuilder(
+                    mesWorkOrder.getEndTimeStart(),
+                    mesWorkOrder.getEndTimeEnd(),
+                    "endTime", packBean, true);
+        }
+        if (!StringUtils.isEmpty(mesWorkOrder.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesWorkOrder.getCreateDateTimeEnd())) {
+            DdlPreparedPack.timeBuilder(
+                    mesWorkOrder.getCreateDateTimeStart(),
+                    mesWorkOrder.getCreateDateTimeEnd(),
+                    "createDatetime", packBean, true);
+        }
+
+        return packBean;
+    }
 }