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

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockReportEnumUtil.java

@@ -533,10 +533,10 @@ public class BlockReportEnumUtil {
         LIKE_LEFT(6, "LIKE", "左模糊"),
         LIKE_RIGHT(7, "LIKE", "右模糊"),
         EQUAL(8, "=", "等于"),
-        EQUAL_NOT(9, "!=", "不等于"),
+        EQUAL_NOT(9, "<>", "不等于"),
-        AND(10, "AND", "AND"),
+//        AND(10, "AND", "AND"),
-        OR(11, "OR", "OR"),
+//        OR(11, "OR", "OR"),
-        NOT(12, "NOT", "NOT"),
+//        NOT(12, "NOT", "NOT"),
         IS_NULL(13, "IS NULL", "IS NULL"),
         IS_NOT_NULL(14, "IS NOT NULL", "IS NOT NULL");
 

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefTaskCyclePlan.java

@@ -35,6 +35,11 @@ public class SysRefTaskCyclePlan extends BaseBean {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long taskCycleId;
 
+    @Column(name="TASK_PLAN_ID")
+    @ApiParam(value ="任务计划id" ,example = "-1")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long taskPlanId;
+
     @Column(name="TASK_PLAN_NAME")
     @ApiParam(value ="任务计划名称")
     private String taskPlanName;

modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java

@@ -77,11 +77,12 @@ public class ReportHqlPack {
 
         // 查询参数封装
         HqlPack.getNumEqualPack(template.getTemplateType(),"templateType",result);
-        if(template.getTemplateStatus() != null &&
+        if(template.getTemplateStatus() != null){
-                template.getTemplateStatus().intValue() == BlockReportEnumUtil.TEMPLATE_STATUS.SAVE_TEMPLATE_ATTR_CONFIRM.getValue()){
+            if(template.getTemplateStatus().intValue() == CommonEnumUtil.USER_STATUS.DISABLE.getValue()){
-            HqlPack.getNumEqualPack(template.getTemplateStatus(),"templateStatus",result);
+                HqlPack.getNumEqualPack(BlockReportEnumUtil.TEMPLATE_STATUS.SAVE_TEMPLATE_ATTR_CONFIRM.getValue(),"templateStatus",result);
-        }else {
+            }else {
-            HqlPack.getNumSmallerPack(BlockReportEnumUtil.TEMPLATE_STATUS.SAVE_TEMPLATE_ATTR_CONFIRM.getValue(),"templateStatus",result);
+                HqlPack.getNumSmallerPack(BlockReportEnumUtil.TEMPLATE_STATUS.SAVE_TEMPLATE_ATTR_CONFIRM.getValue(),"templateStatus",result);
+            }
         }
         HqlPack.getStringLikerPack(template.getName(),"name",result);
 

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

@@ -120,6 +120,10 @@ public class WmsDocMovementDetails extends BaseBean {
     @ApiParam(value = "已收货数量", example = "1")
     private Double recQty;
 
+    @Column(name = "MOVE_QTY")
+    @ApiParam(value = "已移库数量", example = "1")
+    private Double moveQty;
+
     @Column(name = "SRC_AREA_NO")
     @ApiParam("源库存地代码")
     public String srcAreaNo;