Merge branch 'dev' into pre-production

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataTrayClient.java

@@ -25,6 +25,8 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
+import java.util.List;
+
 /**
  * 托盘 Feign接口类
  *
@@ -38,6 +40,7 @@ public interface IBasicdataTrayClient {
 
     String API_PREFIX = "tray/client";
     String TOP = API_PREFIX + "/top";
+    String GETTRAYENTITY  = API_PREFIX + "/getTrayEntity";
 
     /**
      * 获取托盘列表
@@ -57,4 +60,8 @@ public interface IBasicdataTrayClient {
 
 	@PostMapping(API_PREFIX+"/updateTrayStatus")
     void updateTrayStatus(@RequestParam("trayId") Long trayId, @RequestParam("trayStatus") int trayStatus);
+
+	@GetMapping(GETTRAYENTITY)
+	List<BasicdataTrayEntity> getTrayEntityList(@RequestParam("trayId") String trayId);
+
 }

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupOrderListVO.java

@@ -20,8 +20,10 @@ public class DistributionStockupOrderListVO implements Serializable {
 	private String stockArticleId;//订单ID
 	@ApiModelProperty(value = "托盘")
 	private String pallet;//托盘
-	@ApiModelProperty(value = "整托状态")
+	@ApiModelProperty(value = "托盘状态")
 	private boolean trayLean;//整托状态
+	@ApiModelProperty(value = "托盘名称")
+	private String trayLeanName;//整托状态
 	@ApiModelProperty(value = "货位配货状态")
 	private boolean completeStact;//货位配货状态
 	@ApiModelProperty(value = "容器件数")

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupStockListVO.java

@@ -27,6 +27,7 @@ public class DistributionStockupStockListVO implements Serializable {
 	private Integer realNum;//实际数量
 
 	private String  trayName;//托盘信息
+	private String  trayNames;//托盘信息
 
 	private Boolean  trayLean;//整托状态
 

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataTrayClient.java

@@ -19,6 +19,8 @@ package com.logpm.basicdata.feign;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.logpm.basicdata.entity.BasicdataTrayEntity;
 import com.logpm.basicdata.service.IBasicdataTrayService;
 import lombok.AllArgsConstructor;
@@ -29,6 +31,8 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 import springfox.documentation.annotations.ApiIgnore;
 
+import java.util.List;
+
 /**
  * 托盘 Feign实现类
  *
@@ -79,4 +83,13 @@ public class BasicdataTrayClient implements IBasicdataTrayClient {
 		basicdataTrayService.update(updateWrapper);
 	}
 
+
+	@Override
+	@GetMapping(GETTRAYENTITY)
+	public List<BasicdataTrayEntity> getTrayEntityList(String trayId) {
+		return basicdataTrayService.list(Wrappers.<BasicdataTrayEntity>query().lambda()
+			.in(ObjectUtils.isNotNull(trayId),BasicdataTrayEntity::getId,trayId.split(","))
+		);
+	}
+
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java

@@ -22,7 +22,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.logpm.basicdata.entity.BasicdataTrayEntity;
 import com.logpm.basicdata.feign.IBasicdataGoodsAreaClient;
+import com.logpm.basicdata.feign.IBasicdataTrayClient;
 import com.logpm.distribution.bean.Resp;
 
 import com.logpm.distribution.config.RedissonConfig;
@@ -32,10 +34,7 @@ import com.logpm.distribution.entity.*;
 import com.logpm.distribution.service.*;
 import com.logpm.distribution.vo.*;
 import com.logpm.warehouse.entity.WarehouseUpdownGoodsEntity;
-import com.logpm.warehouse.feign.IWarehouseGoodsAllocationClient;
-import com.logpm.warehouse.feign.IWarehouseUpdownGoodsClient;
-import com.logpm.warehouse.feign.IWarehouseUpdownGoodsLogClient;
-import com.logpm.warehouse.feign.IWarehouseUpdownTypeClient;
+import com.logpm.warehouse.feign.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
@@ -82,7 +81,7 @@ public class DistributionStockupAppController extends BladeController {
 	private final IDistributionReservationService distributionReservationService;
 	private final IBasicdataGoodsAreaClient basicdataGoodsAreaClient;
 	private final IDistrilbutionBillStockService distrilbutionBillStockService;
-
+	private final IBasicdataTrayClient basicdataTrayClient;
 	private final IDistributionStockService distributionStockService;
 	private final IDistributionStockArticleService distributionStockArticleService;
 	private final IDistributionParcelListService distributionParcelListService;
@@ -215,8 +214,11 @@ public class DistributionStockupAppController extends BladeController {
 				if(!list.isEmpty()){
 					List<DistributionStockupOrderListVO> collect = list.stream().filter(i -> {
 //						if (ObjectUtils.isNotNull(i.getTrayId()) && !i.getPallet().contains(",") && !i.isCompleteStact() && ObjectUtils.isNotNull( i.getAllocationId()) ) {
-
 						if (ObjectUtils.isNotNull(i.getTrayId()) && !i.isCompleteStact()) {
+							List<BasicdataTrayEntity> trayEntityList = basicdataTrayClient.getTrayEntityList(i.getTrayId());
+							if(ObjectUtils.isNotNull(trayEntityList) && ObjectUtils.isNotNull( trayEntityList.get(0))){
+								i.setTrayLeanName(trayEntityList.stream().map(BasicdataTrayEntity::getPalletName).collect(Collectors.joining(",")));
+							}
 							i.setTrayLean(distributionStockupService.getTrayBoot(i,stockupDTO.getTypeService()));
 						}
 						return true;
@@ -258,6 +260,10 @@ public class DistributionStockupAppController extends BladeController {
 //					vo.setTrayLean(aBoolean);
 //						if (ObjectUtils.isNotNull(vo.getTrayId()) && !vo.getPallet().contains(",") && !vo.isCompleteStact() && ObjectUtils.isNotNull( vo.getAllocationId()) ) {
 						if (ObjectUtils.isNotNull(vo.getTrayId()) && !vo.isCompleteStact() ) {
+							List<BasicdataTrayEntity> trayEntityList = basicdataTrayClient.getTrayEntityList(vo.getTrayId());
+							if(ObjectUtils.isNotNull(trayEntityList) && ObjectUtils.isNotNull( trayEntityList.get(0))){
+								vo.setTrayLeanName(trayEntityList.stream().map(BasicdataTrayEntity::getPalletName).collect(Collectors.joining(",")));
+							}
 							//有没有可用整托配货的数据
 							vo.setTrayLean(distributionStockupService.getTrayBoot(vo,stockupDTO.getTypeService()));
 						}

blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java

@@ -31,6 +31,8 @@ import org.springblade.core.oss.model.BladeFile;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.StringUtil;
 import org.springblade.resource.feign.IOssClient;
+import org.springblade.system.cache.DictCache;
+import org.springblade.system.entity.Dict;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
@@ -42,10 +44,7 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 
 @Slf4j
 @Service
@@ -355,6 +354,12 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
 			return Resp.fail(400, "包条为干仓配的数据类型");
 		}
 
+		boolean isPushHtNomal = checkOpfactoryOrderBusinessModel(factoryOrder);
+		if(isPushHtNomal){
+			log.info("oupai- 该包条为汇通使用欧派系统进行作业类型型 不进行推送  >>> unitNo={}  businessModel:{}", unitNo, factoryOrder.getBusinessModel());
+			return Resp.fail(400, "该包条为汇通使用欧派系统进行作业类型");
+		}
+
 		// 通过仓库编码查询
 		ReceivingOrderEntity receivingOrderEntity = receivingOrderMapper.selectById(factoryOrder.getReceivingId());
 
@@ -411,6 +416,28 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
 		return Resp.success("物流状态传递成功");
 	}
 
+	/**
+	 * 根据汇通业务提供是否操作欧派系统的商场 来决定是否会推数据
+	 * 如果需要使用欧派系统 这里就需要不进行回传
+	 * @param factoryOrder 工厂订单
+	 * @return true 匹配到维护的商场 就不需要进行回传
+	 */
+	private boolean checkOpfactoryOrderBusinessModel(FactoryOrderEntity factoryOrder) {
+
+		String shopCode = factoryOrder.getShopCode();
+		// 获取字典上配置
+		log.info(" >>>>>>>>>>>>>>>>>>>>>>> 传入的订单参数商场 {}",shopCode);
+		List<Dict> htUseOpShops = DictCache.getList("ht_use_op_shops");
+		log.info(" >>>>>>>>>>>>>>>>>>>>>>> 配置的使用欧派系统的商场 {}",htUseOpShops);
+		for (Dict htUseOpShop : htUseOpShops) {
+			if(shopCode.equals(htUseOpShop.getDictKey())){
+				return true;
+			}
+		}
+		return false;
+
+	}
+
 	private void handleSignBillData(String url, Integer event) {
 		OpOrderStatusLogEntity opOrderStatusLogEntity = sendRequestData(url, event);