查询记录页面

src/main/java/com/glxp/api/controller/trace/TraceOrderController.java

@@ -12,9 +12,12 @@ import com.glxp.api.entity.basic.UdiEntity;
 import com.glxp.api.entity.trace.TraceOrderEntity;
 import com.glxp.api.entity.trace.TraceTaskNoticeEntity;
 import com.glxp.api.req.trace.TraceOrderDetailRequest;
+import com.glxp.api.req.trace.TraceOrderRequest;
 import com.glxp.api.req.trace.TraceOrderUploadRequest;
+import com.glxp.api.req.trace.TraceRecordRequest;
 import com.glxp.api.res.PageSimpleResponse;
 import com.glxp.api.res.trace.TraceOrderResponse;
+import com.glxp.api.res.trace.TraceRecordResponse;
 import com.glxp.api.service.trace.TraceOrderService;
 import com.glxp.api.service.trace.TraceTaskNoticeService;
 import com.glxp.api.util.udi.FilterUdiUtils;
@@ -100,4 +103,19 @@ public class TraceOrderController extends BaseController {
         System.out.println("成功");
         return ResultVOUtils.success("成功");
     }
+
+    @ApiOperation(value = "查询出入库", response = TraceRecordResponse.class)
+    @AuthRuleAnnotation("udi/trace/inout/order/filter")
+    @GetMapping("udi/trace/inout/order/filter")
+    public BaseResponse filterLogs(TraceOrderRequest traceOrderRequest) {
+
+        List<TraceOrderResponse> traceOrderResponses = traceOrderService.filterOrder(traceOrderRequest);
+        PageInfo<TraceOrderResponse> pageInfo = new PageInfo<>(traceOrderResponses);
+        PageSimpleResponse<TraceOrderResponse> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        pageSimpleResponse.setList(traceOrderResponses);
+        return ResultVOUtils.success(pageSimpleResponse);
+    }
 }
+
+

src/main/java/com/glxp/api/dao/trace/TraceOrderMapper.java

@@ -10,8 +10,10 @@ import com.glxp.api.req.auth.FilterUserComapanyRequest;
 import com.glxp.api.req.trace.TraceOrderDetailRequest;
 import com.glxp.api.req.trace.TraceOrderRequest;
 import com.glxp.api.req.trace.TraceProductRecordRequest;
+import com.glxp.api.req.trace.TraceRecordRequest;
 import com.glxp.api.res.trace.TraceOrderResponse;
 import com.glxp.api.res.trace.TraceProductRecordResponse;
+import com.glxp.api.res.trace.TraceRecordResponse;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
@@ -25,4 +27,6 @@ public interface TraceOrderMapper extends BaseMapperPlus<TraceOrderMapper, Trace
 
     List<TraceOrderResponse> filterJoin(TraceOrderDetailRequest traceOrderDetailRequest);
 
+    List<TraceOrderResponse> filterOrder(TraceOrderRequest traceOrderRequest);
+
 }

src/main/java/com/glxp/api/req/trace/TraceOrderRequest.java

@@ -131,4 +131,7 @@ public class TraceOrderRequest extends ListPageRequest {
      */
     @ApiModelProperty(value = "更新时间")
     private Date updateTime;
+
+    @ApiModelProperty(value = "查询记录号")
+    private String recordCode;
 }

src/main/java/com/glxp/api/res/trace/TraceOrderResponse.java

@@ -168,4 +168,6 @@ public class TraceOrderResponse {
     @ApiModelProperty(value = "查询UDI码")
     private String udiCode;
     private String zczbhhzbapzbh;
+    @ApiModelProperty(value = "查询记录号")
+    private String recordCode;
 }

src/main/java/com/glxp/api/service/trace/TraceManuOrderService.java

@@ -28,6 +28,7 @@ public class TraceManuOrderService extends ServiceImpl<TraceManuOrderMapper, Tra
             int offset = (traceManuOrderRequest.getPage() - 1) * traceManuOrderRequest.getLimit();
             PageHelper.offsetPage(offset, traceManuOrderRequest.getLimit());
         }
+        //System.out.println("11111"+traceManuOrderRequest.getRecordCode());
         return traceManuOrderMapper.filterTraces(traceManuOrderRequest);
     }
 

src/main/java/com/glxp/api/service/trace/TraceOrderService.java

@@ -4,9 +4,12 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.glxp.api.entity.trace.TraceRecordLogEntity;
 import com.glxp.api.req.trace.TraceOrderDetailRequest;
+import com.glxp.api.req.trace.TraceOrderRequest;
 import com.glxp.api.req.trace.TraceProductRecordRequest;
+import com.glxp.api.req.trace.TraceRecordRequest;
 import com.glxp.api.res.trace.TraceOrderResponse;
 import com.glxp.api.res.trace.TraceProductRecordResponse;
+import com.glxp.api.res.trace.TraceRecordResponse;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.glxp.api.dao.trace.TraceOrderMapper;
@@ -87,4 +90,15 @@ public class TraceOrderService extends ServiceImpl<TraceOrderMapper, TraceOrderE
         return traceOrderMapper.replace(traceOrderEntity) > 0;
     }
 
+    public List<TraceOrderResponse> filterOrder(TraceOrderRequest traceOrderRequest) {
+        if (traceOrderRequest == null) {
+            return Collections.emptyList();
+        }
+        if (traceOrderRequest.getPage() != null) {
+            int offset = (traceOrderRequest.getPage() - 1) * traceOrderRequest.getLimit();
+            PageHelper.offsetPage(offset, traceOrderRequest.getLimit());
+        }
+        return traceOrderMapper.filterOrder(traceOrderRequest);
+    }
+
 }

src/main/resources/mybatis/mapper/trace/TraceOrderMapper.xml

@@ -100,4 +100,14 @@
             </if>
         </where>
     </select>
+    <select id="filterOrder" parameterType="com.glxp.api.req.trace.TraceOrderRequest"
+            resultType="com.glxp.api.res.trace.TraceOrderResponse">
+        SELECT *
+        FROM trace_order
+        <where>
+            <if test="recordCode != '' and recordCode != null">
+                and recordCode = #{recordCode}
+            </if>
+        </where>
+    </select>
 </mapper>