Merge branch 'dev' into pre-production

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

@@ -82,4 +82,12 @@ public interface WarehouseUpdownStockupAreaMapper extends BaseMapper<WarehouseUp
 	 * @return
 	 */
 	List<Map<String, Object>> selectStockUpAreaStockList(@Param("warehouseId")Long warehouseId,@Param("allocationId") Long allocationId);
+
+	/**
+	 *
+	 * @param warehouseId
+	 * @param allocationId
+	 * @return
+	 */
+	List<Map<String, Object>> selectStockUpAreaZeroStockArticle(@Param("warehouseId")Long warehouseId,@Param("allocationId") Long allocationId );
 }

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

@@ -135,6 +135,22 @@
         GROUP BY
         lwusa.incoming_batch
     </select>
+    <select id="selectStockUpAreaZeroStockArticle" resultType="java.util.Map">
+        SELECT
+        ldsa.order_code AS orderCode,
+        ldsa.waybill_number AS waybillNumber,
+        ldsa.total_number AS totalNumber,
+        lwusa.num AS totalNum,
+        IF(ldsa.total_number = sum( lwusa.num ),1,0) AS complete,
+        2 AS goodsType
+        FROM
+        logpm_warehouse_updown_stockup_area AS lwusa
+        LEFT JOIN logpm_distribution_stock_article AS ldsa ON ldsa.id = lwusa.association_id
+        WHERE
+        lwusa.allocation_id = #{allocationId} AND lwusa.warehouse_id = #{warehouseId} AND  lwusa.goods_type = '2' AND lwusa.association_type IN ('1')
+        GROUP BY
+        ldsa.id
+    </select>
 
 
 </mapper>

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownStockupAreaServiceImpl.java

@@ -365,6 +365,12 @@ public class WarehouseUpdownStockupAreaServiceImpl extends BaseServiceImpl<Wareh
 				List<Map<String,Object>> inventoryMap = baseMapper.selectStockUpAreaStockList(warehouseId,allocationId);
 				maps.addAll(inventoryMap);
 			}
+			//查询无数据零担订单信息
+			List<WarehouseUpdownStockupAreaEntity> notSourceOrderData = warehouseUpdownStockupAreaEntities.stream().filter(f -> "2".equals(f.getGoodsType())&& "1".equals(f.getAssociationType())).collect(Collectors.toList());
+			if (Func.isNotEmpty(notSourceOrderData)){
+				List<Map<String,Object>> zeroStockArticleMap = baseMapper.selectStockUpAreaZeroStockArticle(warehouseId,allocationId);
+				maps.addAll(zeroStockArticleMap);
+			}
 		}
 		return R.data(maps);
 	}