I3_YF_SEAT
/
i3plus-pojo
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
yun-zuoyi
jun 4 years ago
parent d0c62b9b2d 3bfb61178b
commit 1b3b5ea6a5
5 changed files with 179 additions and 5 deletions
Show Stats Download Patch File Download Diff File

1
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java
Unescape Escape View File

@ -26,6 +26,7 @@ public class CommonEnumUtil {
WMS(3, 8200, 10, 102000000L, "i3wms", "仓库管理软件"),
SWEB(7, 8800, 19, 108000000L, "i3sweb", "供应商服务"),
QMS(5, 0, 0, 0, "i3qms", "质量管理软件"),
TMS(101, 8250, 24, 118000000L, "i3tms", "运输管理系统"),
/**
* Mes 服务

3
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
Unescape Escape View File

@ -2775,7 +2775,8 @@ public class MesEnumUtil {
FIRST_CHECK(10, "FIRST_CHECK", "首检"),
ON_SITE_CHECK(20, "ON_SITE_CHECK", "巡检"),
END_CHECK(30, "END_CHECK", "末检"),
RC_CHECK(40, "RC_CHECK", "发货检验");
RC_CHECK(40, "RC_CHECK", "发货检验"),
OUTSOURCE_CHECK(50, "OUTSOURCE_CHECK","工序外协检");
private int value;
private String code;

3
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
Unescape Escape View File

@ -1030,7 +1030,8 @@ public class MesPcnEnumUtil {
FIRST_CHECK(10, "首检"),
ON_SITE_CHECK(20, "巡检"),
END_CHECK(30, "末检"),
RC_CHECK(40, "发货检验");
RC_CHECK(40, "发货检验"),
OUTSOURCE_CHECK(50, "工序外协检");
private int value;
private String description;

160
modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserInfoImportModel.java
Unescape Escape View File

@ -0,0 +1,160 @@
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(value = "userImportTemplate")
public class UserInfoImportModel {
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, name = "员工类型", refClass = SysDictionary.class, value = "name", refForeignKey = BaseConstWords.DICTIONARY_EMPLOYEE_TYPE)
private Integer infoEmployeeType;
@ApiModelProperty(value = "员工等级")
@AnnoOutputColumn(required = false, name = "员工等级", refClass = SysDictionary.class, value = "name", refForeignKey = BaseConstWords.DICTIONARY_EMPLOYEE_GRADE)
private Integer infoGrade;
@ApiModelProperty(value = "性别", example = "1", access = "性别（1.男，2.女）")
@AnnoOutputColumn(required = false,name = "性别", refClass = SysDictionary.class, value = "name", refForeignKey = BaseConstWords.DICTIONARY_SEX)
private Integer infoSex;
@ApiModelProperty(value = "婚姻", example = "1", access = "性别（1.未知，2.已婚,3未婚）")
@AnnoOutputColumn(required = false, name = "婚姻",refClass = SysDictionary.class, value = "name", refForeignKey = BaseConstWords.DICTIONARY_MARRIAGE)
private Integer infoMarriage;
@ApiModelProperty(value = "证件类型")
@AnnoOutputColumn(required = false, name = "证件类型", 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,name = "学历", 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,name = "种族", 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 = "入职日期")
private String infoJoinDate;
@ApiModelProperty(value = "离职日期")
private String infoResignationDate;
@ApiModelProperty(value = "政治面貌")
@AnnoOutputColumn(required = false, name = "政治面貌", refClass = SysDictionary.class, value = "name", refForeignKey = BaseConstWords.DICTIONARY_POLITICAL_STATUS)
private Integer infoPoliticalStatus;
@ApiModelProperty(value = "出生日期")
private String infoBornDate;
@ApiModelProperty(value = "部门", access = "部门")
@AnnoOutputColumn
private String infoDepartmentNameRdds;
@ApiModelProperty(value = "主部门", access = "主部门")
@AnnoOutputColumn
private String infoDepartmentNameRdd;
@ApiModelProperty(value = "岗位", access = "岗位")
@AnnoOutputColumn
private String positionNameRdds;
@ApiModelProperty(value = "主岗位", access = "主岗位")
@AnnoOutputColumn
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;
}

17
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java
Unescape Escape View File

@ -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();
}
}

Write Preview
Loading…
Cancel
Save