Merge branch 'test' into dev

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java

@@ -18,7 +18,8 @@ public class MesPcnEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum PART_CHECK_DATA_TYPE {
         ALL_DATA(1, "所有数据"),
-        LAST_DATA(2, "最后一条数据");
+        LAST_DATA(2, "最后一条数据"),
+        ALL_DATA_AND_LAST_DATA(3, "所有数据且最后一条数据必须合格");
 
         private int value;
         private String description;

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

@@ -199,6 +199,10 @@ public class MesPackage extends BaseBean implements Serializable {
     @ApiParam("包装编号集合")
     private List<String> packageNoList = new ArrayList<>();
 
+    @Transient
+    @ApiParam(value = "生产线名称")
+    private String workCenterName;
+
     public MesPackage() {
     }
 

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

@@ -73,6 +73,10 @@ public class MesPackageDetail extends BaseBean implements Serializable {
     @ApiParam("批次")
     private String lotNo;
 
+    @Transient
+    @ApiParam("产品条码")
+    private String productSn;
+
 
 
 }

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

@@ -31,6 +31,9 @@ public class DataReviewModel {
     @ApiParam("对象代码")
     private String objectCode;
 
+    @ApiParam("末检是否合格")
+    private String lastDataResult;
+
     @ApiParam("是否合格标识")
     private Integer reviewFlag;
 
@@ -38,7 +41,7 @@ public class DataReviewModel {
     private String reviewResult;
 
     @ApiParam("显示标识")
-    private String showFlag;
+    private Integer showFlag;
 
     @ApiParam("颜色")
     private String color;

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

@@ -24,4 +24,7 @@ public class ProductDataCacheModel {
     @ApiParam("创建时间")
     private String createDatetime;
 
+    @ApiParam("是否必须是合格")
+    private Boolean isNecessary = false;
+
 }

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

@@ -3687,4 +3687,15 @@ public class MesHqlPack {
         return packBean;
     }
 
+    public static DdlPackBean getMesPackage(MesPackage mesPackage) {
+        DdlPackBean packBean = DdlPackBean.getDdlPackBean(mesPackage.getOrganizeCode());
+        DdlPreparedPack.getStringLikerPack(mesPackage.getWorkCenterCode(), "workCenterCode", packBean);
+        DdlPreparedPack.getStringLikerPack(mesPackage.getWorkOrderNo(), "workOrderNo", packBean);
+        DdlPreparedPack.getStringLikerPack(mesPackage.getPartNo(), "partNo", packBean);
+        DdlPreparedPack.getStringLikerPack(mesPackage.getPackageNo(), "packageNo", packBean);
+        DdlPreparedPack.getStringBiggerPack(mesPackage.getCreateDateTimeStart(), "createDatetime", packBean);
+        DdlPreparedPack.getStringSmallerPack(mesPackage.getCreateDateTimeEnd(), "createDatetime", packBean);
+        return packBean;
+    }
+
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUserPrinterInfo.java

@@ -0,0 +1,38 @@
+package cn.estsh.i3plus.pojo.wms.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.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+
+/**
+ * @Description 用户打印机绑定信息
+ * @Reference
+ * @Author dragon
+ * @CreateDate 2020/12/17 15:38
+ * @Modify
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name="WMS_USER_PRINTER_INFO")
+@Api("用户打印机绑定信息")
+public class WmsUserPrinterInfo extends BaseBean{
+
+    @Column(name="PRINTER_NO")
+    @ApiParam("打印机编号")
+    private String printerNo;
+
+    @Column(name="USER_NO")
+    @ApiParam("用户编码")
+    private String userNo;
+
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsUserPrinterInfoRepository.java

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsUserPrinterInfo;
+
+/**
+ * @Description 用户打印机绑定信息DAO层
+ * @Reference
+ * @Author dragon
+ * @CreateDate 2020/12/17 15:42
+ * @Modify
+ */
+public interface WmsUserPrinterInfoRepository extends BaseRepository<WmsUserPrinterInfo, Long> {
+}