添加自提订单号

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistrilbutionBillLadingVO.java

@@ -49,6 +49,8 @@ public class DistrilbutionBillLadingVO extends DistrilbutionBillLadingEntity {
 	private String warehouseEntryTime;
 	private String storageFee;
 	private String totalNumber;
+	//订单自编号
+	private String orderCode;
 	private String brand;
 	private String typeService;
 

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

@@ -131,6 +131,11 @@ public class DistrilbutionBillLadingDTO extends DistrilbutionBillLadingEntity {
 	 * 备货编码
 	 */
 	private  String stockupCode;
+
+	/**
+	 * 订单自编号
+	 */
+	private  String orderCode;
 	/**
 	 * 库存品
 	 */

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

@@ -27,7 +27,6 @@
     </resultMap>
     <select id="pageList" resultType="com.logpm.distribution.vo.DistrilbutionBillLadingVO">
 
-
         select dbl.id,GROUP_CONCAT(DISTINCT dsa.service_number) serviceNumber,GROUP_CONCAT(DISTINCT dsa.waybill_number) waybillNumber,GROUP_CONCAT(DISTINCT dsa.consignee_unit)
         consigneeUnit,GROUP_CONCAT(DISTINCT dsa.customer_name) customerName,GROUP_CONCAT(DISTINCT dsa.customer_telephone)
         customerTelephone,dsa.warehouse,dsa.warehouse_entry_time warehouseEntryTime,dsa.storage_fee
@@ -45,7 +44,8 @@
         from logpm_distrilbution_bill_stock ldbs
         LEFT JOIN logpm_distribution_stock lds on lds.stock_article = ldbs.stock_article_id
         where ldbs.bill_lading_id = dbl.id
-        ) stopNum
+        ) stopNum,
+        GROUP_CONCAT(DISTINCT dsa.order_code) orderCode
         from logpm_distrilbution_bill_lading dbl
         LEFT JOIN logpm_distrilbution_bill_package dbp on dbp.bill_lading_id = dbl.id and dbp.packet_bar_status in (1,3)
         LEFT JOIN logpm_distribution_stock_article dsa on dbp.stock_article_id = dsa.id
@@ -54,6 +54,9 @@
             <if test="param.serviceNumber != null and param.serviceNumber != ''">and dsa.service_number like
                 concat('%',#{param.serviceNumber},'%')
             </if>
+            <if test="param.orderCode != null and param.orderCode != ''">and dsa.order_code like
+                concat('%',#{param.orderCode},'%')
+            </if>
             <if test="param.pickupBatch != null and param.pickupBatch != ''">and dbl.pickup_batch like
                 concat('%',#{param.pickupBatch},'%')
             </if>