1.零担数据增加运单号

blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/TrayTypeDataListVO.java

@@ -11,6 +11,7 @@ public class TrayTypeDataListVO implements Serializable {
 
 	private Long trayGoodsId;//id
 	private Long dataId;//id
+	private String waybillNo;//运单号
 	private String dataCode;//编码
 	private String dataName;//名称
 	private String sku;//sku

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseTrayGoodsMapper.xml

@@ -50,6 +50,7 @@
     <select id="getZeroListByTrayTypeId" resultType="com.logpm.warehouse.vo.TrayTypeDataListVO">
         select lwtg.id trayGoodsId,
                ldsa.id dataId,
+               ldsa.waybill_number waybillNo,
                ldsa.order_code dataCode,
                lwtg.num scanNum,
                ldsa.total_number orderTotalNum,
@@ -63,6 +64,7 @@
 
     <select id="getZeroUpListByTrayTypeId" resultType="com.logpm.warehouse.vo.UpShelfDataVO">
         select ldsa.order_code orderCode,
+               ldsa.waybill_number waybillNo,
                lwtg.tray_code trayCode,
                2 goodsType,
                lwtg.num shelfNum,

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseTrayTypeMapper.xml

@@ -60,7 +60,8 @@
 
     <select id="getZeroOrderByWaybillCode" resultType="com.logpm.warehouse.vo.TrayTypeDataListVO">
         select ldsa.id dataId,
-                ldsa.order_code dataCode,
+               ldsa.waybill_number waybillNo,
+               ldsa.order_code dataCode,
                ldsa.hand_quantity orderTotalNum
         from logpm_distribution_stock_article ldsa
         where ldsa.is_deleted = 0