From 084dbf57d6c158a3bb126e015840498c8c6e0199 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 11 二月 2025 13:09:29 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/InventoryCheckOrderDetlController.java | 25 ++++++++++++++++++-------
1 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/InventoryCheckOrderDetlController.java b/src/main/java/com/zy/asrs/controller/InventoryCheckOrderDetlController.java
index 09b3b8d..7e1e31b 100644
--- a/src/main/java/com/zy/asrs/controller/InventoryCheckOrderDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/InventoryCheckOrderDetlController.java
@@ -1,38 +1,49 @@
package com.zy.asrs.controller;
-import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
-import com.core.common.DateUtils;
-import com.zy.asrs.entity.InventoryCheckOrderDetl;
-import com.zy.asrs.entity.OrderDetl;
-import com.zy.asrs.service.InventoryCheckOrderDetlService;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
+import com.core.common.DateUtils;
import com.core.common.R;
+import com.zy.asrs.entity.InventoryCheckOrder;
+import com.zy.asrs.entity.InventoryCheckOrderDetl;
+import com.zy.asrs.service.InventoryCheckOrderDetlService;
+import com.zy.asrs.service.InventoryCheckOrderService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
@RestController
public class InventoryCheckOrderDetlController extends BaseController {
@Autowired
private InventoryCheckOrderDetlService inventoryCheckOrderDetlService;
+ @Autowired
+ private InventoryCheckOrderService inventoryCheckOrderService;
@RequestMapping(value = "/inventoryCheckOrderDetl/pakout/list/auth")
@ManagerAuth
public R pakoutList(@RequestParam(defaultValue = "1")Integer curr,
@RequestParam(defaultValue = "10")Integer limit,
@RequestParam Map<String, Object> param){
+ if (null == param.get("order_id")|| param.get("order_id").equals("9999999999")){
+ return R.ok(inventoryCheckOrderDetlService.selectPage(new Page<>(curr, limit), new EntityWrapper<InventoryCheckOrderDetl>().eq("order_no",null)));
+ }
+ InventoryCheckOrder inventoryCheckOrder = inventoryCheckOrderService.selectById(Integer.parseInt(param.get("order_id").toString()));
+
EntityWrapper<InventoryCheckOrderDetl> inventoryCheckOrderDetlEntityWrapper = new EntityWrapper<>();
// convert(param, inventoryCheckOrderDetlEntityWrapper);
- inventoryCheckOrderDetlEntityWrapper.eq("order_no",param.get("order_id"));
+ inventoryCheckOrderDetlEntityWrapper.eq("order_no",inventoryCheckOrder.getOrderNo());
+
return R.ok(inventoryCheckOrderDetlService.selectPage(new Page<>(curr, limit), inventoryCheckOrderDetlEntityWrapper));
}
--
Gitblit v1.9.1