Merge remote-tracking branch 'origin/dev' into dev

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")

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();