bug7754【7754 需要一个接收对方信息在我们系统中触发报工的接口,当接收到数据时,需要在系统中生成一个标签,然后自动对该标签进行报工操作,接口中包含了条码,零件信息。】

yun-zuoyi
puxiao.liao 5 years ago
parent 4c199ce8ba
commit 3a7d7a7924

@ -139,6 +139,15 @@ public class WmsEnumUtil {
}
return tmp;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
}
@ -2977,6 +2986,16 @@ public class WmsEnumUtil {
}
return tmp;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
@ -5150,4 +5169,45 @@ public class WmsEnumUtil {
return tmp;
}
}
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum QAD_DOC_TYPE {
TYPE_S(10, "s","s"), TYPE_D(20, "d","d");
private int value;
private String code;
private String description;
public String getCode() {
return code;
}
QAD_DOC_TYPE(int value,String code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
}
}

@ -170,6 +170,10 @@ public class WmsDocMovementMaster extends BaseBean {
@AnnoOutputColumn(refClass = WmsEnumUtil.STEP.class, refForeignKey = "value", value = "description")
private Integer isSingleStep;
@Column(name = "ERP_SRC_TYPE",columnDefinition = "varchar(50) default ''")
@ApiParam(value = "QAD发运单据类型")
private String erpSrcType;
@Transient
@ApiParam(value = "发运单号")
private String shipOrderNo;

@ -183,6 +183,11 @@ public class WmsMoveToERP extends BaseBean {
@ApiParam("是否预收货")
public Integer priorRC = 2;
@Column(name = "ERP_SRC_TYPE",columnDefinition = "varchar(50) default ''")
@ApiParam(value = "QAD发运单据类型")
private String erpSrcType;
@ApiParam(value = "待出库数量", example = "0")
@Transient
private Long waitingCounts;

@ -1908,6 +1908,9 @@ public class WmsHqlPack {
if (!Strings.isNullOrEmpty(wmsTransModule.getTmDesc())) {
DdlPreparedPack.getStringLikerPack(wmsTransModule.getTmDesc(), "tmDesc", packBean);
}
if (wmsTransModule.getId() != null) {
DdlPreparedPack.getNumEqualPack(wmsTransModule.getId(), "id", packBean);
}
if (StringUtils.isNotBlank(wmsTransModule.orderBy())) {
packBean.setOrderByStr(wmsTransModule.orderBy());
}

Loading…
Cancel
Save