Browse Source

Revert "导入 EXCEL"

This reverts commit 4e3a5af7ee955fb6a7c625700c6e43dbc15d4ce4.
wfg 6 months ago
parent
commit
c69b8af677

+ 1 - 5
blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/Post.java

@@ -62,9 +62,5 @@ public class Post extends TenantEntity {
 	@ApiModelProperty(value = "岗位描述")
 	private String remark;
 
-	/**
-	 * 岗位对应船公司 IDs
-	 */
-	@ApiModelProperty(value = "岗位对应船公司 IDs")
-	private String carrierIds;
+
 }

+ 0 - 6
blade-service/blade-los/src/main/java/org/springblade/los/business/sea/service/impl/TemplateImportServiceImpl.java

@@ -9,7 +9,6 @@ import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
-import org.springblade.los.Util.BigDecimalUtils;
 import org.springblade.los.Util.RegularUtils;
 import org.springblade.los.basic.packages.entity.BPackages;
 import org.springblade.los.basic.packages.service.IBPackagesService;
@@ -542,7 +541,6 @@ public class TemplateImportServiceImpl implements ITemplateImportService {
 				}
 
 				bills.setQuantity(new BigDecimal(String.valueOf(pkgs.get("value"))).setScale(0, RoundingMode.HALF_UP));
-				bills.setQuantityPackingDescr("SAY " + BigDecimalUtils.convertToEnglish(bills.getQuantity()) + " " + bills.getPackingUnit() + " ONLY.");
 
 				//G.W.
 				double gw = getSheetCellValueAsNumericPrefix(sheet, r + 1, 4);
@@ -819,7 +817,6 @@ public class TemplateImportServiceImpl implements ITemplateImportService {
 			double bags = getSheetCellValueAsNumericPrefix(sheet,28, 2);
 			System.out.println("bags:" + bags);
 			bills.setQuantity(new BigDecimal(bags).setScale(0, RoundingMode.HALF_UP));
-			bills.setQuantityPackingDescr("SAY " + BigDecimalUtils.convertToEnglish(bills.getQuantity()) + " " + bills.getPackingUnit() + " ONLY.");
 		} else {
 			throw new RuntimeException("件数不能为空");
 		}
@@ -1087,7 +1084,6 @@ public class TemplateImportServiceImpl implements ITemplateImportService {
 			double bags = getSheetCellValueAsNumericPrefix(sheet,28, 2);
 			System.out.println("bags:" + bags);
 			bills.setQuantity(new BigDecimal(bags).setScale(0, RoundingMode.HALF_UP));
-			bills.setQuantityPackingDescr("SAY " + BigDecimalUtils.convertToEnglish(bills.getQuantity()) + " " + bills.getPackingUnit() + " ONLY.");
 		} else {
 			throw new RuntimeException("件数不能为空");
 		}
@@ -1324,8 +1320,6 @@ public class TemplateImportServiceImpl implements ITemplateImportService {
 				sumVol.setScale(3, BigDecimal.ROUND_HALF_UP);
 				bills.setMeasurement(sumVol);
 				bills.setCfsMeasurement(sumVol);
-
-				bills.setQuantityPackingDescr("SAY " + BigDecimalUtils.convertToEnglish(bills.getQuantity()) + " " + bills.getPackingUnit() + " ONLY.");
 			}
 		}
 

+ 0 - 1
blade-service/blade-system/src/main/java/org/springblade/system/mapper/PostMapper.xml

@@ -17,7 +17,6 @@
         <result column="post_name" property="postName"/>
         <result column="sort" property="sort"/>
         <result column="remark" property="remark"/>
-        <result column="carrier_ids" property="carrierIds"/>
     </resultMap>