Merge remote-tracking branch 'origin/ext-dev' into ext-dev

4 years ago · 540ba4b9e0
parent b6a502475a ab8686ae2c
commit 540ba4b9e0
19 changed files with 125 additions and 17 deletions
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java
@ -97,12 +97,17 @@ public class BaseOrder extends BaseAPS {
    @Column(name="VALID_ORDER")
    @ApiParam(value ="有效订单")
    @FieldAnnotation(modify = false)
-    private ApsEnumUtil.ORDER_VALID_TYPE validOrder = ApsEnumUtil.ORDER_VALID_TYPE.VALID;
+    private Boolean validOrder = true;

-    @Column(name="DELAY")
-    @ApiParam(value ="是否延期")
+    @Column(name="INVALID_REASON")
+    @ApiParam(value ="无效原因")
    @FieldAnnotation(modify = false)
-    private Boolean delay = false;
+    private String invalidReason;
+
+    @Column(name="DELAY_TIME")
+    @ApiParam(value ="延期时间")
+    @FieldAnnotation(modify = false)
+    private Integer delayTime;

    @JsonBackReference
    public List<Work> getWorks() {
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldSetRule.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldSetRule.java
@ -27,7 +27,7 @@ public class FieldSetRule extends BaseRule {
    private static final long serialVersionUID = 6880145972942618559L;
    @Column(name="BEAN")
    @ApiParam(value ="实体名")
-    private ApsEnumUtil.FIELD_SET_BEAN bean;
+    private String bean;

    @Column(name="FILTER")
    @ApiParam(value ="筛选")
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java
@ -17,6 +17,7 @@ import lombok.EqualsAndHashCode;

 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Lob;
 import javax.persistence.Table;
 import java.util.List;

@ -101,6 +102,16 @@ public class ImportDetail extends BaseAPS {
    @FieldAnnotation(relation = "Project", property = false)
    private Long projectId;

+    @Lob
+    @Column(name="INNER_FILTER")
+    @ApiParam(value ="内部对象筛选")
+    private String innerFilter;
+
+    @Lob
+    @Column(name="OUTTER_FILTER")
+    @ApiParam(value ="外部对象筛选")
+    private String outterFilter;
+
    @FieldAnnotation(property = false)
    private transient ImportDataModel model;

--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MatCalcRule.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MatCalcRule.java
@ -29,6 +29,10 @@ public class MatCalcRule extends BaseRule {
    @ApiParam(value ="物料筛选")
    private String materialFilter;

+    @Column(name="ROUTING_FILTER")
+    @ApiParam(value ="工艺路线筛选")
+    private String routingFilter;
+
    @Column(name="INPUT_FILTER")
    @ApiParam(value ="输入筛选")
    private String inputFilter;
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java
@ -90,10 +90,6 @@ public class Operation extends BaseAPS {
    @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
    private String minSpaceTime;

-    @Column(name="MANU_OPER")
-    @ApiParam(value ="是否手工工序")
-    private Boolean manuOper;
-
    public ProductRouting getProductRouting() {
        return BeanRelation.get(this, EOperation.ProductRouting);
    }
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java
@ -61,6 +61,10 @@ public class SalesOrder extends BaseOrder {
    @FieldAnnotation(defaultValue = "WAITING")
    private ApsEnumUtil.SALES_ORDER_STATUS orderStatus;

+    @Column(name="DELIVER_RATE")
+    @ApiParam(value ="发货百分比")
+    private Double deliverRate;
+
    @JsonIgnore
    public Work getWork() {
        return BeanRelation.get(this, EBaseOrder.Works);
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java
@ -75,7 +75,7 @@ public class StandOperation extends BaseAPS {

    @Column(name="TYPE")
    @ApiParam(value ="工序类型")
-    private ApsEnumUtil.SANLUX_OPERATION_TYPE type;
+    private ApsEnumUtil.SANLUX_OPERATION_TYPE type = ApsEnumUtil.SANLUX_OPERATION_TYPE.NORMAL;

    public WorkShop getWorkShop() { return BeanRelation.get(this, EStandOperation.WorkShop); }

--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java
@ -45,4 +45,8 @@ public class SysParam extends BaseAPS {
    @ApiParam(value ="规则组id")
    @FieldAnnotation(display = false)
    private Long ruleGroupId;
+
+    @Column(name="INVENTORY_RATE")
+    @ApiParam(value ="库存误差百分比")
+    private Double inventoryRate;
 }
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java
@ -164,6 +164,8 @@ public class Work extends BaseAPS {
    @FieldAnnotation(property = false)
    private Long dynSplitWorkId;

+    private transient boolean hasOptimized = false;
+
    public BaseOrder getOrder() {
        return BeanRelation.get(this, EWork.Order);
    }
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/PlanRecord.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/PlanRecord.java
@ -0,0 +1,34 @@
+package cn.estsh.i3plus.pojo.aps.model;
+
+import cn.estsh.i3plus.pojo.aps.bean.FurnacePlan;
+import cn.estsh.i3plus.pojo.aps.bean.Resource;
+import cn.estsh.i3plus.pojo.aps.bean.WorkPlan;
+import lombok.Data;
+
+/**
+ * @Description : 计划记录
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2021-04-15
+ * @Modify:
+ **/
+@Data
+public class PlanRecord {
+    /**
+     * 需要插入的工作计划
+     */
+    private WorkPlan plan;
+    /**
+     * 插入到目标资源
+     */
+    private Resource resource;
+    /**
+     * 插入到目标工作计划前面
+     */
+    private WorkPlan postPlan;
+
+    /**
+     * 插入到指定炉资源上
+     */
+    private FurnacePlan furnacePlan;
+}
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/WorkRecord.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/WorkRecord.java
@ -0,0 +1,22 @@
+package cn.estsh.i3plus.pojo.aps.model;
+
+import cn.estsh.i3plus.pojo.aps.bean.Work;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Description : 工作排程记录
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2021-04-15
+ * @Modify:
+ **/
+@Data
+public class WorkRecord {
+    private Work work;
+    private Work splitWork;
+    private PlanRecord mainPlan;
+    private List<PlanRecord> assPlans = new ArrayList<>();
+}
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java
@ -741,8 +741,8 @@ public class ApsEnumUtil {
    public enum WORK_STATUS {
        NOPLAN("NOPLAN", "未计划"),
        PLANDONE("PLANDONE", "计划完毕"),
-        INDICATIONDONE("INDICATIONDONE", "指示完毕"),
-        CONFIRM("CONFIRM", "确认"),
+        INDICATIONDONE("INDICATIONDONE", "锁定"),
+        CONFIRM("CONFIRM", "下发"),
        STARTPRODUCT("STARTPRODUCT", "开始生产"),
        FINISH("FINISH", "完成");

@ -1260,7 +1260,8 @@ public class ApsEnumUtil {
    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
    public enum SANLUX_OPERATION_TYPE {
        NORMAL("NORMAL", "正常工序"),
-        FOUR_SULFIDATION("FOUR_SULFIDATION", "四车间硫化");
+        FOUR_SULFIDATION("FOUR_SULFIDATION", "四车间硫化"),
+        FOUR_TRAINBEARER("FOUR_TRAINBEARER", "四车间牵纱");

        private String value;
        private String description;
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java
@ -73,4 +73,8 @@ public class MesPackageTravel extends BaseBean implements Serializable {
    @Column(name = "FN_LOCATION_NO")
    @ApiParam("炉内位置代码")
    private String fnLocationNo;
+
+    @Column(name = "QR_CODE")
+    @ApiParam("包装二维码")
+    private String qrCode;
 }
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java
@ -17,6 +17,7 @@ import javax.persistence.Entity;
 import javax.persistence.Table;
 import javax.persistence.Transient;
 import java.io.Serializable;
+import java.util.List;

 /**
 * @Description:
@ -138,4 +139,8 @@ public class MesQcOrderDetail extends BaseBean implements Serializable {
    @ApiParam("质检单检测记录id")
    private Long qcOrderRecordId;

+    @Transient
+    @ApiParam("质检单集合")
+    private List<String> orderNoList;
+
 }
--- 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
@ -1091,12 +1091,15 @@ public class MesHqlPack {
     */
    public static DdlPackBean getMesQcDetailReport(MesQcOrderDetail qcOrderDetail, String organizeCode) {
        DdlPackBean packBean = getAllBaseDataByNormalPro(qcOrderDetail, organizeCode);
-        if (!StringUtils.isEmpty(qcOrderDetail.getOrderNo())) {
-            DdlPreparedPack.getStringEqualPack(qcOrderDetail.getOrderNo(), "orderNo", packBean);
-        }
+//        if (!StringUtils.isEmpty(qcOrderDetail.getOrderNo())) {
+//              DdlPreparedPack.getStringEqualPack(mesQcOrder.getOrderNo(), "orderNo", packBean);
+//        }
        if (!StringUtils.isEmpty(qcOrderDetail.getCheckType())) {
            DdlPreparedPack.getNumEqualPack(qcOrderDetail.getCheckType(), "checkType", packBean);
        }
+        if (!CollectionUtils.isEmpty(qcOrderDetail.getOrderNoList())) {
+            DdlPreparedPack.getInPackList(qcOrderDetail.getOrderNoList(), "orderNo", packBean);
+        }
        return packBean;
    }

--- a/modules/i3plus-pojo-screen/pom.xml
+++ b/modules/i3plus-pojo-screen/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>i3plus-pojo</artifactId>
        <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0.0.1</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java
@ -263,6 +263,10 @@ public class WmsMoveDetails extends BaseBean {
    public Integer lockVersion;

    @Transient
+    @ApiParam("历史数据")
+    private Boolean lookHistory;
+
+    @Transient
    @ApiParam("项目代码")
    private String prodCfgTypeCode;

--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java
@ -94,6 +94,10 @@ public class WmsMoveMaster extends BaseBean {
    private String partNo;

    @Transient
+    @ApiParam("历史数据")
+    private Boolean lookHistory;
+
+    @Transient
    @ApiParam("明细状态")
    @AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class)
    private String itemStatus;
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java
@ -209,6 +209,11 @@ public class WmsMoveSn extends BaseBean {
    private String ZoneNo;

    @Transient
+    @ApiParam("历史数据")
+    private Boolean lookHistory;
+
+
+    @Transient
    @ApiParam("交易类型名称")
    private String transTypeName;