|
@@ -16,6 +16,7 @@ import com.uas.platform.b2c.prod.commodity.constant.ModifyConstant;
|
|
|
import com.uas.platform.b2c.prod.commodity.constant.ShortConstant;
|
|
import com.uas.platform.b2c.prod.commodity.constant.ShortConstant;
|
|
|
import com.uas.platform.b2c.prod.commodity.constant.StringConstant;
|
|
import com.uas.platform.b2c.prod.commodity.constant.StringConstant;
|
|
|
import com.uas.platform.b2c.prod.commodity.constant.UploadConstant;
|
|
import com.uas.platform.b2c.prod.commodity.constant.UploadConstant;
|
|
|
|
|
+import com.uas.platform.b2c.prod.commodity.controller.ReleaseProductByBatchController;
|
|
|
import com.uas.platform.b2c.prod.commodity.dao.GoodsDao;
|
|
import com.uas.platform.b2c.prod.commodity.dao.GoodsDao;
|
|
|
import com.uas.platform.b2c.prod.commodity.dao.PCBDao;
|
|
import com.uas.platform.b2c.prod.commodity.dao.PCBDao;
|
|
|
import com.uas.platform.b2c.prod.commodity.dao.PcbPropertyvalueDao;
|
|
import com.uas.platform.b2c.prod.commodity.dao.PcbPropertyvalueDao;
|
|
@@ -71,6 +72,8 @@ import org.apache.poi.ss.usermodel.DateUtil;
|
|
|
import org.apache.poi.ss.usermodel.Row;
|
|
import org.apache.poi.ss.usermodel.Row;
|
|
|
import org.apache.poi.ss.usermodel.Sheet;
|
|
import org.apache.poi.ss.usermodel.Sheet;
|
|
|
import org.apache.poi.ss.usermodel.Workbook;
|
|
import org.apache.poi.ss.usermodel.Workbook;
|
|
|
|
|
+import org.slf4j.Logger;
|
|
|
|
|
+import org.slf4j.LoggerFactory;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.beans.factory.annotation.Value;
|
|
import org.springframework.beans.factory.annotation.Value;
|
|
|
import org.springframework.dao.DataAccessException;
|
|
import org.springframework.dao.DataAccessException;
|
|
@@ -181,6 +184,9 @@ public class ReleaseProductByBatchServiceImpl implements ReleaseProductByBatchSe
|
|
|
|
|
|
|
|
private final ProductPrivateService productPrivateService;
|
|
private final ProductPrivateService productPrivateService;
|
|
|
|
|
|
|
|
|
|
+
|
|
|
|
|
+ private final Logger logger = LoggerFactory.getLogger(ReleaseProductByBatchServiceImpl.class);
|
|
|
|
|
+
|
|
|
private static final String SIZE = "尺寸";
|
|
private static final String SIZE = "尺寸";
|
|
|
private static final String COLOR = "颜色";
|
|
private static final String COLOR = "颜色";
|
|
|
private static final String THICKCOPPER = "铜厚";
|
|
private static final String THICKCOPPER = "铜厚";
|
|
@@ -1861,6 +1867,7 @@ public class ReleaseProductByBatchServiceImpl implements ReleaseProductByBatchSe
|
|
|
if (isPcb) {
|
|
if (isPcb) {
|
|
|
savePcbInfo(idSet, map);
|
|
savePcbInfo(idSet, map);
|
|
|
}
|
|
}
|
|
|
|
|
+ logger.info("测试数据", idSet.toString());
|
|
|
//添加个人关系
|
|
//添加个人关系
|
|
|
String res = restTemplate.postForEntity(productServiceIp + "/product/assign/batch?userUU=" + SystemSession.getUser().getUserUU(), idSet, String.class).getBody();
|
|
String res = restTemplate.postForEntity(productServiceIp + "/product/assign/batch?userUU=" + SystemSession.getUser().getUserUU(), idSet, String.class).getBody();
|
|
|
Integer num = releaseToGoods(releaseProductByBatchList, ignoreImport, idSet);
|
|
Integer num = releaseToGoods(releaseProductByBatchList, ignoreImport, idSet);
|
yuj