仓库导出修改

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);

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;
 
 }

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,
             -- 物料类别名称

blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StGoodsServiceImpl.java

@@ -208,9 +208,6 @@ public class StGoodsServiceImpl extends BaseServiceImpl<StGoodsMapper, StGoods>
 	@Override
 	public List<StGoodsExcel> exportStGoods(Wrapper<StGoods> queryWrapper) {
 		List<StGoodsExcel> stGoodsList = baseMapper.exportStGoods(queryWrapper);
-		//stGoodsList.forEach(stGoods -> {
-		//	stGoods.setTypeName(DictCache.getValue(DictEnum.YES_NO, StGoods.getType()));
-		//});
 		return stGoodsList;
 	}