Merge branch 'dev' into pre-production

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

@@ -152,4 +152,6 @@ public interface DistributionStockListMapper extends BaseMapper<DistributionStoc
 	List<DistributionMerchantStockListVO> selectMerchantHaveDataStockListInfo(@Param("stockListId") Long stockListId);
 
 	List<DistributionMerchantStockListVO> selectMerchantNotHaveDataStockListInfo(@Param("stockListId")Long id);
+
+	IPage<DistributionStockListAllocationVO> listAllocationOrder(IPage<Object> page, @Param("param") DistributionStockListEntity distributionStockListEntity);
 }

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

@@ -387,6 +387,28 @@
 
 
     </select>
+
+    <select id="listAllocationOrder" resultType="com.logpm.distribution.vo.DistributionStockListAllocationVO">
+        select lwug.position_code allocationTitle,
+        ldsi.market_name marketName,
+        lwug.num,
+        lwug.create_time createTime,
+        ldsi.cargo_unit cargoUnit,
+        ldsi.unpack,
+        ldsi.quantity_stock quantityStock,
+        ldsi.unpacking_quantity unpackingQuantity,
+        ldsi.description_goods descriptionGoods
+        FROM
+        logpm_distribution_stock_list ldsi
+        left join logpm_distribution_stock_list_info ldsli on ldsli.material_id = ldsi.material_id AND ldsli.warehouse_id = ldsi.warehouse_id
+        AND ldsi.market_id = ldsli.market_id and ldsli.incoming_batch = ldsi.incoming_batch
+        LEFT JOIN logpm_warehouse_updown_goods lwug ON ldsli.parcel_list_id = lwug.association_id and lwug.association_type = '4'
+        <where>
+            <if test="param.id != null "> and  ldsi.id = #{param.id}</if>
+        </where>
+    </select>
+
+
     <select id="selectAllStockList" resultType="com.logpm.distribution.vo.DistributionStockListVO">
        SELECT
         ldsl.tenant_id,

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockListServiceImpl.java

@@ -40,7 +40,6 @@ import com.logpm.distribution.vo.app.DistributionMerchantStockListVO;
 import com.logpm.distribution.vo.app.StockMallVO;
 import com.logpm.warehouse.entity.WarehouseTrayGoodsEntity;
 import com.logpm.warehouse.feign.IWarehouseTrayGoodsClient;
-import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.common.constant.DictBizConstant;
 import org.springblade.common.constant.printTemplate.PrintTemplateStatusConstant;
@@ -465,7 +464,20 @@ public class DistributionStockListServiceImpl extends BaseServiceImpl<Distributi
 	@Override
 	public IPage<DistributionStockListAllocationVO> listAllocation(IPage<Object> page, Map<String, Object> distributionStockList) {
 		DistributionStockListEntity distributionStockListEntity = JSONObject.parseObject(JSONObject.toJSONString(distributionStockList), DistributionStockListEntity.class);
-		return baseMapper.listAllocation(page,distributionStockListEntity);
+		IPage<DistributionStockListAllocationVO> pageList = null;
+
+		if(Objects.isNull(distributionStockListEntity)){
+			log.warn("##################listAllocation: 库存品信息不存在");
+			return null;
+		}
+		String sourceType = distributionStockListEntity.getSourceType();
+		if("1".equals(sourceType)){
+			pageList = baseMapper.listAllocationOrder(page,distributionStockListEntity);
+		}else{
+			pageList = baseMapper.listAllocation(page,distributionStockListEntity);
+		}
+
+		return pageList;
 	}
 
 	@Override