|
@@ -19,6 +19,7 @@ import com.zfire.mall.manager.exception.RemoteServiceException;
|
|
import com.zfire.mall.manager.logic.common.CommonLogic;
|
|
import com.zfire.mall.manager.logic.common.CommonLogic;
|
|
import com.zfire.mall.manager.logic.manage.product.category.ProductCategoryLogic;
|
|
import com.zfire.mall.manager.logic.manage.product.category.ProductCategoryLogic;
|
|
import com.zfire.mall.manager.plus.entity.*;
|
|
import com.zfire.mall.manager.plus.entity.*;
|
|
|
|
+import com.zfire.mall.manager.plus.service.KingDeeCategoryService;
|
|
import com.zfire.mall.manager.plus.service.KingDeeMaterialService;
|
|
import com.zfire.mall.manager.plus.service.KingDeeMaterialService;
|
|
import com.zfire.mall.manager.plus.service.KingDeeWalletService;
|
|
import com.zfire.mall.manager.plus.service.KingDeeWalletService;
|
|
import com.zfire.mall.manager.plus.service.SaleTypeService;
|
|
import com.zfire.mall.manager.plus.service.SaleTypeService;
|
|
@@ -33,6 +34,7 @@ import javax.annotation.Resource;
|
|
import java.math.BigDecimal;
|
|
import java.math.BigDecimal;
|
|
import java.util.ArrayList;
|
|
import java.util.ArrayList;
|
|
import java.util.List;
|
|
import java.util.List;
|
|
|
|
+import java.util.stream.Collectors;
|
|
|
|
|
|
@Service
|
|
@Service
|
|
@Slf4j
|
|
@Slf4j
|
|
@@ -58,6 +60,9 @@ public class K3MaterialLogic {
|
|
@Autowired
|
|
@Autowired
|
|
CommonCMapper commonCMapper;
|
|
CommonCMapper commonCMapper;
|
|
|
|
|
|
|
|
+ @Autowired
|
|
|
|
+ KingDeeCategoryService kingDeeCategoryService;
|
|
|
|
+
|
|
/**
|
|
/**
|
|
* 物料列表
|
|
* 物料列表
|
|
*/
|
|
*/
|
|
@@ -192,6 +197,8 @@ public class K3MaterialLogic {
|
|
|
|
|
|
public void importData(List<Object> datas) {
|
|
public void importData(List<Object> datas) {
|
|
|
|
|
|
|
|
+ List<KingDeeCategory> list = kingDeeCategoryService.lambdaQuery().list();
|
|
|
|
+
|
|
|
|
|
|
int index = 1;
|
|
int index = 1;
|
|
|
|
|
|
@@ -223,6 +230,12 @@ public class K3MaterialLogic {
|
|
kingDeeMaterial.setUseOrgNumber((String)row.get(6));
|
|
kingDeeMaterial.setUseOrgNumber((String)row.get(6));
|
|
kingDeeMaterial.setUseOrgName((String)row.get(7));
|
|
kingDeeMaterial.setUseOrgName((String)row.get(7));
|
|
kingDeeMaterial.setCategoryNumber((String)row.get(8));
|
|
kingDeeMaterial.setCategoryNumber((String)row.get(8));
|
|
|
|
+
|
|
|
|
+ if (list.stream().filter(item -> item.getNumber().equals(kingDeeMaterial.getCategoryNumber())).collect(Collectors.toList()).size() < 1) {
|
|
|
|
+ throw new RemoteServiceException(kingDeeMaterial.getCategoryNumber()+"未查到对应编号得存货类别");
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+
|
|
kingDeeMaterial.setCategoryName((String)row.get(9));
|
|
kingDeeMaterial.setCategoryName((String)row.get(9));
|
|
kingDeeMaterial.setBaseUnitCode((String)row.get(10));
|
|
kingDeeMaterial.setBaseUnitCode((String)row.get(10));
|
|
kingDeeMaterial.setBaseUnitId((String)row.get(11));
|
|
kingDeeMaterial.setBaseUnitId((String)row.get(11));
|