Merge branch 'pre-production'

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

@@ -582,8 +582,18 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
 	 * @param basicdataWarehouseEntity 仓库对象
 	 */
 	private void saveOrderPackage(String unitNo, DistributionStockArticleEntity distributionStockArticleEntity,  BasicdataWarehouseEntity basicdataWarehouseEntity, String waybillNo,String operationTime) {
-		DistributionParcelListEntityVO vo = advanceDetailClient.getByUnitNo(unitNo);
-//		WarehouseWaybillEntity warehouseWaybill = warehouseWaybillClient.findByWaybillNo(waybillNo);
+
+		DistributionParcelListEntityVO vo;
+		// 判断当前查询包件不是否为皮阿落
+		if("皮阿诺".equals(distributionStockArticleEntity.getBrand())){
+			vo = advanceDetailClient.getByUnitNoByPyl(unitNo);
+		}else{
+			vo = advanceDetailClient.getByUnitNo(unitNo);
+
+		}
+//
+//		DistributionParcelListEntityVO vo = advanceDetailClient.getByUnitNo(unitNo);
+////		WarehouseWaybillEntity warehouseWaybill = warehouseWaybillClient.findByWaybillNo(waybillNo);
 
 		if(Objects.isNull(vo)){
 			logger.warn("##############saveOrderPackage: 未在老系统查询到包件数据 unitNo={}",unitNo);

blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/feign/AdvanceDetailClient.java

@@ -79,6 +79,11 @@ public class AdvanceDetailClient implements IAdvanceDetailClient {
 		return advanceDetailService.getByUnitNo(unitNo);
 	}
 
+	@Override
+	public DistributionParcelListEntityVO getByUnitNoByPyl(String unitNo) {
+		return advanceDetailService.getByUnitNoByPyl(unitNo);
+	}
+
 	@Override
 	@GetMapping(API_PREFIX + "/getAllNumByOrderNo")
 	public Integer getAllNumByOrderNo(String orderSelfNum) {

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

@@ -60,4 +60,6 @@ public interface AdvanceDetailMapper extends BaseMapper<AdvanceDetailEntity> {
 	List<AdvanceDetailEntity> findAdvanceDetailEntityByPackageCode(@Param("newList") List<String> newList);
 
 	DistributionParcelListEntityVO getByUnitNoAndWarehouseId(@Param("unitNo") String unitNo, @Param("oldWarehouseId") Integer oldWarehouseId);
+
+	DistributionParcelListEntityVO getByUnitNoByPyl(@Param("unitNo")String unitNo);
 }

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

@@ -117,6 +117,33 @@
     </select>
 
 
+    <select id="getByUnitNoByPyl" resultType="com.logpm.oldproject.vo.DistributionParcelListEntityVO">
+        select w.title warehouse,
+               od.unitNo packetBarCode,
+               c.title cargoTitle,
+               s.title shelfTitle,
+               l.title goodsAllocation,
+               ad.firstPackName firsts,
+               ad.secondPackName `second`,
+               ad.thirdPackName thirdProduct,
+               ad.mscsNum quantity,
+               ad.mctsTruck trainNumber,
+               (
+                   select create_time from ht_scan_log where unitNo = #{unitNo}  and type in (1,4)
+                   ORDER BY create_time desc
+                   limit 1
+            ) warehouseEntryTimeEnd
+        from ht_order_detail od
+                 left join ht_advance_detail ad on ad.unitNo = od.unitNo
+                 left join ht_warehouse w on w.id = od.now_warehouse_id
+                 left join ht_location l on od.location_id = l.id
+                 left join ht_shelf s on l.shelf_id = s.id
+                 left join ht_cargo c on s.cargo_id = c.id
+        where od.unitNo = #{unitNo}
+
+    </select>
+
+
     <select id="getByCarNum" resultType="string" >
         SELECT
         cls.unitNo

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

@@ -58,4 +58,6 @@ public interface IAdvanceDetailService {
 	List<AdvanceDetailEntity> findAdvanceDetailEntityByPackageCode(List<String> newList);
 
 	DistributionParcelListEntityVO getByUnitNoAndWarehouseId(String unitNo, Integer oldWarehouseId);
+
+	DistributionParcelListEntityVO getByUnitNoByPyl(String unitNo);
 }

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

@@ -69,6 +69,11 @@ public class AdvanceDetailServiceImpl implements IAdvanceDetailService {
 		return advanceDetailMapper.getByUnitNo(unitNo);
 	}
 
+	@Override
+	public DistributionParcelListEntityVO getByUnitNoByPyl(String unitNo) {
+		return advanceDetailMapper.getByUnitNoByPyl(unitNo);
+	}
+
 	@Override
 	public Integer getAllNumByOrderNo(String orderSelfNum) {
 		QueryWrapper<AdvanceDetailEntity> queryWrapper = new QueryWrapper<>();