Merge branch 'dev' into pre-production

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

@@ -365,7 +365,7 @@
                ldsa.total_number   totalNum,
                count(ldpl.id)      num
         FROM logpm_distribution_stock_article ldsa
-                 left join logpm_distribution_parcel_list ldpl on ldpl.order_code = ldsa.order_code
+                 left join logpm_distribution_parcel_list ldpl on ldpl.stock_article_id = ldsa.id
                  left join logpm_warehouse_tray_goods lwtg
                            on ldpl.order_package_code = lwtg.association_value and lwtg.association_type = 3
                  left join logpm_warehouse_updown_goods lwug
@@ -388,7 +388,7 @@
                ldsa.total_number   totalNum,
                count(ldpl.id)      num
         FROM logpm_distribution_stock_article ldsa
-                 left join logpm_distribution_parcel_list ldpl on ldpl.order_code = ldsa.order_code
+                 left join logpm_distribution_parcel_list ldpl on ldpl.stock_article_id = ldsa.id
                  left join logpm_warehouse_tray_goods lwtg
                            on ldpl.order_package_code = lwtg.association_value and lwtg.association_type = 3
                  left join logpm_warehouse_updown_goods lwug

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

@@ -3153,8 +3153,12 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 							DistributionParcelListEntity distributionParcelListEntity = null;
 
 							for (DistributionParcelListEntity parcelListEntity : list1) {
+								log.debug("getScan parcelListEntity >>>> {}", parcelListEntity);
+								log.debug("getScan so >>>> {}", so);
+								log.debug("getScan coding >>>> {}", coding);
 								if (parcelListEntity.getStockArticleId().equals(so.getStockArticleId()) && parcelListEntity.getOrderPackageCode().equals(coding)) {
 									distributionParcelListEntity = parcelListEntity;
+									break;
 								}
 							}