From 9134afd1ebc5402ce37fe47749c1b53e8bd6fd47 Mon Sep 17 00:00:00 2001 From: wusiyu <2015098864@qq.com> Date: Wed, 3 Jun 2026 16:12:43 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BB=93=E5=BA=93=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/springblade/wms/mapper/StGlassCakeOutMapper.xml | 2 +- .../java/org/springblade/wms/mapper/StGraphiteMoldOutMapper.xml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StGlassCakeOutMapper.xml b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StGlassCakeOutMapper.xml index 12cff5949..21eecd685 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StGlassCakeOutMapper.xml +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StGlassCakeOutMapper.xml @@ -41,7 +41,7 @@ gco.part_name, gco.batch_code, gco.card_no, gco.quantity, gco.require_qty, gco.stove_pi_no, gco.out_qty, gco.cur_status, gco.est_use_time, gco.out_time, gco.out_users, gco.out_code, - gco.memo, gco.picker, + gco.memo, gco.picker, gco.pre_out_qty, -- 物料表字段（根据实际ST_GOODS字段调整，无则删对应行） g.goods_code, g.id AS goodsId, diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StGraphiteMoldOutMapper.xml b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StGraphiteMoldOutMapper.xml index d259f1ec9..42a12dbd8 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StGraphiteMoldOutMapper.xml +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StGraphiteMoldOutMapper.xml @@ -35,6 +35,7 @@ gmo.sir_id, gmo.yo_code, gmo.pi_no, gmo.card_no, gmo.need_quantity, gmo.outed_quantity, gmo.cur_status, gmo.out_time, gmo.out_user, gmo.out_code, gmo.picker, + gmo.parent_out_code, gmo.complete_quantity, -- 物料表字段 g.goods_code, g.id AS goodsId, From 864f5402c88be2557ede79462c946e9c617dcf4b Mon Sep 17 00:00:00 2001 From: liweidong-hj Date: Wed, 3 Jun 2026 16:14:46 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=95=80=E7=A7=8D=E5=88=86=E7=B1=BB?= =?UTF-8?q?=E6=AD=A3=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../desk/basic/controller/PlatingAssortmentController.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/PlatingAssortmentController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/PlatingAssortmentController.java index 2e0eb24fb..ee994693a 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/PlatingAssortmentController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/PlatingAssortmentController.java @@ -99,7 +99,8 @@ public class PlatingAssortmentController extends BladeController { QueryWrapper qw = Condition.getQueryWrapper(platingAssortment, PlatingAssortment.class); // 添加未删除的条件 qw.eq("IS_DELETED", CommonConstant.DELETE_FALSE); - + qw.orderByAsc("NAME"); + IPage pages = service.page(Condition.getPage(query), qw); IPage pagesVO = PlatingAssortmentWrapper.build().pageVO(pages); pagesVO.getRecords().stream()