From 1337f52d77b1973861e62442c81dfe09a42d4eb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com>
Date: Wed, 7 Dec 2022 15:46:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=A2=84=E9=AA=8C=E6=94=B6?=
 =?UTF-8?q?=E5=BA=93=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inventory/InvPreInProductsController.java       | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvPreInProductsController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvPreInProductsController.java
index 6891f95..244dc53 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvPreInProductsController.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvPreInProductsController.java
@@ -6,7 +6,10 @@ import com.github.pagehelper.PageInfo;
 import com.glxp.sale.admin.annotation.AuthRuleAnnotation;
 import com.glxp.sale.admin.constant.ConstantStatus;
 import com.glxp.sale.admin.constant.ConstantType;
+import com.glxp.sale.admin.dao.inout.OrderDao;
+import com.glxp.sale.admin.dao.inout.StockOrderDao;
 import com.glxp.sale.admin.entity.info.CompanyEntity;
+import com.glxp.sale.admin.entity.inout.StockOrderEntity;
 import com.glxp.sale.admin.entity.inventory.InvProductDetailEntity;
 import com.glxp.sale.admin.entity.inventory.InvProductEntity;
 import com.glxp.sale.admin.req.inout.DeleteRequest;
@@ -45,11 +48,21 @@ public class InvPreInProductsController {
     InvPreInProductDetailService invProductDetailService;
     @Resource
     private CompanyService companyService;
+    @Resource
+    private StockOrderDao stockOrderDao;
 
     @AuthRuleAnnotation("")
     @GetMapping("spms/prein/inv/products/filter")
     public BaseResponse filterInvProduct(FilterInvProductRequest filterInvProductRequest) {
         boolean showSup = false;
+
+        if(StrUtil.isNotBlank(filterInvProductRequest.getOrderIdFk())){
+            StockOrderEntity stockOrderEntity = stockOrderDao.selectByBillNo(filterInvProductRequest.getOrderIdFk());
+            if(stockOrderEntity !=null && StrUtil.isNotBlank(stockOrderEntity.getOrderIdFk())){
+                filterInvProductRequest.setOrderIdFk(stockOrderEntity.getOrderIdFk());
+            }
+        }
+
         if (Constant.SYSTEM_CUSTOMER_ID.equals(filterInvProductRequest.getCustomerId())) {
             filterInvProductRequest.setCustomerId(null);
             showSup = true;