diff --git a/src/main/java/com/glxp/api/constant/ConstantStatus.java b/src/main/java/com/glxp/api/constant/ConstantStatus.java
index a53b8d32f..5133852cb 100644
--- a/src/main/java/com/glxp/api/constant/ConstantStatus.java
+++ b/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;
/**
* 已提交待处理
diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java
index 2b610ad22..67dfc3b67 100644
--- a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java
+++ b/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) {
- if (bindingResult.hasErrors()) {
- return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
- }
+ public BaseResponse filterOrder(FilterOrderRequest filterOrderRequest) {
if (StrUtil.isNotBlank(filterOrderRequest.getStatusType())) {
orderService.setFilterStatus(filterOrderRequest);
}
diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml
index 804425f4d..665b574d3 100644
--- a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml
+++ b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml
@@ -17,12 +17,21 @@
AND id = #{id}
+
+ AND action = #{action}
+
+
+ AND mainAction = #{mainAction}
+
AND billNo like concat('%', #{billNo}, '%')
AND corpOrderId = #{corpOrderId}
+
+ AND fromCorp = #{fromCorp}
+
AND deptCode = #{deptCode}
@@ -50,6 +59,9 @@
#{item}
+
+ AND status = #{status}
+