1.干线-bug修复

2.推送订单查询优化

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

@@ -24,6 +24,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springblade.common.exception.CustomerException;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
@@ -31,9 +32,7 @@ import org.springblade.core.tool.utils.ObjectUtil;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * 签收 控制器
@@ -143,9 +142,15 @@ public class DistributionSignforAppController {
 	@ApiOperationSupport(order = 2)
 	public R signfor(@Valid @RequestBody DistrilbutionAppsignforDTO distrilbutionloadingscanDTO) {
 		R r	= distributionSignforService.signfor(distrilbutionloadingscanDTO);
+		long time = new Date().getTime();
 		try{
 			BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
+			if(Objects.isNull(myCurrentWarehouse)){
+				log.warn("#############signfor:"+time+" 下架仓库信息为空  myCurrentWarehouse={}",myCurrentWarehouse);
+				throw new CustomerException("下架仓库信息为空");
+			}
 			List<String> packageCodes = (List<String>) r.getData();
+			log.info("#############signfor:"+time+" 处理下架的包件 packageCodes={}",packageCodes);
 			String orderPackageCodes = null;
 			for (String packageCode : packageCodes) {
 				if(StringUtils.isBlank(orderPackageCodes)){
@@ -156,7 +161,7 @@ public class DistributionSignforAppController {
 			}
 			updownTypeClient.downPackageOrDelTray(orderPackageCodes,myCurrentWarehouse.getId());
 		}catch (Exception e){
-			log.error("#############signfor: 下架失败");
+			log.error("#############signfor:"+time+" 下架失败",e);
 		}
 		return r;
 	}

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java

@@ -16,7 +16,6 @@
  */
 package com.logpm.distribution.controller;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
@@ -24,7 +23,6 @@ import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
 import com.logpm.basicdata.feign.IBasicdataWarehouseClient;
 import com.logpm.distribution.bean.MyExcelUtil;
 import com.logpm.distribution.dto.DistributionDeliveryExcelDTO;
-import com.logpm.distribution.dto.DistributionDeliveryInfoDTO;
 import com.logpm.distribution.dto.DistributionDeliveryListDTO;
 import com.logpm.distribution.dto.DistrilbutionAppsignforDTO;
 import com.logpm.distribution.dto.app.DistrilbutionloadingscanDTO;
@@ -42,13 +40,13 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springblade.common.exception.CustomerException;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.excel.util.ExcelUtil;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.tool.api.R;
-import org.springblade.core.tool.constant.BladeConstant;
 import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springframework.web.bind.annotation.*;
@@ -57,9 +55,10 @@ import springfox.documentation.annotations.ApiIgnore;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.text.ParseException;
-import java.util.HashMap;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 /**
  * 配送管理 控制器
@@ -477,9 +476,16 @@ public class DistributionDeliveryListController extends BladeController {
 	@ApiOperation(value = "PC签收包件")
 	public R signfor(@Valid @RequestBody DistrilbutionAppsignforDTO distrilbutionloadingscanDTO) {
 		R r	= distributionSignforService.signforPC(distrilbutionloadingscanDTO);
+		long time = new Date().getTime();
 		try{
+
 			BasicdataWarehouseEntity myCurrentWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse();
+			if(Objects.isNull(myCurrentWarehouse)){
+				log.warn("#############signforPC:"+time+" 仓库信息为空  myCurrentWarehouse={}",myCurrentWarehouse);
+				throw new CustomerException("仓库信息为空");
+			}
 			List<String> packageCodes = (List<String>) r.getData();
+			log.info("#############signforPC:"+time+" 处理下架的包件 packageCodes={}",packageCodes);
 			String orderPackageCodes = null;
 			for (String packageCode : packageCodes) {
 				if(StringUtils.isBlank(orderPackageCodes)){
@@ -490,7 +496,7 @@ public class DistributionDeliveryListController extends BladeController {
 			}
 			warehouseUpdownTypeClient.downPackageOrDelTray(orderPackageCodes,myCurrentWarehouse.getId());
 		}catch (Exception e){
-			log.error("#############signfor: 下架失败");
+			log.error("#############signforPC:"+time+" 下架失败",e);
 		}
 		return r;
 	}

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

@@ -50,7 +50,6 @@ import com.logpm.warehouse.feign.IWarehouseUpdownTypeClient;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.jetbrains.annotations.NotNull;
-import org.springblade.common.constant.DictBizConstant;
 import org.springblade.common.constant.DistributionTypeConstant;
 import org.springblade.common.constant.Inventory.InventoryLoadingStatusConstant;
 import org.springblade.common.constant.Inventory.InventorySigningStatusConstant;
@@ -83,7 +82,6 @@ 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.ObjectUtil;
-import org.springblade.system.cache.DictBizCache;
 import org.springblade.system.entity.User;
 import org.springblade.system.feign.IDictBizClient;
 import org.springblade.system.feign.IUserClient;
@@ -2375,7 +2373,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 				//推送信息至工厂
 				distributionAsyncService.sendFactory(collect.get(0), simpleDateFormat.format(new Date()), distributionReservationEntity.getId(), distributionReservationEntity.getReservationCode(), myCurrentWarehouse.getName(), nickName);
 				//收集包件
-				orderpackages.add(collect.get(0).getOrderPackageCode());
+				orderpackages.add(updatePackage.getOrderPackageCode());
 			} else {
 				//一个客户下出现重复包条码
 				log.error("############出现重复包条码：{}", collect);

blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceDetailMapper.java

@@ -64,4 +64,6 @@ public interface AdvanceDetailMapper extends BaseMapper<AdvanceDetailEntity> {
 	DistributionParcelListEntityVO getByUnitNoByPyl(@Param("unitNo")String unitNo);
 
     List<AdvanceDetailEntity> findListByAdvanceId(@Param("advanceId") Integer advanceId);
+
+    AdvanceDetailEntity getOneByUnitNo(@Param("unitNo") String unitNo);
 }

blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceDetailMapper.xml

@@ -211,4 +211,12 @@
         and advance_id = #{advanceId}
     </select>
 
+    <select id="getOneByUnitNo" resultType="com.logpm.oldproject.entity.AdvanceDetailEntity">
+        select *
+        from ht_advance_detail
+        where unitNo = #{unitNo}
+        and delete_time = 0
+        limit 1
+    </select>
+
 </mapper>

blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/impl/AdvanceDetailServiceImpl.java

@@ -59,10 +59,7 @@ public class AdvanceDetailServiceImpl implements IAdvanceDetailService {
 
 	@Override
 	public AdvanceDetailEntity getOneByUnitNo(String unitNo) {
-		QueryWrapper<AdvanceDetailEntity> queryWrapper = new QueryWrapper<>();
-		queryWrapper.eq("unitNo",unitNo)
-			.eq("delete_time",0);
-		return advanceDetailMapper.selectOne(queryWrapper);
+		return advanceDetailMapper.getOneByUnitNo(unitNo);
 	}
 
 	@Override

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

@@ -41,4 +41,6 @@ public interface TrunklineAdvanceDetailMapper extends BaseMapper<TrunklineAdvanc
     Integer findTotalNumByOrderCode(@Param("orderCode") String orderCode);
 
 	void updateWaybillNoByAdvanceId(@Param("advanceId") Long advanceId, @Param("waybillNo") String waybillNo, @Param("waybillId") Long waybillId);
+
+    List<String> findIncomingWarehouseName(@Param("advanceId") Long advanceId);
 }

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

@@ -172,5 +172,12 @@
         where advance_id = #{advanceId}
     </update>
 
+    <select id="findIncomingWarehouseName" resultType="String">
+        select incoming_warehouse_name
+        from logpm_trunkline_advance_detail
+        where advance_id = #{advanceId}
+        and package_status = '1'
+        group by incoming_warehouse_name
+    </select>
 
 </mapper>

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

@@ -30,4 +30,6 @@ public interface TrunklineAdvanceMapper extends BaseMapper<TrunklineAdvanceEntit
     void deletedAdvance(@Param("advanceIds") List<Long> advanceIds);
 
 	void subTotalNumByAdvanceId(@Param("advanceId") Long advanceId);
+
+    void updateIncomingWarehouseName(@Param("incomingWarehouseName") String incomingWarehouseName, @Param("advanceId") Long advanceId);
 }

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

@@ -12,8 +12,11 @@
     </select>
 
     <select id="advancePageList" resultType="com.logpm.trunkline.vo.TrunklineAdvanceVO">
-        select *
+        select lta.*,
+               lbc.client_name htMallName
         from logpm_trunkline_advance lta
+        left join logpm_basicdata_tripartite_mall lbtm on lbtm.tripartite_mall = lta.dealer_name and lbtm.brand_name = lta.brand
+        left join logpm_basicdata_client lbc on lbc.id = lbtm.client_id
         where lta.is_deleted = 0
           and lta.waybill_status = 0
           and lta.freeze_status = #{param.freezeStatus}
@@ -62,6 +65,9 @@
         <if test="param.endCreateTime != null">
             and lta.create_time &lt;= #{param.endCreateTime}
         </if>
+        <if test="param.htMallName != null and param.htallName != ''">
+            and Locate(#{param.htMallName},lbc.client_name) &gt; 0
+        </if>
         order by lta.create_time desc
     </select>
 
@@ -125,4 +131,10 @@
         where id = #{advanceId}
     </update>
 
+    <update id="updateIncomingWarehouseName" >
+        update logpm_trunkline_advance
+        set incoming_warehouse_name = #{incomingWarehouseName}
+        and id = #{advanceId}
+    </update>
+
 </mapper>

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineAdvanceDetailService.java

@@ -51,4 +51,7 @@ public interface ITrunklineAdvanceDetailService extends BaseService<TrunklineAdv
     Integer findTotalNumByOrderCode(String orderCode);
 
 	void updateWaybillNoByAdvanceId(Long advanceId, String waybillNo, Long waybillId);
+
+	List<String> findIncomingWarehouseName(Long advanceId);
+
 }

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineAdvanceService.java

@@ -30,4 +30,7 @@ public interface ITrunklineAdvanceService extends BaseService<TrunklineAdvanceEn
 	void updateTotalNumById(Long id, int totalNum);
 
     void deletedAdvance(List<Long> advanceIds);
+
+    void updateIncomingWarehouseName(String incomingWarehouseName, Long advanceId);
+
 }

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

@@ -19,6 +19,7 @@ import org.springblade.core.tool.utils.StringUtil;
 import org.springframework.stereotype.Service;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 
@@ -57,6 +58,7 @@ public class InComingServiceImpl implements IInComingService {
 			}
 			Long advanceDetailId = advanceDetailEntity.getId();
 			String packageStatus = advanceDetailEntity.getPackageStatus();
+			Long advanceId = advanceDetailEntity.getAdvanceId();
 			if("1".equals(packageStatus)){
 				log.warn("############incomingPackage: 包件已入库 packageCode={} warehouseId={}",packageCode,warehouseId);
 				return Resp.scanFail(405,"包件已入库","包件已入库");
@@ -71,6 +73,8 @@ public class InComingServiceImpl implements IInComingService {
 
 			//1.修改暂存单包件入库状态
 			advanceDetailService.updatePackageStatusById("1",advanceDetailId,warehouseId,warehouseName);
+			List<String> incomingWarehouseNames = advanceDetailService.findIncomingWarehouseName(advanceId);
+			advanceService.updateIncomingWarehouseName(String.join(",",incomingWarehouseNames),advanceId);
 
 			//2.判断包件和订单是否已经存入在库订单
 			boolean b = advanceService.saveOrderAndPackage(advanceDetailEntity, warehouseId);

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

@@ -1131,6 +1131,9 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 				trunklineAdvanceEntity.setTrainNumber(importCustomizedOuPaiDTO.getTrainNumber());
 				trunklineAdvanceEntity.setFreezeStatus("0");
 				trunklineAdvanceEntity.setLegacyStatus("0");
+				if(orderCode.contains("遗")){
+					trunklineAdvanceEntity.setLegacyStatus("1");
+				}
 				trunklineAdvanceEntity.setDeliveryDate(CommonUtil.StringToDate(importCustomizedOuPaiDTO.getDueDateStr()));
 				trunklineAdvanceEntity.setCreateUserName(AuthUtil.getNickName());
 				advanceService.save(trunklineAdvanceEntity);
@@ -1241,6 +1244,9 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 				trunklineAdvanceEntity.setTrainNumber(importStandardOuPaiDTO.getTrainNumber());
 				trunklineAdvanceEntity.setFreezeStatus("0");
 				trunklineAdvanceEntity.setLegacyStatus("0");
+				if(orderCode.contains("遗")){
+					trunklineAdvanceEntity.setLegacyStatus("1");
+				}
 				trunklineAdvanceEntity.setDeliveryDate(CommonUtil.StringToDate(importStandardOuPaiDTO.getDueDateStr()));
 				trunklineAdvanceEntity.setCreateUserName(AuthUtil.getNickName());
 				advanceService.save(trunklineAdvanceEntity);

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

@@ -235,4 +235,9 @@ public class TrunklineAdvanceDetailServiceImpl extends BaseServiceImpl<Trunkline
 	public void updateWaybillNoByAdvanceId(Long advanceId, String waybillNo, Long waybillId) {
 		baseMapper.updateWaybillNoByAdvanceId(advanceId,waybillNo,waybillId);
 	}
+
+	@Override
+	public List<String> findIncomingWarehouseName(Long advanceId) {
+		return baseMapper.findIncomingWarehouseName(advanceId);
+	}
 }

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

@@ -374,4 +374,9 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl<TrunklineAdvanc
 		baseMapper.deletedAdvance(advanceIds);
 	}
 
+	@Override
+	public void updateIncomingWarehouseName(String incomingWarehouseName, Long advanceId) {
+		baseMapper.updateIncomingWarehouseName(incomingWarehouseName,advanceId);
+	}
+
 }