diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/SkuWeightController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/SkuWeightController.java
index cb0f9423e..0507e96b8 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/SkuWeightController.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/SkuWeightController.java
@@ -10,11 +10,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.apache.poi.ss.usermodel.*;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
@@ -215,28 +211,39 @@ public class SkuWeightController extends JeecgController<SkuWeight, ISkuWeightSe
 					String erpCode = null;
 					for (int cellIndex = row.getFirstCellNum(); cellIndex < NUMBER_OF_SKU_EXCEL_COLUMNS; cellIndex++) {
 						Cell cell = row.getCell(cellIndex, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK);
-						String cellValue = cell.getStringCellValue();
 						if(hasError) continue;
-						if(cellValue.isEmpty()){
+						if(cell.getCellType().equals(CellType.BLANK)){
 							responses.addFailure("Row " + rowIndex + " has empty cell at index " + cellIndex);
 							hasError = true;
 							continue;
 						}
 						switch (cellIndex) {
 							case 0:
-								Sku sku = skuService.getByErpCode(cellValue);
+								String skuCode = cell.getStringCellValue();
+								Sku sku = skuService.getByErpCode(skuCode);
 								if(sku == null){
-									responses.addFailure("Row " + rowIndex + " SKU not found : " + cellValue);
+									responses.addFailure("Row " + rowIndex + " SKU not found : " + skuCode);
 									hasError = true;
 									continue;
 								}
-								erpCode = cellValue;
+								erpCode = skuCode;
 								skuWeight.setSkuId(sku.getId());
 								break;
 							case 1:
-								skuWeight.setWeight((int) Double.parseDouble(cellValue));
+								int weight;
+								if(cell.getCellType().equals(CellType.STRING))
+									weight = Integer.parseInt(cell.getStringCellValue());
+								else if(cell.getCellType().equals(CellType.NUMERIC))
+									weight = (int) cell.getNumericCellValue();
+								else {
+									responses.addFailure("Row " + rowIndex + " Weight is not a number - Sku : " + erpCode);
+									hasError = true;
+									continue;
+								}
+								skuWeight.setWeight(weight);
 								break;
 							case 2:
+								String cellValue = cell.getStringCellValue();
 								Date effectiveDate = formatter.parse(cellValue);
 								skuWeight.setEffectiveDate(effectiveDate);
 								break;
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/job/SkuAssociationToClientJob.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/job/SkuAssociationToClientJob.java
index f27c316f7..202deddf2 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/job/SkuAssociationToClientJob.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/job/SkuAssociationToClientJob.java
@@ -42,11 +42,9 @@ public class SkuAssociationToClientJob implements Job {
     @Override
     public void execute(JobExecutionContext context) throws JobExecutionException {
         log.info("SkuAssociationToClientJob start");
-        List<String> allSkusIds = skuService.list().stream().map(Sku::getId).collect(Collectors.toList());
-        List<String> allClientSkuIds = clientSkuService.list().stream().map(ClientSku::getSkuId).collect(Collectors.toList());
-        List<String> newSkusIds = allSkusIds.stream().filter(skuId -> !allClientSkuIds.contains(skuId)).collect(Collectors.toList());
-        List<Sku> newSkus = skuService.listByIds(newSkusIds);
-        List<String> unknownClientSkus = clientSkuService.saveClientSku(newSkus);
+        List<Sku> unpairedSkus = clientSkuService.getUnpairedSkus();
+        System.out.println("There is " + unpairedSkus.size() + "Unpaired Skus.");
+        List<String> unknownClientSkus = clientSkuService.saveClientSku(unpairedSkus);
 
         // send email for manual check
         if(!unknownClientSkus.isEmpty()) {
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/ClientSkuMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/ClientSkuMapper.java
index aae842163..5952a2ad4 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/ClientSkuMapper.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/ClientSkuMapper.java
@@ -4,6 +4,7 @@ import java.util.List;
 import org.jeecg.modules.business.entity.ClientSku;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.business.entity.Sku;
 import org.springframework.stereotype.Repository;
 
 /**
@@ -18,4 +19,6 @@ public interface ClientSkuMapper extends BaseMapper<ClientSku> {
 	public boolean deleteByMainId(@Param("mainId") String mainId);
 
 	List<ClientSku> selectByMainId(@Param("mainId") String mainId);
+
+    List<Sku> getUnpairedSkus();
 }
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/ClientSkuMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/ClientSkuMapper.xml
index 904523247..7377bc9bc 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/ClientSkuMapper.xml
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/ClientSkuMapper.xml
@@ -13,4 +13,11 @@
 		FROM  client_sku
 		WHERE
 			 client_id = #{mainId} 	</select>
+
+	<select id="getUnpairedSkus" resultType="org.jeecg.modules.business.entity.Sku">
+		SELECT s.*
+		FROM sku s
+		LEFT JOIN client_sku cs ON s.id = cs.sku_id
+		WHERE cs.sku_id IS NULL;
+	</select>
 </mapper>
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/IClientSkuService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/IClientSkuService.java
index 3a36d673c..d2e3e6f1b 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/IClientSkuService.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/IClientSkuService.java
@@ -19,4 +19,6 @@ public interface IClientSkuService extends IService<ClientSku> {
 	List<String> saveClientSku(List<Sku> newSkus);
 
 	void addClientSku(String clientId, String skuId);
+
+	List<Sku> getUnpairedSkus();
 }
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/ClientSkuServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/ClientSkuServiceImpl.java
index 773cc8b56..58290ec35 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/ClientSkuServiceImpl.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/ClientSkuServiceImpl.java
@@ -68,4 +68,9 @@ public class ClientSkuServiceImpl extends ServiceImpl<ClientSkuMapper, ClientSku
 		clientSku.setSkuId(skuId);
 		clientSkuMapper.insert(clientSku);
 	}
+
+	@Override
+	public List<Sku> getUnpairedSkus() {
+		return clientSkuMapper.getUnpairedSkus();
+	}
 }