2 Achegas 9d68df762c ... c73c7f5240

Autor SHA1 Mensaxe Data
  yz c73c7f5240 Merge remote-tracking branch 'origin/dev_huangjunjie' hai 2 semanas
  huang b58f7b97aa pda出库配送地址,选择 hai 2 semanas

+ 3 - 0
src/main/java/com/jsh/erp/datasource/pda/vo/PDADepotHeadVO.java

@@ -39,4 +39,7 @@ public class PDADepotHeadVO {
     @ApiModelProperty("出入库时间")
     private Date warehousingTime;
 
+    @ApiModelProperty("配送地址")
+    private String receiverAddress;
+
 }

+ 5 - 1
src/main/resources/mapper_xml/DepotHeadMapper.xml

@@ -760,7 +760,8 @@
       dh.goods_type_count,
       dh.oper_time,
       s.supplier AS supplier_name,
-      dh.status
+      dh.status,
+      dh.receiver_address
     FROM
       jsh_depot_head dh
       LEFT JOIN jsh_supplier s ON dh.organ_id = s.id
@@ -777,6 +778,9 @@
       <if test="beginTime != null and beginTime != ''">
         AND dh.create_time between #{beginTime} and #{endTime}
       </if>
+      <if test="depotId != null and depotId !=0">
+        AND dh.depot_id = #{depotId}
+      </if>
     </where>
       GROUP BY dh.id
       ORDER BY dh.create_time DESC