Merge remote-tracking branch 'i3plus-pojo/test' into test

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

@@ -2559,7 +2559,8 @@ public class MesPcnEnumUtil {
     public enum PACKAGE_OP_TYPE {
 
         PACK(10, "打包"),
-        UNPACK(20, "拆包");
+        UNPACK(20, "拆包"),
+        STOP_OVER(30, "过站");
 
         private int value;
         private String description;

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

@@ -0,0 +1,53 @@
+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.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/4/20 5:16 下午
+ * @Modify:
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_FURNACE_LOCATION")
+@Api("MES_炉内模式位置信息")
+public class MesFurnaceLocation extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 3681747818263404126L;
+
+    @Column(name = "MODEL_NO")
+    @ApiParam("模式编号")
+    private String modelNo;
+
+    @Column(name = "FN_LOCATION_NO")
+    @ApiParam("炉内位置代码")
+    private String fnLocationNo;
+
+    @Column(name = "MODEL_IMG_URL")
+    @ApiParam("模式图片路径")
+    private String modelImgUrl;
+
+    @Column(name = "SEQ")
+    @ApiParam("推荐顺序")
+    private Integer seq;
+
+    @Transient
+    @ApiParam("容器编号")
+    private String ctNo;
+}

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

@@ -0,0 +1,52 @@
+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.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/4/20 5:16 下午
+ * @Modify:
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_FURNACE_LOCATION_DETAIL")
+@Api("MES_炉内占位信息")
+public class MesFurnaceLocationDetail extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 3681747818212133126L;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工作单元代码")
+    private String workCellCode;
+
+    @Column(name = "MODEL_NO")
+    @ApiParam("模式编号")
+    private String modelNo;
+
+    @Column(name = "FN_LOCATION_NO")
+    @ApiParam("炉内位置代码")
+    private String fnLocationNo;
+
+    @Column(name = "CT_NO")
+    @ApiParam("容器编号")
+    private String ctNo;
+}

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

@@ -153,6 +153,10 @@ public class MesPackage extends BaseBean implements Serializable {
     @ApiParam("erp工作中心")
     private String erpWorkCenterCode;
 
+    @Column(name = "FN_LOCATION_NO")
+    @ApiParam("炉内位置代码")
+    private String fnLocationNo;
+
     @Transient
     @ApiParam("目标库位代码")
     private String destLocationCode;

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

@@ -34,7 +34,7 @@ public class MesPackageTravel extends BaseBean implements Serializable {
     @ApiParam("包装编码")
     private String packageNo;
 
-    @Column(name = "CT_LOCATION_NO", nullable = false)
+    @Column(name = "CT_LOCATION_NO")
     @ApiParam("容器位置编号")
     private String ctLocationNo;
 
@@ -58,5 +58,19 @@ public class MesPackageTravel extends BaseBean implements Serializable {
     @ApiParam("包装编码4")
     private String packageNo4;
 
+    @Column(name = "CT_NO")
+    @ApiParam("容器编号")
+    private String ctNo;
 
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工作单元代码")
+    private String workCellCode;
+
+    @Column(name = "FN_LOCATION_NO")
+    @ApiParam("炉内位置代码")
+    private String fnLocationNo;
 }

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

@@ -0,0 +1,40 @@
+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.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/4/20 5:16 下午
+ * @Modify:
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_PART_FURNACE")
+@Api("MES_物料上炉模式")
+public class MesPartFurnace extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 3681747818263404111L;
+
+    @Column(name = "MODEL_NO")
+    @ApiParam("模式编号")
+    private String modelNo;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料编码")
+    private String partNo;
+}

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

@@ -0,0 +1,49 @@
+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.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+/**
+ * @author dominic
+ * @date 2020/11/18 21:52
+ * @desc 包装明细
+ */
+@Data
+@Api("包装明细")
+public class PackageDetailModel {
+
+    @ApiParam("料架号")
+    private String ctNo;
+
+    @ApiParam("容器位置编号")
+    private String ctLocationNo;
+
+    @ApiParam("过程条码")
+    private String serialNumber;
+
+    @ApiParam("物料编号")
+    private String partNo;
+
+    public PackageDetailModel(String ctNo, String ctLocationNo, String serialNumber, String partNo) {
+        this.ctNo = ctNo;
+        this.ctLocationNo = ctLocationNo;
+        this.serialNumber = serialNumber;
+        this.partNo = partNo;
+    }
+
+    public PackageDetailModel() {
+    }
+
+    ;
+}

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

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesFurnaceLocationDetail;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\11\18 10:34
+ * @Modify:
+ **/
+public interface MesFurnaceLocationDetailRepository extends BaseRepository<MesFurnaceLocationDetail, Long> {
+}

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

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesFurnaceLocation;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\11\18 10:34
+ * @Modify:
+ **/
+public interface MesFurnaceLocationRepository extends BaseRepository<MesFurnaceLocation, Long> {
+}

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

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesPartFurnace;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\11\18 10:34
+ * @Modify:
+ **/
+public interface MesPartFurnaceRepository extends BaseRepository<MesPartFurnace, Long> {
+}

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

@@ -3628,4 +3628,12 @@ public class MesHqlPack {
         }
         return packBean;
     }
+
+    public static DdlPackBean getMesFurnaceLocation(MesFurnaceLocation mesFurnaceLocation) {
+        DdlPackBean packBean = getAllBaseData(mesFurnaceLocation.getOrganizeCode());
+        DdlPreparedPack.getStringLikerPack(mesFurnaceLocation.getFnLocationNo(), "fnLocationNo", packBean);
+        DdlPreparedPack.getStringLikerPack(mesFurnaceLocation.getModelNo(), "modelNo", packBean);
+        DdlPreparedPack.getNumEqualPack(mesFurnaceLocation.getIsValid(), "isValid", packBean);
+        return packBean;
+    }
 }

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

@@ -75,4 +75,8 @@ public class BasCustomer extends BaseBean {
     @ApiParam(value = "安全库存")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2)
     private Double safetyStock;
+
+    public double getSafetyStockVal() {
+        return this.safetyStock == null ? 0.0d : this.safetyStock;
+    }
 }

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

@@ -324,10 +324,10 @@ public class WmsPOMasterDetails extends BaseBean {
         this.qty = qty;
     }
 
-    public WmsPOMasterDetails(String orderNo, String erpSrcNo, Integer item,String partNo,String partNameRdd, Double qty,
+    public WmsPOMasterDetails(String orderNo, String remark, Integer item,String partNo,String partNameRdd, Double qty,
                                 Double rcQty, Integer itemStatus) {
         this.orderNo = orderNo;
-        this.erpSrcNo = erpSrcNo;
+        this.remark = remark;
         this.item = item;
         this.partNo = partNo;
         this.partNameRdd = partNameRdd;

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

@@ -110,7 +110,8 @@ public class WmsQCDetails extends BaseBean {
                         Double qty, String unit, String orderNo,
                         Integer itemStatus, String remark, Double factQty,
                         Double passQty, Double rejectQty,
-                        Integer orderStatus, String vendorNo, String vendorDesc) {
+                        Integer orderStatus, String vendorNo, String vendorDesc,
+                        String createUser, String createDatetime,String modifyUser,String modifyDatetime) {
         this.organizeCode = organizeCode;
         this.partNo = partNo;
         this.partNameRdd = partNameRdd;
@@ -126,6 +127,10 @@ public class WmsQCDetails extends BaseBean {
         this.orderStatus = orderStatus;
         this.vendorNo = vendorNo;
         this.vendorDesc = vendorDesc;
+        this.createUser = createUser;
+        this.createDatetime = createDatetime;
+        this.modifyUser = modifyUser;
+        this.modifyDatetime = modifyDatetime;
     }
 
     public WmsQCDetails(String partNo, String partNameRdd, String item,

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

@@ -35,6 +35,9 @@ public class WmsVendorDelayMasterModel extends BaseBean {
     @ApiParam(value = "延迟次数")
     private Long sumDelayCount;
 
+    @ApiParam(value = "延迟到货百分比")
+    private Double delayPercent;
+
     @ApiParam(value = "查询开始时间")
     private String startDateTime;
 
@@ -62,7 +65,8 @@ public class WmsVendorDelayMasterModel extends BaseBean {
         this.createDatetime = createDateTime;
     }
 
-    public WmsVendorDelayMasterModel(String orderNo, String reason, String planDate, String planTime, String actualPlanTime, String vendorNo, String vendorName, String organizeCode) {
+    public WmsVendorDelayMasterModel(String orderNo, String reason, String planDate, String planTime,
+                                     String actualPlanTime, String vendorNo, String vendorName, String organizeCode) {
         this.orderNo = orderNo;
         this.reason = reason;
         this.planDate = planDate;