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

5 years ago · 9a2b6fe43a
parent c3bdf4a162 1ffebd418f
commit 9a2b6fe43a
11 changed files with 61 additions and 15 deletions
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
@ -3416,7 +3416,8 @@ public class MesEnumUtil {
        REPRODUCTION_NOT_RMS(120, "重新生产-不报工"),
        REVERSE_SPRAY_ORDER(130, "反喷工单"),
        SPARE_RETURN_REPAIR(140, "客退备件返修"),
-        SEIZE_SEAT_ORDER(150, "占位工单");
+        SEIZE_SEAT_ORDER(150, "占位工单"),
+        SAMPLE_ORDER(160, "样件工单");

        private int value;
        private String description;
@ -3581,11 +3582,11 @@ public class MesEnumUtil {
    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
    public enum QUEUE_ORDER_STATUS {

+        WAIT_LANDED(5, "待下达"),
        NORMAL(10, "正常"),
        ONLINE(20, "已上线"),
        OFFLINE(30, "已下线"),
-        CLOSE(40, "已关闭"),
-        ;
+        CLOSE(40, "已关闭");

        private int value;
        private String description;
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
@ -2075,8 +2075,7 @@ public class MesPcnEnumUtil {
        NORMAL(10, "正常"),
        ONLINE(20, "已上线"),
        OFFLINE(30, "已下线"),
-        CLOSE(40, "已关闭"),
-        ;
+        CLOSE(40, "已关闭");

        private int value;
        private String description;
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java
@ -88,7 +88,7 @@ public class MesHqlPack {
    public static DdlPackBean getMesCellFeed(MesCellFeed mesCellFeed, String org) {
        DdlPackBean packBean = getAllBaseData(org);
        DdlPreparedPack.getStringEqualPack(mesCellFeed.getWorkCenterCode(), "workCenterCode", packBean);
-        DdlPreparedPack.getNumberBiggerPack(0, "rawQty", packBean);
+        DdlPreparedPack.getNumberBiggerPackContainsZero(0, "rawQty", packBean);
        return packBean;
    }

--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java
@ -79,10 +79,18 @@ public class MesPartStockSchedule extends BaseBean implements Serializable {
    @ApiParam("工作单元代码")
    private String workCellCode;

+    @Column(name = "PROCESS_CODE")
+    @ApiParam("工序代码")
+    private String processCode;
+
    @Column(name = "STOCK_QTY")
    @ApiParam("排程实时库存")
    private Integer stockQty;

+    @Column(name = "MIN_GEN_LOT")
+    @ApiParam("最小生成批次")
+    private Integer minGenLot;
+
    @Transient
    @ApiParam("物料名称")
    private String partName;
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java
@ -122,6 +122,14 @@ public class MesQueueOrder extends BaseBean implements Serializable {
    @ApiParam("特殊标识")
    private Integer specialFlag;

+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工作单元代码")
+    private String workCellCode;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心")
+    private String workCenterCode;
+
    @Transient
    @ApiParam("起始车号")
    private String custFlagNoStart;
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessCell.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessCell.java
@ -55,4 +55,8 @@ public class MesRouteProcessCell extends BaseBean implements Serializable {
    @ApiParam("工序代码名称")
    private String processCodeName;

+    @Transient
+    @ApiParam("正在生产队列数量")
+    private Integer genningNum;
+
 }
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FutrueTaskModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FutrueTaskModel.java
@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.mes.model;

+import cn.estsh.i3plus.pojo.mes.bean.MesProdBindRecord;
 import cn.estsh.i3plus.pojo.mes.bean.MesProduceSn;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@ -19,12 +20,15 @@ public class FutrueTaskModel<T> {
    @ApiParam("实现类")
    private Object futrueTaskService;

-    @ApiParam("包装条码")
+    @ApiParam("工位请求bean")
    private StationRequestBean stationRequestBean;

-    @ApiParam("过程条码")
+    @ApiParam("产品条码表")
    private MesProduceSn produceSn;

+    @ApiParam("产品绑定记录表")
+    private MesProdBindRecord prodBindRecord;
+
    @ApiParam("组织代码")
    private String organizeCode;

--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java
@ -106,7 +106,7 @@ public class MesPcnHqlPack {
    public static DdlPackBean getMesCellFeed(MesCellFeed mesCellFeed, String org) {
        DdlPackBean packBean = getAllBaseData(org);
        DdlPreparedPack.getStringEqualPack(mesCellFeed.getWorkCenterCode(), "workCenterCode", packBean);
-        DdlPreparedPack.getNumberBiggerPack(0, "rawQty", packBean);
+        DdlPreparedPack.getNumberBiggerPackContainsZero(0, "rawQty", packBean);
        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean);
        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", packBean);
        return packBean;
@ -122,7 +122,7 @@ public class MesPcnHqlPack {
    public static DdlPackBean getMesCellFeedRecord(MesCellFeedRecord mesCellFeedRecord, String org) {
        DdlPackBean packBean = getAllBaseData(org);
        DdlPreparedPack.getStringEqualPack(mesCellFeedRecord.getWorkCenterCode(), "workCenterCode", packBean);
-        DdlPreparedPack.getNumberBiggerPack(0, "rawQty", packBean);
+        DdlPreparedPack.getNumberBiggerPackContainsZero(0, "rawQty", packBean);
        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean);
        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", packBean);
        return packBean;
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java
@ -53,6 +53,10 @@ public class WmsDocMovementDetails extends BaseBean {
    @ApiParam("行号")
    public String item;

+    @Column(name = "REF_ITEM")
+    @ApiParam("关联行号")
+    public Integer refItem;
+
    @Column(name = "QTY", columnDefinition = "decimal(18,8)")
    @ColumnDefault("0")
    @ApiParam(value = "需求数量", example = "0")
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java
@ -273,4 +273,13 @@ public class WmsPOMasterDetails extends BaseBean {
        this.totalBoxes = totalBoxes.intValue();
        this.qty = qty;
    }
+
+    public WmsPOMasterDetails(String orderNo, String partNo, Double qty,
+                              Double rcQty, Integer itemStatus) {
+        this.orderNo = orderNo;
+        this.partNo = partNo;
+        this.qty = qty;
+        this.rcQty = rcQty;
+        this.itemStatus = itemStatus;
+    }
 }
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java
@ -9,7 +9,12 @@ import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;

-import javax.persistence.*;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Index;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+import javax.persistence.Version;
 import java.util.List;

 /**
@ -115,10 +120,10 @@ public class WmsStockQuan extends BaseBean {
    @ApiParam(value = "报废数量")
    private Double scrapQty;

-//    @Version
-//    @Column(name = "LOCK_VERSION")
-//    @ApiParam(value = "乐观锁", example = "1")
-//    public Integer lockVersion;
+    @Version
+    @Column(name = "LOCK_VERSION", columnDefinition = "int default 0")
+    @ApiParam(value = "乐观锁", defaultValue = "0")
+    public Integer lockVersion;

    @Transient
    @ApiParam(value = "总数量")
@ -221,6 +226,10 @@ public class WmsStockQuan extends BaseBean {
        return this.boxQty == null ? 0 : this.boxQty;
    }

+    public Integer getLockVersion() {
+        return this.lockVersion == null ? 0 : this.lockVersion;
+    }
+
    public WmsStockQuan() {
    }