枚举修改

yun-zuoyi
刘敏 6 years ago
parent 60be1763b2
commit 34dcf6d526

@ -193,10 +193,10 @@ public class WmsEnumUtil {
*/ */
@JsonFormat(shape = JsonFormat.Shape.OBJECT) @JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ORDER_DETAILS_STATUS { public enum ORDER_DETAILS_STATUS {
CREATE(10, "N", "创建"), CREATE(10, "CREATE", "创建"),
RECEIPTED(20, "R", "已完成"), RECEIPTED(20, "FINISHED", "已完成"),
CANCEL(30, "C", "行取消"), CANCEL(30, "CANCLE", "行取消"),
PRINTED(40, "C", "已打印"); PRINTED(40, "PRINTED", "已打印");
private int value; private int value;
private String code; private String code;

@ -23,7 +23,7 @@ public class SapBase {
private String actusr = "导入"; private String actusr = "导入";
@ApiParam(value = "SID", example = "-1") @ApiParam(value = "SID", example = "-1")
private String sid = ( Math.abs(new Random().nextInt())+ ""); private String sid = "";
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiParam(value = "接收数据日期", example = "-1") @ApiParam(value = "接收数据日期", example = "-1")

@ -27,6 +27,7 @@ import javax.persistence.Table;
@DynamicUpdate @DynamicUpdate
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Api(value="线边库物料信息",description = "线边库物料信息") @Api(value="线边库物料信息",description = "线边库物料信息")
@Deprecated
public class WmsLineLocatePart extends BaseBean { public class WmsLineLocatePart extends BaseBean {
@Column(name="LOCATE_NO") @Column(name="LOCATE_NO")

@ -79,6 +79,9 @@ public class WmsHqlPack {
//查询参数封装 //查询参数封装
DdlPreparedPack.getStringEqualPack(wmsDocMovementDetails.getOrderNo(), "orderNo", result); DdlPreparedPack.getStringEqualPack(wmsDocMovementDetails.getOrderNo(), "orderNo", result);
DdlPreparedPack.getNumEqualPack(wmsDocMovementDetails.getItemStatus(), "itemStatus", result); DdlPreparedPack.getNumEqualPack(wmsDocMovementDetails.getItemStatus(), "itemStatus", result);
DdlPreparedPack.timeBuilder(wmsDocMovementDetails.getCreateDateTimeStart(),
wmsDocMovementDetails.getCreateDateTimeEnd(),"createDatetime",result,true);
getStringBuilderPack(wmsDocMovementDetails, result); getStringBuilderPack(wmsDocMovementDetails, result);
return result; return result;

Loading…
Cancel
Save