优化

lastleg-service/src/main/java/com/baiyue/lastleg/dropship/mapper/DropshipOrderProfileMapper.java

@@ -10,7 +10,7 @@ import java.util.List;
 public interface DropshipOrderProfileMapper extends BaseMapper<DropshipOrderProfile> {
     String OUTBOUND_CANDIDATE_SELECT = "SELECT pos.id inventory_position_id,p.id profile_id," +
         "p.warehouse_pallet_id,pos.overseas_warehouse_id,b.overseas_warehouse_name," +
-        "p.pallet_no,b.inbound_code,s.sku_code,s.product_name," +
+        "p.pallet_no,b.inbound_code,o.order_no,o.customer_id,o.customer_name,s.sku_code,s.product_name," +
         "LEAST(pos.available_packages,s.package_count,(SELECT COUNT(*) FROM ll_dropship_carton c " +
         "WHERE c.customer_id=p.customer_id AND c.profile_id=p.id AND c.sku_code=s.sku_code " +
         "AND c.status='AVAILABLE')) available_packages FROM ll_dropship_order_profile p " +
@@ -21,7 +21,7 @@ public interface DropshipOrderProfileMapper extends BaseMapper<DropshipOrderProf
         "JOIN ll_inventory_balance b ON b.id=pos.balance_id AND b.customer_id=pos.customer_id " +
         "JOIN ll_dropship_sku_inventory s ON s.customer_id=p.customer_id AND s.order_id=p.order_id " +
         "AND s.profile_id=p.id ";
-    String OUTBOUND_CANDIDATE_WHERE = "WHERE p.customer_id=#{customerId} AND p.status='ACTIVE' " +
+    String OUTBOUND_CANDIDATE_WHERE = "WHERE (#{customerId} IS NULL OR #{customerId}='' OR p.customer_id=#{customerId}) AND p.status='ACTIVE' " +
         "AND pos.status='OCCUPIED' AND pos.available_packages>0 AND s.package_count>0 " +
         "AND EXISTS (SELECT 1 FROM ll_dropship_carton c WHERE c.customer_id=p.customer_id " +
         "AND c.profile_id=p.id AND c.sku_code=s.sku_code AND c.status='AVAILABLE') " +

lastleg-service/src/main/java/com/baiyue/lastleg/dropship/model/DropshipOutboundCandidate.java

@@ -12,6 +12,9 @@ public class DropshipOutboundCandidate {
     private String overseasWarehouseName;
     private String palletNo;
     private String inboundCode;
+    private String orderNo;
+    private String customerId;
+    private String customerName;
     private String skuCode;
     private String productName;
     private Long availablePackages;