diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java index 6e95f51..c04edf2 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java @@ -33,15 +33,6 @@ public class WmsMoveMaster extends BaseBean { public String orderNo; /** - * 业务类型:RC=收货,QC=质检,IN=入库,ZI=杂收,ZO=杂发, - * VJ=供应商退货,CJ=客户退货,WP=工单领料,WJ=工单退料, - * MI=移库入库,MO=移库出库,SO=发运1 - */ - @Column(name="ORDER_TYPE") - @ApiParam(value = "业务类型", example = "0") - public Integer orderType; - - /** * 状态:0=创建,5=待处理,10=已处理 */ @Column(name="ORDER_STATUS") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index b983943..d372081 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -828,7 +828,6 @@ public class WmsHqlPack { HqlPack.getStringEqualPack(wmsMoveMaster.getOrderNo(), "orderNo", result); HqlPack.getNumEqualPack(wmsMoveMaster.getOrderStatus(),"orderStatus",result); - HqlPack.getNumEqualPack(wmsMoveMaster.getOrderType(),"orderType",result); getStringBuilderPack(wmsMoveMaster, result); return result.toString(); @@ -1110,6 +1109,8 @@ public class WmsHqlPack { getStringBuilderPack(wmsActionGroupDetails, result); + HqlPack.getOrderByPack(new Object[]{1}, new String[]{"seq"}, result); + return result.toString(); }