Merge branch 'dev' into test

6 years ago · 23c59d4326
parent 32b15fdabf 271a26d2b8
commit 23c59d4326
9 changed files with 395 additions and 30 deletions
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCellFeed.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCellFeed.java
@ -0,0 +1,71 @@
+package cn.estsh.i3plus.pojo.mes.pcn.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;
+
+/**
+ * @Description :mes系统业务动作
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-12
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_CELL_FEED")
+@Api("工位投料信息")
+public class MesCellFeed extends BaseBean {
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心")
+    private String workCenterCode;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工作单元")
+    private String workCellCode;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
+
+    @Column(name = "PART_NAME")
+    @ApiParam("物料名称")
+    private String partName;
+
+    @Column(name = "RAW_TYPE")
+    @ApiParam("原料类型")
+    private String rawType;
+
+    @Column(name = "RAW_SN")
+    @ApiParam("原材料条码")
+    private String rawSn;
+
+    @Column(name = "RAW_QTY")
+    @ApiParam("特殊批次")
+    private Long rawQty;
+
+    @Column(name = "LOT_NO")
+    @ApiParam("关联批次")
+    private String lotNo;
+
+    @Column(name = "SUPPLIER_CODE")
+    @ApiParam("供应商代码")
+    private String supplierCode;
+
+    public long getRawQtyVal() {
+        return this.rawQty == null ? 0l : this.rawQty;
+    }
+
+}
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProcessBom.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProcessBom.java
@ -34,6 +34,18 @@ public class MesProcessBom extends BaseBean {
    @ApiParam("零件号")
    private String partNo;

+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心")
+    private String workCenterCode;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工作单元")
+    private String workCellCode;
+
+    @Column(name = "ROUTE_CODE")
+    @ApiParam("流程代码")
+    private String routeCode;
+
    @Column(name = "PROCESS_CODE")
    @ApiParam("工序代码")
    private String processCode;
@ -55,6 +67,10 @@ public class MesProcessBom extends BaseBean {
    @ApiParam(value = "是否检查")
    private Integer isCheck;

+    @Column(name = "IS_FEED")
+    @ApiParam(value = "是否检查")
+    private Integer isFeed;
+
    @Transient
    @ApiParam("是否已绑定")
    private Boolean isBind;
@ -80,6 +96,10 @@ public class MesProcessBom extends BaseBean {
        return this.isBind == null ? false : this.isBind;
    }

+    public int getIsFeedVal() {
+        return this.isFeed == null ? 0 : this.isFeed;
+    }
+
    @Override
    public String toString() {
        return "MesProcessBom{" +
@ -89,6 +109,7 @@ public class MesProcessBom extends BaseBean {
                ", qty=" + qty +
                ", isRepeat=" + isRepeat +
                ", isCheck=" + isCheck +
+                ", isFeed=" + isFeed +
                ", isBind=" + isBind +
                ", color='" + color + '\'' +
                ", id=" + id +
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdBindRecord.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdBindRecord.java
@ -25,20 +25,20 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
-@Table(name="MES_PROD_BIND_RECORD")
+@Table(name = "MES_PROD_BIND_RECORD")
@Api("产品绑定记录表")
 public class MesProdBindRecord extends BaseBean {
    @Column(name = "SERIAL_NUMBER")
    @ApiParam(value = "产品条码")
    private String serialNumber;

-    @Column(name="PART_NO")
+    @Column(name = "PART_NO")
    @ApiParam("产品条码零件号")
    private String partNo;

-    @Column(name="WORK_ORDER")
+    @Column(name = "WORK_ORDER_NO")
    @ApiParam("工单号")
-    private String  workOrder;
+    private String workOrderNo;

    @Column(name = "WORK_CENTER_CODE")
    @ApiParam(value = "工作中心")
@ -52,11 +52,11 @@ public class MesProdBindRecord extends BaseBean {
    @ApiParam(value = "工步代码")
    private String stepCode;

-    @Column(name="ITEM_PART_NO")
+    @Column(name = "ITEM_PART_NO")
    @ApiParam("原材料零件号")
    private String itemPartNo;

-    @Column(name="KP_SN")
+    @Column(name = "KP_SN")
    @ApiParam("原材料条码")
    private String kpSn;

@ -65,11 +65,19 @@ public class MesProdBindRecord extends BaseBean {
    @ApiParam(value = "原材料数量", example = "0")
    private Double kpQty;

-    @Column(name="SUPPLIER_CODE")
+    @Column(name = "SUPPLIER_CODE")
    @ApiParam("供应商")
    private String supplierCode;

-    @Column(name="VERSION")
+    @Column(name = "LOT_NO")
+    @ApiParam
+    private String lotNo;
+
+    @Column(name = "IS_FEED")
+    @ApiParam
+    private Integer isFeed;
+
+    @Column(name = "VERSION")
    @ApiParam("版本")
    private String version;

@ -77,6 +85,10 @@ public class MesProdBindRecord extends BaseBean {
    @ApiParam(value = "结果")
    private String result;

+    public int getIsFeedVal() {
+        return this.isFeed == null ? 0 : this.isFeed;
+    }
+
    public double getQtyVal() {
        return this.kpQty == null ? 0.0d : this.kpQty;
    }
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRawPartSn.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRawPartSn.java
@ -0,0 +1,75 @@
+package cn.estsh.i3plus.pojo.mes.pcn.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;
+
+/**
+ * @Description :mes系统业务动作
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-12
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_RAW_PART_SN")
+@Api("原材料信息")
+public class MesRawPartSn extends BaseBean {
+    @Column(name = "PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
+
+    @Column(name = "PART_NAME")
+    @ApiParam("物料名称")
+    private String partName;
+
+    @Column(name = "RAW_TYPE")
+    @ApiParam("原料类型")
+    private String rawType;
+
+    @Column(name = "RAW_SN")
+    @ApiParam("原材料条码")
+    private String rawSn;
+
+    @Column(name = "RAW_QTY")
+    @ApiParam("数量")
+    private Long rawQty;
+
+    @Column(name = "LOT_NO")
+    @ApiParam("生产批次")
+    private String lotNo;
+
+    @Column(name = "FIX_LOT_NO")
+    @ApiParam("特殊批次")
+    private String fixLotNo;
+
+    @Column(name = "STATUS")
+    @ApiParam("原料状态")
+    private Integer status;
+
+    @Column(name = "SUPPLIER_CODE")
+    @ApiParam("供应商代码")
+    private String supplierCode;
+
+    public long getRawQtyVal() {
+        return this.rawQty == null ? 0l : this.rawQty;
+    }
+
+    public int getStatusVal() {
+        return this.status == null ? 0 : this.status;
+    }
+
+}
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java
@ -0,0 +1,72 @@
+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;
+
+/**
+ * @Description :mes系统业务动作
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-12
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_CELL_FEED")
+@Api("工位投料信息")
+public class MesCellFeed extends BaseBean {
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心")
+    private String workCenterCode;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工作单元")
+    private String workCellCode;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
+
+    @Column(name = "PART_NAME")
+    @ApiParam("物料名称")
+    private String partName;
+
+    @Column(name = "RAW_TYPE")
+    @ApiParam("原料类型")
+    private String rawType;
+
+    @Column(name = "RAW_SN")
+    @ApiParam("原材料条码")
+    private String rawSn;
+
+    @Column(name = "RAW_QTY")
+    @ApiParam("特殊批次")
+    private Long rawQty;
+
+    @Column(name = "LOT_NO")
+    @ApiParam("关联批次")
+    private String lotNo;
+
+    @Column(name = "SUPPLIER_CODE")
+    @ApiParam("供应商代码")
+    private String supplierCode;
+
+
+    public long getRawQtyVal() {
+        return this.rawQty == null ? 0l : this.rawQty;
+    }
+
+}
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcessBom.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcessBom.java
@ -29,18 +29,31 @@ import java.util.Date;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
-@Table(name="MES_PROCESS_BOM")
+@Table(name = "MES_PROCESS_BOM")
@Api("工序物料清单")
 public class MesProcessBom extends BaseBean {
-    @Column(name="PART_NO")
+    @Column(name = "PART_NO")
    @ApiParam("零件号")
    private String partNo;

-    @Column(name="PROCESS_CODE")
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心")
+    private String workCenterCode;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工作单元")
+    private String workCellCode;
+
+    @Column(name = "ROUTE_CODE")
+    @ApiParam("流程代码")
+    private String routeCode;
+
+
+    @Column(name = "PROCESS_CODE")
    @ApiParam("工序代码")
    private String processCode;

-    @Column(name="ITEM_PART_NO")
+    @Column(name = "ITEM_PART_NO")
    @ApiParam("子零件")
    private String itemPartNo;

@ -57,6 +70,11 @@ public class MesProcessBom extends BaseBean {
    @ApiParam(value = "是否检查")
    private Integer isCheck;

+
+    @Column(name = "IS_FEED")
+    @ApiParam(value = "是否检查")
+    private Integer isFeed;
+
    @Transient
    @ApiParam("是否已绑定")
    private Boolean isBind;
@ -71,13 +89,17 @@ public class MesProcessBom extends BaseBean {
    }

    public int getIsRepeatVal() {
-        return  this.isRepeat == null ? 0 : this.isRepeat;
+        return this.isRepeat == null ? 0 : this.isRepeat;
    }

    public int getIsCheckVal() {
        return this.isCheck == null ? 0 : this.isCheck;
    }

+    public int getIsFeedVal() {
+        return this.isFeed == null ? 0 : this.isFeed;
+    }
+
    public boolean getIsBindVal() {
        return this.isBind == null ? false : this.isBind;
    }
@ -91,6 +113,7 @@ public class MesProcessBom extends BaseBean {
                ", qty=" + qty +
                ", isRepeat=" + isRepeat +
                ", isCheck=" + isCheck +
+                ", isFeed=" + isFeed +
                ", isBind=" + isBind +
                ", color='" + color + '\'' +
                ", id=" + id +
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java
@ -26,20 +26,20 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
-@Table(name="MES_PROD_BIND_RECORD")
+@Table(name = "MES_PROD_BIND_RECORD")
@Api("产品绑定记录表")
 public class MesProdBindRecord extends BaseBean {
    @Column(name = "SERIAL_NUMBER")
    @ApiParam(value = "产品条码")
    private String serialNumber;

-    @Column(name="PART_NO")
+    @Column(name = "PART_NO")
    @ApiParam("产品条码零件号")
    private String partNo;

-    @Column(name="WORK_ORDER")
+    @Column(name = "WORK_ORDER_NO")
    @ApiParam("工单号")
-    private String  workOrder;
+    private String workOrderNo;

    @Column(name = "WORK_CENTER_CODE")
    @ApiParam(value = "工作中心")
@ -53,11 +53,11 @@ public class MesProdBindRecord extends BaseBean {
    @ApiParam(value = "工步代码")
    private String stepCode;

-    @Column(name="ITEM_PART_NO")
+    @Column(name = "ITEM_PART_NO")
    @ApiParam("原材料零件号")
    private String itemPartNo;

-    @Column(name="KP_SN")
+    @Column(name = "KP_SN")
    @ApiParam("原材料条码")
    private String kpSn;

@ -66,11 +66,19 @@ public class MesProdBindRecord extends BaseBean {
    @ApiParam(value = "原材料数量", example = "0")
    private Double kpQty;

-    @Column(name="SUPPLIER_CODE")
+    @Column(name = "SUPPLIER_CODE")
    @ApiParam("供应商")
    private String supplierCode;

-    @Column(name="VERSION")
+    @Column(name = "LOT_NO")
+    @ApiParam
+    private String lotNo;
+
+    @Column(name = "IS_FEED")
+    @ApiParam
+    private Integer isFeed;
+
+    @Column(name = "VERSION")
    @ApiParam("版本")
    private String version;

@ -78,6 +86,10 @@ public class MesProdBindRecord extends BaseBean {
    @ApiParam(value = "结果")
    private String result;

+    public int getIsFeedVal() {
+        return this.isFeed == null ? 0 : this.isFeed;
+    }
+
    public double getQtyVal() {
        return this.kpQty == null ? 0.0d : this.kpQty;
    }
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRawPartSn.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRawPartSn.java
@ -0,0 +1,75 @@
+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;
+
+/**
+ * @Description :mes系统业务动作
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-12
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_RAW_PART_SN")
+@Api("原材料信息")
+public class MesRawPartSn extends BaseBean {
+    @Column(name="PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
+
+    @Column(name="PART_NAME")
+    @ApiParam("物料名称")
+    private String partName;
+
+    @Column(name="RAW_TYPE")
+    @ApiParam("原料类型")
+    private String rawType;
+
+    @Column(name="RAW_SN")
+    @ApiParam("原材料条码")
+    private String rawSn;
+
+    @Column(name="RAW_QTY")
+    @ApiParam("数量")
+    private Long rawQty;
+
+    @Column(name="LOT_NO")
+    @ApiParam("生产批次")
+    private String lotNo;
+
+    @Column(name="FIX_LOT_NO")
+    @ApiParam("特殊批次")
+    private String fixLotNo;
+
+    @Column(name="STATUS")
+    @ApiParam("原料状态")
+    private Integer status;
+
+    @Column(name="SUPPLIER_CODE")
+    @ApiParam("供应商代码")
+    private String supplierCode;
+
+    public long getRawQtyVal() {
+        return this.rawQty == null ? 0l : this.rawQty;
+    }
+
+    public int getStatusVal() {
+        return this.status == null ? 0 : this.status;
+    }
+
+}
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
@ -718,16 +718,19 @@ public class MesHqlPack {
     */
    public static DdlPackBean getMesProcessBom(MesProcessBom processBom, String organizeCode) {
        DdlPackBean packBean = getAllBaseDataByNormalPro(processBom, organizeCode);
-        if (StringUtils.isNotEmpty(processBom.getPartNo())) {
-            DdlPreparedPack.getStringLikerPack(processBom.getPartNo(), "partNo", packBean);
-        }
-        if (StringUtils.isNotEmpty(processBom.getItemPartNo())) {
-            DdlPreparedPack.getStringLikerPack(processBom.getItemPartNo(), "itemPartNo", packBean);
-        }
-        if (StringUtils.isNotEmpty(processBom.getProcessCode())) {
-            DdlPreparedPack.getStringLikerPack(processBom.getProcessCode(), "processCode", packBean);
-        }
+        DdlPreparedPack.getStringLikerPack(processBom.getPartNo(), "partNo", packBean);
+        DdlPreparedPack.getStringLikerPack(processBom.getItemPartNo(), "itemPartNo", packBean);
+        DdlPreparedPack.getStringLikerPack(processBom.getProcessCode(), "processCode", packBean);
+        return packBean;
+    }

+    public static DdlPackBean getMesProcessBomExcludeById(MesProcessBom mesProcessBom, String org) {
+        DdlPackBean packBean = getAllBaseData(org);
+        DdlPreparedPack.getStringEqualPack(mesProcessBom.getPartNo(), "partNo", packBean);
+        DdlPreparedPack.getStringEqualPack(mesProcessBom.getItemPartNo(), "itemPartNo", packBean);
+        DdlPreparedPack.getStringEqualPack(mesProcessBom.getWorkCenterCode(), "workCenterCode", packBean);
+        DdlPreparedPack.getStringEqualPack(mesProcessBom.getWorkCellCode(), "workCellCode", packBean);
+        DdlPreparedPack.getNumNOEqualPack(mesProcessBom.getId(), "id", packBean);
        return packBean;
    }

@ -1177,6 +1180,7 @@ public class MesHqlPack {

    /**
     * 系统业务动作
+     *
     * @param organizeCode
     * @return
     */