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

Merge branch 'dev' into test

Browse Source
yun-zuoyi
peter.pan 6 years ago
parent 9c38ed702a efbe9dac9e
commit 96264870c2
5 changed files with 190 additions and 105 deletions
Show Stats Download Patch File Download Diff File

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

@ -2711,7 +2711,7 @@ public class WmsEnumUtil {
}
}
public static Map<String, Object> getEnumByName(String enumName) throws Exception{
public static Map<String, Object> getEnumByName(String enumName) throws Exception {
Class innerClazz[] = WmsEnumUtil.class.getDeclaredClasses();// 获取常量类中的所有内部类
Class<Enum> clazz;
Enum[] enumConstants;
@ -2764,6 +2764,61 @@ public class WmsEnumUtil {
}
/**
* 库存数量类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum STOCK_QUAN_QTY_TYPE {
QTY("qty", "可用数量"),
FAIL_QTY("failQty", "不合格数量"),
HOLD_QTY("holdQty", "隔离数量"),
QC_QTY("qcQty", "质检中数量"),
RIN_QTY("rinQty", "待入库数量"),
FREEZE_QTY("freezeQty", "冻结数量"),
CONSIGN_QTY("consignQty", "寄售数量"),
LOCK_QTY("lockQty", "锁定数量"),
SCRAP_QTY("scrapQty", "报废数量");
private String code;
private String description;
STOCK_QUAN_QTY_TYPE(String code, String description) {
this.code = code;
this.description = description;
}
public String getDescription() {
return description;
}
public String getCode() {
return code;
}
public String getValue() {
return code;
}
public static STOCK_QUAN_QTY_TYPE codeOf(String code) {
for (int i = 0; i < values().length; i++) {
if (values()[i].code.equals(code)) {
return values()[i];
}
}
return null;
}
public static String getDescription(String code) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].code == code) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
* ERP同步标识 10=待同步，20=同步成功，30=同步失败
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)

8
modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java
Unescape Escape View File

@ -33,8 +33,8 @@ public class WmsTaskInfoModel implements Serializable {
@ApiParam("关联单号")
public String refSrc;
@ApiParam(value = "关联单据类型")
private String refType;
@ApiParam(value = "关联单据业务类型")
private String busiTypeDesc;
@Column(name = "ZDATE")
@ApiParam(value = "计划日期")
@ -56,13 +56,13 @@ public class WmsTaskInfoModel implements Serializable {
}
public WmsTaskInfoModel(String orderNo, Integer taskStatus, String opTypeName, String transTypeCode, String refSrc,
String refType, String zdate, String ztime, String custNo, String vendorNo) {
String busiTypeDesc, String zdate, String ztime, String custNo, String vendorNo) {
this.orderNo = orderNo;
this.taskStatus = taskStatus;
this.opTypeName = opTypeName;
this.transTypeCode = transTypeCode;
this.refSrc = refSrc;
this.refType = refType;
this.busiTypeDesc = busiTypeDesc;
this.zdate = zdate;
this.ztime = ztime;
this.custNo = custNo;

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

@ -28,103 +28,115 @@ import javax.persistence.Transient;
@Table(name = "WMS_PART")
@Api("物料表")
public class WmsPart extends BaseBean {
@Column(name="PART_NO")
@ApiParam(value ="物料编码")
@Column(name = "PART_NO")
@ApiParam(value = "物料编码")
private String partNo;
@Column(name="PART_NAME")
@ApiParam(value ="物料名称")
@Column(name = "PART_NAME")
@ApiParam(value = "物料名称")
private String partName;
@Column(name="PART_SPEC")
@ApiParam(value ="物料规格")
@Column(name = "PART_SPEC")
@ApiParam(value = "物料规格")
private String partSpec;
@Column(name="PART_TYPE")
@ApiParam(value ="物料类型")
@Column(name = "PART_TYPE")
@ApiParam(value = "物料类型")
private String partType;
@Column(name="PART_TYPE_DESC")
@ApiParam(value ="物料类型描述")
@Column(name = "PART_TYPE_DESC")
@ApiParam(value = "物料类型描述")
private String partTypeDesc;
@Column(name="GRAPHI_NO")
@ApiParam(value ="图号")
@Column(name = "GRAPHI_NO")
@ApiParam(value = "图号")
private String graphiNo;
@Column(name="VERSION")
@ApiParam(value ="版本")
@Column(name = "VERSION")
@ApiParam(value = "版本")
private String version;
@Column(name="COLOR")
@ApiParam(value ="颜色")
@Column(name = "COLOR")
@ApiParam(value = "颜色")
private String color;
@Column(name="STOCK_UNIT")
@ApiParam(value ="库存单位")
@Column(name = "STOCK_UNIT")
@ApiParam(value = "库存单位")
private String stockUnit;
@Column(name="ABC")
@ApiParam(value ="分类")
@Column(name = "ABC")
@ApiParam(value = "分类")
private String abc;
@Column(name="BUY_UNIT")
@ApiParam(value ="采购单位")
@Column(name = "BUY_UNIT")
@ApiParam(value = "采购单位")
private String buyUnit;
@Column(name="BU2SU")
@ApiParam(value ="换算率1",example = "1")
@Column(name = "BU2SU")
@ApiParam(value = "换算率1", example = "1")
private Double bu2su;
@Column(name="PRICE_UNIT")
@ApiParam(value ="计价单位")
@Column(name = "PRICE_UNIT")
@ApiParam(value = "计价单位")
private String priceUnit;
@Column(name="PU2SU")
@ApiParam(value ="换算率2",example = "1")
@Column(name = "PU2SU")
@ApiParam(value = "换算率2", example = "1")
private Double pu2su;
@Column(name="SNP")
@ApiParam(value ="标准包装",example = "1")
@Column(name = "SNP")
@ApiParam(value = "标准包装", example = "1")
private Double snp;
@Column(name="IQC")
@ApiParam(value ="收货检验否",example = "1")
@Column(name = "IQC")
@ApiParam(value = "收货检验否", example = "1")
private Integer iqc;
@Column(name="MIN")
@ApiParam(value ="最低库存",example = "1")
@Column(name = "MIN")
@ApiParam(value = "最低库存", example = "1")
private Double min;
@Column(name="MAX")
@ApiParam(value ="最高库存",example = "1")
@Column(name = "MAX")
@ApiParam(value = "最高库存", example = "1")
private Double max;
@Column(name="PART_GROUP")
@ApiParam(value ="物料组")
@Column(name = "PART_GROUP")
@ApiParam(value = "物料组")
private String partGroup;
@Column(name="LOT_CHECK_RULE")
@ApiParam(value ="批次校验规则")
@Column(name = "LOT_CHECK_RULE")
@ApiParam(value = "批次校验规则")
private String lotCheckRule;
@Column(name="SN_CONTROL")
@ApiParam(value ="是否条码管理",example = "1")
@Column(name = "SN_CONTROL")
@ApiParam(value = "是否条码管理", example = "1")
private Integer snControl;
@Column(name="IN_LOCATE_NO")
@ApiParam(value ="默认入库库位")
@Column(name = "VENDOR_NO")
@ApiParam(value = "供应商代码")
private String vendorNo;
@Column(name = "IN_LOCATE_NO")
@ApiParam(value = "默认入库库位")
private String inLocateNo;
@Column(name="PROD_CFG_TYPE_CODE")
@Transient
@ApiParam("默认入库存储区")
private String inZoneNo;
@Transient
@ApiParam("默认入库仓库")
private String inWhNo;
@Column(name = "PROD_CFG_TYPE_CODE")
@ApiParam("项目代码")
private String prodCfgTypeCode;
@Column(name="PROD_CFG_TYPE_NAME")
@Column(name = "PROD_CFG_TYPE_NAME")
@ApiParam("项目名称")
private String prodCfgTypeName;
@Column(name="OUT_CLOSE_FLAG")
@Column(name = "OUT_CLOSE_FLAG")
@ApiParam("項目结算标识")
private String outCloseFlag;
@ -136,13 +148,23 @@ public class WmsPart extends BaseBean {
@ApiParam("库存水平")
private String stockLevelStatus;
public WmsPart(){}
public WmsPart(String partNo, String partName, Double maxQty, Double minQty, Double cqty){
public WmsPart() {
}
public WmsPart(String partNo, String partName, Double maxQty, Double minQty, Double cqty) {
this.partNo = partNo;
this.partName = partName;
this.max = maxQty;
this.min = minQty;
this.qty = cqty;
}
public WmsPart(String partNo, String vendorNo, String inLocateNo, String inZoneNo, String inWhNo) {
this.partNo = partNo;
this.vendorNo = vendorNo;
this.inLocateNo = inLocateNo;
this.inZoneNo = inZoneNo;
this.inWhNo = inWhNo;
}
}

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

@ -91,8 +91,8 @@ public class WmsTaskDetails extends BaseBean {
@ApiParam(value = "状态", example = "1")
private Integer itemStatus;
public Integer getItemStatus(){
if(itemStatus == null) {
public Integer getItemStatus() {
if (itemStatus == null) {
return null;
}
return itemStatus.intValue();
@ -134,11 +134,19 @@ public class WmsTaskDetails extends BaseBean {
@ApiParam("目的库存地代码")
public String destAreaNo;
@Column(name = "BUSI_TYPE")
@ApiParam("业务类型")
public Integer busiType;
@Column(name = "BUSI_TYPE_DESC")
@ApiParam("业务类型描述")
public String busiTypeDesc;
public Double getQty() {
return this.qty == null ? 0 : this.qty;
}
public String getQtyTxt(){
public String getQtyTxt() {
return new BigDecimal(getQty() + "").stripTrailingZeros().toPlainString();
}

4
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
Unescape Escape View File

@ -475,7 +475,7 @@ public class WmsHqlPack {
DdlPackBean result = new DdlPackBean();
//客户编号
DdlPreparedPack.getStringEqualPack(basCustomer.getCustNo(), "custNo", result);
DdlPreparedPack.getStringLikerPack(basCustomer.getCustNo(), "custNo", result);
//客户简称
DdlPreparedPack.getStringLikerPack(basCustomer.getCustName(), "custName", result);
//客户全称
@ -633,7 +633,7 @@ public class WmsHqlPack {
DdlPreparedPack.getStringEqualPack(wmsFGInStock.getErpAreaNo(), "erpWhno", result);
DdlPreparedPack.getStringEqualPack(wmsFGInStock.getLineNo(), "lineNo", result);
DdlPreparedPack.getStringEqualPack(wmsFGInStock.getWhNo(), "whNo", result);
DdlPreparedPack.getStringEqualPack(wmsFGInStock.getCustNo(), "custNo", result);
DdlPreparedPack.getStringLikerPack(wmsFGInStock.getCustNo(), "custNo", result);
DdlPreparedPack.getStringEqualPack(wmsFGInStock.getShippingFlag(), "shippingFlag", result);
DdlPreparedPack.getStringEqualPack(wmsFGInStock.getMfgLogNo(), "mfgLogNo", result);

Write Preview
Loading…
Cancel
Save