Merge branch 'master' into feature/NoScanning

nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/PackingVO.java

@@ -74,4 +74,9 @@ public class PackingVO {
      * 最后扫描人名称
      */
     private String lastScanByName;
+
+    /**
+     * 送货单号列表
+     */
+    private String deliveryNos;
 }

nflg-wms-repository/src/main/resources/mapper/WmsPackageMapper.xml

@@ -27,7 +27,11 @@
     </select>
 
     <select id="search" resultType="com.nflg.wms.common.pojo.vo.PackingVO">
-        select a.*,b.supplier_code,b.supplier_name from wms_package a
+        select a.*,b.supplier_code,b.supplier_name,
+        (
+            SELECT string_agg(DISTINCT delivery_no,',') FROM wms_package_item WHERE package_id=a."id"
+        ) as "deliveryNos"
+        from wms_package a
         left join user_supplier b on a.supplier_id=b.user_id
         <where>
             <if test="request.packingCode !=null and request.packingCode !=''">