Merge remote-tracking branch 'origin/dev' into pre-production

blade-service/logpm-factory-data/logpm-factory-data-suofeiya/src/main/java/com/logpm/factorydata/suofeiya/job/SpiderDataJob.java

@@ -194,6 +194,7 @@ public class SpiderDataJob {
 							packageInfoEntity.setUpdateTime(new Date());
 							packageInfoEntity.setIsDeleted(0);
 							packageInfoEntity.setStatus(1);
+							packageInfoEntity.setDealerName(spiderInforEntity.getBindBussiness());
 
 							// 判断这个包条是否存在鱼数据库 如果不存在  则执行
 

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java

@@ -1821,6 +1821,12 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 			dto.setOrderCode(dto.getOrderCode().trim());
 			dto.setOrderPackageCode(dto.getOrderPackageCode().trim());
 		});
+
+		List<BasicMaterialEntity> materialEntities = basicMaterialClient.findAllList();
+		//把materialEntities转化成以productCode和productName拼接为key的Map
+		Map<String, BasicMaterialEntity> materialEntityMap = materialEntities.stream().collect(Collectors.toMap(item -> item.getProductCode() + "&&" + item.getName(), item -> item));
+
+
 		//排除pacakgeDetailExcelDTOS中的orderPackageCode为空的元素
 		pacakgeDetailExcelDTOS = pacakgeDetailExcelDTOS.stream().filter(item -> StringUtil.isNotBlank(item.getOrderPackageCode())).collect(Collectors.toList());
 		//把importStandardOuPaiDTOS中orderPackageCode相同的元素去重
@@ -2077,16 +2083,37 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 						advanceDetailModel.setQuantity(1);
 						advanceDetailModel.setServiceNum(pacakgeDetailExcelDTO.getServiceNum());
 						advanceDetailModel.setPackageStatus("0");
+
+						String materialName = pacakgeDetailExcelDTO.getMaterialName();
+						String materialCode = pacakgeDetailExcelDTO.getMaterialCode();
+						advanceDetailModel.setMaterialName(materialName);
+						advanceDetailModel.setMaterialCode(materialCode);
+
 						if (!Objects.isNull(pacakgeDetailExcelDTO.getVolume())) {
 							advanceDetailModel.setVolume(new BigDecimal(pacakgeDetailExcelDTO.getVolume()));
 						} else {
 							advanceDetailModel.setVolume(BigDecimal.ZERO);
+
+							BasicMaterialEntity basicMaterialEntity = materialEntityMap.get(materialCode + "&&" + materialName);
+
+							if (!Objects.isNull(basicMaterialEntity)) {
+								advanceDetailModel.setMaterialId(basicMaterialEntity.getId());
+
+								String weight = basicMaterialEntity.getWeight();
+								if (StringUtil.isBlank(weight)) {
+									weight = "0";
+								}
+								String volume2 = basicMaterialEntity.getVolume();
+								if (StringUtil.isBlank(volume2)) {
+									volume2 = "0";
+								}
+								advanceDetailModel.setWeight(new BigDecimal(weight));
+								advanceDetailModel.setVolume(new BigDecimal(volume2));
+							}
+
 						}
 
-						String materialName = pacakgeDetailExcelDTO.getMaterialName();
-						String materialCode = pacakgeDetailExcelDTO.getMaterialCode();
-						advanceDetailModel.setMaterialName(materialName);
-						advanceDetailModel.setMaterialCode(materialCode);
+
 
 
 //						if (StringUtil.isNotBlank(materialCode) && StringUtil.isNotBlank(materialName)) {

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java

@@ -39,8 +39,11 @@ import org.springblade.common.exception.CustomerException;
 import org.springblade.common.utils.CommonUtil;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.StringUtil;
+import org.springblade.system.entity.Tenant;
+import org.springblade.system.feign.ISysClient;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -65,6 +68,7 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl<TrunklineAdvanc
 	private final RabbitTemplate rabbitTemplate;
 	private final ITrunklineAdvanceDetailService advanceDetailService;
 	private final IBasicdataBrandClient basicdataBrandClient;
+	private final ISysClient sysClient;
 
 	@Override
 	public boolean saveOrderAndPackage(TrunklineAdvanceDetailEntity advanceDetailEntity, Long warehouseId) {
@@ -764,7 +768,24 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl<TrunklineAdvanc
 	@Override
 	public boolean saveOrderAndPackages(List<TrunklineAdvanceDetailEntity> advanceDetailEntities, Long warehouseId) {
 
-		BasicdataWarehouseEntity warehouseEntity = basicdataWarehouseClient.getEntityWarehouseId(warehouseId);
+
+
+		Integer isTransfer;
+
+		R<Tenant> tenant = sysClient.getTenant(AuthUtil.getTenantId());
+		if(tenant.isSuccess()){
+			Tenant data = tenant.getData();
+			if(new Integer(2).equals(data.getTenantType())){
+				isTransfer=0;
+			} else {
+                isTransfer = 1;
+            }
+        } else {
+            isTransfer = 1;
+        }
+
+
+        BasicdataWarehouseEntity warehouseEntity = basicdataWarehouseClient.getEntityWarehouseId(warehouseId);
 		if (Objects.isNull(warehouseEntity)) {
 			log.warn("############saveOrderAndPackages: 仓库信息不存在warehouseId={}", warehouseId);
 			throw new CustomerException(405, "仓库信息不存在");
@@ -1010,7 +1031,11 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl<TrunklineAdvanc
 						parcelList.setTenantId(tenantId);
 						parcelList.setWarehouse(warehouseEntity.getName());
 						parcelList.setWarehouseId(warehouseId);
-						parcelList.setIsTransfer(1);
+
+						/*增加通过当前登陆人所应对的租户类型来判断是否是 中转包件 还是 目的仓包件*/
+
+						parcelList.setIsTransfer(isTransfer);
+
 						String waybillNo = ad.getWaybillNo();
 						if (StringUtil.isNotBlank(waybillNo)) {
 							WarehouseWaybillEntity waybillEntity = finalWaybillEntityMap.get(waybillNo);