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

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/MesDefectRecord.java

@@ -115,6 +115,10 @@ public class MesDefectRecord extends BaseBean implements Serializable {
     @ApiParam("维修状态名称")
     private String repairStatusName;
 
+    @Transient
+    @ApiParam("产品二维码")
+    private String productSn;
+
     public int getRepairStatusVal() {
         return this.repairStatus == null ? 0 : this.repairStatus;
     }

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/ProductBiSeriesModel.java

@@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.mes.model;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -20,4 +21,8 @@ public class ProductBiSeriesModel {
     private String type;
     @ApiParam("显示的数据")
     private List<Double> data;
+    @ApiParam("实际数量集合")
+    private List<Double> snQtyList = new ArrayList<>();
+    @ApiParam("计划数量集合")
+    private List<Double> planQtyList = new ArrayList<>();
 }

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

@@ -2081,10 +2081,10 @@ public class MesHqlPack {
     public static DdlPackBean getMesProduceSn(MesProduceSn mesProduceSn, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(mesProduceSn, organizeCode);
         if (!StringUtils.isEmpty(mesProduceSn.getWorkOrderNo())) {
-            DdlPreparedPack.getStringLikerPack(mesProduceSn.getWorkOrderNo(), "workOrderNo", packBean);
+            DdlPreparedPack.getStringEqualPack(mesProduceSn.getWorkOrderNo(), "workOrderNo", packBean);
         }
         if (!StringUtils.isEmpty(mesProduceSn.getPartNo())) {
-            DdlPreparedPack.getStringRightLikerPack(mesProduceSn.getPartNo(), "partNo", packBean);
+            DdlPreparedPack.getStringEqualPack(mesProduceSn.getPartNo(), "partNo", packBean);
         }
         if (!StringUtils.isEmpty(mesProduceSn.getSerialNumber())) {
             DdlPreparedPack.getStringEqualPack(mesProduceSn.getSerialNumber(), "serialNumber", packBean);
@@ -2093,7 +2093,7 @@ public class MesHqlPack {
             DdlPreparedPack.getStringEqualPack(mesProduceSn.getProductSn(), "productSn", packBean);
         }
         if (!StringUtils.isEmpty(mesProduceSn.getWorkCenterCode())) {
-            DdlPreparedPack.getStringLikerPack(mesProduceSn.getWorkCenterCode(), "workCenterCode", packBean);
+            DdlPreparedPack.getStringEqualPack(mesProduceSn.getWorkCenterCode(), "workCenterCode", packBean);
         }
         if (mesProduceSn.getSnStatus() != null) {
             DdlPreparedPack.getNumEqualPack(mesProduceSn.getSnStatus(), "snStatus", packBean);
@@ -2102,7 +2102,7 @@ public class MesHqlPack {
             DdlPreparedPack.getNumEqualPack(mesProduceSn.getQcStatus(), "qcStatus", packBean);
         }
         if (!StringUtils.isEmpty(mesProduceSn.getVinCode())) {
-            DdlPreparedPack.getStringLikerPack(mesProduceSn.getVinCode(), "vinCode", packBean);
+            DdlPreparedPack.getStringEqualPack(mesProduceSn.getVinCode(), "vinCode", packBean);
         }
         if (!StringUtil.isEmpty(mesProduceSn.getOutWorkCenterTimeEnd())) {
             DdlPreparedPack.getStringSmallerPack(mesProduceSn.getOutWorkCenterTimeEnd(), "outWorkCenterTime", packBean);
@@ -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/WmsPOMasterDetails.java

@@ -278,10 +278,11 @@ public class WmsPOMasterDetails extends BaseBean {
         this.rcQty = rcQty;
     }
 
-    public WmsPOMasterDetails(String orderNo ,String erpAreaNo,String organizeCode){
+    public WmsPOMasterDetails(String orderNo ,String erpAreaNo,String organizeCode, String createDatetime){
         this.orderNo = orderNo;
         this.erpAreaNo = erpAreaNo;
         this.organizeCode = organizeCode;
+        this.createDatetime = createDatetime;
     }
 
     public WmsPOMasterDetails(

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

@@ -8,8 +8,6 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
@@ -19,6 +17,8 @@ import org.springframework.format.annotation.DateTimeFormat;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Index;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import javax.persistence.Table;
 import javax.persistence.Transient;
 import java.util.Date;
@@ -923,4 +923,14 @@ public class WmsStockSn extends BaseBean {
         this.snStatus = snStatus;
         this.lotNo = lotNo;
     }
+
+    public WmsStockSn(String organizeCode, String sn, String partNo, String locateNo, String whNo, String zoneNo, String vendorNo) {
+        this.organizeCode = organizeCode;
+        this.sn = sn;
+        this.partNo = partNo;
+        this.locateNo = locateNo;
+        this.whNo = whNo;
+        this.zoneNo = zoneNo;
+        this.vendorNo = vendorNo;
+    }
 }

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/modelbean/AutoPickingModel.java

@@ -0,0 +1,35 @@
+package cn.estsh.i3plus.pojo.wms.modelbean;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+/**
+ * @Description : 自动生成领料看板model
+ * @Author : shun.cui
+ * @CreateDate : 2020/12/17 10:34
+ * @Modify :
+ **/
+@Data
+@Api("自动生成领料看板")
+public class AutoPickingModel {
+    @ApiParam("工厂名")
+    private String organizeCode;
+    @ApiParam("计划日期")
+    private String planDate;
+    @ApiParam("sap单号")
+    private String erpSrcNo;
+    @ApiParam("状态")
+    private int orderStatus;
+    @ApiParam("父零件号")
+    private String partNo;
+    @ApiParam("简称")
+    private String partNameRdd;
+    @ApiParam("完成数量")
+    private Double printQty;
+    @ApiParam("总数量")
+    private Double qty;
+    @ApiParam("操作时间")
+    private String modifyDateTime;
+    @ApiParam("操作人")
+    private String modifyUser;
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/MinAndMaxStockModel.java

@@ -0,0 +1,37 @@
+package cn.estsh.i3plus.pojo.wms.modelbean;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description : 最低库存/最高库存 预警看板 Model
+ * @Author : shun.cui
+ * @CreateDate : 2020/12/17 10:55
+ * @Modify :
+ **/
+@Data
+@Api("最低库存/最高库存预警看板")
+public class MinAndMaxStockModel {
+    @ApiParam("工厂名")
+    private String organizeCode;
+    @ApiParam("存储区")
+    private String zoneNo;
+    @ApiParam("库位")
+    private String locateNo;
+    @ApiParam("零件号")
+    private String partNo;
+    @ApiParam("简称")
+    private String partNameAdd;
+    @ApiParam("数量")
+    private Double qty;
+    @ApiParam("最低库存")
+    private Double min;
+    @ApiParam("最高库存")
+    private Double max;
+    @ApiParam("件号")
+    private String partTypeDesc;
+    @ApiParam("包装规格")
+    private Double snp;
+
+}

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> {
+}