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

blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/entity/BasicMaterialEntity.java

@@ -116,9 +116,9 @@ public class BasicMaterialEntity extends TenantEntity {
 	@ApiModelProperty(value = "体积")
 	private String volume;
 	/**
-	 * 总量
+	 * 重量
 	 */
-	@ApiModelProperty(value = "总量")
+	@ApiModelProperty(value = "重量")
 	private String weight;
 	/**
 	 * 备注

blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/TrayTypeDataListVO.java

@@ -11,6 +11,7 @@ public class TrayTypeDataListVO implements Serializable {
 
 	private Long trayGoodsId;//id
 	private Long dataId;//id
+	private String waybillNo;//运单号
 	private String dataCode;//编码
 	private String dataName;//名称
 	private String sku;//sku

blade-service/logpm-basic/src/main/java/com/logpm/basic/controller/BasicMaterialController.java

@@ -190,7 +190,7 @@ public class BasicMaterialController extends BladeController {
 		basicMaterialExcel.setVolume("1.489792");
 		basicMaterialExcel.setLogpmUnit("1");
 		basicMaterialExcel.setPackageNum("3");
-		basicMaterialExcel.setWeight(BigDecimal.valueOf(0));
+		basicMaterialExcel.setWeight("2.33");
 		list.add(basicMaterialExcel);
 		ExcelUtil.export(response, "物料基础信息数据模板" + DateUtil.time(), "物料基础信息数据模板表", list, BasicMaterialExcel.class);
 	}

blade-service/logpm-basic/src/main/java/com/logpm/basic/excel/BasicMaterialExcel.java

@@ -154,11 +154,11 @@ public class BasicMaterialExcel implements Serializable {
 	@ExcelProperty("体积")
 	private String volume;
 	/**
-	 * 总量
+	 * 重量
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("总量")
-	private BigDecimal weight;
+	@ExcelProperty("重量")
+	private String weight;
 	/**
 	 * 备注
 	 */

blade-service/logpm-basic/src/main/java/com/logpm/basic/service/impl/BasicMaterialServiceImpl.java

@@ -73,7 +73,7 @@ public class BasicMaterialServiceImpl extends BaseServiceImpl<BasicMaterialMappe
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public void importMaterial(List<BasicMaterialExcel> data) {
-		log.info("传入参数>>>>>>>>>>>>>>>>,>>>>>>>>{}",data);
+		log.info("传入参数>>>>>>>>>>>>>>>>>>>>>>>{}",data);
 		ArrayList<BasicMaterialEntity> arrayList = new ArrayList<>();
 		for (BasicMaterialExcel datum : data) {
 			//去重

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsAreaServiceImpl.java

@@ -315,7 +315,7 @@ public class BasicdataGoodsAreaServiceImpl extends BaseServiceImpl<BasicdataGood
 		//查询货架
 		List<BasicdataGoodsAreaEntity> basicdataGoodsAreaEntities = basicdataGoodsAreaMapper.selectList(new QueryWrapper<BasicdataGoodsAreaEntity>().lambda()
 			.eq(BasicdataGoodsAreaEntity::getIsDeleted,0)
-			.in(BasicdataGoodsAreaEntity::getWarehouseId,collect)
+			.in(collect.size()>0,BasicdataGoodsAreaEntity::getWarehouseId,collect)
 		);
 		return basicdataGoodsAreaEntities;
 	}

blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/AsyncDataServiceImpl.java

@@ -852,19 +852,19 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
 	}
 
 	/**
-	 * 获取订单对象 加入了缓存
-	 *
-	 * @param orderSelfNum
+	 *  获取订单缓存对象
+	 * @param receiptId 收货任务ID
+	 * @param orderSelfNum 订单自编号
+	 * @param departCode 发车单号
 	 * @return
 	 */
 	private AdvanceEntity findAdvanceEntityUseCacheByOrderSelfNumAndReceiptId(Long receiptId,String orderSelfNum,String departCode) {
 		String key = AdvanceEntity.class.getName() + ":"+receiptId + orderSelfNum + ":" + departCode;
-		AdvanceEntity advanceEntity = bladeRedis.get(key);
-//		if (ObjectUtils.isNull(advanceEntity)) {
+        //		if (ObjectUtils.isNull(advanceEntity)) {
 ////			advanceEntity = iAdvanceClient.getEntityByMctsTruck(orderSelfNum,departCode);
 ////			bladeRedis.setEx(key, advanceEntity, 12 * 60 * 60L);
 //		}
-		return advanceEntity;
+		return bladeRedis.get(key);
 	}
 
 	private AdvanceEntity saveAdvanceInfor(ZbOrderPackageEntity serviceNumEntity, List<ZbOrderPackageEntity> zbOrderPackageEntityList) {
@@ -874,7 +874,7 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
 		// 查询订单对应的发货单
 		ZbReceiptEntity zbReceiptEntity = findZbReceiptEntityUseCacheById(serviceNumEntity.getReceiptId());
 
-		AdvanceEntity advanceEntity = findAdvanceEntityUseCacheByOrderSelfNumAndReceiptId(serviceNumEntity.getReceiptId(),serviceNumEntity.getRelationOrderCode(),zbReceiptEntity.getDepartCode());
+		AdvanceEntity advanceEntity = findAdvanceEntityUseCacheByOrderSelfNumAndReceiptId(serviceNumEntity.getReceiptId(),serviceNumEntity.getPlatformOrderCode(),zbReceiptEntity.getDepartCode());
 		if (ObjectUtils.isNotNull(advanceEntity)) {
 			return advanceEntity;
 		}
@@ -883,13 +883,13 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
 		//添加订单信息
 		 advanceEntity = new AdvanceEntity();
 
-		advanceEntity.setOrderSelfNum(StringUtil.isBlank(serviceNumEntity.getRelationOrderCode()) ? "" : serviceNumEntity.getRelationOrderCode()); //订单自编号
+		advanceEntity.setOrderSelfNum(StringUtil.isBlank(serviceNumEntity.getPlatformOrderCode()) ? "" : serviceNumEntity.getPlatformOrderCode()); //订单自编号
 		advanceEntity.setSiteName(""); // 基地
 		advanceEntity.setArea(""); // 区域
 		advanceEntity.setOrderTypeName(zbReceiptEntity.getOrderType()); //订单类型名称 可以为空
 		advanceEntity.setOrderClassName("工厂"); //订单类型 可以为空
 		advanceEntity.setType(FactoryConstant.ZHIBANG);
-		int num = mathTotalOrderPackageNum(serviceNumEntity.getRelationOrderCode(), zbOrderPackageEntityList);
+		int num = mathTotalOrderPackageNum(serviceNumEntity.getPlatformOrderCode(), zbOrderPackageEntityList);
 		advanceEntity.setTotal(num); //订单总数据
 		advanceEntity.setMctsTruck(StringUtil.isBlank(zbReceiptEntity.getDepartCode()) ? "" : zbReceiptEntity.getDepartCode()); //车次
 		advanceEntity.setMctsTruckNo(zbReceiptEntity.getCarNumber());
@@ -909,7 +909,7 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
 		advanceEntity.setStoreNo(StringUtil.isBlank(serviceNumEntity.getCustomerCode()) ? "" : serviceNumEntity.getCustomerCode()); //门店编码
 		advanceEntity.setStoreName(serviceNumEntity.getCustomerName()); //门店名称
 		advanceEntity.setSerialKey(""); //序列号
-		advanceEntity.setServiceNum(StringUtil.isBlank(serviceNumEntity.getPlatformOrderCode()) ? "" : serviceNumEntity.getPlatformOrderCode()); //服务号
+		advanceEntity.setServiceNum(StringUtil.isBlank(serviceNumEntity.getRelationOrderCode()) ? "" : serviceNumEntity.getRelationOrderCode()); //服务号
 		advanceEntity.setMatingCode("");//齐套模式 可以为空
 		advanceEntity.setContractNum("");//合同号 可以为空
 		advanceEntity.setLeaveBehind(serviceNumEntity.getLegacyFlag());//遗留：Y=是，N=否
@@ -933,7 +933,7 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
 		Integer advanceId = iAdvanceClient.addAdvanceClient(advanceEntity);
 		advanceEntity.setId(advanceId);
 
-		String key = AdvanceEntity.class.getName() + ":"+serviceNumEntity.getReceiptId() + serviceNumEntity.getRelationOrderCode() + ":" + zbReceiptEntity.getDepartCode();
+		String key = AdvanceEntity.class.getName() + ":"+serviceNumEntity.getReceiptId() + serviceNumEntity.getPlatformOrderCode() + ":" + zbReceiptEntity.getDepartCode();
 		// 加入缓存  1小时的缓存
 		bladeRedis.setEx(key, advanceEntity, 60*60L);
 
@@ -952,7 +952,7 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
 	private int mathTotalOrderPackageNum(String orderNum, List<ZbOrderPackageEntity> zbOrderPackageEntityList) {
 		int totalPackageNum = 0;
 		for (ZbOrderPackageEntity entity : zbOrderPackageEntityList) {
-			if (entity.getRelationOrderCode().equals(orderNum)) {
+			if (entity.getPlatformOrderCode().equals(orderNum)) {
 				totalPackageNum++;
 			}
 		}

blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/FactoryAuthServiceImpl.java

@@ -56,7 +56,7 @@ public class FactoryAuthServiceImpl implements IFactoryAuthService {
 
 		//查询是否有当前账户的token数据
 		QueryWrapper<FactoryToken> queryTokenWrapper = new QueryWrapper<>();
-		queryWrapper.eq("corpid",corpId);
+		queryTokenWrapper.eq("corpid",corpId);
 		FactoryToken factoryToken = factoryTokenService.getOne(queryTokenWrapper);
 		if(Objects.isNull(factoryToken)){
 			factoryToken = new FactoryToken();

blade-service/logpm-factory/src/main/java/com/logpm/factory/config/InterceptorAdapterConfig.java

@@ -26,7 +26,7 @@ public class InterceptorAdapterConfig implements WebMvcConfigurer {
 			excludePathPatterns("/factory/oupai/**").
 			excludePathPatterns("/factory/zb/**")
 			.excludePathPatterns("/factory/common/**");
-		InterceptorRegistration registryZbFactory = interceptorRegistry.addInterceptor(new ZbFactoryAccountsInterceptor(zbFactoryProperties));
-		registryZbFactory.addPathPatterns("/factory/zb/**");
+//		InterceptorRegistration registryZbFactory = interceptorRegistry.addInterceptor(new ZbFactoryAccountsInterceptor(zbFactoryProperties));
+//		registryZbFactory.addPathPatterns("/factory/zb/**");
 	}
 }

blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/receiver/OpReceivingDataHandler.java

@@ -5,13 +5,13 @@ import com.logpm.factory.pan.service.IPanFactoryDataService;
 import com.rabbitmq.client.Channel;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.common.constant.RabbitConstant;
+import org.springblade.common.exception.CustomerException;
 import org.springframework.amqp.core.Message;
 import org.springframework.amqp.rabbit.annotation.RabbitHandler;
 import org.springframework.amqp.rabbit.annotation.RabbitListener;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import java.io.IOException;
 import java.util.Map;
 
 
@@ -40,9 +40,11 @@ public class OpReceivingDataHandler {
 		try {
 			panFactoryDataService.handleDataToPlatform(orderPackageCode, receivingTime);
 
-		} catch (Exception e) {
+		} catch (CustomerException e) {
 			log.error("##################opReceivingDataHandler: 处理欧派收货数据到新系统,orderPackageCode:{},receivingTime:{},msg:{}",
-				orderPackageCode,receivingTime,e.getMessage());
+				orderPackageCode,receivingTime,e.message);
+		} catch (Exception e) {
+			log.error("##################opReceivingDataHandler: 处理欧派收货数据到新系统",e);
 		}
 
 	}

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

@@ -147,7 +147,7 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
 		if (Objects.isNull(packageEntity)) {
 			log.warn("############oid 查询数据失败: {}", key);
 			// 查询欧派系统的的数据
-			String url = ouPaiProperties.getUri() + "tims_odata_api/api/odata/Package(" + key + ")?select=Code,PackageStatus,FirstClassCode,FirstClassName,SecondClassCode,SecondClassName,ThirdClassCode,ThirdClassName,BuyIn,CosourcingCode,CosourcingUnit,Length,Width,Height,Weight,IsInventory,SendTime,ReceivingTime,CreateTime,ShipTime,CarNumber,DeliveryMethod&$expand=ReceivingOrders($select=Code,Type,Status,Plate,PackagesCount,ReceivePackageCount,PlateNum,CarNumber,CarrierCode,SendTime,ArrivalTime,ReceiveTime,CreateTime,ReturnNumber;$expand=EndWarehouse($select=Name,Code))&$expand=Order($select=SelfCode,Code)";
+			String url = ouPaiProperties.getUri() + "tims_odata_api/api/odata/Package(" + key + ")?select=Code,PackageStatus,FirstClassCode,FirstClassName,SecondClassCode,SecondClassName,ThirdClassCode,ThirdClassName,PackageDetailNames,BuyIn,CosourcingCode,CosourcingUnit,Length,Width,Height,Weight,IsInventory,SendTime,ReceivingTime,CreateTime,ShipTime,CarNumber,DeliveryMethod&$expand=ReceivingOrders($select=Code,Type,Status,Plate,PackagesCount,ReceivePackageCount,PlateNum,CarNumber,CarrierCode,SendTime,ArrivalTime,ReceiveTime,CreateTime,ReturnNumber;$expand=EndWarehouse($select=Name,Code)&$expand=FromWarehouse($select=Name,Code)&$expand=CurrentWarehouse($select=Name,Code))&$expand=Order($select=SelfCode,Code)";
 			OpOrderStatusLogEntity opOrderStatusLogEntity = sendRequestData(url, event);
 
 			JSONObject jsonObject = JSONObject.parseObject(opOrderStatusLogEntity.getResponseBody());

blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java

@@ -37,7 +37,6 @@ import com.logpm.factory.snm.entity.PanPackageInfo;
 import com.logpm.factory.snm.entity.PanPackageList;
 import com.logpm.oldproject.entity.AdvanceDetailEntity;
 import com.logpm.oldproject.entity.AdvanceEntity;
-import com.logpm.oldproject.entity.OrderDetailEntity;
 import com.logpm.oldproject.entity.WayBillEntity;
 import com.logpm.oldproject.feign.*;
 import com.logpm.oldproject.vo.DistributionParcelListEntityVO;
@@ -462,13 +461,12 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
 				distributionStockArticleEntity.setGenre(1);
 				distributionStockArticleEntity.setAdvanceId(advanceId);
 				//--------------2023-07-06 新增字段处理
-				//查询包条码对应的运单信息
-				OrderDetailEntity orderDetailEntity = orderDetailClient.findByUnitNo(unitNo);
-
 
+				//查询包条码对应的运单信息
+				waybillNoNum = supplyData.get("logiBillNo");
 				//存入运单信息
-				saveWaybillEntity(orderDetailEntity.getWaybillNo());
-				waybillNoNum = orderDetailEntity.getWaybillNo();
+				saveWaybillEntity(waybillNoNum );
+
 				// 增加订单 经销商信息 和门店信息
 				buildDealerAndStore(distributionStockArticleEntity, advanceEntity);
 
@@ -575,59 +573,63 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
 		DistributionParcelListEntityVO vo = advanceDetailClient.getByUnitNo(unitNo);
 //		WarehouseWaybillEntity warehouseWaybill = warehouseWaybillClient.findByWaybillNo(waybillNo);
 
-		DistributionParcelListEntity entity = new DistributionParcelListEntity();
-		BeanUtil.copyProperties(vo, entity);
-		entity.setOrderPackageCode(vo.getPacketBarCode());
-		entity.setConditions(1);
-		entity.setWarehouse(distributionStockArticleEntity.getWarehouse());
-		entity.setWarehouseId(distributionStockArticleEntity.getWarehouseId());
-		entity.setStockArticleId(distributionStockArticleEntity.getId());
-		entity.setOrderPackageStatus(OrderPackageStatusConstant.yiruku.getValue());
-		entity.setOrderPackageFreezeStatus(OrderPackageFreezeStatusConstant.weidongjie.getValue());
-		entity.setOrderPackageReservationStatus(OrderPackageReservationStatusConstant.daiyuyue.getValue());
-		entity.setOrderPackageGroundingStatus(OrderPackageGroundingStatusConstant.daishangjia.getValue());
-		entity.setOrderPackageStockupStatus(OrderPackageStockupStatusConstant.daibeihuo.getValue());
-		entity.setOrderCode(distributionStockArticleEntity.getOrderCode());
-		entity.setServiceNumber(distributionStockArticleEntity.getServiceNumber());
-		entity.setWaybillNumber(waybillNo);
+		if(Objects.isNull(vo)){
+			logger.warn("##############saveOrderPackage: 未在老系统查询到包件数据 unitNo={}",unitNo);
+		}else{
+			DistributionParcelListEntity entity = new DistributionParcelListEntity();
+			BeanUtil.copyProperties(vo, entity);
+			entity.setOrderPackageCode(vo.getPacketBarCode());
+			entity.setConditions(1);
+			entity.setWarehouse(distributionStockArticleEntity.getWarehouse());
+			entity.setWarehouseId(distributionStockArticleEntity.getWarehouseId());
+			entity.setStockArticleId(distributionStockArticleEntity.getId());
+			entity.setOrderPackageStatus(OrderPackageStatusConstant.yiruku.getValue());
+			entity.setOrderPackageFreezeStatus(OrderPackageFreezeStatusConstant.weidongjie.getValue());
+			entity.setOrderPackageReservationStatus(OrderPackageReservationStatusConstant.daiyuyue.getValue());
+			entity.setOrderPackageGroundingStatus(OrderPackageGroundingStatusConstant.daishangjia.getValue());
+			entity.setOrderPackageStockupStatus(OrderPackageStockupStatusConstant.daibeihuo.getValue());
+			entity.setOrderCode(distributionStockArticleEntity.getOrderCode());
+			entity.setServiceNumber(distributionStockArticleEntity.getServiceNumber());
+			entity.setWaybillNumber(waybillNo);
 //		if(ObjectUtil.isNotEmpty(warehouseWaybill)){
 //			entity.setWarehouseId(warehouseWaybill.getId());
 //		}
 
-		// 增加 进销商 名称 编码  发站仓
+			// 增加 进销商 名称 编码  发站仓
 
-		entity.setSendWarehouseName(distributionStockArticleEntity.getSendWarehouseName());
-		entity.setSendWarehouseId(distributionStockArticleEntity.getSendWarehouseId());
+			entity.setSendWarehouseName(distributionStockArticleEntity.getSendWarehouseName());
+			entity.setSendWarehouseId(distributionStockArticleEntity.getSendWarehouseId());
 
-		//收货仓库
-		entity.setAcceptWarehouseName(distributionStockArticleEntity.getAcceptWarehouseName());
-		entity.setAcceptWarehouseId(distributionStockArticleEntity.getAcceptWarehouseId());
+			//收货仓库
+			entity.setAcceptWarehouseName(distributionStockArticleEntity.getAcceptWarehouseName());
+			entity.setAcceptWarehouseId(distributionStockArticleEntity.getAcceptWarehouseId());
 
-		//进销售
-		entity.setDealerCode(distributionStockArticleEntity.getDealerCode());
-		entity.setDealerName(distributionStockArticleEntity.getDealerName());
-		entity.setWarehouseEntryTimeEnd(CommonUtil.StringToDate(operationTime));
+			//进销售
+			entity.setDealerCode(distributionStockArticleEntity.getDealerCode());
+			entity.setDealerName(distributionStockArticleEntity.getDealerName());
+			entity.setWarehouseEntryTimeEnd(CommonUtil.StringToDate(operationTime));
 
-		// 绑定部门--仓库
-		if (!Objects.isNull(basicdataWarehouseEntity)) {
-			entity.setCreateDept(basicdataWarehouseEntity.getDepartment());
-		}
-		entity.setCreateUser(1123598821738675201L);
-		entity.setTenantId(TenantNum.HUITONGCODE);
-		if (StringUtil.isNoneBlank(entity.getMaterialName()) && StringUtil.isNoneBlank(entity.getMaterialCode())) {
-			// 查询物料信息
-			String sku = "";
-			BasicMaterialEntity basicMaterialEntity = basicMaterialClient.getMaterialOwn(entity.getMaterialCode(), entity.getMaterialName(), sku);
-			if (ObjectUtils.isNotNull(basicMaterialEntity)) {
-				entity.setMaterialId(basicdataWarehouseEntity.getId());
-				entity.setMaterialCode(basicMaterialEntity.getProductCode());
-				entity.setMaterialUnit(basicMaterialEntity.getLogpmUnit());
+			// 绑定部门--仓库
+			if (!Objects.isNull(basicdataWarehouseEntity)) {
+				entity.setCreateDept(basicdataWarehouseEntity.getDepartment());
+			}
+			entity.setCreateUser(1123598821738675201L);
+			entity.setTenantId(TenantNum.HUITONGCODE);
+			if (StringUtil.isNoneBlank(entity.getMaterialName()) && StringUtil.isNoneBlank(entity.getMaterialCode())) {
+				// 查询物料信息
+				String sku = "";
+				BasicMaterialEntity basicMaterialEntity = basicMaterialClient.getMaterialOwn(entity.getMaterialCode(), entity.getMaterialName(), sku);
+				if (ObjectUtils.isNotNull(basicMaterialEntity)) {
+					entity.setMaterialId(basicMaterialEntity.getId());
+					entity.setMaterialCode(basicMaterialEntity.getProductCode());
+					entity.setMaterialUnit(basicMaterialEntity.getLogpmUnit());
+				}
+			}
+			boolean b = distributionParcelListClient.add(entity);
+			if (!b) {
+				logger.warn("#################handleDataToPlatform: 保存包件信息失败  orderCode={}", entity.getOrderCode());
+				throw new CustomerException(405, "保存包件信息失败");
 			}
-		}
-		boolean b = distributionParcelListClient.add(entity);
-		if (!b) {
-			logger.warn("#################handleDataToPlatform: 保存包件信息失败  orderCode={}", entity.getOrderCode());
-			throw new CustomerException(405, "保存包件信息失败");
 		}
 	}
 

blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/UnloadCarComHandler.java

@@ -112,8 +112,8 @@ public class UnloadCarComHandler {
 	/**
 	 * 根基匹配到的发货单编号 推送梦天
 	 *
-	 * @param carNum
-	 * @param completeDate
+	 * @param carNum 车次号
+	 * @param completeDate 完成时间
 	 * @throws ParseException
 	 * @throws NoSuchAlgorithmException
 	 * @throws JsonProcessingException

blade-service/logpm-factory/src/main/java/com/logpm/factory/zb/controller/ZbFactoryDataController.java

@@ -30,6 +30,7 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.nio.file.Files;
 import java.util.Objects;
 
 /**
@@ -94,10 +95,6 @@ public class ZbFactoryDataController {
 		zbFactoryLogService.save(zbFactoryLogEntity);
 
 
-
-
-
-
 //		orderStatusLogService.save(orderStatusLog);
 
 //		//判断数据是否已存入
@@ -149,8 +146,9 @@ public class ZbFactoryDataController {
 			, MediaType.MULTIPART_FORM_DATA_VALUE
 			, true
 			, file.getName());
-		try (InputStream input = new FileInputStream(file);
-			 OutputStream os = item.getOutputStream()) {
+		try (
+                InputStream input = Files.newInputStream(file.toPath());
+                OutputStream os = item.getOutputStream()) {
 			// 流转移
 			IOUtils.copy(input, os);
 		} catch (Exception e) {

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseGoodsAllocationMapper.java

@@ -167,4 +167,6 @@ public interface WarehouseGoodsAllocationMapper extends BaseMapper<WarehouseGood
 
 
 	List<Long> selectIsStocking(@Param("allocationId") Long allocationId);
+
+	Integer selectOrderNum(@Param("id") Long id);
 }

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseGoodsAllocationMapper.xml

@@ -19,8 +19,7 @@
         FROM logpm_warehouse_goods_allocation ${ew.customSqlSegment}
     </select>
     <select id="selectnum" resultType="com.logpm.warehouse.vo.WarehouseGoodsAllocationVO">
-        SELECT COALESCE(SUM(CASE WHEN association_type = '1' THEN num END), 0) orderNum,
-               COALESCE(SUM(CASE WHEN association_type = '2' THEN num END), 0) lessNum,
+        SELECT COALESCE(SUM(CASE WHEN association_type = '1' THEN num END), 0) lessNum,
                COALESCE(SUM(CASE WHEN association_type = '3' THEN num END), 0) packageNum,
                COALESCE(SUM(CASE WHEN association_type = '4' THEN num END), 0) inventoryNum
         FROM logpm_warehouse_updown_goods
@@ -362,6 +361,15 @@
         SELECT lwgaa.id FROM logpm_warehouse_goods_allocation lwgaa join logpm_warehouse_goods_area lwga on  lwgaa.goods_area_id =lwga.id WHERE
             lwgaa.id = #{allocationId} and lwgaa.is_deleted = 0 and lwga.area_type ='1'
     </select>
+    <select id="selectOrderNum" resultType="java.lang.Integer">
+        SELECT  COALESCE
+                    ( count( DISTINCT ldpl.stock_article_id), 0 )
+        FROM
+            logpm_warehouse_updown_goods lwug
+                JOIN logpm_distribution_parcel_list ldpl ON lwug.association_id = ldpl.id
+        where lwug.allocation_id = #{id}
+          and lwug.is_deleted = 0
+    </select>
 
 
 </mapper>

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseTrayGoodsMapper.xml

@@ -50,6 +50,7 @@
     <select id="getZeroListByTrayTypeId" resultType="com.logpm.warehouse.vo.TrayTypeDataListVO">
         select lwtg.id trayGoodsId,
                ldsa.id dataId,
+               ldsa.waybill_number waybillNo,
                ldsa.order_code dataCode,
                lwtg.num scanNum,
                ldsa.total_number orderTotalNum,
@@ -63,6 +64,7 @@
 
     <select id="getZeroUpListByTrayTypeId" resultType="com.logpm.warehouse.vo.UpShelfDataVO">
         select ldsa.order_code orderCode,
+               ldsa.waybill_number waybillNo,
                lwtg.tray_code trayCode,
                2 goodsType,
                lwtg.num shelfNum,

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseTrayTypeMapper.xml

@@ -60,7 +60,8 @@
 
     <select id="getZeroOrderByWaybillCode" resultType="com.logpm.warehouse.vo.TrayTypeDataListVO">
         select ldsa.id dataId,
-                ldsa.order_code dataCode,
+               ldsa.waybill_number waybillNo,
+               ldsa.order_code dataCode,
                ldsa.hand_quantity orderTotalNum
         from logpm_distribution_stock_article ldsa
         where ldsa.is_deleted = 0

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseGoodsAllocationServiceImpl.java

@@ -398,7 +398,9 @@ public class WarehouseGoodsAllocationServiceImpl extends BaseServiceImpl<Warehou
 		Func.copy(warehouseGoodsAllocationEntity,warehouseGoodsAllocationVO);
 		//查询数量
 		WarehouseGoodsAllocationVO	warehouseGoodsAllocationVOData = baseMapper.selectnum(warehouseGoodsAllocationEntity.getId());
-		warehouseGoodsAllocationVO.setOrderNum(warehouseGoodsAllocationVOData.getOrderNum());
+		//查询订单数量
+		Integer i = baseMapper.selectOrderNum(warehouseGoodsAllocationEntity.getId());
+		warehouseGoodsAllocationVO.setOrderNum(i);
 		warehouseGoodsAllocationVO.setInventoryNum(warehouseGoodsAllocationVOData.getInventoryNum());
 		warehouseGoodsAllocationVO.setLessNum(warehouseGoodsAllocationVOData.getLessNum());
 		warehouseGoodsAllocationVO.setPackageNum(warehouseGoodsAllocationVOData.getPackageNum());

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownGoodsLogServiceImpl.java

@@ -28,6 +28,7 @@ import com.logpm.warehouse.mapper.WarehouseUpdownGoodsLogMapper;
 import com.logpm.warehouse.service.IWarehouseUpdownGoodsLogService;
 import com.logpm.warehouse.vo.WarehouseUpdownGoodsLogVO;
 import lombok.AllArgsConstructor;
+import lombok.extern.log4j.Log4j2;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.system.feign.IUserSearchClient;
 import org.springframework.stereotype.Service;
@@ -43,6 +44,7 @@ import java.util.stream.Collectors;
  */
 @Service
 @AllArgsConstructor
+@Log4j2
 public class WarehouseUpdownGoodsLogServiceImpl extends BaseServiceImpl<WarehouseUpdownGoodsLogMapper, WarehouseUpdownGoodsLogEntity> implements IWarehouseUpdownGoodsLogService {
 
 	private final IBasicdataWarehouseClient basicdataWarehouseClient;
@@ -58,7 +60,10 @@ public class WarehouseUpdownGoodsLogServiceImpl extends BaseServiceImpl<Warehous
 			.collect(Collectors.toList());
 		warehouseUpdownGoodsLog.setWarehouseIdList(collect);
 		//查询操作员
-//		userSearchClient.listByname();
+//		if (null != warehouseUpdownGoodsLog.getCreateUserName()){
+//			R<List<User>> listR = userSearchClient.listByName(warehouseUpdownGoodsLog.getCreateUserName());
+//			log.info("listR>>>>{}",listR);
+//		}
 		List<WarehouseUpdownGoodsLogVO> warehouseUpdownGoodsLogVOS = baseMapper.selectWarehouseUpdownGoodsLogPage(page, warehouseUpdownGoodsLog);
 		return page.setRecords(warehouseUpdownGoodsLogVOS);
 	}

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java

@@ -184,11 +184,9 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl<WarehouseWaybil
 
 			distributionStockArticleEntity.setBrand(warehouseWaybill.getBrand());
 			distributionStockArticleEntity.setResource("零担");
-			if (!Objects.isNull(basicdataWarehouseEntity)) {
-				distributionStockArticleEntity.setCreateDept(Objects.isNull(basicdataWarehouseEntity.getDepartment()) ? null : basicdataWarehouseEntity.getDepartment());
-			}
+            distributionStockArticleEntity.setCreateDept(Objects.isNull(basicdataWarehouseEntity.getDepartment()) ? null : basicdataWarehouseEntity.getDepartment());
 
-			String customerName = warehouseWaybill.getConsignee();//客户名称
+            String customerName = warehouseWaybill.getConsignee();//客户名称
 			//通过客户名称去查询客户的服务类型、
 			distributionStockArticleEntity.setTypeService("1");//默认商配
 			BasicdataClientEntity basicdataClientEntity = basicdataClientClient.findByName(customerName);
@@ -313,8 +311,7 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl<WarehouseWaybil
 	public WarehouseWaybillEntity findByWaybillNo(String waybillNo) {
 		QueryWrapper<WarehouseWaybillEntity> queryWrapper = new QueryWrapper<>();
 		queryWrapper.eq("waybill_no", waybillNo);
-		WarehouseWaybillEntity warehouseWaybillEntity = warehouseWaybillMapper.selectOne(queryWrapper);
-		return warehouseWaybillEntity;
+        return warehouseWaybillMapper.selectOne(queryWrapper);
 	}
 
 	@Override