库存交易前后端以及(11月19日)所有的小bug

yun-zuoyi
gragon.xu 7 years ago
parent 8841e18a4d
commit b3faaf50f4

@ -703,19 +703,17 @@ public class WmsEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PART_ABC {
A(1, "A", "正常"),
B(2, "B", "正常"),
C(3, "C", "取消"),
D(4, "D", "取消"),
E(5, "E", "取消");
A(1, "A"),
B(2, "B"),
C(3, "C"),
D(4, "D"),
E(5, "E");
private int value;
private String code;
private String description;
PART_ABC(int value, String code, String description) {
PART_ABC(int value, String description) {
this.value = value;
this.code = code;
this.description = description;
}
@ -727,10 +725,6 @@ public class WmsEnumUtil {
return description;
}
public String getCode() {
return code;
}
public static String valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {

@ -7,6 +7,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import org.springframework.format.annotation.DateTimeFormat;
import javax.persistence.Column;
import javax.persistence.Entity;
@ -118,6 +119,7 @@ public class WmsStockSn extends BaseBean {
@Column(name = "PDATE")
@ApiParam(value = "打印时间")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date pdate;
/**
* 1=ASN,10=PO,20=SO

@ -823,7 +823,7 @@ public class WmsHqlPack {
public static String packWmsTransSn(String tranNo) {
StringBuffer result = new StringBuffer();
//查询参数封装
HqlPack.getStringEqualPack(tranNo, "tranNo", result);
HqlPack.getStringEqualPack(tranNo, "transNo", result);
HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
return result.toString();
}

Loading…
Cancel
Save