Merge branch 'dev' into pre-production

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionReservationPackageDTO.java

@@ -20,6 +20,8 @@ import com.logpm.distribution.entity.DistributionReservationPackageEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.Date;
+
 /**
  * 预约包件中间表 数据传输对象实体类
  *
@@ -31,4 +33,19 @@ import lombok.EqualsAndHashCode;
 public class DistributionReservationPackageDTO extends DistributionReservationPackageEntity {
 	private static final long serialVersionUID = 1L;
     private Long warehouseId;
+    private String waybillNumber;
+    private String serviceNumber;
+    private String orderCode;
+    private String warehouseName;
+    private String orderPackageCode;
+    private String sendWarehouseName;
+    private String acceptWarehouseName;
+    private Date reservationDate;
+    private String trainNumber;
+    private String firsts;
+    private String second;
+    private String thirdProduct;
+    private String materialName;
+    private String trayCode;
+    private String positionCode;
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionReservationStockarticleDTO.java

@@ -31,4 +31,14 @@ import lombok.EqualsAndHashCode;
 public class DistributionReservationStockarticleDTO extends DistributionReservationStockarticleEntity {
 	private static final long serialVersionUID = 1L;
 
+	private String waybillNumber;
+	private String orderCode;
+	private String mallName;
+	private String storeName;
+	private String descriptionGoods;
+	private String brand;
+	private String consigneeUnit;
+	private String resource;
+	private String deliveryType;
+
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionReservationStocklistDTO.java

@@ -30,5 +30,16 @@ import lombok.EqualsAndHashCode;
 @EqualsAndHashCode(callSuper = true)
 public class DistributionReservationStocklistDTO extends DistributionReservationStocklistEntity {
 	private static final long serialVersionUID = 1L;
+	private String  incomingBatch;
+	private String  orderCode;
+	private String  sku;
+	private String  marketName;
+	private String  cargoNumber;
+	private String  cargoUnit;
+	private String  descriptionGoods;
+	private String  brandName;
+	private String  trayCode;
+	private String  positionCode;
+	private String  stockupArea;
 
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionReservationPackageExcel.java

@@ -53,7 +53,7 @@ public class DistributionReservationPackageExcel implements Serializable {
 	 */
 	@ColumnWidth(20)
 	@ExcelProperty("预约时间")
-	private Date reservation_date;
+	private Date reservationDate;
 
 	/**
 	 * 订单编号

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionReservationStocklistExcel.java

@@ -24,6 +24,7 @@ import com.alibaba.excel.annotation.write.style.HeadRowHeight;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.Date;
 
 
 /**
@@ -40,65 +41,132 @@ public class DistributionReservationStocklistExcel implements Serializable {
 
 	private static final long serialVersionUID = 1L;
 
+
 	/**
-	 * 租户号
+	 * 预约编号
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("租户号")
-	private String tenantId;
+	@ExcelProperty("预约编号")
+	private String reservationCode;
 	/**
-	 * 是否已删除
+	 * 包件编号
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("是否已删除")
-	private Integer isDeleted;
+	@ExcelProperty("预约时间")
+	private Date reservationDate;
+
 	/**
-	 * 预约编号
+	 * 订单编号
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("预约编号")
-	private String reservationId;
+	@ExcelProperty("服务类型")
+	private String deliveryType;
+	/**
+	 * 订单编号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("收货人")
+	private String consignee;
+	/**
+	 * 订单编号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("手机号码")
+	private String deliveryPhone;
+	/**
+	 * 订单编号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("收货地址")
+	private String deliveryAddress;
+
+//	/**
+//	 * 订单编号
+//	 */
+//	@ColumnWidth(20)
+//	@ExcelProperty("服务号")
+//	private String serviceNumber;
+
+	/**
+	 * 订单编号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("订单自编号")
+	private String orderCode;
+
+	/**
+	 * 订单编号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("SKU")
+	private String sku;
 	/**
-	 * 库存编号
+	 * 订单编号
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("库存编号")
-	private String stocklistId;
+	@ExcelProperty("商场名称")
+	private String marketName;
 	/**
-	 * 预约数量
+	 * 订单编号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("物料编码")
+	private String cargoNumber;
+	/**
+	 * 订单编号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("单位")
+	private String cargoUnit;
+	/**
+	 * 订单编号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("物料名称")
+	private String descriptionGoods;
+	/**
+	 * 订单编号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("品牌")
+	private String brandName;
+
+	/**
+	 * 订单编号
 	 */
 	@ColumnWidth(20)
 	@ExcelProperty("预约数量")
 	private String reservationNum;
 	/**
-	 * 预留1
+	 * 订单编号
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("预留1")
-	private String reserve1;
+	@ExcelProperty("备货数量")
+	private String stockNumber;
 	/**
-	 * 预留2
+	 * 订单编号
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("预留2")
-	private String reserve2;
+	@ExcelProperty("已备件数")
+	private String realityNum;
 	/**
-	 * 预留3
+	 * 订单编号
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("预留3")
-	private String reserve3;
+	@ExcelProperty("备货区")
+	private String stockupArea;
 	/**
-	 * 预留4
+	 * 订单编号
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("预留4")
-	private String reserve4;
+	@ExcelProperty("托盘码")
+	private String trayCode;
 	/**
-	 * 预留5
+	 * 订单编号
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("预留5")
-	private String reserve5;
+	@ExcelProperty("库位信息")
+	private String positionCode;
+
 
 }

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

@@ -59,13 +59,21 @@
         <where>
             ldrp.packet_bar_status in (1,3)
             <if test="param.reservationId != null and param.reservationId != ''"> and ldrs.reservation_id  = #{param.reservationId } </if>
-            <if test="param. != null and param. != ''"> and  = #{param. } </if>
-            <if test="param. != null and param. != ''"> and  = #{param. } </if>
-            <if test="param. != null and param. != ''"> and  = #{param. } </if>
-            <if test="param. != null and param. != ''"> and  = #{param. } </if>
-            <if test="param. != null and param. != ''"> and  = #{param. } </if>
-            <if test="param. != null and param. != ''"> and  = #{param. } </if>
-            <if test="param. != null and param. != ''"> and  = #{param. } </if>
+            <if test="param.waybillNumber != null and param.waybillNumber != ''"> and ldpl.waybill_number like concat('%',#{param.waybillNumber },'%')  </if>
+            <if test="param.serviceNumber != null and param.serviceNumber != ''"> and ldpl.service_number  like concat('%', #{param.serviceNumber },'%') </if>
+            <if test="param.orderCode != null and param.orderCode != ''"> and ldpl.order_code  like concat('%', #{param.orderCode },'%') </if>
+            <if test="param.warehouseName != null and param.warehouseName != ''"> and ldr.warehouse_name like concat('%', #{param.warehouseName },'%') </if>
+            <if test="param.orderPackageCode != null and param.orderPackageCode != ''"> and ldpl.order_package_code  like concat('%', #{param.orderPackageCode },'%') </if>
+            <if test="param.sendWarehouseName != null and param.sendWarehouseName != ''"> and ldpl.send_warehouse_name like concat('%', #{param.sendWarehouseName },'%') </if>
+            <if test="param.acceptWarehouseName != null and param.acceptWarehouseName != ''"> and ldpl.accept_warehouse_name like concat('%', #{param.acceptWarehouseName },'%') </if>
+            <if test="param.reservationDate != null "> and  date_format(ldr.reservation_date,'%Y-%m-%d') = #{param.reservationDate} </if>
+            <if test="param.trainNumber != null and param.trainNumber != ''"> and ldpl.train_number like concat('%', #{param.trainNumber },'%') </if>
+            <if test="param.firsts != null and param.firsts != ''"> and ldpl.firsts like concat('%', #{param.firsts },'%') </if>
+            <if test="param.second != null and param.second != ''"> and ldpl.second like concat('%', #{param.second } ,'%')</if>
+            <if test="param.thirdProduct != null and param.thirdProduct != ''"> and ldpl.third_product like concat('%', #{param.thirdProduct } ,'%')</if>
+            <if test="param.materialName != null and param.materialName != ''"> and ldpl.material_name like concat('%', #{param.materialName },'%') </if>
+            <if test="param.trayCode != null and param.trayCode != ''"> and lwtg.tray_code like concat('%',#{param.trayCode },'%') </if>
+            <if test="param.positionCode != null and param.positionCode != ''"> and lwug.position_code like concat('%', #{param.positionCode } ,'%')</if>
         </where>
 
     </select>

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

@@ -19,6 +19,7 @@ package com.logpm.distribution.mapper;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.distribution.dto.DistributionReservationStockarticleDTO;
 import com.logpm.distribution.entity.DistributionReservationStockarticleEntity;
 import com.logpm.distribution.excel.DistributionReservationStockarticleExcel;
 import com.logpm.distribution.vo.DistributionReservationStockarticleVO;
@@ -52,7 +53,7 @@ public interface DistributionReservationStockarticleMapper extends BaseMapper<Di
 	 * @param queryWrapper
 	 * @return
 	 */
-	List<DistributionReservationStockarticleExcel> exportDistributionReservationStockarticle(@Param("ew") Wrapper<DistributionReservationStockarticleEntity> queryWrapper);
+	List<DistributionReservationStockarticleExcel> exportDistributionReservationStockarticle(@Param("param") DistributionReservationStockarticleDTO queryWrapper);
 
 	/**
 	 * 物理删除预约订单中间表

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

@@ -58,14 +58,15 @@
         <where>
             ldrs.stock_article_status in (1,3)
             <if test="param.reservationId != null and param.reservationId != ''"> and ldrs.reservation_id  = #{param.reservationId } </if>
-            <if test="param. != null and param. != ''"> and  = #{param. } </if>
-            <if test="param. != null and param. != ''"> and  = #{param. } </if>
-            <if test="param. != null and param. != ''"> and  = #{param. } </if>
-            <if test="param. != null and param. != ''"> and  = #{param. } </if>
-            <if test="param. != null and param. != ''"> and  = #{param. } </if>
-            <if test="param. != null and param. != ''"> and  = #{param. } </if>
-            <if test="param. != null and param. != ''"> and  = #{param. } </if>
-            <if test="param. != null and param. != ''"> and  = #{param. } </if>
+            <if test="param.waybillNumber != null and param.waybillNumber != ''"> and ldsa.waybill_number like concat('%',#{param.waybillNumber },'%')  </if>
+            <if test="param.orderCode != null and param.orderCode != ''"> and ldsa.order_code  like concat('%', #{param.orderCode },'%') </if>
+            <if test="param.mallName != null and param.mallName != ''"> and ldsa.mall_name like concat('%', #{param.mallName },'%')  </if>
+            <if test="param.storeName != null and param.storeName != ''"> and ldsa.store_name  like concat('%', #{param.storeName },'%')  </if>
+            <if test="param.descriptionGoods != null and param.descriptionGoods != ''"> and  ldsa.description_goods like concat('%', #{param.descriptionGoods },'%')  </if>
+            <if test="param.brand != null and param.brand != ''"> and ldsa.brand  like concat('%', #{param.brand },'%')  </if>
+            <if test="param.consigneeUnit != null and param.consigneeUnit != ''"> and ldsa.consignee_unit like concat('%', #{param.consigneeUnit },'%')  </if>
+            <if test="param.resource != null and param.resource != ''"> and ldsa.resource like concat('%',#{param.resource },'%')  </if>
+            <if test="param.deliveryType != null and param.deliveryType != ''"> and ldr.delivery_type = #{param.deliveryType} </if>
         </where>
 
 

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

@@ -35,7 +35,32 @@
 
     <select id="exportDistributionReservationStocklist" resultType="com.logpm.distribution.excel.DistributionReservationStocklistExcel">
        <!-- SELECT * FROM logpm_distribution_reservation_stocklist ${ew.customSqlSegment}-->
+        select DISTINCT ldr.reservation_code reservationCode,ldr.reservation_date reservationDate,ldr.delivery_type deliveryType,ldr.consignee,ldr.delivery_address deliveryAddress
+        ,ldr.delivery_phone deliveryPhone,ldr.reservation_num reservationNum,ldr.warehouse_name warehouseName,
+        ldsl.incoming_batch incomingBatch,ldsl.incoming_batch orderCode,ldsl.sku,ldsl.market_name marketName,ldsl.cargo_number cargoNumber,ldsl.cargo_unit cargoUnit,ldsl.description_goods descriptionGoods,
+        ldsl.brand_name brandName,ldrs.reservation_num reservationNum,ldrs.reservation_num stockNumber,ldrs.reality_num realityNum, lwtg.tray_code trayCode ,lwug.position_code positionCode
+        ,lds.stockup_area stockupArea
 
+        from  logpm_distribution_reservation_stocklist ldrs
+        LEFT JOIN logpm_distribution_reservation ldr on ldr.id = ldrs.reservation_id
+        LEFT JOIN logpm_distribution_stock_list ldsl on ldsl.id = ldrs.stocklist_id
+        LEFT JOIN logpm_warehouse_tray_goods lwtg on lwtg.association_id = ldsl.material_id and lwtg.incoming_batch = ldsl.incoming_batch and lwtg.market_id = ldsl.market_id
+        LEFT JOIN logpm_warehouse_updown_goods lwug on lwug.association_id = ldsl.material_id and lwug.incoming_batch = ldsl.incoming_batch and lwug.market_id = ldsl.market_id
+        LEFT JOIN logpm_distribution_stockup_info ldsi on ldsi.reservation_id = ldrs.reservation_id
+        LEFT JOIN logpm_distribution_stockup lds on lds.id = ldsi.stockup_id
+        <where>
+            <if test="param.incomingBatch != null and param.incomingBatch !=''"> and ldsl.incoming_batch like concat('%', #{param.incomingBatch },'%')</if>
+            <if test="param.sku != null and param.sku !=''"> and ldsl.sku like concat('%', #{param.sku },'%')</if>
+            <if test="param.marketName != null and param.marketName !=''"> and ldsl.market_name like concat('%', #{param.marketName },'%')</if>
+            <if test="param.cargoNumber != null and param.cargoNumber !=''"> and ldsl.cargo_number like concat('%', #{param.cargoNumber },'%')</if>
+            <if test="param.cargoUnit != null and param.cargoUnit !=''"> and ldsl.cargo_unit like concat('%', #{param.cargoUnit },'%')</if>
+            <if test="param.descriptionGoods != null and param.descriptionGoods !=''"> and ldsl.description_goods like concat('%', #{param.descriptionGoods },'%')</if>
+            <if test="param.brandName != null and param.brandName !=''"> and ldsl.brand_name like concat('%', #{param.brandName },'%')</if>
+            <if test="param.trayCode != null and param.trayCode !=''"> and lwtg.tray_code like concat('%', #{param.trayCode },'%')</if>
+            <if test="param.positionCode != null and param.positionCode !=''"> and lwug.position_code like concat('%', #{param.positionCode },'%')</if>
+            <if test="param.stockupArea != null and param.stockupArea !=''"> and lds.stockup_area like concat('%', #{param.stockupArea },'%')</if>
+            <if test="param.orderCode != null and param.orderCode !=''"> and ldsl.incoming_batch like concat('%', #{param.orderCode },'%')</if>
+        </where>
 
 
 

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

@@ -102,7 +102,7 @@
                 concat('%',#{param.deliveryDocument},'%')
             </if>
             <if test="param.certificateType != null and param.certificateType != ''">and dbl.certificate_type =
-                #{param.certificateType},
+                #{param.certificateType}
             </if>
 
         </where>

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

@@ -67,9 +67,9 @@ public class DistributionReservationPackageServiceImpl extends BaseServiceImpl<D
 
 	@Override
 	public List<DistributionReservationPackageExcel> exportDistributionReservationPackage(Map<String, Object> distributionReservationPackage) {
-		QueryWrapper<DistributionReservationPackageEntity> queryWrapper = Condition.getQueryWrapper(distributionReservationPackage, DistributionReservationPackageEntity.class);
-		queryWrapper.lambda().eq(DistributionReservationPackageEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
-		queryWrapper.apply("packet_bar_status in (1,3)");
+//		QueryWrapper<DistributionReservationPackageEntity> queryWrapper = Condition.getQueryWrapper(distributionReservationPackage, DistributionReservationPackageEntity.class);
+//		queryWrapper.lambda().eq(DistributionReservationPackageEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
+//		queryWrapper.apply("packet_bar_status in (1,3)");
 
 		BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
 		DistributionReservationPackageDTO reservationPackageDTO = JSONObject.parseObject(JSONObject.toJSONString(distributionReservationPackage), DistributionReservationPackageDTO.class);

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

@@ -233,7 +233,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 //			distrbutionReservation.setTypeName(DictCache.getValue(DictEnum.YES_NO, DistrbutionReservation.getType()));
 			DistributionReservationExcel reservationExcel = new DistributionReservationExcel();
 			reservationExcel.setReservationCode(dis.getReservationCode());
-			reservationExcel.setOrderCode("订单自编号");
+			reservationExcel.setOrderCode(dis.getStockArticleId());
 			reservationExcel.setServiceNumber(dis.getServiceNumber());
 			reservationExcel.setWarehouseName(dis.getWarehouseName());
 			reservationExcel.setMallName(dis.getMallName());

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

@@ -16,9 +16,11 @@
  */
 package com.logpm.distribution.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.distribution.dto.DistributionReservationStockarticleDTO;
 import com.logpm.distribution.entity.DistributionReservationStockarticleEntity;
 import com.logpm.distribution.excel.DistributionReservationStockarticleExcel;
 import com.logpm.distribution.mapper.DistributionReservationStockarticleMapper;
@@ -52,10 +54,12 @@ public class DistributionReservationStockarticleServiceImpl extends BaseServiceI
 	@Override
 	public List<DistributionReservationStockarticleExcel> exportDistributionReservationStockarticle(Map<String, Object> distributionReservationStockarticle) {
 
-		QueryWrapper<DistributionReservationStockarticleEntity> queryWrapper = Condition.getQueryWrapper(distributionReservationStockarticle, DistributionReservationStockarticleEntity.class);
-		queryWrapper.lambda().eq(DistributionReservationStockarticleEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
-		queryWrapper.apply("stock_article_status in (1,3)");
-		List<DistributionReservationStockarticleExcel> distributionReservationStockarticleList = baseMapper.exportDistributionReservationStockarticle(queryWrapper);
+//		QueryWrapper<DistributionReservationStockarticleEntity> queryWrapper = Condition.getQueryWrapper(distributionReservationStockarticle, DistributionReservationStockarticleEntity.class);
+//		queryWrapper.lambda().eq(DistributionReservationStockarticleEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
+//		queryWrapper.apply("stock_article_status in (1,3)");
+		DistributionReservationStockarticleDTO reservationStockarticleDTO = JSONObject.parseObject(JSONObject.toJSONString(distributionReservationStockarticle), DistributionReservationStockarticleDTO.class);
+
+		List<DistributionReservationStockarticleExcel> distributionReservationStockarticleList = baseMapper.exportDistributionReservationStockarticle(reservationStockarticleDTO);
 		distributionReservationStockarticleList.forEach(d  -> {
 			d.setDeliveryType(DictBizCache.getValue(DictBizConstant.DISTRIBUTION_TYPE,d.getDeliveryType()));
 //			distributionReservationStockarticle.setTypeName(DictCache.getValue(DictEnum.YES_NO, DistributionReservationStockarticle.getType()));

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

@@ -52,9 +52,9 @@ public class DistributionReservationStocklistServiceImpl extends BaseServiceImpl
 	@Override
 	public List<DistributionReservationStocklistExcel> exportDistributionReservationStocklist(Map<String, Object> distributionReservationStocklist) {
 
-		QueryWrapper<DistributionReservationStocklistEntity> queryWrapper = Condition.getQueryWrapper(distributionReservationStocklist, DistributionReservationStocklistEntity.class);
-		queryWrapper.apply("stock_list_status in (1,3)");
-		queryWrapper.lambda().eq(DistributionReservationStocklistEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
+//		QueryWrapper<DistributionReservationStocklistEntity> queryWrapper = Condition.getQueryWrapper(distributionReservationStocklist, DistributionReservationStocklistEntity.class);
+//		queryWrapper.apply("stock_list_status in (1,3)");
+//		queryWrapper.lambda().eq(DistributionReservationStocklistEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
 		DistributionReservationStocklistDTO reservationStocklistDTO = JSONObject.parseObject(JSONObject.toJSONString(distributionReservationStocklist), DistributionReservationStocklistDTO.class);
 
 		List<DistributionReservationStocklistExcel> distributionReservationStocklistList = baseMapper.exportDistributionReservationStocklist(reservationStocklistDTO);

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

@@ -376,9 +376,9 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
 				logger.warn("############handleDataToPlatform: 仓库信息不存在 destinationWarehouse={}",destinationWarehouse);
 				throw new CustomerException(405, "仓库信息不存在");
 			}
-
+			Long warehouseId = basicdataWarehouseEntity.getId();
 			//判断新系统是否有这条订单数据
-			DistributionStockArticleEntity distributionStockArticleEntity = distributionStockArticleClient.findByAdvanceId(advanceId);
+			DistributionStockArticleEntity distributionStockArticleEntity = distributionStockArticleClient.findStockArticleByOrderCodeAndWarehouseId(orderSelfNum,warehouseId);
 
 			Long id;
 			String waybillNoNum = advanceEntity.getWaybillNo();

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

@@ -67,7 +67,7 @@ public class WarehouseUpdownTypeApiController {
 			return R.data(upShelfDataVOs);
 		}catch (CustomerException e){
 			log.warn(e.message);
-			return Resp.scanFail(e.message,e.message);
+			return Resp.scanFail(e.code,e.message,e.message);
 		}catch (Exception e){
 			log.error(method+"系统异常，联系管理员",e);
 			return R.fail(500,"系统异常，联系管理员");
@@ -101,7 +101,7 @@ public class WarehouseUpdownTypeApiController {
 			return R.data(upShelfAllocationVO);
 		}catch (CustomerException e){
 			log.warn(e.message);
-			return Resp.scanFail(e.message,e.message);
+			return Resp.scanFail(e.code,e.message,e.message);
 		}catch (Exception e){
 			log.error(method+"系统异常，联系管理员",e);
 			return R.fail(500,"系统异常，联系管理员");