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

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

@@ -164,6 +164,14 @@ public class MesProduceSn extends BaseBean implements Serializable {
     @ApiParam("Vin")
     private String vinCode;
 
+    @Column(name = "IF_COMPENSATE")
+    @ApiParam(value ="是否补偿")
+    private Integer ifCompensate = 0;
+
+    @Column(name = "COMPENSATE_TIME")
+    @ApiParam(value ="补偿时间")
+    private String compensateTime;
+
     @Transient
     @ApiParam("返回信息")
     private String resultMsg;

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

@@ -166,6 +166,11 @@ public class MesProduceSnTravel extends BaseBean implements Serializable {
     @ApiParam("员工编号")
     private String employeeNumber;
 
+    @Column(name = "COMPENSATE_SN")
+    @ApiParam("补偿过程条码")
+    private String compensateSn;
+
+
     @Transient
     @ApiParam("返回信息")
     private String resultMsg;

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

@@ -160,6 +160,9 @@ public class UserDetailModel extends BaseBean {
     @ApiParam(value ="用户ID集合信息")
     private List<String> userInfoIdList;
 
+    @ApiParam(value ="登录次数")
+    private Integer userLoginNum;
+
     public SysUser getSysUser(){
         SysUser user = new SysUser();
         user.setId(!StringUtils.isBlank(this.userId) ? Long.parseLong(this.userId) : null);
@@ -172,6 +175,7 @@ public class UserDetailModel extends BaseBean {
         user.setUserLoginPassword(this.userLoginPassword);
         user.setLanguageCode(this.userLanguageCode);
         user.setOrganizeCode(this.organizeCode);
+        user.setUserLoginNum(this.userLoginNum);
 
         return user;
     }
@@ -206,6 +210,7 @@ public class UserDetailModel extends BaseBean {
         info.setUserGrade(this.infoGrade);
         info.setUserEmployeeType(this.infoEmployeeType);
         info.setOrganizeCode(this.organizeCode);
+        info.setUserLoginNum(this.userLoginNum);
 
         return info;
     }

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

@@ -116,6 +116,11 @@ public class BasVendor extends BaseBean{
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String mapLocation;
 
+    @Column(name = "FIRST_LOGIN")
+    @ApiParam("是否首次登录")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
+    private Integer firstLogin;
+
     public BasVendor() {
     }
 
@@ -123,4 +128,4 @@ public class BasVendor extends BaseBean{
         this.id = id;
         this.userName = userName;
     }
-}
+}

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

@@ -1100,4 +1100,72 @@ public class WmsStockSn extends BaseBean {
         this.dateCode = wmsStockSn.getDateCode();
         this.fixLotNo = wmsStockSn.getFixLotNo();
     }
+
+    /**
+     * 条码待打印列表
+     *  queueGroupNo
+     *  remark
+     */
+    public WmsStockSn(String organizeCode, Long id, String sn, String partNo, String partNameRdd, String unit, Integer snStatus,
+                      Integer qcStatus, Double qty, String locateNo, String zoneNo, String whNo, String lotNo,
+                      String dateCode, String leftCode, String fixLotNo, String vendorNo, String vendorNameRdd,
+                      String qualityDate, String custNo, String custSn, String sn2d,
+                      String packageNo, String createDatetime, String createUser, String modifyDatetime, String modifyUser,
+                      String parentPositionNo, Date pdate, Integer printed, String refSrc, String refType,
+                      String shippingFlag, String workCenterCode, Integer snType,
+                      String packagePartNo, Integer useCount, Integer seqNo,
+                      String whNameRdd, String locateNameRdd, String zoneNameRdd, String partTypeDesc,
+                      String prodCfgTypeName, String custNameRdd, String workOrderCode, String color,
+                      String orderNo ,String queueGroupNo, String remark) {
+        this.organizeCode = organizeCode;
+        this.id = id;
+        this.sn = sn;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.unit = unit;
+        this.snStatus = snStatus;
+        this.qcStatus = qcStatus;
+        this.qty = qty;
+        this.locateNo = locateNo;
+        this.zoneNo = zoneNo;
+        this.whNo = whNo;
+        this.lotNo = lotNo;
+        this.dateCode = dateCode;
+        this.leftCode = leftCode;
+        this.fixLotNo = fixLotNo;
+        this.vendorNo = vendorNo;
+        this.vendorNameRdd = vendorNameRdd;
+        this.qualityDate = qualityDate;
+        this.custNo = custNo;
+        this.custSn = custSn;
+        this.sn2d = sn2d;
+        this.packageNo = packageNo;
+        this.createDatetime = createDatetime;
+        this.createUser = createUser;
+        this.modifyDatetime = modifyDatetime;
+        this.modifyUser = modifyUser;
+        this.parentPositionNo = parentPositionNo;
+        this.pdate = pdate;
+        this.printed = printed;
+        this.refSrc = refSrc;
+        this.refType = refType;
+        this.shippingFlag = shippingFlag;
+        this.workCenterCode = workCenterCode;
+        this.snType = snType;
+        this.packagePartNo = packagePartNo;
+        this.useCount = useCount;
+        this.seqNo = seqNo;
+
+        this.whNameRdd = whNameRdd;
+        this.locateNameRdd = locateNameRdd;
+        this.zoneNameRdd = zoneNameRdd;
+        this.partTypeDesc = partTypeDesc;
+        this.prodCfgTypeName = prodCfgTypeName;
+        this.custNameRdd = custNameRdd;
+        this.workOrderCode = workOrderCode;
+        this.color = color;
+        this.orderNo = orderNo;
+        this.queueGroupNo = queueGroupNo;
+        this.remark = remark;
+    }
 }