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

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

@ -2711,56 +2711,111 @@ 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 innerClazz[] = WmsEnumUtil.class.getDeclaredClasses();// 获取常量类中的所有内部类
Class<Enum> clazz; Class<Enum> clazz;
Enum[] enumConstants; Enum[] enumConstants;
Map<String, Object> enumMap;// 枚举类 Map<String, Object> enumMap;// 枚举类
List<Map<String, Object>> values;// 枚举实例【enumName：{“”：}，{“”：}，{“”：}】 List<Map<String, Object>> values;// 枚举实例【enumName：{“”：}，{“”：}，{“”：}】
Map<String, Object> value;// 枚举实例属性 Map<String, Object> value;// 枚举实例属性
Method getValue; Method getValue;
Method getCode; Method getCode;
Method getDescription; Method getDescription;
// 遍历内部类 // 遍历内部类
String simpleName;//内部类的类名 String simpleName;//内部类的类名
for (Class class1 : innerClazz) { for (Class class1 : innerClazz) {
//获取内部内的类名 //获取内部内的类名
simpleName = class1.getSimpleName(); simpleName = class1.getSimpleName();
if (simpleName.equals(enumName)) { if (simpleName.equals(enumName)) {
// 判断类是不是枚举类 // 判断类是不是枚举类
clazz = (Class<Enum>) Class.forName("cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil$" + simpleName); clazz = (Class<Enum>) Class.forName("cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil$" + simpleName);
// 枚举类方法初始化 // 枚举类方法初始化
getCode = null; getCode = null;
try { try {
getCode = clazz.getMethod("getCode"); getCode = clazz.getMethod("getCode");
} catch (NoSuchMethodException e) { } catch (NoSuchMethodException e) {
}
getValue = clazz.getMethod("getValue");
getDescription = clazz.getMethod("getDescription");
// 获取所有枚举实例
enumConstants = clazz.getEnumConstants();
enumMap = new HashMap<>();
values = new ArrayList<>();
for (Enum enum1 : enumConstants) {
value = new HashMap<>();
value.put("value", getValue.invoke(enum1));
if (getCode != null) {
value.put("code", getCode.invoke(enum1));
} }
getValue = clazz.getMethod("getValue"); value.put("description", getDescription.invoke(enum1));
getDescription = clazz.getMethod("getDescription"); values.add(value);
}
// 获取所有枚举实例 enumMap.put("enumName", clazz.getSimpleName());
enumConstants = clazz.getEnumConstants(); enumMap.put("valuesList", values);
enumMap = new HashMap<>(); return enumMap;
values = new ArrayList<>(); }
for (Enum enum1 : enumConstants) { }
value = new HashMap<>(); return null;
value.put("value", getValue.invoke(enum1)); }
if (getCode != null) {
value.put("code", getCode.invoke(enum1)); /**
} * 库存数量类型
value.put("description", getDescription.invoke(enum1)); */
values.add(value); @JsonFormat(shape = JsonFormat.Shape.OBJECT)
} public enum STOCK_QUAN_QTY_TYPE {
enumMap.put("enumName", clazz.getSimpleName()); QTY("qty", "可用数量"),
enumMap.put("valuesList", values); FAIL_QTY("failQty", "不合格数量"),
return enumMap; 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; 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;
}
} }
/** /**

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("关联单号") @ApiParam("关联单号")
public String refSrc; public String refSrc;
@ApiParam(value = "关联单据类型") @ApiParam(value = "关联单据业务类型")
private String refType; private String busiTypeDesc;
@Column(name = "ZDATE") @Column(name = "ZDATE")
@ApiParam(value = "计划日期") @ApiParam(value = "计划日期")
@ -56,13 +56,13 @@ public class WmsTaskInfoModel implements Serializable {
} }
public WmsTaskInfoModel(String orderNo, Integer taskStatus, String opTypeName, String transTypeCode, String refSrc, 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.orderNo = orderNo;
this.taskStatus = taskStatus; this.taskStatus = taskStatus;
this.opTypeName = opTypeName; this.opTypeName = opTypeName;
this.transTypeCode = transTypeCode; this.transTypeCode = transTypeCode;
this.refSrc = refSrc; this.refSrc = refSrc;
this.refType = refType; this.busiTypeDesc = busiTypeDesc;
this.zdate = zdate; this.zdate = zdate;
this.ztime = ztime; this.ztime = ztime;
this.custNo = custNo; 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") @Table(name = "WMS_PART")
@Api("物料表") @Api("物料表")
public class WmsPart extends BaseBean { public class WmsPart extends BaseBean {
@Column(name="PART_NO") @Column(name = "PART_NO")
@ApiParam(value ="物料编码") @ApiParam(value = "物料编码")
private String partNo; private String partNo;
@Column(name="PART_NAME") @Column(name = "PART_NAME")
@ApiParam(value ="物料名称") @ApiParam(value = "物料名称")
private String partName; private String partName;
@Column(name="PART_SPEC") @Column(name = "PART_SPEC")
@ApiParam(value ="物料规格") @ApiParam(value = "物料规格")
private String partSpec; private String partSpec;
@Column(name="PART_TYPE") @Column(name = "PART_TYPE")
@ApiParam(value ="物料类型") @ApiParam(value = "物料类型")
private String partType; private String partType;
@Column(name="PART_TYPE_DESC") @Column(name = "PART_TYPE_DESC")
@ApiParam(value ="物料类型描述") @ApiParam(value = "物料类型描述")
private String partTypeDesc; private String partTypeDesc;
@Column(name="GRAPHI_NO") @Column(name = "GRAPHI_NO")
@ApiParam(value ="图号") @ApiParam(value = "图号")
private String graphiNo; private String graphiNo;
@Column(name="VERSION") @Column(name = "VERSION")
@ApiParam(value ="版本") @ApiParam(value = "版本")
private String version; private String version;
@Column(name="COLOR") @Column(name = "COLOR")
@ApiParam(value ="颜色") @ApiParam(value = "颜色")
private String color; private String color;
@Column(name="STOCK_UNIT") @Column(name = "STOCK_UNIT")
@ApiParam(value ="库存单位") @ApiParam(value = "库存单位")
private String stockUnit; private String stockUnit;
@Column(name="ABC") @Column(name = "ABC")
@ApiParam(value ="分类") @ApiParam(value = "分类")
private String abc; private String abc;
@Column(name="BUY_UNIT") @Column(name = "BUY_UNIT")
@ApiParam(value ="采购单位") @ApiParam(value = "采购单位")
private String buyUnit; private String buyUnit;
@Column(name="BU2SU") @Column(name = "BU2SU")
@ApiParam(value ="换算率1",example = "1") @ApiParam(value = "换算率1", example = "1")
private Double bu2su; private Double bu2su;
@Column(name="PRICE_UNIT") @Column(name = "PRICE_UNIT")
@ApiParam(value ="计价单位") @ApiParam(value = "计价单位")
private String priceUnit; private String priceUnit;
@Column(name="PU2SU") @Column(name = "PU2SU")
@ApiParam(value ="换算率2",example = "1") @ApiParam(value = "换算率2", example = "1")
private Double pu2su; private Double pu2su;
@Column(name="SNP") @Column(name = "SNP")
@ApiParam(value ="标准包装",example = "1") @ApiParam(value = "标准包装", example = "1")
private Double snp; private Double snp;
@Column(name="IQC") @Column(name = "IQC")
@ApiParam(value ="收货检验否",example = "1") @ApiParam(value = "收货检验否", example = "1")
private Integer iqc; private Integer iqc;
@Column(name="MIN") @Column(name = "MIN")
@ApiParam(value ="最低库存",example = "1") @ApiParam(value = "最低库存", example = "1")
private Double min; private Double min;
@Column(name="MAX") @Column(name = "MAX")
@ApiParam(value ="最高库存",example = "1") @ApiParam(value = "最高库存", example = "1")
private Double max; private Double max;
@Column(name="PART_GROUP") @Column(name = "PART_GROUP")
@ApiParam(value ="物料组") @ApiParam(value = "物料组")
private String partGroup; private String partGroup;
@Column(name="LOT_CHECK_RULE") @Column(name = "LOT_CHECK_RULE")
@ApiParam(value ="批次校验规则") @ApiParam(value = "批次校验规则")
private String lotCheckRule; private String lotCheckRule;
@Column(name="SN_CONTROL") @Column(name = "SN_CONTROL")
@ApiParam(value ="是否条码管理",example = "1") @ApiParam(value = "是否条码管理", example = "1")
private Integer snControl; private Integer snControl;
@Column(name="IN_LOCATE_NO") @Column(name = "VENDOR_NO")
@ApiParam(value ="默认入库库位") @ApiParam(value = "供应商代码")
private String vendorNo;
@Column(name = "IN_LOCATE_NO")
@ApiParam(value = "默认入库库位")
private String inLocateNo; 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("项目代码") @ApiParam("项目代码")
private String prodCfgTypeCode; private String prodCfgTypeCode;
@Column(name="PROD_CFG_TYPE_NAME") @Column(name = "PROD_CFG_TYPE_NAME")
@ApiParam("项目名称") @ApiParam("项目名称")
private String prodCfgTypeName; private String prodCfgTypeName;
@Column(name="OUT_CLOSE_FLAG") @Column(name = "OUT_CLOSE_FLAG")
@ApiParam("項目结算标识") @ApiParam("項目结算标识")
private String outCloseFlag; private String outCloseFlag;
@ -136,13 +148,23 @@ public class WmsPart extends BaseBean {
@ApiParam("库存水平") @ApiParam("库存水平")
private String stockLevelStatus; 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.partNo = partNo;
this.partName = partName; this.partName = partName;
this.max = maxQty; this.max = maxQty;
this.min = minQty; this.min = minQty;
this.qty = cqty; 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;
}
} }

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

@ -91,9 +91,9 @@ public class WmsTaskDetails extends BaseBean {
@ApiParam(value = "状态", example = "1") @ApiParam(value = "状态", example = "1")
private Integer itemStatus; private Integer itemStatus;
public Integer getItemStatus(){ public Integer getItemStatus() {
if(itemStatus == null) { if (itemStatus == null) {
return null; return null;
} }
return itemStatus.intValue(); return itemStatus.intValue();
} }
@ -134,11 +134,19 @@ public class WmsTaskDetails extends BaseBean {
@ApiParam("目的库存地代码") @ApiParam("目的库存地代码")
public String destAreaNo; public String destAreaNo;
@Column(name = "BUSI_TYPE")
@ApiParam("业务类型")
public Integer busiType;
@Column(name = "BUSI_TYPE_DESC")
@ApiParam("业务类型描述")
public String busiTypeDesc;
public Double getQty() { public Double getQty() {
return this.qty == null ? 0 : this.qty; return this.qty == null ? 0 : this.qty;
} }
public String getQtyTxt(){ public String getQtyTxt() {
return new BigDecimal(getQty() + "").stripTrailingZeros().toPlainString(); 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(); DdlPackBean result = new DdlPackBean();
//客户编号 //客户编号
DdlPreparedPack.getStringEqualPack(basCustomer.getCustNo(), "custNo", result); DdlPreparedPack.getStringLikerPack(basCustomer.getCustNo(), "custNo", result);
//客户简称 //客户简称
DdlPreparedPack.getStringLikerPack(basCustomer.getCustName(), "custName", result); DdlPreparedPack.getStringLikerPack(basCustomer.getCustName(), "custName", result);
//客户全称 //客户全称
@ -633,7 +633,7 @@ public class WmsHqlPack {
DdlPreparedPack.getStringEqualPack(wmsFGInStock.getErpAreaNo(), "erpWhno", result); DdlPreparedPack.getStringEqualPack(wmsFGInStock.getErpAreaNo(), "erpWhno", result);
DdlPreparedPack.getStringEqualPack(wmsFGInStock.getLineNo(), "lineNo", result); DdlPreparedPack.getStringEqualPack(wmsFGInStock.getLineNo(), "lineNo", result);
DdlPreparedPack.getStringEqualPack(wmsFGInStock.getWhNo(), "whNo", 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.getShippingFlag(), "shippingFlag", result);
DdlPreparedPack.getStringEqualPack(wmsFGInStock.getMfgLogNo(), "mfgLogNo", result); DdlPreparedPack.getStringEqualPack(wmsFGInStock.getMfgLogNo(), "mfgLogNo", result);

Write Preview
Loading…
Cancel
Save