Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java

@@ -43,7 +43,7 @@ public class WmsCSOrderMaster extends BaseBean {
     public Integer orderType;
 
     @Column(name = "ORDER_STATUS")
-    @ApiParam(value = "状态 (1-创建 10-已冻结 20-盘点中  30-盘点完成  40-已解冻  50-已关闭)", example = "1")
+    @ApiParam(value = "状态 (10-创建 20-开启盘点  30-盘点中  40-盘点完成  50-已解冻 60-已关闭)", example = "1")
     public Integer orderStatus;
 
     @Column(name = "ACTION_PERSENT")

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java

@@ -1128,6 +1128,7 @@ public class WmsHqlPack {
         HqlPack.getStringEqualPack(wmsCSOrderMaster.getOrderNo(), "orderNo", result);
         HqlPack.getNumEqualPack(wmsCSOrderMaster.getOrderType(), "orderType", result);
         HqlPack.getNumEqualPack(wmsCSOrderMaster.getOrderStatus(), "orderStatus", result);
+        HqlPack.getNumEqualPack(wmsCSOrderMaster.getIsPart(), "isPart", result);
 
         getStringBuilderPack(wmsCSOrderMaster, result);