1.调整单据查询逻辑，修改单据状态值参数

src/main/java/com/glxp/api/constant/ConstantStatus.java

@@ -10,7 +10,7 @@ public class ConstantStatus {
     /**
      * 等待提交(草稿）
      */
-    public static final Integer ORDER_STATUS_TEMP_SAVE = -1;
+    public static final Integer ORDER_STATUS_TEMP_SAVE = 1;
 
     /**
      * 已提交待处理

src/main/java/com/glxp/api/controller/inout/IoOrderController.java

@@ -1,10 +1,8 @@
 package com.glxp.api.controller.inout;
 
-import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import com.github.pagehelper.PageInfo;
 import com.glxp.api.annotation.AuthRuleAnnotation;
-import com.glxp.api.common.enums.ResultEnum;
 import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
 import com.glxp.api.entity.basic.BasicBussinessTypeEntity;
@@ -16,13 +14,10 @@ import com.glxp.api.req.inout.AddOrderRequest;
 import com.glxp.api.req.inout.FilterOrderRequest;
 import com.glxp.api.req.system.DeleteRequest;
 import com.glxp.api.res.PageSimpleResponse;
-import com.glxp.api.res.inout.AcceptOrderResponse;
 import com.glxp.api.res.inout.IoOrderResponse;
 import com.glxp.api.service.basic.IBasicBussinessTypeService;
 import com.glxp.api.service.inout.*;
-import com.glxp.api.util.RedisUtil;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -57,10 +52,7 @@ public class IoOrderController {
      * @return
      */
     @GetMapping("/udiwms/inout/order/filter")
-    public BaseResponse filterOrder(FilterOrderRequest filterOrderRequest, BindingResult bindingResult) {
+    public BaseResponse filterOrder(FilterOrderRequest filterOrderRequest) {
-        if (bindingResult.hasErrors()) {
-            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
-        }
         if (StrUtil.isNotBlank(filterOrderRequest.getStatusType())) {
             orderService.setFilterStatus(filterOrderRequest);
         }

src/main/resources/mybatis/mapper/inout/IoOrderDao.xml

@@ -17,12 +17,21 @@
             <if test="id != null and id != ''">
                 AND id = #{id}
             </if>
+            <if test="action != null and action != ''">
+                AND action = #{action}
+            </if>
+            <if test="mainAction != null and mainAction != ''">
+                AND mainAction = #{mainAction}
+            </if>
             <if test="billNo != null and billNo != ''">
                 AND billNo like concat('%', #{billNo}, '%')
             </if>
             <if test="corpOrderId != null and corpOrderId != ''">
                 AND corpOrderId = #{corpOrderId}
             </if>
+            <if test="fromCorp != null and fromCorp != ''">
+                AND fromCorp = #{fromCorp}
+            </if>
             <if test="deptCode != null and deptCode != ''">
                 AND deptCode = #{deptCode}
             </if>
@@ -50,6 +59,9 @@
                     #{item}
                 </foreach>
             </if>
+            <if test="status != null">
+                AND status = #{status}
+            </if>
         </where>
     </select>