14165 返修队列增加校验

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

@@ -0,0 +1,148 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.ColumnDefault;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: Crish
+ * @CreateDate:2019-04-16-17:36
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "MES_QUEUE_ORDER_DETAIL_RECORD", indexes = {
+        @Index(columnList = "ORDER_NO"),
+        @Index(columnList = "SERIAL_NUMBER"),
+        @Index(columnList = "QUEUE_GROUP_NO"),
+        @Index(columnList = "PRODUCE_CATEGORY_CODE")
+})
+@Api("生产队列明细记录表")
+public class MesQueueOrderDetailRecord extends BaseBean implements Serializable {
+    private static final long serialVersionUID = 7840873844253353896L;
+
+    @Column(name = "ORDER_NO")
+    @ApiParam("主队列编号")
+    private String orderNo;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
+
+    @Column(name = "PART_NAME_RDD")
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @Column(name = "SERIAL_NUMBER")
+    @ApiParam("产品条码")
+    private String serialNumber;
+
+    @Column(name = "SEQ", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
+    @ApiParam("队列明细序号")
+    private Double seq;
+
+    @Column(name = "QTY", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
+    @ApiParam("数量")
+    private Double qty;
+
+    @Column(name = "STATUS")
+    @ApiParam("状态")
+    private Integer status;
+
+    @Column(name = "WORK_TYPE")
+    @ApiParam("生产类型")
+    private String workType;
+
+    @Column(name = "PRODUCE_CATEGORY_CODE")
+    @ApiParam("产品位置")
+    private String produceCategoryCode;
+
+    @Column(name = "PRODUCE_CATEGORY_NAME_RDD")
+    @ApiParam("产品位置名称")
+    private String produceCategoryNameRdd;
+
+    @Column(name = "PPT_CODE")
+    @ApiParam("产品类型名称")
+    private String pptCode;
+
+    @Column(name = "QUEUE_GROUP_NO")
+    @ApiParam("分组队列编号")
+    private String queueGroupNo;
+
+    @Column(name = "GROUP_NO")
+    @ApiParam("组内编号")
+    private Integer groupNo;
+
+    @Column(name = "IS_GROUP_PRINTED")
+    @ApiParam("料架是否已打印")
+    private Integer isGroupPrinted = 2;
+
+    @Column(name = "PRODUCE_COLOR")
+    @ApiParam("产品颜色")
+    private String produceColor;
+
+    @Column(name = "PRODUCE_COLOR_CODE")
+    @ApiParam("产品颜色代码")
+    private String produceColorCode;
+
+    @Column(name = "OPTION_CODE")
+    @ApiParam("选项代码")
+    private String optionCode;
+
+    @Column(name = "ASSY_NO")
+    @ApiParam("组件编号")
+    private String assyNo;
+
+    @Column(name = "FORMULA_CONTENT")
+    @ApiParam("配方内容")
+    private String formulaContent;
+
+    @Column(name = "FINSIH_QTY", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
+    @ApiParam("已生产数量")
+    private Double finsihQty;
+
+    @Column(name = "GROUP_SIDE")
+    @ApiParam("料架摆放位置")
+    private String groupSide;
+
+    @Column(name = "GROUP_SEQ")
+    @ApiParam("分组序号")
+    private String groupSeq;
+
+    @Column(name = "PRODUCT_SN")
+    @ApiParam("产品条码")
+    private String productSn;
+
+    @Column(name = "IS_EMPTY")
+    @ApiParam("是否放空")
+    private Integer isEmpty;
+
+    @Column(name = "JIS_BACKFLUSH_STATUS")
+    @ApiParam("回冲标识")
+    private String jisBackflushStatus;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工作单元代码")
+    private String workCellCode;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心")
+    private String workCenterCode;
+}

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

@@ -20,6 +20,8 @@ public class SnPrintDataModel {
 
     @ApiParam("打印数据")
     private List<StepPrintSnModel> valueList;
+    @ApiParam("打印数据")
+    private List<StepPrintSnModel> templateData;
 
     @ApiParam("打印模板及参数")
     private MesLabelTemplate labelTemplate;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueOrderDetailRecordRepository.java

@@ -0,0 +1,13 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesQueueOrderDetailRecord;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2021/2/26 10:18 AM
+ * @Modify:
+ */
+public interface MesQueueOrderDetailRecordRepository extends BaseRepository<MesQueueOrderDetailRecord, Long> {
+}

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

@@ -2120,7 +2120,7 @@ public class MesHqlPack {
             DdlPreparedPack.getNumEqualPack(mesProduceSn.getQcStatus(), "qcStatus", packBean);
         }
         if (!StringUtils.isEmpty(mesProduceSn.getVinCode())) {
-            DdlPreparedPack.getStringEqualPack(mesProduceSn.getVinCode(), "vinCode", packBean);
+            DdlPreparedPack.getStringLikerPack(mesProduceSn.getVinCode(), "vinCode", packBean);
         }
         if (!StringUtils.isEmpty(mesProduceSn.getOutWorkCenterTimeEnd())) {
             DdlPreparedPack.getStringSmallerPack(mesProduceSn.getOutWorkCenterTimeEnd(), "outWorkCenterTime", packBean);