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;