From c292a14344c7e27fa93fab82c3020e6f3dc3b101 Mon Sep 17 00:00:00 2001 From: wusiyu <2015098864@qq.com> Date: Fri, 26 Jun 2026 13:46:33 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=93=E5=BA=93=E5=AF=BC=E5=87=BA=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../springblade/wms/controller/StGoodsController.java | 2 +- .../java/org/springblade/wms/excel/StGoodsExcel.java | 6 +++--- .../java/org/springblade/wms/mapper/StGoodsMapper.xml | 10 +++++----- .../wms/service/impl/StGoodsServiceImpl.java | 3 --- 4 files changed, 9 insertions(+), 12 deletions(-) diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StGoodsController.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StGoodsController.java index eec218ab8..e3ae8b21e 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StGoodsController.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StGoodsController.java @@ -174,7 +174,7 @@ public class StGoodsController extends BladeController { //} //queryWrapper.lambda().eq(StGoodsEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); queryWrapper.clear(); - // 物理编号 + // 物料编号 String goodsCode = Func.toStr(stGoods.get("goodsCode")); if (StrUtil.isNotBlank(goodsCode)) { queryWrapper.like("t1.goods_code", goodsCode); diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/excel/StGoodsExcel.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/excel/StGoodsExcel.java index cec5a2136..352dc9d8c 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/excel/StGoodsExcel.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/excel/StGoodsExcel.java @@ -80,7 +80,7 @@ public class StGoodsExcel implements Serializable { */ @ColumnWidth(20) @ExcelProperty("是否工艺审批") - private String processApproval; + private String processApprovalName; /** * 补制类型 */ @@ -116,7 +116,7 @@ public class StGoodsExcel implements Serializable { */ @ColumnWidth(20) @ExcelProperty("是否启用") - private String used; + private String usedName; /** * 版本 */ @@ -152,6 +152,6 @@ public class StGoodsExcel implements Serializable { */ @ColumnWidth(20) @ExcelProperty("是否最低库存预警") - private String minWarning; + private String minWarningName; } diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StGoodsMapper.xml b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StGoodsMapper.xml index 98e66a8e8..58d458e5b 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StGoodsMapper.xml +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StGoodsMapper.xml @@ -99,20 +99,20 @@ ELSE '' END AS reissue_type_name, CASE t1.process_approval - WHEN '0' THEN '否' - WHEN '1' THEN '是' + WHEN 0 THEN '否' + WHEN 1 THEN '是' ELSE '' - END AS process_approval, + END AS process_approval_name, CASE t1.used WHEN 1 THEN '启用' WHEN 0 THEN '停用' ELSE '' - END AS used, + END AS used_name, CASE t1.min_warning WHEN '0' THEN '否' WHEN '1' THEN '是' ELSE '' - END AS min_warning, + END AS min_warning_name, -- 部门名称 t2.dept_name, -- 物料类别名称 diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StGoodsServiceImpl.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StGoodsServiceImpl.java index dd43cdc96..09061c366 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StGoodsServiceImpl.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StGoodsServiceImpl.java @@ -208,9 +208,6 @@ public class StGoodsServiceImpl extends BaseServiceImpl @Override public List exportStGoods(Wrapper queryWrapper) { List stGoodsList = baseMapper.exportStGoods(queryWrapper); - //stGoodsList.forEach(stGoods -> { - // stGoods.setTypeName(DictCache.getValue(DictEnum.YES_NO, StGoods.getType())); - //}); return stGoodsList; }