Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into pext-dev

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRecord.java

@@ -39,7 +39,7 @@ import java.io.Serializable;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Inheritance(strategy = InheritanceType.JOINED)
-@Api("去去去去去去去去去安灯记录")
+@Api("安灯记录")
 public class AndonManageRecord extends BaseManageQueue implements Serializable {
 
     private static final long serialVersionUID = 4667499369694353351L;

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/ExcludeImportExport.java

@@ -15,4 +15,6 @@ import java.lang.annotation.Target;
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)
 public @interface ExcludeImportExport {
+    boolean excludeImport() default true;
+    boolean excludeExport() default true;
 }

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java

@@ -8,6 +8,7 @@ import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
 import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder;
 import cn.estsh.i3plus.pojo.aps.validator.InsertGroup;
 import cn.estsh.i3plus.pojo.aps.validator.UpdateGroup;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import com.fasterxml.jackson.annotation.JsonBackReference;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
@@ -93,6 +94,11 @@ public class BaseOrder extends BaseAPS {
     @ApiParam(value ="专料号")
     private String specifyMaterialNum;
 
+    @Column(name="VALID_ORDER")
+    @ApiParam(value ="有效订单")
+    @FieldAnnotation(modify = false)
+    private Integer validOrder = CommonEnumUtil.VALID;
+
     @JsonBackReference
     public List<Work> getWorks() {
         return BeanRelation.list(this, EBaseOrder.Works);

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java

@@ -61,6 +61,7 @@ public class ImportDetail extends BaseAPS {
 
     @Column(name="IN_NAME")
     @ApiParam(value ="内部表名")
+    @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.QUERY_LIST, notEmpty = true)
     private String inName;
 
     @Column(name="PORT")

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/InsertedOrder.java

@@ -0,0 +1,60 @@
+package cn.estsh.i3plus.pojo.aps.bean;
+
+import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
+import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
+import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder;
+import cn.estsh.i3plus.pojo.aps.holders.EInsertedOrder;
+import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description :插单管理
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2021-03-02
+ * @Modify:
+ **/
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Entity
+@Table(name = "APS_INSERTED_ORDER")
+@Api("插单管理")
+public class InsertedOrder extends BaseOrder  {
+    private static final long serialVersionUID = -5036380772996107234L;
+
+    @Column(name="ORDER_STATUS")
+    @ApiParam(value ="订单状态")
+    @FieldAnnotation(defaultValue = "UNCOMMIT")
+    private ApsEnumUtil.INSERTED_ORDER_STATUS orderStatus;
+
+    @Column(name="STAND_OPERATIONS")
+    @ApiParam("工序")
+    private String standOperations;
+
+    @Column(name="PRODUCT_ROUTING_ID")
+    @ApiParam(value ="工艺路线")
+    @FieldAnnotation(property = false)
+    private Long productRoutingId;
+
+    public ProductRouting getProductRouting() {
+        return BeanRelation.get(this, EInsertedOrder.ProductRouting);
+    }
+
+    public void setProductRouting(ProductRouting routing) {
+        this.productRoutingId = routing != null ? routing.getId() : 0l;
+        BeanRelation.set(this, EInsertedOrder.ProductRouting, routing);
+    }
+
+    @JsonIgnore
+    public Work getWork() {
+        return BeanRelation.get(this, EBaseOrder.Works);
+    }
+}

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Inventory.java

@@ -3,6 +3,8 @@ package cn.estsh.i3plus.pojo.aps.bean;
 import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
 import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
 import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder;
+import cn.estsh.i3plus.pojo.aps.holders.EInventory;
+import com.fasterxml.jackson.annotation.JsonBackReference;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
@@ -13,6 +15,7 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import java.util.Date;
+import java.util.List;
 
 /**
  * @Description :库存
@@ -66,4 +69,7 @@ public class Inventory extends BaseOrder {
     public Work getWork() {
         return BeanRelation.get(this, EBaseOrder.Works);
     }
+
+    @JsonBackReference
+    public List<SafeStockOrder> getSafeStockOrders() { return BeanRelation.list(this, EInventory.SafeStockOrders); }
 }

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialDeliveryPromise.java

@@ -28,6 +28,7 @@ import java.util.Date;
 @Table(name = "APS_MATERIAL_DELIVERY_PROMISE")
 @Api("物料交期承诺")
 public class MaterialDeliveryPromise extends BaseBean {
+    private static final long serialVersionUID = 831759543772896829L;
     @Column(name="QTY")
     @ApiParam(value ="到货数量")
     private Double count;

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SafeStockOrder.java

@@ -1,12 +1,16 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
 import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
 import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder;
+import cn.estsh.i3plus.pojo.aps.holders.ESafeStockOrder;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 
@@ -30,4 +34,16 @@ public class SafeStockOrder extends BaseOrder {
     public Work getWork() {
         return BeanRelation.get(this, EBaseOrder.Works);
     }
+
+    @Column(name="INVENTORY_ID")
+    @ApiParam(value ="库存")
+    @FieldAnnotation(relation = "Inventory", notEmpty = true)
+    private Long inventoryId;
+
+    public Inventory getInventory() { return BeanRelation.get(this, ESafeStockOrder.Inventory); }
+
+    public void setInventory(Inventory inventory) {
+        this.inventoryId = inventory != null ? inventory.getId() : 0;
+        BeanRelation.set(this, ESafeStockOrder.Inventory, inventory);
+    }
 }

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java

@@ -56,6 +56,11 @@ public class SalesOrder extends BaseOrder {
     @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
     private String allowDelayTime;
 
+    @Column(name="ORDER_STATUS")
+    @ApiParam(value ="订单状态")
+    @FieldAnnotation(defaultValue = "WAITING")
+    private ApsEnumUtil.SALES_ORDER_STATUS orderStatus;
+
     @JsonIgnore
     public Work getWork() {
         return BeanRelation.get(this, EBaseOrder.Works);

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java

@@ -45,6 +45,14 @@ public abstract class BaseAPS extends BaseBean {
         customFields.put(code, value);
     }
 
+    public String getCustomString(String code) {
+        Object value = customFields.get(code);
+        if (value == null) {
+            return "";
+        }
+        return value.toString();
+    }
+
     public Integer getCustomInteger(String code) {
         Object value = customFields.get(code);
         if (value == null) {

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EInsertedOrder.java

@@ -0,0 +1,5 @@
+package cn.estsh.i3plus.pojo.aps.holders;
+
+public enum EInsertedOrder {
+    ProductRouting
+}

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EInventory.java

@@ -0,0 +1,5 @@
+package cn.estsh.i3plus.pojo.aps.holders;
+
+public enum EInventory {
+    SafeStockOrders
+}

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/ESafeStockOrder.java

@@ -0,0 +1,5 @@
+package cn.estsh.i3plus.pojo.aps.holders;
+
+public enum ESafeStockOrder {
+    Inventory
+}

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/InsertedOrderRepository.java

@@ -0,0 +1,9 @@
+package cn.estsh.i3plus.pojo.aps.repository;
+
+import cn.estsh.i3plus.pojo.aps.bean.InsertedOrder;
+import org.springframework.data.repository.CrudRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface InsertedOrderRepository extends CrudRepository<InsertedOrder, Long> {
+}

modules/i3plus-pojo-aps/src/main/resources/relations/InsertedOrder.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Class name="InsertedOrder" extends="BaseOrder">
+    <Relation field="ProductRouting" name="ProductRouting" type="ONE_TO_ONE" owner="true">
+    </Relation>
+</Class>

modules/i3plus-pojo-aps/src/main/resources/relations/Inventory.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Class name="Inventory" extends="BaseOrder">
+    <Relation field="SafeStockOrders" name="SafeStockOrder" reverse="Inventory" type="ONE_TO_MULTI" owner="true">
+    </Relation>
+</Class>

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

@@ -999,7 +999,8 @@ public class ApsEnumUtil {
         STRING("STRING", "字符串，文本框编辑"),
         OBJECT("OBJECT", "关联对象，下来选择关联对象的Code值"),
         LIST("LIST", "对象集合，不可编辑。"),
-        MULTI_OBJECT("MULTI_OBJECT", "多选对象，弹出框选择，可以选择全部对象，以*表示选择全部");
+        MULTI_OBJECT("MULTI_OBJECT", "多选对象，弹出框选择，可以选择全部对象，以*表示选择全部"),
+        QUERY_LIST("QUERY_LIST", "通过接口获取下拉选项");
 
         private String value;
         private String description;
@@ -1116,4 +1117,55 @@ public class ApsEnumUtil {
             return description;
         }
     }
+
+    /**
+     * 销售订单状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum SALES_ORDER_STATUS {
+        WAITING("WAITING", "待处理"),
+        CHANGE("CHANGE", "改带"),
+        COMMIT("COMMIT", "确认");
+
+        private String value;
+        private String description;
+
+        SALES_ORDER_STATUS(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+    /**
+     * 插单状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum INSERTED_ORDER_STATUS {
+        UNCOMMIT("UNCOMMIT", "未提交"),
+        COMMIT("COMMIT", "提交");
+
+        private String value;
+        private String description;
+
+        INSERTED_ORDER_STATUS(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
 }

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

@@ -1082,7 +1082,8 @@ public class ImppEnumUtil {
         CONFIG(6, "系统配置"),
         LOG(7, "日志配置"),
         WORK_WECHAT(8, "企业微信配置"),
-        SMS(9, "短信配置");
+        SMS(9, "短信配置"),
+        SSO(10, "单点登录配置");
 
         private final int value;
         private final String description;

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

@@ -180,5 +180,5 @@ public class MesPart extends BaseBean implements Serializable {
 
     @Transient
     @ApiParam("是否绑定关键件")
-    private Integer isBingKey;
+    private Integer isBindKey;
 }

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

@@ -190,6 +190,10 @@ public class MesProduceSnTravel extends BaseBean implements Serializable {
     @ApiParam("条码类型名称")
     private String snTypeName;
 
+    @Transient
+    @ApiParam("节拍时间")
+    private Integer cycleTime;
+
     public double getQtyVal() {
         return this.qty == null ? 0.0d : this.qty;
     }

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

@@ -0,0 +1,76 @@
+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.*;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2021/3/4 7:16 PM
+ * @Modify:
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "MES_QUARANTINE_RECORD", indexes = {
+        @Index(columnList = "SERIAL_NUMBER"),
+        @Index(columnList = "PART_NO")
+})
+@Api("隔离记录表")
+public class MesQuarantineRecord extends BaseBean {
+    private static final long serialVersionUID = -4667731056014803186L;
+
+    @Column(name = "SERIAL_NUMBER")
+    @ApiParam("过程条码")
+    private String serialNumber;
+
+    @Column(name = "PART_NO")
+    @ApiParam("零件号")
+    private String partNo;
+
+    @Column(name = "PART_NAME")
+    @ApiParam("零件名称")
+    private String partName;
+
+    @Column(name = "QTY")
+    @ApiParam("用量")
+    private Integer qty;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工作单元代码")
+    private String workCellCode;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心")
+    private String workCenterCode;
+
+    @Column(name = "DEFECT_CODE")
+    @ApiParam("缺陷代码")
+    private String defectCode;
+
+    @Column(name = "DC_CODE")
+    @ApiParam("缺陷原因代码")
+    private String dcCode;
+
+    @Column(name = "REPAIR_CODE")
+    @ApiParam("维修代码")
+    private String repairCode;
+
+    @Column(name = "QUARANTINE_NO")
+    @ApiParam("隔离单号")
+    private String quarantineNo;
+
+    @Column(name = "SCRAP_No")
+    @ApiParam("报废单号")
+    private String scrapNo;
+}

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

@@ -5,6 +5,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
+import javax.persistence.Column;
 import javax.persistence.Transient;
 
 /**
@@ -147,4 +148,15 @@ public class StepPrintSnModel extends MesProduceSn {
     private String tgPartDesc;
     @ApiParam("泰国过程条码截取前11位")
     private String snTop11;
+
+    @ApiParam("缺陷代码")
+    private String defectCode;
+    @ApiParam("缺陷原因代码")
+    private String dcCode;
+    @ApiParam("维修代码")
+    private String repairCode;
+    @ApiParam("质量代码")
+    private String qcCode;
+    @ApiParam("打印机名称")
+    private String printerName;
 }

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

@@ -0,0 +1,13 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesQuarantineRecord;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2021/3/4 7:38 PM
+ * @Modify:
+ */
+public interface MesQuarantineRecordRepository extends BaseRepository<MesQuarantineRecord, Long> {
+}

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

@@ -77,4 +77,15 @@ public class SwebProcurementPlanOrder extends BaseBean {
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "TRUE_OR_FALSE")
     private Integer consignment=2;
 
+    @Column(name = "EXP_DATE")
+    @ApiParam(value = "过期日期")
+    private String expDate;
+
+    @Column(name = "ITEM")
+    @ApiParam("行号")
+    private Integer item;
+
+    @Column(name = "START_DATE")
+    @ApiParam(value = "起始日期")
+    private String startDate;
 }