Kaynağa Gözat

单个物料录入,是否标准判断及相关赋值更新

hejq 7 yıl önce
ebeveyn
işleme
967b97c743

+ 1 - 4
src/main/java/com/uas/platform/b2c/core/support/view/JxlsxExcelView.java

@@ -3,10 +3,8 @@ package com.uas.platform.b2c.core.support.view;
 import com.uas.platform.b2c.core.utils.ContextUtils;
 import com.uas.platform.b2c.core.utils.StringUtilB2C;
 import com.uas.platform.core.exception.IllegalOperatorException;
-import javassist.runtime.Desc;
 import net.sf.jxls.transformer.XLSTransformer;
 import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.ss.usermodel.WorkbookFactory;
 import org.springframework.core.io.Resource;
@@ -17,8 +15,7 @@ import org.springframework.web.servlet.view.document.AbstractXlsxView;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.*;
-import java.net.URL;
-import java.net.URLEncoder;
+import java.net.*;
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;

+ 17 - 3
src/main/java/com/uas/platform/b2c/prod/commodity/service/impl/ProductServiceImpl.java

@@ -12,9 +12,19 @@ import com.uas.platform.b2c.common.base.dao.CommonDao;
 import com.uas.platform.b2c.common.search.rpc.service.SearchService;
 import com.uas.platform.b2c.common.search.util.SPage;
 import com.uas.platform.b2c.core.config.SysConf;
-import com.uas.platform.b2c.core.constant.*;
+import com.uas.platform.b2c.core.constant.ExcelConstant;
+import com.uas.platform.b2c.core.constant.IntegerConstant;
+import com.uas.platform.b2c.core.constant.ReleaseStatus;
+import com.uas.platform.b2c.core.constant.ShortConstant;
+import com.uas.platform.b2c.core.constant.SplitChar;
+import com.uas.platform.b2c.core.constant.Status;
 import com.uas.platform.b2c.core.support.SystemSession;
-import com.uas.platform.b2c.core.utils.*;
+import com.uas.platform.b2c.core.utils.FastjsonUtils;
+import com.uas.platform.b2c.core.utils.NumberUtil;
+import com.uas.platform.b2c.core.utils.PoiUtil;
+import com.uas.platform.b2c.core.utils.RegexConstant;
+import com.uas.platform.b2c.core.utils.StringUtilB2C;
+import com.uas.platform.b2c.core.utils.WriteExcelDataDelegated;
 import com.uas.platform.b2c.prod.commodity.constant.DoubleConstant;
 import com.uas.platform.b2c.prod.commodity.constant.ErrorInfoConstant;
 import com.uas.platform.b2c.prod.commodity.constant.PublicProductUrl;
@@ -2533,6 +2543,10 @@ public class ProductServiceImpl implements ProductService {
                 productInfo.setStandard(IntegerConstant.NO_SHORT);
             } else {
                 productInfo.setStandard(IntegerConstant.YES_SHORT);
+                Component component = (Component) criterionResultMap.getData();
+                productInfo.setCmpUuId(component.getUuid());
+                productInfo.setKind(component.getKind().getNameCn());
+                productInfo.setKindid(component.getKindid());
             }
         }
         if (StringUtilB2C.isEmpty(productInfo.getProdNum())) {
@@ -2675,7 +2689,7 @@ public class ProductServiceImpl implements ProductService {
             // 判断标准器件信息
             List<Component> components = componentDao.findByBrandidAndCode(brands.get(0).getId(), product.getCmpCode());
             if (CollectionUtils.isNotEmpty(components)) {
-               return ResultMap.success();
+               return ResultMap.success(components.get(0));
             }
         }
         return ResultMap.error(new NotFoundException("非标准物料"));