Merge branch 'dev' into pre-production

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataCarrierEntity.java

@@ -208,4 +208,5 @@ public class BasicdataCarrierEntity extends TenantEntity {
 	@ApiModelProperty(value = "预留5")
 	private String reserve5;
 
+
 }

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataVehicleEntity.java

@@ -319,4 +319,5 @@ public class BasicdataVehicleEntity extends TenantEntity {
 	@ApiModelProperty(value = "预留5")
 	private String reserve5;
 
+
 }

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

@@ -80,4 +80,11 @@ public interface IBasicdataClientClient {
 
 	@GetMapping(API_PREFIX+"/findListByClientName")
     List<JSONObject> findListByClientName(@RequestParam String clientName);
+
+	/**
+	 * 根据Id查询客户
+	 * @param mallId
+	 * @return
+	 */
+    BasicdataClientEntity getMallById(Long mallId);
 }

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

@@ -114,4 +114,9 @@ public class BasicdataClientClient implements IBasicdataClientClient {
 		return basicdataClientService.findListByClientName(clientName);
 	}
 
+	@Override
+	public BasicdataClientEntity getMallById(Long mallId) {
+		return basicdataClientService.getById(mallId);
+	}
+
 }

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

@@ -1,5 +1,6 @@
 package com.logpm.basicdata.feign;
 
+import com.logpm.basicdata.entity.BasicdataClientEntity;
 import com.logpm.basicdata.service.IBasicdataCodeService;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.RestController;
@@ -16,4 +17,5 @@ public class BasicdataCodeClient implements IBasicdataCodeClient {
 	public String getCodeByType(Integer type,String warehouseCode,String orderCode) {
 		return basicdataCodeService.getCodeByType(type,warehouseCode,orderCode);
 	}
+
 }

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

@@ -256,9 +256,6 @@
     </select>
 
     <select id="getLoadCountNum" resultType="int">
-
-
-
         SELECT
         count( ldl.id )
         FROM
@@ -269,7 +266,6 @@
         AND ldl.delivery_id = #{deliveryId}
         AND ldl.scan_status != '1'
         AND ldl.is_abnormal_loading = 1
-
     </select>
     <select id="selectLoadingNumByReservationId" resultType="java.lang.Integer">
         SELECT (IF((SELECT sum(loaded_nub) FROM logpm_distribution_loadscan WHERE reservation_id = #{reservationId} AND scan_state != 1 AND is_abnormal_loading != 2) is null,0,(SELECT sum(loaded_nub) FROM logpm_distribution_loadscan WHERE reservation_id = #{reservationId} AND scan_state != 1 AND is_abnormal_loading != 2)))

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

@@ -70,8 +70,7 @@ public interface DistributionReservationMapper extends BaseMapper<DistributionRe
 	List<DistributionStockupOrderListVO> selectStockupOrderList(@Param("reservationId")Long reservationId,@Param("isZero") String isZero);
 
     List<DistributionStockupStockListVO> selectStockupStockList(@Param("reservationId")Long reservationId);
-    List<DistributionStockupStockListVO> selectStockupStockListNew(@Param("reservationId")Long reservationId,@Param("warehouseId") Long warehouseId);
-
+	List<DistributionStockupStockListVO> selectStockupStockListNew(@Param("reservationId")Long reservationId,@Param("warehouseId")Long warehouseId,@Param("mallName")String mallName);
     Integer selectOrderNumByReservationId(@Param("reservationId")Long reservationId);
 
 	Integer selectPlanNum(@Param("reservationId")Long reservationId);
@@ -119,8 +118,8 @@ public interface DistributionReservationMapper extends BaseMapper<DistributionRe
 
 	/**
 	 * 查询预约单下指定订单包件列表
-	 * @param id
-	 * @param id1
+	 * @param orderIds
+	 * @param param
 	 * @return
 	 */
 	IPage<DistributionParcelListEntity> getReservationPackage(IPage<DistributionParcelListEntity> page,@Param("orderIds") List<Long> orderIds,@Param("param")Map<String,Object> param);
@@ -133,8 +132,8 @@ public interface DistributionReservationMapper extends BaseMapper<DistributionRe
 
 	/**
 	 * 通过预约和订单查询预约订单中间表
-	 * @param id
-	 * @param id1
+	 * @param reservationId
+	 * @param warehourseId
 	 * @return
 	 */
 	List<DistributionParcelListEntity> selectPackageByReservationAndStockArticle(@Param("reservationId") Long reservationId,@Param("stockArticleId") Long stockArticleId,@Param("warehourseId") Long warehourseId);

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

@@ -335,10 +335,12 @@
         LEFT JOIN logpm_distribution_stock_list ldsl ON ldrs.stocklist_id = ldsl.id
         WHERE
         ldrs.reservation_id = #{reservationId}
+        AND ldsl.mall_name = #{mallName}
         group by ldsl.cargo_number
         ) t
         LEFT JOIN logpm_distribution_stock_list ldslNew ON t.cargo_number = ldslNew.cargo_number
-        LEFT JOIN logpm_distribution_stock ldss ON ldss.stock_list_id = t.id where ldslNew.is_deleted = 0
+        LEFT JOIN logpm_distribution_stock ldss ON ldss.stock_list_id = t.id
+        where ldslNew.is_deleted = 0
 
 <!--        SELECT-->
 <!--        ldsl.sku AS sku,-->

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

@@ -349,7 +349,7 @@
         JOIN logpm_distribution_delivery_list lddl ON lddl.id = lds.delivery_id
         JOIN logpm_distribution_reservation ldr ON ldr.id = lds.reservation_id
         <where>
-            lds.is_deleted = 0 and ldr.is_deleted = 0 and lddl.is_deleted = 0
+            lds.is_deleted = 0 and ldr.is_deleted = 0 and lddl.is_deleted = 0 AND (ldr.reservation_num + ldr.reservation_stock_list_num) > 0
             <if test="param.mallName != null and param.mallName!=''">
                 and ldr.mall_name like concat('%',#{param.mallName},'%')
             </if>

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

@@ -123,6 +123,7 @@
         CASE
         WHEN (SELECT COUNT(id) FROM logpm_distribution_bill_lading_scan WHERE stock_article_id = ldsa.id) - (SELECT COUNT(id) FROM logpm_distrilbution_bill_package WHERE stock_article_id = ldsa.id AND packet_bar_status IN (1,3)) = 0 THEN 20
         WHEN (SELECT COUNT(id) FROM logpm_distribution_bill_lading_scan WHERE stock_article_id = ldsa.id) - (SELECT COUNT(id) FROM logpm_distrilbution_bill_package WHERE stock_article_id = ldsa.id AND packet_bar_status IN (1,3)) > 0 THEN 10
+        WHEN (SELECT COUNT(id) FROM logpm_distribution_bill_lading_scan WHERE stock_article_id = ldsa.id) - (SELECT COUNT(id) FROM logpm_distrilbution_bill_package WHERE stock_article_id = ldsa.id AND packet_bar_status IN (1,3)) <  0 THEN 30
         END AS conditions,
         (select GROUP_CONCAT(DISTINCT ldpl.material_name )
         from logpm_distribution_parcel_list ldpl

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionReservationService.java

@@ -173,7 +173,7 @@ public interface IDistributionReservationService extends BaseService<Distributio
 
 	List<DistributionStockupOrderListVO> selectStockupOrderList(Long reservationId,String isZero);
 
-	List<DistributionStockupStockListVO> selectStockupStockList(Long reservationId,Long warehouseId);
+	List<DistributionStockupStockListVO> selectStockupStockList(Long reservationId,Long warehouseId,String mallName);
 
     Integer selectOrderNumByReservationId(Long reservationId);
 

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

@@ -2863,8 +2863,8 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 	}
 
 	@Override
-	public List<DistributionStockupStockListVO> selectStockupStockList(Long reservationId,Long warehouseId) {
-		return baseMapper.selectStockupStockListNew(reservationId,warehouseId);
+	public List<DistributionStockupStockListVO> selectStockupStockList(Long reservationId,Long warehouseId,String mallName) {
+		return baseMapper.selectStockupStockListNew(reservationId,warehouseId,mallName);
 	}
 
 	@Override

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

@@ -218,10 +218,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			Integer abnormalLoading = distributionLoadscanMapper.selectAbnormalLoadingByReservationId(d.getReservationId());
 			//该客户的异常签收件数
 			Integer abnormalSigning = distributionLoadscanMapper.selectAbnormalSigningByReservationId(d.getReservationId());
-
-
 //			DistributionLoadingNumDTO reservationSigningNum = distributionReservationMapper.selectReservationSigningNum(d.getReservationId());
-
 			if (d.getDeliveryType().equals(DistributionTypeConstant.shipie.getValue())){
 				List<DisStockListDetailEntity> disStockListDetailEntities = distributionReservationMapper.selectInventoryListByReservation(d.getReservationId());
 				if (Func.isNotEmpty(disStockListDetailEntities)){

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

@@ -26,7 +26,9 @@ import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.logpm.basicdata.entity.BasicdataClientEntity;
 import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
+import com.logpm.basicdata.feign.IBasicdataClientClient;
 import com.logpm.basicdata.feign.IBasicdataCodeClient;
 import com.logpm.basicdata.feign.IBasicdataGoodsAreaClient;
 import com.logpm.basicdata.feign.IBasicdataWarehouseClient;
@@ -201,6 +203,9 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 	@Autowired
 	private DistributionStockListInfoMapper distributionStockListInfoMapper;
 
+	@Autowired
+	private IBasicdataClientClient basicdataClientClient;
+
 
 	@Override
 	public IPage<DistributionStockupVO> selectDistributionStockupPage(IPage<DistributionStockupVO> page, DistributionStockupVO distributionStockup) {
@@ -1135,10 +1140,28 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 
 	@Override
 	public List<DistributionStockupStockListVO> selectStockupStockList(StockupDTO stockupDTO) {
-
-
+		BasicdataWarehouseEntity myCurrentWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse();
+		if (Func.isEmpty(myCurrentWarehouse)){
+			log.error("###########myCurrentWarehouse:{}",myCurrentWarehouse);
+			return null;
+		}
 		Long reservationId = stockupDTO.getReservationId();//预约单id
 		DistributionReservationEntity reservationEntity = distributionReservationService.getById(reservationId);
+		if (Func.isEmpty(reservationEntity)){
+			log.error("###########查询预约失败reservationId:{}",reservationId);
+			return null;
+		}
+		String mallName = reservationEntity.getMallName();
+		if (Func.isBlank(mallName)){
+			//预约商场名称为空  查看是否存在商场ID
+			if (Func.isNotEmpty(reservationEntity.getMallId())){
+				BasicdataClientEntity basicdataClientEntity = basicdataClientClient.getMallById(reservationEntity.getMallId());
+				mallName = basicdataClientEntity.getClientName();
+			}else {
+				log.error("###########预约单无商场信息:{}",reservationId);
+
+			}
+		}
 
 		if (stockupDTO.getTypeService().equals("3")) {
 			//自
@@ -1167,30 +1190,29 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 		} else {
 
 			//商，市
-			List<DistributionStockupStockListVO> list = distributionReservationService.selectStockupStockList(reservationId,reservationEntity.getWarehouseId());
-			for (int i = 0; i < list.size(); i++) {
-				DistributionStockupStockListVO distributionStockupStockListVO = list.get(i);
-				if (distributionStockupStockListVO.getPlanNum().equals(distributionStockupStockListVO.getRealNum())) {
-					distributionStockupStockListVO.setCompleteStact(true);
-				}
-				if (Func.isNotEmpty(distributionStockupStockListVO.getAllocations())){
-
-					String[] ids = distributionStockupStockListVO.getAllocations().split(",");
-					List<WarehouseGoodsAllocationEntity> allocationInforByIds = warehouseGoodsAllocationClient.getAllocationInforByIds(ids);
-
-					for (WarehouseGoodsAllocationEntity allocationInforById : allocationInforByIds) {
-						if (distributionStockupStockListVO.getAllocationList() == null) {
-							distributionStockupStockListVO.setAllocationList(new ArrayList<>());
-						}
-						Map<String, Object> map = new HashMap<>();
-						map.put("id", allocationInforById.getId());
-						map.put("name", allocationInforById.getQrCode());
-						distributionStockupStockListVO.getAllocationList().add(map);
-					}
-				}
-
-
-			}
+			List<DistributionStockupStockListVO> list = distributionReservationService.selectStockupStockList(reservationId,myCurrentWarehouse.getId(),mallName);
+            for (DistributionStockupStockListVO distributionStockupStockListVO : list) {
+                if (distributionStockupStockListVO.getPlanNum().equals(distributionStockupStockListVO.getRealNum())) {
+                    distributionStockupStockListVO.setCompleteStact(true);
+                }
+                if (Func.isNotEmpty(distributionStockupStockListVO.getAllocations())) {
+
+                    String[] ids = distributionStockupStockListVO.getAllocations().split(",");
+                    List<WarehouseGoodsAllocationEntity> allocationInforByIds = warehouseGoodsAllocationClient.getAllocationInforByIds(ids);
+
+                    for (WarehouseGoodsAllocationEntity allocationInforById : allocationInforByIds) {
+                        if (distributionStockupStockListVO.getAllocationList() == null) {
+                            distributionStockupStockListVO.setAllocationList(new ArrayList<>());
+                        }
+                        Map<String, Object> map = new HashMap<>();
+                        map.put("id", allocationInforById.getId());
+                        map.put("name", allocationInforById.getQrCode());
+                        distributionStockupStockListVO.getAllocationList().add(map);
+                    }
+                }
+
+
+            }
 			return list;
 		}
 

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

@@ -2127,12 +2127,12 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
 	@Override
 	public void downPackageByOrderPackageCode(String orderPackageCode,String remark,Long warehouseId) {
 		QueryWrapper<WarehouseTrayGoodsEntity> trayGoodsQueryWrapper = new QueryWrapper<>();
-		DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCode(orderPackageCode);
+		DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCodeAndWarehouseId(orderPackageCode,warehouseId);
 		trayGoodsQueryWrapper.eq("association_type","3")
 			.eq("association_value",orderPackageCode);
 		WarehouseTrayGoodsEntity trayGoodsEntity = warehouseTrayGoodsService.getOne(trayGoodsQueryWrapper);
 		StringBuffer stringBuffer = new StringBuffer();
-		if (Func.isNotEmpty(trayGoodsEntity)){
+		if (!Objects.isNull(trayGoodsEntity)){
 			Long trayGoodsId = trayGoodsEntity.getId();
 			Long trayTypeId = trayGoodsEntity.getTrayTypeId();
 			Long trayId = trayGoodsEntity.getTrayId();

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

@@ -1370,7 +1370,7 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 				WarehouseTrayGoodsEntity warehouseTrayGoodsEntity = warehouseTrayGoodsService.getOne(trayGoodsEntityQueryWrapper);
 				if(!Objects.isNull(warehouseTrayGoodsEntity)){
 					//有托盘，托盘下托
-					warehouseTrayTypeService.downPackageByOrderPackageCode(orderPackageCode,"包件下架:同步下托",warehouseId);
+					warehouseTrayTypeService.downPackageByOrderPackageCode(orderPackageCode,"包件解托",warehouseId);
 				}
 				continue;
 			}