From 89a685ff800a34aa37eabd7ee84b5d6601db7a92 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 09:51:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8D=95=E6=8D=AE=E6=8E=92?= =?UTF-8?q?=E5=BA=8F=E4=BF=AE=E6=94=B9=E5=BD=95=E5=85=A5=E5=8D=95=E6=8D=AE?= =?UTF-8?q?=E5=AE=9E=E6=97=B6=E6=95=B0=E9=87=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/api/admin/controller/inout/WareHouseController.java | 2 +- .../main/resources/mybatis/mapper/business/StockOrderDao.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java index b4e31bdf..e9a8f82a 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java @@ -844,7 +844,7 @@ public class WareHouseController { if (udiRelevanceResponse.getBhzxxsbzsl() == 0) { actCount = udiRelevanceResponse.getZxxsbzbhsydysl(); } else { - actCount = udiRelevanceResponse.getBhzxxsbzsl() * udiRelevanceResponse.getBhzxxsbzsl(); + actCount = udiRelevanceResponse.getBhzxxsbzsl() * udiRelevanceResponse.getZxxsbzbhsydysl(); } } else { actCount = udiRelevanceResponse.getBhzxxsbzsl(); diff --git a/api-admin/src/main/resources/mybatis/mapper/business/StockOrderDao.xml b/api-admin/src/main/resources/mybatis/mapper/business/StockOrderDao.xml index dea393f8..4eae4064 100644 --- a/api-admin/src/main/resources/mybatis/mapper/business/StockOrderDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/business/StockOrderDao.xml @@ -218,7 +218,7 @@ group by stock_order.id - ORDER BY id DESC + ORDER BY stock_order.updateTime DESC,id DESC