Merge branch 'test' into dev

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

@@ -6758,4 +6758,37 @@ public class MesPcnEnumUtil {
         }
     }
 
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum OPC_TYPE {
+
+        UA(10, "UA"),
+        DA(20, "DA");
+
+        private int value;
+        private String code;
+
+        OPC_TYPE(int value, String code) {
+            this.value = value;
+            this.code = code;
+        }
+
+        public static String valueOfCode(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].code;
+                }
+            }
+            return tmp;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getCode() {
+            return code;
+        }
+    }
+
 }

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

@@ -238,6 +238,11 @@ public class WmsEnumUtil {
             }
             return tmp;
         }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+
     }
 
 

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

@@ -207,10 +207,10 @@ public class MesProduceSn extends BaseBean implements Serializable {
     @ApiParam("包规数量")
     private Double packageQty;
 
-    @Version
-    @Column(name = "LOCK_VERSION")
-    @ApiParam(value = "乐观锁", example = "1")
-    public Integer lockVersion;
+//    @Version
+//    @Column(name = "LOCK_VERSION")
+//    @ApiParam(value = "乐观锁", example = "1")
+//    public Integer lockVersion;
 
     @Transient
     @ApiParam("缺陷代码")

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/excel/mgnbj/SparePartsImportModel.java

@@ -58,4 +58,6 @@ public class SparePartsImportModel {
     @ApiParam("用量")
     private Integer qty;
 
+    @ApiParam("生成次数")
+    private Integer time;
 }

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserInfoImportModel.java

@@ -0,0 +1,163 @@
+package cn.estsh.i3plus.pojo.model.platform;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.bean.BaseConstWords;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import cn.estsh.i3plus.pojo.platform.bean.SysDictionary;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import javax.persistence.Column;
+
+/**
+ * @author ns
+ * @create 2021/7/21 0021 上午 10:20
+ */
+@Data
+@ApiModel
+public class UserInfoImportModel extends BaseBean {
+    private static final long serialVersionUID = -6597413958814715617L;
+
+    @ApiModelProperty(value = "姓名", access = "名称")
+    @AnnoOutputColumn()
+    private String infoName;
+
+    @ApiModelProperty(value = "工号")
+    @AnnoOutputColumn()
+    private String infoEmpNo;
+
+
+    @ApiModelProperty(value = "员工类型", access = "实习、试用期、正式")
+    @AnnoOutputColumn(required = false, refClass = SysDictionary.class, value = "name", refForeignKey = BaseConstWords.DICTIONARY_EMPLOYEE_TYPE)
+    private Integer infoEmployeeType;
+
+    @ApiModelProperty(value = "员工等级")
+    @AnnoOutputColumn(required = false, refClass = SysDictionary.class, value = "name", refForeignKey = BaseConstWords.DICTIONARY_EMPLOYEE_GRADE)
+    private Integer infoGrade;
+
+    @ApiModelProperty(value = "性别（1.男，2.女）", example = "1", access = "性别（1.男，2.女）")
+    @AnnoOutputColumn(required = false, refClass = SysDictionary.class, value = "name", refForeignKey = BaseConstWords.DICTIONARY_SEX)
+    private Integer infoSex;
+
+    @ApiModelProperty(value = "婚姻", example = "1", access = "性别（1.未知，2.已婚,3未婚）")
+    @AnnoOutputColumn(required = false, refClass = SysDictionary.class, value = "name", refForeignKey = BaseConstWords.DICTIONARY_MARRIAGE)
+    private Integer infoMarriage;
+
+
+    @ApiModelProperty(value = "证件类型")
+    @AnnoOutputColumn(required = false, refClass = SysDictionary.class, value = "name", refForeignKey = BaseConstWords.DICTIONARY_CERTIFICATE_TYPE)
+    private Integer infoCardType;
+
+    @ApiModelProperty(value = "证件编号")
+    private String infoCardNumber;
+
+    @ApiModelProperty(value = "毕业专业")
+    private String infoSchoolProfession;
+
+    @ApiModelProperty(value = "毕业院校")
+    private String infoSchool;
+
+    @ApiModelProperty(value = "学历")
+    @AnnoOutputColumn(required = false, refClass = SysDictionary.class, value = "name", refForeignKey = BaseConstWords.DICTIONARY_EDUCATION)
+    private Integer infoSchoolEducation;
+
+
+    @ApiModelProperty(value = "毕业时间")
+    private String infoSchoolLeaveDate;
+
+
+    @ApiModelProperty(value = "籍贯")
+    private String infoBirthplace;
+
+    @ApiModelProperty(value = "种族")
+    @AnnoOutputColumn(required = false, refClass = SysDictionary.class, value = "name", refForeignKey = BaseConstWords.DICTIONARY_NATIONALITY)
+    private Integer infoRace;
+
+
+    @ApiModelProperty(value = "紧急联系人")
+    private String userEmergencyContact;
+
+    @ApiModelProperty(value = "紧急联系人-电话")
+    private String userEmergencyPhone;
+
+
+    @ApiModelProperty(value = "紧急联系人")
+    private String infoEmergencyContact;
+
+    @ApiModelProperty(value = "紧急联系人-电话")
+    private String infoEmergencyPhone;
+
+    @ApiModelProperty(value = "入职日期", access = "默认当前时间")
+    private String infoJoinDate;
+
+    @ApiModelProperty(value = "离职日期", access = "默认当前时间")
+    private String infoResignationDate;
+
+    @ApiModelProperty(value = "政治面貌")
+    @AnnoOutputColumn(required = false, refClass = SysDictionary.class, value = "name", refForeignKey = BaseConstWords.DICTIONARY_POLITICAL_STATUS)
+    private Integer infoPoliticalStatus;
+
+    @ApiModelProperty(value = "出生日期")
+    private String infoBornDate;
+
+    @ApiModelProperty(value = "部门名称", access = "部门名称")
+    private String infoDepartmentNameRdds;
+
+    @ApiModelProperty(value = "岗位", access = "岗位")
+    private String positionNameRdds;
+
+    @ApiModelProperty(value = "主部门", access = "主部门")
+    private String infoDepartmentNameRdd;
+
+    @ApiModelProperty(value = "主岗位", access = "主岗位")
+    private String positionNameRdd;
+
+    @ApiModelProperty(value = "家庭地址")
+    private String infoFamilyAddress;
+
+    @ApiModelProperty(value = "兴趣爱好")
+    private String infoHobby;
+
+    /********************************** 账号相关 ********************************/
+
+    @ApiModelProperty(value = "登陆名称", access = "登陆名称")
+    @AnnoOutputColumn
+    private String userLoginName;
+
+    @ApiModelProperty(value = "用户语言")
+    private String languageCode;
+
+    @ApiParam(value = "登陆密码")
+    @AnnoOutputColumn
+    private String userLoginPassword;
+
+
+    @ApiModelProperty(value = "角色名称", access = "角色名称")
+    @AnnoOutputColumn
+    private String roleNameRdds;
+
+    @ApiModelProperty(value = "手机号", access = "手机号")
+    private String userPhone;
+
+    @ApiModelProperty(value = "操作部门", access = "操作部门部门")
+    @AnnoOutputColumn
+    private String userDepartmentNameRdds;
+
+    @ApiModelProperty(value = "主操作部门", access = "主操作部门")
+    @AnnoOutputColumn
+    private String userDepartmentNameRdd;
+
+    @ApiModelProperty(value = "邮箱", access = "邮箱")
+    private String userEmail;
+
+    @ApiModelProperty(value = "微信号")
+    private String userWeChatNo;
+
+    @ApiModelProperty(value = "组织名称", access = "组织名称")
+    private String organizeNameRdd;
+
+
+}

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlControl.java

@@ -5,16 +5,10 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
-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.Version;
+import javax.persistence.*;
 import java.io.Serializable;
 
 /**
@@ -71,4 +65,7 @@ public class PtlControl extends BaseBean implements Serializable {
     @ApiParam(value = "乐观锁", example = "1")
     public transient Integer lockVersion;
 
+    @Column(name = "BACKOFF")
+    @ApiParam("是否需要回调")
+    private Integer backoff;
 }

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

@@ -826,4 +826,10 @@ public class WmsDocMovementDetails extends BaseBean {
         this.createUser = createUser;
 
     }
+
+    public WmsDocMovementDetails (String erpSrcNo,String partNo,Double outQty) {
+        this.erpSrcNo = erpSrcNo;
+        this.partNo = partNo;
+        this.outQty = outQty;
+    }
 }

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

@@ -50,6 +50,7 @@ public class WmsPOMaster extends BaseBean {
      */
     @Column(name = "PO_TYPE")
     @ApiParam("单据类型")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.ORDER_TYPE.class, refForeignKey = "value", value = "description")
     public String poType;
 
     /**
@@ -89,6 +90,7 @@ public class WmsPOMaster extends BaseBean {
 
     @Column(name = "IS_TASK")
     @ApiParam(value = "是否生成任务", example = "1")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.IS_GENERAL_TASK.class, refForeignKey = "value", value = "description")
     public Integer isTask;
 
     @Column(name = "IS_PART")
@@ -121,6 +123,7 @@ public class WmsPOMaster extends BaseBean {
 
     @Column(name = "IS_SN")
     @ApiParam(value = "是否生成条码", example = "1")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.IS_GENERAL_TASK.class, refForeignKey = "value", value = "description")
     public Integer isSn;
 
     @Column(name = "CONTAINER_NO")
@@ -177,6 +180,7 @@ public class WmsPOMaster extends BaseBean {
 
     @Transient
     @ApiParam("看板状态")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.PO_QC_STATUS.class, refForeignKey = "value", value = "description")
     private Integer boardStatus;
 
     @Transient

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

@@ -249,6 +249,10 @@ public class WmsPOMasterDetails extends BaseBean {
     private Double sumRcQty;
 
     @Transient
+    @ApiParam("退货数量")
+    private Double outQty;
+
+    @Transient
     @ApiParam("单据集合")
     private List<String> orderNoLst;
 
@@ -330,7 +334,7 @@ public class WmsPOMasterDetails extends BaseBean {
     }
 
     public WmsPOMasterDetails(String orderNo, String partNo, String partNameRdd, String planDate, String planTime,
-                              Double snp, Long totalBoxes, Double qty) {
+                              Double snp, Long totalBoxes, Double qty,Double recQty,String modifyDatetime) {
         this.orderNo = orderNo;
         this.partNo = partNo;
         this.partNameRdd = partNameRdd;
@@ -339,6 +343,8 @@ public class WmsPOMasterDetails extends BaseBean {
         this.snp = snp;
         this.totalBoxes = totalBoxes.intValue();
         this.qty = qty;
+        this.rcQty = recQty;
+        this.modifyDatetime = modifyDatetime;
     }
 
     public WmsPOMasterDetails(String orderNo, String erpSrcNo, Integer item,String partNo,String partNameRdd, Double qty,

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

@@ -1025,11 +1025,22 @@ public class WmsStockSn extends BaseBean {
         this.vendorNo = vendorNo;
     }
 
-
-
-
     public WmsStockSn(String partNo, Double qty) {
         this.partNo = partNo;
         this.qty = qty;
     }
+
+    public WmsStockSn(WmsStockSn wmsStockSn, String modifyDatetime ,String modifyUser) {
+        this.sn = wmsStockSn.getSn();
+        this.partNo = wmsStockSn.getPartNo();
+        this.partNameRdd = wmsStockSn.getPartNameRdd();
+        this.qty = wmsStockSn.getQty();
+        this.vendorNo = wmsStockSn.getVendorNo();
+        this.lotNo = wmsStockSn.getLotNo();
+        this.modifyDatetime = modifyDatetime;
+        this.modifyUser = modifyUser;
+        this.leftCode = wmsStockSn.getLeftCode();
+        this.dateCode = wmsStockSn.getDateCode();
+        this.fixLotNo = wmsStockSn.getFixLotNo();
+    }
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpFgDetailsSnapshot.java

@@ -64,4 +64,12 @@ public class WmsErpFgDetailsSnapshot extends BaseBean {
 
     @ApiParam("存储区")
     private String zoneNo;
+
+    public WmsErpFgDetailsSnapshot(String snapshotTime,String createDatetime){
+        this.snapshotTime = snapshotTime;
+        this.createDatetime = createDatetime;
+    }
+
+    public WmsErpFgDetailsSnapshot(){
+    }
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java

@@ -566,6 +566,8 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringLikerPack(wmsZones.getZoneNo(), "zoneNo", result);
         //存储区名称
         DdlPreparedPack.getStringLikerPack(wmsZones.getZoneName(), "zoneName", result);
+        //是否字节点
+        DdlPreparedPack.getNumEqualPack(wmsZones.getIsSonNode(), "isSonNode", result);
 
         getStringBuilderPack(wmsZones, result);