Merge branch 'pre-production'

blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/AdvanceDTO.java

@@ -38,6 +38,7 @@ public class AdvanceDTO implements Serializable {
 	private String brand;
 
 	private Integer hasPackage;
+	private Integer enterNum;
 
 	private String startCreateTimeStr;
 	private String endCreateTimeStr;

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml

@@ -147,10 +147,10 @@
                 #{param.despatch},'%')
             </if>
             <if test=" param.incomingBatch != null and param.incomingBatch != ''">and ldsi.incoming_batch like
-                concat('%', #{param.incomingBatch},'%')
+                concat(#{param.incomingBatch},'%')
             </if>
             <if test=" param.brandName != null and param.brandName != ''">and ldsi.brand_name like
-                concat('%',#{param.brandName},'%')
+                concat(#{param.brandName},'%')
             </if>
             <if test=" param.marketName != null and param.marketName != ''">and ldsi.market_name like
                 concat('%',#{param.marketName},'%')

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java

@@ -516,7 +516,7 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 			listMap.forEach((k, v) -> {
 				int sum = v.stream().mapToInt(DistributionParcelListEntity::getQuantity).sum();
 				List<Long> packageIds = new ArrayList<>();
-				v.stream().forEach(i -> {
+				v.forEach(i -> {
 					//查询有没有打托数据
 
 //					//查询包件有没有物料
@@ -546,7 +546,7 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 
 
 					DistributionParcelListEntity parcelListEntity = new DistributionParcelListEntity();
-					BeanUtil.copyProperties(v, parcelListEntity);
+					BeanUtil.copyProperties(i, parcelListEntity);
 					parcelListEntity.setQuantity(sum);
 					parcelListEntity.setMaterialName(i.getMaterialName());
 					parcelListEntity.setMaterialCode(i.getMaterialCode());
@@ -557,7 +557,7 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 					if (ObjectUtil.isEmpty(distributionStockArticleEntity.getMallId())) {
 						throw new ServiceException("订单的客户数据异常，无法转换！！");
 					}
-					addStockList(distributionStockArticleEntity, parcelListEntity, 1);
+//					addStockList(distributionStockArticleEntity, parcelListEntity, 1);
 //					//修改状态
 					DistributionParcelListEntity parcelList = new DistributionParcelListEntity();
 					parcelList.setId(i.getId());
@@ -985,6 +985,7 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 			distributionStockListInfo.setWarehouseId(distributionStockListEntity.getWarehouseId()); //仓库ID
 			distributionStockListInfo.setMarketId(distributionStockListEntity.getMarketId()); //商场
 			distributionStockListInfo.setCargoUnit(distributionStockListEntity.getCargoUnit()); //货物单位
+			distributionStockListInfo.setStorageLocation(distributionParcelListEntity.getPallet()); //货物单位
 
 			distributionStockListInfo.setMallName(distributionStockListEntity.getMallName()); //商场名称
 			distributionStockListInfo.setQuantityStock(distributionParcelListEntity.getQuantity()); //库存数量(包件数量)
@@ -1002,6 +1003,7 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 //		distributionStockListEntity.setCategory(Optional.ofNullable(distributionParcelList.getBrandId()+"").orElse(null));//品分类
 			// 品牌
 			distributionStockListInfo.setBrandId(distributionStockListEntity.getBrandId());
+			distributionStockListInfo.setBrandName(distributionStockListEntity.getBrandName());
 			distributionStockListInfo.setUnpackingQuantity(0);
 			distributionStockListInfo.setSourceType("1"); //类型
 
@@ -1027,6 +1029,7 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 			distributionStockListInfo.setOrderCode(distributionStockArticleEntity.getOrderCode());
 			distributionStockListInfo.setParcelListId(distributionParcelListEntity.getId());
 			distributionStockListInfo.setPackageCode(distributionParcelListEntity.getOrderPackageCode());
+			distributionStockListInfo.setDespatch(distributionParcelListEntity.getWaybillNumber());
 			infoEntities.add(distributionStockListInfo);
 		}
 		distributionStockListInfoService.saveBatch(infoEntities);

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/impl/StatisticsOrderInfoServiceImpl.java

@@ -441,7 +441,7 @@ public class StatisticsOrderInfoServiceImpl extends BaseServiceImpl<StatisticsOr
 		PriceClientVO price = priceClient.price(BasicdatPriceApiVO.builder()
 			.clientId(consigneeId.toString())
 			.brandId(brandId.toString())
-			.time(DateUtil.formatTime(createTime))
+			.time(DateUtil.formatDate(createTime))
 			.build());
 		if (ObjectUtil.isEmpty(price)) {
 			log.warn("#############calculateRealCost: 未维护价格，无法计算。");
@@ -450,7 +450,7 @@ public class StatisticsOrderInfoServiceImpl extends BaseServiceImpl<StatisticsOr
 		// 查询包件数据
 		List<StatisticsDistributionPackageEntity> distributionPackageEntities = distributionPackageService.list(new QueryWrapper<StatisticsDistributionPackageEntity>().lambda().eq(StatisticsDistributionPackageEntity::getOrderInfoId, id));
 		// 校验是否全部配送完成
-		if (distributionPackageEntities.stream().anyMatch(distributionPackageEntity -> distributionPackageEntity.getIsSign() == 0)) {
+		if (CollUtil.isEmpty(distributionPackageEntities) || distributionPackageEntities.stream().anyMatch(distributionPackageEntity -> distributionPackageEntity.getIsSign() == null || NumberUtil.equals(0, distributionPackageEntity.getIsSign()))) {
 			log.warn("#############calculateRealCost: 订单未全部配送完成，无法计算。");
 			throw new CustomerException(405, "订单未全部配送完成，无法计算。");
 		}

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceMapper.xml

@@ -187,6 +187,7 @@
             </if>
         </foreach>
         ) orderCodes where orderCodes.orderCode = lta.order_code)
+        and lta.waybill_status = '0'
     </select>
 
 

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

@@ -3317,9 +3317,84 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 	public R createOrderPackage(AdvanceDTO advanceDTO) {
 		Long advanceId = advanceDTO.getAdvanceId();
 		Long warehouseId = advanceDTO.getWarehouseId();
+		Integer enterNum = advanceDTO.getEnterNum();
 
+		BasicdataWarehouseEntity warehouseEntity = basicdataWarehouseClient.getEntityWarehouseId(warehouseId);
+		if(Objects.isNull(warehouseEntity)){
+			log.warn("##########createOrderPackage: 仓库信息不存在 warehouseId={}",warehouseId);
+			return R.fail(405,"仓库信息不存在");
+		}
+		String warehouseName = warehouseEntity.getName();
+		String warehouseCode = warehouseEntity.getWarehouseCode();
+
+		TrunklineAdvanceEntity advanceEntity = advanceService.getById(advanceId);
+		Integer totalNum = advanceEntity.getTotalNum();
+
+		List<TrunklineAdvanceDetailVO> advanceDetailList = advanceDetailService.findList(advanceId);
+
+		if(totalNum > 0 || CollUtil.isNotEmpty(advanceDetailList)){
+			log.warn("##########createOrderPackage: 订单已有包件数据 advanceId={}",advanceId);
+			return R.fail(405,"订单已有包件数据");
+		}
+
+		if(enterNum == null || enterNum <= 0){
+			log.warn("##########createOrderPackage: 输入的数量不正确 enterNum={}",enterNum);
+			return R.fail(405,"输入的数量不正确");
+		}
+
+		TrunklineAdvanceDetailEntity advanceDetailModel = new TrunklineAdvanceDetailEntity();
+		advanceDetailModel.setWarehouseId(warehouseId);
+		advanceDetailModel.setWarehouseName(warehouseName);
+		advanceDetailModel.setAdvanceId(advanceId);
+		advanceDetailModel.setOrderCode(advanceEntity.getOrderCode());
+		advanceDetailModel.setBrand(advanceEntity.getBrand());
+		advanceDetailModel.setSystemType("线上");
+
+//		advanceDetailModel.setFirstPackName(firsts);
+//		String sencods = importOrderNoPackageExcelDTO.getSeconds();
+//		if (StringUtil.isBlank(sencods)) {
+//			advanceDetailModel.setSecondPackName(firsts);
+//		} else {
+//			advanceDetailModel.setSecondPackName(sencods);
+//		}
+//		String thirds = importOrderNoPackageExcelDTO.getThirds();
+//		if (StringUtil.isBlank(thirds)) {
+//			advanceDetailModel.setThirdPackName(firsts);
+//		} else {
+//			advanceDetailModel.setThirdPackName(thirds);
+//		}
+		advanceDetailModel.setQuantity(1);
+		advanceDetailModel.setServiceNum(advanceEntity.getServiceNum());
+//		advanceDetailModel.setMaterialCode(importOrderNoPackageExcelDTO.getMaterialCode());
+//		advanceDetailModel.setMaterialName(importOrderNoPackageExcelDTO.getMaterialName());
+//		String volume = importOrderNoPackageExcelDTO.getVolume();
+//		if (StringUtil.isBlank(volume)){
+//			advanceDetailModel.setVolume(BigDecimal.ZERO);
+//		}else{
+//			advanceDetailModel.setVolume(new BigDecimal(volume));
+//		}
+//		String weight = importOrderNoPackageExcelDTO.getWeight();
+//		if (StringUtil.isBlank(weight)){
+//			advanceDetailModel.setWeight(BigDecimal.ZERO);
+//		}else{
+//			advanceDetailModel.setWeight(new BigDecimal(weight));
+//		}
+		advanceDetailModel.setPackageStatus("0");
 
-		return null;
+		List<TrunklineAdvanceDetailEntity> advanceDetailEntities = new ArrayList<>();
+		List<String> orderPackageCodes = basicdataCodeClient.getBatchPackageCodeByType(warehouseCode, advanceEntity.getOrderCode(), totalNum);
+		orderPackageCodes.forEach(orderPackageCode -> {
+			TrunklineAdvanceDetailEntity advanceDetailEntity = new TrunklineAdvanceDetailEntity();
+			BeanUtil.copy(advanceDetailModel, advanceDetailEntity);
+			advanceDetailEntity.setOrderPackageCode(orderPackageCode);
+			advanceDetailEntities.add(advanceDetailEntity);
+		});
+		advanceDetailService.saveBatch(advanceDetailEntities);
+		advanceEntity.setTotalNum(enterNum);
+
+		advanceService.updateById(advanceEntity);
+
+		return R.success("添加成功");
 	}
 
 	private List<EditOrderMsgVO> verifyData(OpenOrderDTO openOrderDTO, WarehouseWaybillEntity waybillEntity) {

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

@@ -68,19 +68,23 @@
         <where>
             lwup.is_deleted = 0
             <if test="param.warehouseName!=null and param.warehouseName!=''">
-                and ldpl.warehouse like concat('%',#{param.warehouseName},'%')
+                and ldpl.warehouse like concat(#{param.warehouseName},'%')
             </if>
             <if test="param.orderCode!=null and param.orderCode!=''">
-                and ldpl.order_code like concat('%',#{param.orderCode},'%')
+                and ldpl.order_code like concat(#{param.orderCode},'%')
             </if>
             <if test="param.warehouseIdList != null and @org.apache.commons.collections4.CollectionUtils@isNotEmpty(param.warehouseIdList)">
                 and lwup.warehouse_id in
                 <foreach collection="param.warehouseIdList" item="item" open="(" close=")" separator=",">
                     #{item}
                 </foreach>
+                AND ldpl.warehouse_id IN
+                <foreach collection="param.warehouseIdList" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
             </if>
             <if test="param.orderPackageCode!=null and param.orderPackageCode!=''">
-                and ldpl.order_package_code like concat('%',#{param.orderPackageCode},'%')
+                and ldpl.order_package_code like concat(#{param.orderPackageCode},'%')
             </if>
             <if test="param.bindingType!=null and param.bindingType!=''">
                 and lwup.binding_type = #{param.bindingType}

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

@@ -62,17 +62,23 @@ public class WarehouseUpdownGoodsLogServiceImpl extends BaseServiceImpl<Warehous
 
 	@Override
 	public IPage<WarehouseUpdownGoodsLogVO> selectWarehouseUpdownGoodsLogPage(IPage<WarehouseUpdownGoodsLogVO> page, WarehouseUpdownGoodsLogVO warehouseUpdownGoodsLog) {
-		//获取当前登录人仓库
-		List<BasicdataWarehouseEntity> myWatchWarehouse = basicdataWarehouseClient.getMyWatchWarehouse();
-		List<Long> collect = myWatchWarehouse.stream()
-			.map(BasicdataWarehouseEntity::getId)
-			.collect(Collectors.toList());
-		warehouseUpdownGoodsLog.setWarehouseIdList(collect);
-		//查询操作员
-//		if (null != warehouseUpdownGoodsLog.getCreateUserName()){
-//			R<List<User>> listR = userSearchClient.listByName(warehouseUpdownGoodsLog.getCreateUserName());
-//			log.info("listR>>>>{}",listR);
-//		}
+
+		BasicdataWarehouseEntity myCurrentWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse();
+		if(ObjectUtils.isEmpty(myCurrentWarehouse)){
+			List<BasicdataWarehouseEntity> myWatchWarehouse = basicdataWarehouseClient.getMyWatchWarehouse();
+			List<Long> collect = myWatchWarehouse.stream()
+				.map(BasicdataWarehouseEntity::getId)
+				.collect(Collectors.toList());
+			warehouseUpdownGoodsLog.setWarehouseIdList(collect);
+		}else{
+			//获取当前登录人仓库
+			List<Long> collect = Arrays.asList(myCurrentWarehouse.getId());
+			warehouseUpdownGoodsLog.setWarehouseIdList(collect);
+		}
+
+
+
+
 		List<WarehouseUpdownGoodsLogVO> warehouseUpdownGoodsLogVOS = baseMapper.selectWarehouseUpdownGoodsLogPage(page, warehouseUpdownGoodsLog);
 		return page.setRecords(warehouseUpdownGoodsLogVOS);
 	}